From 5fc14dcfb044d53878987e5bf069f94592501510 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Wed, 21 Feb 2024 13:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E6=8D=AE=E4=BB=8E?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=B0=E5=87=BA=E5=BA=93=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9A=84=E5=88=87=E6=8D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/modules/PurchaseInModal.vue | 8 +++++++-
 jshERP-web/src/views/bill/modules/SaleOutModal.vue    | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 0aad53bc..59af8ebc 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -434,6 +434,7 @@
         this.$refs.linkBillList.title = "选择采购订单"
       },
       linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) {
+        let that = this
         this.rowCanEdit = false
         this.materialTable.columns[1].type = FormTypes.normal
         this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
@@ -450,7 +451,6 @@
               info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
               info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
             }
-            info.depotId = depotId ? depotId:''
             info.linkId = info.id
             allTaxLastMoney += info.taxLastMoney
             listEx.push(info)
@@ -481,6 +481,12 @@
               'remark': remark
             })
           })
+          //判断后进行仓库的切换
+          if(depotId) {
+            setTimeout(function () {
+              that.batchSetDepotModalFormOk(depotId)
+            },1000)
+          }
         }
       },
     }
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 05927e1d..3d2f6c4d 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -452,6 +452,7 @@
         this.$refs.linkBillList.title = "选择销售订单"
       },
       linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) {
+        let that = this
         this.rowCanEdit = false
         this.materialTable.columns[1].type = FormTypes.normal
         this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
@@ -468,7 +469,6 @@
               info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
               info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
             }
-            info.depotId = depotId ? depotId:''
             info.linkId = info.id
             allTaxLastMoney += info.taxLastMoney
             listEx.push(info)
@@ -499,6 +499,12 @@
               'remark': remark
             })
           })
+          //判断后进行仓库的切换
+          if(depotId) {
+            setTimeout(function () {
+              that.batchSetDepotModalFormOk(depotId)
+            },1000)
+          }
         }
       },
     }