From 8818f234b5e4563aac5e629c04e37d81c932e4f9 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 十二月 2023 22:17:59 +0800
Subject: [PATCH] 	modified:   src/api/quality/finishedProduct.js 	modified:   src/api/quality/processInspect.js 	modified:   src/api/quality/rawMaterial.js 	modified:   src/views/product/workbench/taskinfo-pane.vue 	modified:   src/views/quality/Packaging_ledger/pack-from.vue 	modified:   src/views/quality/finishedProductInspection/finishedProduct-form.vue 	modified:   src/views/quality/packageinspect/packageInspect-form.vue 	modified:   src/views/quality/processInspect/index.vue 	modified:   src/views/quality/processInspect/processInspect-form.vue 	modified:   src/views/quality/rawMaterial/rawMaterial-form.vue

---
 src/views/quality/finishedProductInspection/finishedProduct-form.vue |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 7d3842e..fd45c92 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -341,6 +341,11 @@
                     pro+=arr.length
                 }
             })
+            let obj = {
+                id: this.processInspectVo.id,
+                number: 0,
+                result: this.inspectionResultForm[0].result
+            }
             if (pro > 0) {
                 this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
                     confirmButtonText: '纭畾',
@@ -348,11 +353,8 @@
                     inputPattern: /^\d+$/,
                     inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
                 }).then(({ value }) => {
-                    let data = {
-                    id: this.processInspectVo.id,
-                    number: value
-                    }
-                    updateFinishedInspectById(data).then(res => {
+                    obj.number = value
+                    updateFinishedInspectById(obj).then(res => {
                         if(res.data.data.indexOf("鎴愬姛") > 0){
                             this.$message.success("涓婃姤鎴愬姛");
                             this.checkTestState()
@@ -362,7 +364,7 @@
                     });
                 }).catch(() => {});
             }else{
-                updateFinishedInspectById({id:this.processInspectVo.id,number:0}).then(res => {
+                updateFinishedInspectById(obj).then(res => {
                     if(res.data.data.indexOf("鎴愬姛") > 0){
                             this.$message.success("涓婃姤鎴愬姛");
                             this.checkTestState()
@@ -558,12 +560,38 @@
                 }
             })
         },
+        changeRowResult(){
+            if(this.inspectionItems){
+                this.inspectionItems.forEach(e=>{
+                    if(e.children){
+                        e.children.forEach(i=>{
+                            if(i.empiricalValueAddss.length>1){
+                                let arr = i.inspectionValue.split(",")
+                                arr.splice((arr.length-1),1)
+                                let obj = {
+                                    devideId: i.eId,
+                                    fpid: row.iid,
+                                    inspectionValue: arr.join(","),
+                                    note : i.inote
+                                }
+                                updateFinishedInsProduct(obj).then(res => {
+                                    if (res.data.code == 0) {
+                                        this.init()
+                                    } 
+                                })
+                            }
+                        })
+                    }
+                })
+            }
+        },
         // 鍒犻櫎妫�楠屽�煎垪
         clickDeleteInspectionColumn() {
             if (this.empiricalValueAdd - 1 === 0) {
             } else {
                 if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
                     this.empiricalValueAdd = this.empiricalValueAdd - 1;
+                    this.changeRowResult()
                     this.inspectionItems.forEach(i => {
                         i.empiricalValueAddss.splice(this.empiricalValueAdd, 1);
                     });

--
Gitblit v1.9.3