From b66b78d843e43d8133394508b1b9e77d25a9b668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Thu, 24 Aug 2023 17:21:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/pro/feedback/index.vue | 25 +++++++++++------- src/views/mes/pro/proroute/index.vue | 2 +- src/views/mes/pro/proroute/routeprocess.vue | 29 +++++++++++++++++++++ src/views/mes/pro/schedule/index.vue | 10 +++---- src/views/mes/pro/schedule/proTask.vue | 3 +++ 5 files changed, 52 insertions(+), 17 deletions(-) diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue index 35baa9a..43ad677 100644 --- a/src/views/mes/pro/feedback/index.vue +++ b/src/views/mes/pro/feedback/index.vue @@ -228,7 +228,7 @@ - + @@ -245,6 +245,18 @@ + + + + + + + + + + + + @@ -367,12 +379,6 @@ export default { workorderCode: [ { required: true, message: "生产工单不能为空", trigger: "blur" } ], - quantityQualified: [ - { required: true, message: "请输入合格品数量", trigger: "blur"} - ], - quantityUnquanlified: [ - { required: true, message: "请输入不合格品数量", trigger: "blur"} - ], nickName: [ { required: true, message: "请选择报工人", trigger: "blur"} ], @@ -444,7 +450,7 @@ export default { this.resetForm("form"); }, handleQuantityChanged(){ - this.form.quantityFeedback = this.form.quantityQualified + this.form.quantityUnquanlified; + this.form.quantityFeedback = this.form.quantityQualified + this.form.quantityUnquanlified + this.form.quantityUncheck; }, /** 搜索按钮操作 */ handleQuery() { @@ -559,7 +565,6 @@ export default { }, onWorkorderSelected(row){ if(row != undefined && row != null){ - debugger; this.form.workorderId = row.workorderId; this.form.workorderCode = row.workorderCode; this.form.workorderName = row.workorderName; @@ -575,6 +580,7 @@ export default { this.$refs.taskSelect.getList(); }, onTaskSelected(row){ + debugger; if(row != undefined && row != null){ this.form.taskId = row.taskId; this.form.taskCode = row.taskCode; @@ -585,6 +591,7 @@ export default { this.form.processId = row.processId; this.form.processCode = row.processCode; this.form.processName = row.processName; + this.form.isCheck = row.isCheck; } }, //点击人员选择按钮 diff --git a/src/views/mes/pro/proroute/index.vue b/src/views/mes/pro/proroute/index.vue index 1cb6ba7..67b14a8 100644 --- a/src/views/mes/pro/proroute/index.vue +++ b/src/views/mes/pro/proroute/index.vue @@ -125,7 +125,7 @@ /> - + diff --git a/src/views/mes/pro/proroute/routeprocess.vue b/src/views/mes/pro/proroute/routeprocess.vue index f9b3c75..94e4608 100644 --- a/src/views/mes/pro/proroute/routeprocess.vue +++ b/src/views/mes/pro/proroute/routeprocess.vue @@ -52,6 +52,11 @@ + + + @@ -159,6 +164,26 @@ + + +
+ 是:当前工序报工时需要进行质检确认
+ 质检合格数量作为最终生产数量 +
+ + + +
+
+
+
+ + @@ -248,6 +273,9 @@ export default { ], keyFlag: [ { required: true, message: "请指定当前工序是否关键工序", trigger: "blur" } + ], + isCheck: [ + { required: true, message: "请指定当前工序是否需要质检确认", trigger: "blur" } ] } }; @@ -289,6 +317,7 @@ export default { processId: null, processCode: null, processName: null, + isCheck: 'N', orderNum: 1, nextProcessId: null, nextProcessCode: null, diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue index 546feb9..5cc5919 100644 --- a/src/views/mes/pro/schedule/index.vue +++ b/src/views/mes/pro/schedule/index.vue @@ -261,7 +261,7 @@ - +