From fe2928bc28d7f99ebee14a6df8a0957a9aecf982 Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Mon, 24 Jan 2022 09:16:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=97=B6=E9=97=B4BUG?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/yieldReport/com_defect_roll.vue | 4 +++- src/views/modules/yieldReport/com_end_tuning.vue | 7 +++++-- src/views/modules/yieldReport/com_finish_roll.vue | 2 ++ src/views/modules/yieldReport/com_merge_roll.vue | 3 ++- src/views/modules/yieldReport/com_produce_down.vue | 7 +++++-- src/views/modules/yieldReport/com_replace_material.vue | 7 +++++-- src/views/modules/yieldReport/com_replace_tool.vue | 7 +++++-- src/views/modules/yieldReport/com_separate_roll.vue | 7 +++++-- src/views/modules/yieldReport/com_start_produce.vue | 7 +++++-- src/views/modules/yieldReport/com_start_tuning.vue | 7 +++++-- 10 files changed, 42 insertions(+), 16 deletions(-) diff --git a/src/views/modules/yieldReport/com_defect_roll.vue b/src/views/modules/yieldReport/com_defect_roll.vue index 432d872..a5f2bcd 100644 --- a/src/views/modules/yieldReport/com_defect_roll.vue +++ b/src/views/modules/yieldReport/com_defect_roll.vue @@ -153,7 +153,7 @@ export default { seqNo: '', rollNo: '', operatorId: '', - reportDate: this.dayjs(new Date()).format('YYYY-MM-DD'), + reportDate: '', defectCode: '', defectDesc: '', defectQty: 0, @@ -317,6 +317,8 @@ export default { this.pageData.defectQty = 0; this.pageData.defectCode = ''; this.pageData.defectDesc = ''; + //重置时间 + this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD'); //自动获取焦点 this.$nextTick(() => { this.$refs.defectCode.focus(); diff --git a/src/views/modules/yieldReport/com_end_tuning.vue b/src/views/modules/yieldReport/com_end_tuning.vue index ded93a3..9760cbb 100644 --- a/src/views/modules/yieldReport/com_end_tuning.vue +++ b/src/views/modules/yieldReport/com_end_tuning.vue @@ -121,8 +121,8 @@ export default { orderNo: '', itemNo: 0, operatorId: '', - reportDate: this.dayjs().format('YYYY-MM-DD'), - reportTime: this.dayjs().format('HH:mm:ss'), + reportDate: '', + reportTime: '', }, operatorData: { site: this.$store.state.user.site, @@ -310,6 +310,9 @@ export default { this.pageData.seqNo = pageData.seqNo; this.pageData.rollNo = pageData.rollNo; this.pageData.operatorId = operatorData.operatorId; + //重置时间 + this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD'); + this.pageData.reportTime = this.dayjs(new Date()).format('HH:mm:ss'); //初始化操作员对象 this.operatorData = JSON.parse(JSON.stringify(operatorData)); //初始化标题 diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue index 9e40a40..3f526a4 100644 --- a/src/views/modules/yieldReport/com_finish_roll.vue +++ b/src/views/modules/yieldReport/com_finish_roll.vue @@ -499,6 +499,8 @@ export default { this.pageData.scheduledDate = scheduleData.scheduledDate; this.pageData.shiftNo = scheduleData.shiftNo; this.pageData.resourceId = scheduleData.resourceId; + //重置时间 + this.pageData.reportedTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'); //初始化操作员对象 this.operatorData = JSON.parse(JSON.stringify(operatorData)); //初始化标题 diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue index d1148ac..fb42d9c 100644 --- a/src/views/modules/yieldReport/com_merge_roll.vue +++ b/src/views/modules/yieldReport/com_merge_roll.vue @@ -63,7 +63,7 @@ export default { partNo: '', rollNo: '', partDesc: '', - reportTime: this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'), + reportTime: '', reportedFlag: 'N', qtyRequiredOriginal: 0, scheduledDate: '', @@ -114,6 +114,7 @@ export default { this.scheduleData.seqNo = seqNo; //初始化操作员对象 this.operatorData = JSON.parse(JSON.stringify(operatorData)); + this.pageData.reportTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'); // this.currentRollOps.seqNo = seqNo; // this.currentRollOps.rollNo = rollNo; //刷新当前派工单的信息 diff --git a/src/views/modules/yieldReport/com_produce_down.vue b/src/views/modules/yieldReport/com_produce_down.vue index 22881b5..141b51f 100644 --- a/src/views/modules/yieldReport/com_produce_down.vue +++ b/src/views/modules/yieldReport/com_produce_down.vue @@ -132,8 +132,8 @@ export default { seqNo: '', rollNo: '', operatorId: '', - reportDate: this.dayjs(new Date()).format('YYYY-MM-DD'), - reportTime: this.dayjs(new Date()).format('HH:mm:ss'), + reportDate: '', + reportTime: '', totalTime: 0, downTimeCode: '', downTimeDesc: '', @@ -167,6 +167,9 @@ export default { this.pageData.seqNo = scheduleData.seqNo; this.pageData.rollNo = scheduleData.rollNo; this.pageData.operatorId = operatorData.operatorId; + //重置时间 + this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD'); + this.pageData.reportTime = this.dayjs(new Date()).format('HH:mm:ss'); //清空数据 this.pageData.totalTime = 0; this.pageData.downTimeCode = ''; diff --git a/src/views/modules/yieldReport/com_replace_material.vue b/src/views/modules/yieldReport/com_replace_material.vue index 87f6c53..577ae1d 100644 --- a/src/views/modules/yieldReport/com_replace_material.vue +++ b/src/views/modules/yieldReport/com_replace_material.vue @@ -118,8 +118,8 @@ export default { bomItemNo: -1, rmRollNo: '', oriRmRollNo: '', - reportDate: this.dayjs(new Date()).format('YYYY-MM-DD'), - reportTime: this.dayjs(new Date()).format('HH:mm:ss'), + reportDate: '', + reportTime: '', downTimeQty: 0, consumeQty: 0, oriConsumeQty: 0, @@ -165,6 +165,9 @@ export default { this.pageData.histSeqNo = oriMaterialData.histSeqNo; this.pageData.oriRmRollNo = oriMaterialData.rmRollNo; this.pageData.bomItemNo = oriMaterialData.sAPBOMItemNo; + //重置时间 + this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD'); + this.pageData.reportTime = this.dayjs(new Date()).format('HH:mm:ss'); this.pageData.rmRollNo = ''; //自动获取焦点 this.$nextTick(() => { diff --git a/src/views/modules/yieldReport/com_replace_tool.vue b/src/views/modules/yieldReport/com_replace_tool.vue index 3b9725a..7363a19 100644 --- a/src/views/modules/yieldReport/com_replace_tool.vue +++ b/src/views/modules/yieldReport/com_replace_tool.vue @@ -149,8 +149,8 @@ export default { toolInstanceId: '', oriToolInstanceId: '', replaceFlag: 'Y', - reportDate: this.dayjs(new Date()).format('YYYY-MM-DD'), - reportTime: this.dayjs(new Date()).format('HH:mm:ss'), + reportDate: '', + reportTime: '', downTimeFlag: 'Y', downTimeQty: 0, consumeQty: 0, @@ -195,6 +195,9 @@ export default { this.pageData.operatorId = operatorData.operatorId; this.pageData.histSeqNo = oriToolData.histSeqNo; this.pageData.oriToolInstanceId = oriToolData.toolInstanceId; + //重置时间 + this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD'); + this.pageData.reportTime = this.dayjs(new Date()).format('HH:mm:ss'); //区分是否是切换切换的 this.pageData.toolInstanceId = ''; this.pageData.consumeQty = 0; diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue index 8fe378e..5fd557c 100644 --- a/src/views/modules/yieldReport/com_separate_roll.vue +++ b/src/views/modules/yieldReport/com_separate_roll.vue @@ -66,8 +66,8 @@ export default { partNo: '', rollNo: '', partDesc: '', - reportDate: this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'), - reportTime: this.dayjs(new Date()).format('HH:mm:ss'), + reportDate: '', + reportTime: '', reportedFlag: 'N', qtyRequiredOriginal: 0, scheduledDate: '', @@ -130,6 +130,9 @@ export default { this.scheduleData.seqNo = seqNo; //初始化操作员对象 this.operatorData = JSON.parse(JSON.stringify(operatorData)); + //重置时间 + this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'); + this.pageData.reportTime = this.dayjs(new Date()).format('HH:mm:ss'); // this.currentRollOps.seqNo = seqNo; // this.currentRollOps.rollNo = rollNo; //刷新当前派工单的信息 diff --git a/src/views/modules/yieldReport/com_start_produce.vue b/src/views/modules/yieldReport/com_start_produce.vue index d8d2a95..0b7d455 100644 --- a/src/views/modules/yieldReport/com_start_produce.vue +++ b/src/views/modules/yieldReport/com_start_produce.vue @@ -66,8 +66,8 @@ export default { itemNo: 0, rollNo: '', operatorId: '', - reportDate: this.dayjs().format('YYYY-MM-DD'), - reportTime: this.dayjs().format('HH:mm:ss'), + reportDate: '', + reportTime: '', }, operatorData: { site: this.$store.state.user.site, @@ -94,6 +94,9 @@ export default { this.pageData.seqNo = scheduleData.seqNo; this.pageData.rollNo = scheduleData.rollNo; this.pageData.operatorId = operatorData.operatorId; + //重置时间 + this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD'); + this.pageData.reportTime = this.dayjs(new Date()).format('HH:mm:ss'); //初始化操作员对象 this.operatorData = JSON.parse(JSON.stringify(operatorData)); //初始化标题 diff --git a/src/views/modules/yieldReport/com_start_tuning.vue b/src/views/modules/yieldReport/com_start_tuning.vue index 73b064c..2857cd9 100644 --- a/src/views/modules/yieldReport/com_start_tuning.vue +++ b/src/views/modules/yieldReport/com_start_tuning.vue @@ -78,8 +78,8 @@ export default { itemNo: 0, seqNo: '', rollNo: '', - reportDate: this.dayjs(new Date()).format('YYYY-MM-DD'), - reportTime: this.dayjs(new Date()).format('HH:mm:ss'), + reportDate: '', + reportTime: '', operatorId: '' }, operatorData: { @@ -110,6 +110,9 @@ export default { this.pageData.seqNo = scheduleData.seqNo; this.pageData.rollNo = scheduleData.rollNo; this.pageData.operatorId = operatorData.operatorId; + //重置时间 + this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD'); + this.pageData.reportTime = this.dayjs(new Date()).format('HH:mm:ss'); }, /*关闭modal*/