From 15cdcbe521382e9a916adac9fa7ab4e290ca83ce Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Tue, 8 Feb 2022 15:11:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=B4=BE=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yieldReport/com_finish_schedule.vue | 46 ++++++------------- .../yieldReport/com_produce_report_normal.vue | 42 +++++++++++++++-- .../modules/yieldReport/produce_order.vue | 11 ++++- 3 files changed, 60 insertions(+), 39 deletions(-) diff --git a/src/views/modules/yieldReport/com_finish_schedule.vue b/src/views/modules/yieldReport/com_finish_schedule.vue index 5fa9d78..1840c22 100644 --- a/src/views/modules/yieldReport/com_finish_schedule.vue +++ b/src/views/modules/yieldReport/com_finish_schedule.vue @@ -9,13 +9,13 @@ 数量 - - + @@ -288,8 +288,8 @@ export default { itemNo: 0, seqNo: '', operatorId: '', - totalApprovedQty: 0, - totalDefectedQty: 0, + approvedQty: 0, + defectedQty: 0, reportedTime: this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'), scheduledDate: '', shiftDesc: '', @@ -311,6 +311,7 @@ export default { remark: '', exceptionFlag: 'N', exceptionReason: '', + autoTool: 'N',//是否自动处理工具 }, operatorData: { site: this.$store.state.user.site, @@ -906,8 +907,8 @@ export default { /*刷新当前的页面参数*/ refreshPageData(){ getFinishSchedulePageData(this.pageData).then(({data}) => { - this.pageData.totalApprovedQty = data.resultMap.reportedQty;//总良品数量 - this.pageData.totalDefectedQty = data.resultMap.defectedQty;//总不良品数量 + this.pageData.approvedQty = data.resultMap.reportedQty;//总良品数量 + this.pageData.defectedQty = data.resultMap.defectedQty;//总不良品数量 //调机的数据 this.pageData.totalSetupTime = data.resultMap.totalSetupTime;//总调机时间 this.pageData.totalDowntimeTimeSetup = data.resultMap.totalDowntimeTimeSetup;//总调机过程停机时间 @@ -969,26 +970,10 @@ export default { }); }, - - - /*添加定制的css类*/ - customerCellClassName({row, column, rowIndex, columnIndex}) { - if(column.property == 'netIssueQty'){ - return 'customer-number-cell'; - } - }, - - /*添加定制的cess样式*/ - customerCellStyle({row, column, rowIndex, columnIndex}) { - if(column.property == 'netIssueQty'){ - return 'padding: 0px 0px;'; - } - }, - /*检验良品的总数量*/ checkValidApprovedQty(){ //首先判断数值是否通过判断 - let approvedQty = this.pageData.totalApprovedQty; + let approvedQty = this.pageData.approvedQty; if(approvedQty == null || approvedQty == ''){ this.$message.error('请输入总良品数量!'); this.pageData.approvedQty = 0;//重新赋值 @@ -999,15 +984,15 @@ export default { /*结束当前的操作*/ finishScheduleBun(){ //首先判断数值是否通过判断 - let totalApprovedQty = this.pageData.totalApprovedQty; - if(totalApprovedQty == null || totalApprovedQty == ''){ + let approvedQty = this.pageData.approvedQty; + if(approvedQty == null || approvedQty == ''){ this.$message.error('请输入总良品数量!'); - this.pageData.totalApprovedQty = 0;//重新赋值 + this.pageData.approvedQty = 0;//重新赋值 return false; } - if(totalApprovedQty <= 0){ + if(approvedQty <= 0){ this.$message.error('总良品数量必须大于0!'); - this.pageData.totalApprovedQty = 0;//重新赋值 + this.pageData.approvedQty = 0;//重新赋值 return false; } //班次判断 @@ -1016,11 +1001,8 @@ export default { return false; } - //验证通过提交到后台 - let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)}; - //先调用检查方法 - checkFinishRollWithNoFqc(postData).then(({data}) => { + checkFinishScheduleWithNoFqc(this.pageData).then(({data}) => { //判断是否成功 if(data.code == 500){ this.$message.error(data.msg); diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 16190d1..69185b9 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -61,36 +61,43 @@ + style="margin-left: 0px; margin-bottom: 5px;"> 创建新卷 + style="margin-left: 0px; margin-bottom: 5px;"> 切换卷 + style="margin-left: 0px; margin-bottom: 5px;"> 创建分卷 + @click="finishRollModal" style="margin-left: 0px; margin-bottom: 5px;"> 结束卷 + @click="mergeRollModal" style="margin-left: 0px; margin-bottom: 5px;"> 合并卷 + + + 结单 + + +
列表信息 @@ -478,6 +485,13 @@ + + + + + + @@ -512,6 +526,7 @@ import comReplaceTool from "./com_replace_tool";/*生产过程的工具组件*/ import comProduceMaterial from "./com_produce_material";/*生产过程的材料组件*/ import comReplaceMaterial from "./com_replace_material"/*换料组件*/ import comProduceDown from "./com_produce_down";/*停机组件*/ +import comFinishSchedule from "./com_finish_schedule";/*结束派工单组件*/ /*生产过程的停机组件*/ export default { name: "com_produce_report_normal", @@ -531,6 +546,7 @@ export default { showMaterialFlag: false, showReplaceMaterialFlag: false, showDownFlag: false, + showFinishScheduleFlag: false, activeTable: 'sfdc_time', sfdcTimeList: [], orderToolList: [], @@ -2773,6 +2789,7 @@ export default { comProduceMaterial,/*生产过程的材料组件*/ comReplaceMaterial,/*换料的组件*/ comProduceDown,/*生产过程的停机组件*/ + comFinishSchedule,/*结束派工单的组件*/ }, methods: { // 获取派工单的信息 @@ -3204,6 +3221,21 @@ export default { }); }, + //打开结束派工单的modal + showFinishScheduleModal() { + //打开操作员切换功能 + this.showFinishScheduleFlag = true; + this.$nextTick(() => { + this.$refs.comFinishSchedule.init(this.scheduleData, this.operatorData); + }); + }, + + //结束派工单后刷新页面 + processFinishScheduleOperation(){ + //刷新当前页面的数据 + this.refreshPageTables(); + }, + //创建新卷的方法 createNewRollDo() { createNewRoll(this.scheduleData).then(({data}) => { diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index f4f1af0..9fdb859 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -119,9 +119,10 @@ - + + :visible.sync="showFinishScheduleFlag" ref="comFinishSchedule" + @processFinishScheduleOperation = "processFinishScheduleOperation"> @@ -1038,6 +1039,12 @@ export default { }); }, + //结束派工单后刷新页面 + processFinishScheduleOperation(){ + //刷新当前页面的数据 + this.refreshPageTables(); + }, + //保存操作员的信息 saveOperatorData() { //查询操作员信息