From bb2a51bcd3ec2c6f5dcdc4f34a53e5d19b89ffa5 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 31 Mar 2025 21:21:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=9B=98=E7=82=B9=E8=A1=A5=E4=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...嶆暣鍗曠洏鐐瑰姛鑳絖fix__寮鍚拰淇鏁村崟鐩樼偣鍔熻兘.patch | 97 ------------------- 1 file changed, 97 deletions(-) delete mode 100644 fix__寮鍚拰淇鏁村崟鐩樼偣鍔熻兘_fix__寮鍚拰淇鏁村崟鐩樼偣鍔熻兘.patch diff --git a/fix__寮鍚拰淇鏁村崟鐩樼偣鍔熻兘_fix__寮鍚拰淇鏁村崟鐩樼偣鍔熻兘.patch b/fix__寮鍚拰淇鏁村崟鐩樼偣鍔熻兘_fix__寮鍚拰淇鏁村崟鐩樼偣鍔熻兘.patch deleted file mode 100644 index 705ff529..00000000 --- a/fix__寮鍚拰淇鏁村崟鐩樼偣鍔熻兘_fix__寮鍚拰淇鏁村崟鐩樼偣鍔熻兘.patch +++ /dev/null @@ -1,97 +0,0 @@ -Subject: [PATCH] fix: 寮鍚拰淇鏁村崟鐩樼偣鍔熻兘 -fix: 寮鍚拰淇鏁村崟鐩樼偣鍔熻兘 ---- -Index: src/views/inventory/count/InvCountOrderModify.vue -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/src/views/inventory/count/InvCountOrderModify.vue b/src/views/inventory/count/InvCountOrderModify.vue ---- a/src/views/inventory/count/InvCountOrderModify.vue (revision 6877dcc229f0592427c367ec58272414a20aabcd) -+++ b/src/views/inventory/count/InvCountOrderModify.vue (revision e80a4233bb02b3bc8c6f5c807fde3f709a1b2da9) -@@ -130,7 +130,7 @@ - v-if="countType != 2" - type="primary" - size="mini" -- -+ :disabled="startCountVisible" - @click.native="startCount(1)" - >褰曞叆浜у搧 - -@@ -431,6 +431,7 @@ - selectedIndex: null, - isCodeAlive: true, - saveLoading: false, -+ startCountVisible: false, - submitLoading: false, - } - }, -@@ -711,6 +712,7 @@ - }); - }, - startCount(val) { -+ - // this.countProductList = []; - if (this.countType === 0 && val === 1) { - if (isBlank(this.formData.invStorageCode)) { -@@ -724,9 +726,22 @@ - }; - getCountInvProductProduct(params).then((res) => { - if (res.data.total !== 0) { -+ this.startCountVisible = true - let invProductList = res.data.list; - for (let product of invProductList) { -- this.countProductList.push(product); -+ let product2 = { -+ orderIdFk: this.formData.orderId, -+ productId: product.relIdFk, -+ nameCode: product.nameCode, -+ batchNo: product.batchNo, -+ produceDate: product.productionDate, -+ expireDate: product.expireDate, -+ invCode: this.formData.invStorageCode, -+ invSpaceCode: this.formData.invSpaceCode, -+ invNum: product.reCount, -+ supId: product.supId -+ } -+ this.countProductList.push(product2); - } - this.saveOrder(1); - } -@@ -808,6 +823,11 @@ - this.getInvList(); - - if (!isBlank(this.countOrder.orderId)) { -+ if (!isBlank(this.countOrder.countType)) { -+ if (this.countOrder.countType == 0){ -+ this.startCountVisible = true -+ } -+ } - //鎷夊彇鍗曟嵁璇︽儏淇℃伅 - this.formData = this.countOrder; - let params = {orderIdFk: this.countOrder.orderId}; -@@ -818,6 +838,7 @@ - } - }) - } -+ - }, - }; - -Index: src/views/inventory/count/InvCountOrderNew.vue -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/src/views/inventory/count/InvCountOrderNew.vue b/src/views/inventory/count/InvCountOrderNew.vue ---- a/src/views/inventory/count/InvCountOrderNew.vue (revision 6877dcc229f0592427c367ec58272414a20aabcd) -+++ b/src/views/inventory/count/InvCountOrderNew.vue (revision 6f8f84e06ee12b612725edd3e6b231e8116dd306) -@@ -128,7 +128,7 @@ - 鏄剧ず/闅愯棌鎼滅储鏍 - 閲嶇疆 - 鏌ヨ -- -+ 鏂板鏁村簱鐩樼偣 - - 鏂板閮ㄥ垎鐩樼偣 -