From cedb34067fa8db1a9b7fd18be23550fbbb63be80 Mon Sep 17 00:00:00 2001 From: DouDou <877258667@qq.com> Date: Thu, 13 Jun 2024 13:11:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduleReport/com_die_cutting_report.js | 5 ++ src/api/scheduleReport/com_fqc_report.js | 3 + .../scheduleReport/com_die_cutting_report.vue | 52 ++++++++------ .../modules/scheduleReport/com_fqc_report.vue | 67 +++++++------------ .../scheduleReport/com_scan_material.vue | 2 +- .../scheduleReport/com_separate_roll.vue | 2 +- 6 files changed, 66 insertions(+), 65 deletions(-) diff --git a/src/api/scheduleReport/com_die_cutting_report.js b/src/api/scheduleReport/com_die_cutting_report.js index c8b89db..d4de8b9 100644 --- a/src/api/scheduleReport/com_die_cutting_report.js +++ b/src/api/scheduleReport/com_die_cutting_report.js @@ -11,3 +11,8 @@ export const getSfdcRollOpsByCon = data => createAPI('schedule/getSfdcRollOpsByC // 获取当前上机卷信息 export const getSoFinalRollsByCon = data => createAPI('schedule/getSoFinalRollsByCon', 'POST', data) + + // 删除成品卷 +export const deleteSoFinalRoll = data => createAPI('schedule/deleteSoFinalRoll', 'POST', data) + + diff --git a/src/api/scheduleReport/com_fqc_report.js b/src/api/scheduleReport/com_fqc_report.js index 50f6b6d..b896257 100644 --- a/src/api/scheduleReport/com_fqc_report.js +++ b/src/api/scheduleReport/com_fqc_report.js @@ -9,3 +9,6 @@ export const getSoFinalRollsByCon = data => createAPI('schedule/getSoFinalRollsB // 检验当前的卷信息 export const scanFinalRollNo = data => createAPI('schedule/scanFinalRollNo', 'POST', data) +// 取消检验成品卷 +export const cancelCheckSoFinalRoll = data => createAPI('schedule/cancelCheckSoFinalRoll', 'POST', data) + diff --git a/src/views/modules/scheduleReport/com_die_cutting_report.vue b/src/views/modules/scheduleReport/com_die_cutting_report.vue index dbceb56..9bc6aef 100644 --- a/src/views/modules/scheduleReport/com_die_cutting_report.vue +++ b/src/views/modules/scheduleReport/com_die_cutting_report.vue @@ -110,18 +110,18 @@ style="width: 100px; height: 80px"/> - + @@ -130,12 +130,12 @@ + @refreshCurrentTabTable="refreshCurrentTabTable"> + @refreshCurrentTabTable="refreshCurrentTabTable"> @@ -146,6 +146,7 @@ import { getCurrentRollOpsBySeqNo, getSfdcRollOpsByCon, getSoFinalRollsByCon, + deleteSoFinalRoll, } from "@/api/scheduleReport/com_die_cutting_report.js"; /*打印标签专用的js*/ import { @@ -968,7 +969,7 @@ export default { //设置table页签 //this.activeTable = 'sfdc_rollOps'; //刷新当前页签的table的内容 - await this.refreshCurrentTabTable(); + await this.refreshCurrentTabTable(false); }, //设置当前的夏季卷 @@ -1023,7 +1024,7 @@ export default { //列表表格选择替换 tabClick(tab, event) { //刷新列表数据 - this.refreshCurrentTabTable(); + this.refreshCurrentTabTable(false); }, //刷新派工单 的下机卷的记录 @@ -1040,7 +1041,7 @@ export default { }, //刷新页签的table数据 - async refreshCurrentTabTable() { + async refreshCurrentTabTable(tableMark) { //设置查询的数据 this.searchData = JSON.parse(JSON.stringify(this.scheduleData)); //判断是否按照当前卷来查询 @@ -1050,6 +1051,10 @@ export default { } else { this.searchData.rollNo = ''; } + //判断是否是跳转回来组件使用的 + if(tableMark){ + this.activeTable = tableMark; + } //区分不同的页签刷新不同的列表数据 if (this.activeTable == 'sfdc_material') { @@ -1061,14 +1066,23 @@ export default { } }, - /*结束卷操作*/ - finishRollModal() { - //1.首先调用菜单判断方式 看看是否可以结束卷 - //checkProduceButton('finishRollFlag'); - //打开结束卷的页面 - this.$nextTick(() => { - this.showFinishFlag = true; - this.$refs.comFinishRoll.init(this.scheduleData) + /*确认删除操作*/ + deleteFinalRollConfirm(finalRow) { + this.$confirm('确认删除成品卷:'+finalRow.finalRollNo, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + //执行删除的操作 + deleteSoFinalRoll(finalRow).then(({data}) => { + //如果成功刷新表格 + if(data.code == 200) { + this.$message.success(data.msg); + this.refreshCurrentTabTable(false); + }else { + this.$message.error(data.msg); + } + }); }); }, diff --git a/src/views/modules/scheduleReport/com_fqc_report.vue b/src/views/modules/scheduleReport/com_fqc_report.vue index cd6aca8..744e718 100644 --- a/src/views/modules/scheduleReport/com_fqc_report.vue +++ b/src/views/modules/scheduleReport/com_fqc_report.vue @@ -30,7 +30,7 @@
{{ labels.rollButtons }} - + @@ -76,18 +76,18 @@ style="width: 100px; height: 80px"/> - + @@ -102,6 +102,7 @@ import { getScheduleDataBySeqNo, getSoFinalRollsByCon, scanFinalRollNo, + cancelCheckSoFinalRoll, } from "@/api/scheduleReport/com_fqc_report.js"; /*打印标签专用的js*/ import { @@ -876,45 +877,23 @@ export default { } }, - /*结束卷操作*/ - finishRollModal() { - //1.首先调用菜单判断方式 看看是否可以结束卷 - //checkProduceButton('finishRollFlag'); - //打开结束卷的页面 - this.$nextTick(() => { - this.showFinishFlag = true; - this.$refs.comFinishRoll.init(this.scheduleData) - }); - }, - - /*开始调机modal*/ - startProduceModal() { - //1.首先调用菜单判断方式 看看是否可以结束卷 - //checkProduceButton('startProduceFlag'); - //打开开始生产的页面 - this.$nextTick(() => { - this.showProduceFlag = true; - this.$refs.comStartProduce.init(this.scheduleData) - }); - }, - - /*材料结束生产的modal*/ - finishMaterialModal(materialRow) { - this.$nextTick(() => { - this.showMaterialFlag = true; - this.$refs.comProduceMaterial.init(this.scheduleData) - }); - }, - - /*提醒是否删除的提示*/ - warnDeleteSfdcRollsConfirm(sfdcRollRow) { - this.$confirm(this.labels.sureDeleteCurrentRoll, '提示', { - confirmButtonText: this.labels.confirmLabel, - celButtonText: this.labels.cancelLabel, + /*确认取消检验提示操作*/ + confirmCancelCheckFinalRoll(finalRow) { + this.$confirm('确认取消检验成品卷:'+finalRow.finalRollNo, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', type: 'warning' }).then(() => { - //执行重新打开sfdcRolls记录的操作 - this.deleteSfdcRollsOperation(sfdcRollRow); + //执行删除的操作 + cancelCheckSoFinalRoll(finalRow).then(({data}) => { + //如果成功刷新表格 + if(data.code == 200) { + this.$message.success(data.msg); + this.refreshCurrentTabTable(false); + }else { + this.$message.error(data.msg); + } + }); }); }, diff --git a/src/views/modules/scheduleReport/com_scan_material.vue b/src/views/modules/scheduleReport/com_scan_material.vue index 5299a61..f4535da 100644 --- a/src/views/modules/scheduleReport/com_scan_material.vue +++ b/src/views/modules/scheduleReport/com_scan_material.vue @@ -167,7 +167,7 @@ export default { closeDialog(){ this.visible = false; //刷新报工的页面 - this.$emit('refreshPageData'); + this.$emit('refreshCurrentTabTable', 'sfdc_rollOps'); }, /*检查材料卷号的数据*/ diff --git a/src/views/modules/scheduleReport/com_separate_roll.vue b/src/views/modules/scheduleReport/com_separate_roll.vue index d6a768d..6a1a41a 100644 --- a/src/views/modules/scheduleReport/com_separate_roll.vue +++ b/src/views/modules/scheduleReport/com_separate_roll.vue @@ -218,7 +218,7 @@ export default { /*关闭modal*/ closeDialog(){ //刷新报工的页面 - this.$emit('refreshPageData'); + this.$emit('refreshCurrentTabTable', 'sfdc_roll'); //关闭当前的页面 this.visible = false; },