From 411510ac2a402301f7b16720088eaf90d1a11b0c Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Thu, 24 Feb 2022 13:28:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8FBUG=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/yieldReport/produce_report_normal.js | 3 +- .../modules/yieldReport/com_finish_roll.vue | 28 ++++++++++++++++--- .../yieldReport/com_produce_report_normal.vue | 26 +++++++++++++---- .../modules/yieldReport/com_produce_tool.vue | 6 +--- 4 files changed, 47 insertions(+), 16 deletions(-) diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js index 8f79455..825b843 100644 --- a/src/api/yieldReport/produce_report_normal.js +++ b/src/api/yieldReport/produce_report_normal.js @@ -50,7 +50,8 @@ export const deleteSfdcRolls = data => createAPI('schedule/deleteSfdcRolls', 'PO export const processFinishTool = data => createAPI('schedule/processFinishTool', 'POST', data) //执行材料结束使用 且未剩余的方法 -export const processFinishMaterialWithNoRemainder = data => createAPI('schedule/processFinishMaterialWithNoRemainder', 'POST', data) +export const finishMaterialWithNoRemainder = data => createAPI('schedule/processFinishMaterialWithNoRemainder', 'POST', data) + diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue index e35b995..b10592b 100644 --- a/src/views/modules/yieldReport/com_finish_roll.vue +++ b/src/views/modules/yieldReport/com_finish_roll.vue @@ -16,19 +16,19 @@ - + 列表 - + 刷新 - + 结束卷 - + 关闭 @@ -868,4 +868,24 @@ div.table-input /deep/ input.el-input__inner{ text-align: right; } +/*当前按钮的通用样式*/ +.customer-css .customer-bun-mid{ + width: 65px; + text-align: center; +} + +.customer-css .customer-bun-min{ + width: 50px; + text-align: center; +} + +.customer-css .customer-bun-max{ + width: 80px; + text-align: center; +} +/*当前按钮的通用样式*/ +.customer-css .el-button--medium { + padding: 5px 5px; +} + diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 71e3e3b..b3b606d 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -53,15 +53,15 @@ -
+
卷操作 - + {{ this.currentRollOps.rollNo }} + style="margin-left: 5px; margin-bottom: 5px;"> 创建新卷 @@ -2982,6 +2982,15 @@ export default { this.scheduleData.seqNo = seqNo; this.currentRollOps.seqNo = seqNo; this.operatorData = operatorData; + //清空当前的页面列表参数 + this.sfdcTimeList = []; + this.sfdcToolList = []; + this.sfdcMaterialList = []; + this.sfdcRollOpsList = []; + this.sfdcDefectList = []; + this.sfdcRollList = []; + //设置table页签 + this.activeTable = 'sfdc_time'; //刷新当前派工单的信息 this.refreshPageData(); }, @@ -3013,7 +3022,7 @@ export default { await this.getCurrentRollOpsBySeqNoFun(); //设置table页签 - this.activeTable = 'sfdc_time'; + //this.activeTable = 'sfdc_time'; //刷新当前页签的table的内容 await this.refreshCurrentTabTable(); @@ -3467,12 +3476,12 @@ export default { /*当前按钮的通用样式*/ .customer-css .customer-bun-mid{ - width: 65px; + width: 60px; text-align: center; } .customer-css .customer-bun-min{ - width: 45px; + width: 50px; text-align: center; } @@ -3485,5 +3494,10 @@ export default { padding: 5px 5px; } +.customer-css .customer-roll-css span{ + font-size: 16px; + color: #387877; +} + diff --git a/src/views/modules/yieldReport/com_produce_tool.vue b/src/views/modules/yieldReport/com_produce_tool.vue index 8bba29d..3b1718b 100644 --- a/src/views/modules/yieldReport/com_produce_tool.vue +++ b/src/views/modules/yieldReport/com_produce_tool.vue @@ -200,11 +200,7 @@ export default { /*添加刀模记录*/ addToolInstanceIdFun(){ - //判断是否校验通过 - if(!this.pageData.checkFlag){ - this.$message.error('校验失败,请重试!') - return false; - } + /*添加工具的实例*/ addToolInstanceId(this.pageData).then(({data}) => { if(data.code == 500){ this.$message.error(data.msg);