From dce5efb86cd29a914fa66f9964c29702eadaaec2 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Mon, 11 Nov 2024 21:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=87=87=E8=B4=AD=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E5=8E=BB=E5=85=B3=E8=81=94=E9=87=87=E8=B4=AD=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E5=8D=95=E6=8D=AE=EF=BC=8C=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=89=B9=E5=8F=B7?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecgbiz/modal/JSelectBatchModal.vue      | 20 +++++++++++++------
 .../src/views/bill/mixins/BillModalMixin.js   | 10 +++++++---
 .../views/bill/modules/PurchaseBackModal.vue  |  1 +
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue
index c9f9f733..14fd9c5f 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue
@@ -131,9 +131,13 @@
       loadData(arg) {
         if(this.rows) {
           if(JSON.parse(this.rows).depotId && JSON.parse(this.rows).barCode ){
-            let depotItemId = JSON.parse(this.rows).id
-            if(depotItemId.length<=19) {
-              this.queryParam.depotItemId = depotItemId-0
+            let isEdit = JSON.parse(this.rows).isEdit
+            if(isEdit) {
+              //只有在保存之后的编辑页面下才获取明细id
+              let depotItemId = JSON.parse(this.rows).id
+              if (depotItemId.length <= 19) {
+                this.queryParam.depotItemId = depotItemId-0
+              }
             }
             this.queryParam.depotId = JSON.parse(this.rows).depotId-0
             this.queryParam.barCode = JSON.parse(this.rows).barCode
@@ -176,9 +180,13 @@
           if(this.rows) {
             this.queryParam.name=''
             if(JSON.parse(this.rows).depotId && JSON.parse(this.rows).barCode ){
-              let depotItemId = JSON.parse(this.rows).id
-              if(depotItemId.length<=19) {
-                this.queryParam.depotItemId = depotItemId-0
+              let isEdit = JSON.parse(this.rows).isEdit
+              if(isEdit) {
+                //只有在保存之后的编辑页面下才获取明细id
+                let depotItemId = JSON.parse(this.rows).id
+                if(depotItemId.length<=19) {
+                  this.queryParam.depotItemId = depotItemId-0
+                }
               }
               this.queryParam.depotId = JSON.parse(this.rows).depotId-0
               this.queryParam.barCode = JSON.parse(this.rows).barCode
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 7e1498c4..41e5e9c3 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -128,6 +128,7 @@ export const BillModalMixin = {
           tab.dataSource = res.data.rows
           for(let i=0; i<tab.dataSource.length; i++){
             let info = tab.dataSource[i]
+            info.isEdit = this.model.id?1:0
             this.changeColumnShow(info)
           }
           typeof success === 'function' ? success(res) : ''
@@ -519,9 +520,12 @@ export const BillModalMixin = {
         case "batchNumber":
           batchNumber = value
           let depotItemId = ''
-          let rowId = row.id
-          if(rowId.length<=19) {
-            depotItemId = rowId-0
+          if(this.model.id) {
+            //只有在保存之后的编辑页面下才获取明细id
+            let rowId = row.id
+            if(rowId.length<=19) {
+              depotItemId = rowId-0
+            }
           }
           getBatchNumberList({name:'', depotItemId: depotItemId, depotId: row.depotId, barCode: row.barCode, batchNumber: batchNumber}).then((res) => {
             if (res && res.code === 200) {
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 5414d942..1a948627 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -264,6 +264,7 @@
             { title: '价税合计', key: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
             { title: '备注', key: 'remark', width: '6%', type: FormTypes.input },
             { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
+            { title: '是否再次编辑', key: 'isEdit', width: '5%', type: FormTypes.hidden },
           ]
         },
         confirmLoading: false,