From 7389d2ab74d5e09083dbcd45b9165b4092668a4c Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Tue, 5 Apr 2022 17:09:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E5=8C=85=E8=A3=85=202022=E5=B9=B44?= =?UTF-8?q?=E6=9C=885=E6=97=A5=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/yieldReport/com_separate_roll.js | 5 + src/api/yieldReport/com_switch_roll.js | 6 + .../modules/yieldReport/com_finish_roll.vue | 2 +- .../otherReport/bulk_inspection.vue | 2 +- .../otherReport/change_packaging.vue | 27 +- .../otherReport/change_switch_roll.vue | 299 ++++++++++++++++++ .../otherReport/fqc_produce_report_normal.vue | 6 +- .../otherReport/fqc_split_roll_report.vue | 3 + .../otherReport/rework_inspect_report.vue | 3 + 9 files changed, 340 insertions(+), 13 deletions(-) create mode 100644 src/views/modules/yieldReport/otherReport/change_switch_roll.vue diff --git a/src/api/yieldReport/com_separate_roll.js b/src/api/yieldReport/com_separate_roll.js index 80d54a3..edda3ba 100644 --- a/src/api/yieldReport/com_separate_roll.js +++ b/src/api/yieldReport/com_separate_roll.js @@ -12,3 +12,8 @@ export const otherCheckCreateSplitSfdcRoll = data => createAPI('schedule/otherCh // 执行fqc创建分卷的操作 export const otherCreateSplitSfdcRoll = data => createAPI('schedule/otherCreateSplitSfdcRoll', 'POST', data) + + +// 换包装分卷 +export const workbenchCreateslittingrollRepackAction = data => createAPI('schedule/workbench_createslittingroll_Repack_action', 'POST', data) + diff --git a/src/api/yieldReport/com_switch_roll.js b/src/api/yieldReport/com_switch_roll.js index 79a30b8..c7bcef4 100644 --- a/src/api/yieldReport/com_switch_roll.js +++ b/src/api/yieldReport/com_switch_roll.js @@ -13,3 +13,9 @@ export const otherCheckSwitchSfdcRoll = data => createAPI('schedule/otherCheckSw // 其它报工执行切换卷的操作 export const otherSwitchSfdcRoll = data => createAPI('schedule/otherSwitchSfdcRoll', 'POST', data) + +// 换包装切换卷校验 +export const switchrollRepackCheck = data => createAPI('schedule/switchrollRepackCheck', 'POST', data) +// 包装切换卷执行 +export const switchrollRepackAction = data => createAPI('schedule/switchrollRepackAction', 'POST', data) + diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue index 0f5b292..c0309e9 100644 --- a/src/views/modules/yieldReport/com_finish_roll.vue +++ b/src/views/modules/yieldReport/com_finish_roll.vue @@ -44,7 +44,7 @@ - + diff --git a/src/views/modules/yieldReport/otherReport/bulk_inspection.vue b/src/views/modules/yieldReport/otherReport/bulk_inspection.vue index 5d2f255..944e777 100644 --- a/src/views/modules/yieldReport/otherReport/bulk_inspection.vue +++ b/src/views/modules/yieldReport/otherReport/bulk_inspection.vue @@ -233,7 +233,7 @@ export default { }, searchScheduleShiftData(){ - let requestData = {'site': this.site, 'username': this.reportedBy}; + let requestData = {'site': this.site, 'username': this.reportedBy,reportedTime:this.scheduleDateShiftDto.currentDateTime}; getScheduleShiftData(requestData).then(({data}) => { let specialAuth = data.row.specialAuth; //根据不同设置不同的属性 diff --git a/src/views/modules/yieldReport/otherReport/change_packaging.vue b/src/views/modules/yieldReport/otherReport/change_packaging.vue index c95859c..0abf4f5 100644 --- a/src/views/modules/yieldReport/otherReport/change_packaging.vue +++ b/src/views/modules/yieldReport/otherReport/change_packaging.vue @@ -354,7 +354,11 @@ + + + { if (data.code == 0) { this.$message.success(data.msg) + this.harmful.defectCode= '' + this.harmful.defectQty= '' + this.harmful.defectDesc = '' this.getSfdcDefectList(); } else if(data.code == 500){ this.$message.error(data.msg) @@ -3275,22 +3283,18 @@ export default { //打开切换用户的页面 this.$nextTick(() => { this.showSwitchFlag = true; - this.$refs.changeFinishRoll.init(this.scheduleData, this.operatorData) + this.$refs.changeSwitchRoll.init(this.scheduleData, this.operatorData) }); }, /*创建分卷的modal调用*/ separateRollModal() { if (!this.currentRollOps.rollNo) { - this.$message({ - message: '请扫描卷后再进行分卷' - }); + this.$message.warning( '请扫描卷后再进行分卷') return; } if (!this.createRoll.rollQty || !this.createRoll.rollNums) { - this.$message({ - message: '请输入每卷数量和卷数' - }) + this.$message.warning( '请输入每卷数量和卷数') return; } @@ -3299,6 +3303,7 @@ export default { this.createRoll.seqNo = this.scheduleData.seqNo this.createRoll.rollNo = this.currentRollOps.rollNo this.createRoll.operatorId = this.operatorData.operatorId; + this.createRoll.rollCount = this.operatorData.rollNums; this.createRoll.sFQCSlitFlag = 'N' otherCheckCreateSplitSfdcRoll(this.createRoll).then(({data}) => { //判断是否成功 @@ -3326,12 +3331,14 @@ export default { /*执行创建分卷的操作*/ createSeparateRolllOperation() { //处理信息 - otherCreateSplitSfdcRoll(this.createRoll).then(({data}) => { + workbenchCreateslittingrollRepackAction(this.createRoll).then(({data}) => { //判断操作是否成功 if (data.code == 500) { this.$message.error(data.msg); } else if (data.code == 200) { this.$message.success(data.msg) + this.createRoll.rollNums= '' + this.createRoll.rollQty= '' //刷新报工的页面 this.getSfdcRollList() }else { diff --git a/src/views/modules/yieldReport/otherReport/change_switch_roll.vue b/src/views/modules/yieldReport/otherReport/change_switch_roll.vue new file mode 100644 index 0000000..e4e3d8d --- /dev/null +++ b/src/views/modules/yieldReport/otherReport/change_switch_roll.vue @@ -0,0 +1,299 @@ + + + + + diff --git a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue index f4ded14..b0a6cbb 100644 --- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue +++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue @@ -2783,7 +2783,7 @@ export default { deep: true, handler: function (newV, oldV) { this.harmful.defectCode = this.harmful.defectCode.toUpperCase() - this.defectCodeCheck() + //this.defectCodeCheck() } } }, @@ -2938,6 +2938,9 @@ export default { saveSfdcDefect(this.harmful).then(({data}) => { if (data.code == 0) { this.$message.success(data.msg) + this.harmful.defectCode= '' + this.harmful.defectQty= '' + this.harmful.defectDesc = '' this.getSfdcDefectList(); } else if(data.code == 500){ this.$message.error(data.msg) @@ -2945,6 +2948,7 @@ export default { this.$message.warning(data.msg) } }) + }, // 获取派工单的信息 getScheduleDataBySeqNo() { diff --git a/src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue b/src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue index 4ad695c..cf11c0a 100644 --- a/src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue +++ b/src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue @@ -2780,6 +2780,9 @@ export default { saveSfdcDefect(this.harmful).then(({data}) => { if (data.code == 0) { this.$message.success(data.msg) + this.harmful.defectCode= '' + this.harmful.defectQty= '' + this.harmful.defectDesc = '' this.getSfdcDefectList(); } else { this.$message.error(data.msg) diff --git a/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue b/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue index 4008798..6feb74c 100644 --- a/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue +++ b/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue @@ -2936,6 +2936,9 @@ export default { saveSfdcDefect(this.harmful).then(({data}) => { if (data.code == 0) { this.$message.success(data.msg) + this.harmful.defectCode= '' + this.harmful.defectQty= '' + this.harmful.defectDesc = '' this.getSfdcDefectList(); } else if(data.code == 500){ this.$message.error(data.msg)