From 9adf9cd368006f07ecc43ef75b92972cb196b4ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 09 四月 2025 13:10:39 +0800
Subject: [PATCH] 原辅材提交

---
 src/views/business/materialOrder/customsInspection.vue |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 9199be7..ee3cc8e 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -915,7 +915,7 @@
             item.insProduct = this.productList
           })
           this.getTotal(sampleList)
-          let projectNum = this.totalArr.filter(a => a.state == 1).length
+          let projectNum = this.totalArr.length
           if (projectNum == 0) {
             this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
               confirmButtonText: "纭畾",
@@ -1058,11 +1058,7 @@
         insOrder: this.addObj,
         sampleList: sampleList.map(a => {
           a.standardMethodListId = JSON.stringify(a.standardMethodListId)
-          if (a.insProduct.length > 0) {
-            a.insProduct.forEach(c => {
-              delete c.id
-            })
-          }
+           a.insProduct = this.fullProductList
           if (a.modelNum) {
             // 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
             // 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
@@ -1077,7 +1073,6 @@
           } else {
             a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
           }
-          a.insProduct = a.insProduct.filter(b => b.state === 1)
           return a
         }),
       }).then(res => {
@@ -1603,11 +1598,10 @@
         ifsInventoryId: this.customsInspection.id
       }).then(res => {
         this.getProductLoad = false
-        res.data.forEach(a => {
-          a.state = 0
-        })
-        this.productList = this.HaveJson(res.data)
-        this.productList0 = JSON.parse(JSON.stringify(this.productList))
+        // 鐩存帴灏嗘煡璇㈢粨鏋滆祴鍊肩粰 productList
+        this.fullProductList = res.data
+        this.productList = res.data
+        this.productList0 = res.data
         this.$refs.sampleTable.setCurrentRow(row)
         setTimeout(() => {
           this.productList.forEach(a => {

--
Gitblit v1.9.3