diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 53dd55e1..2c42a5d9 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -18,6 +18,7 @@ export const BillModalMixin = {
         options: [],
         value: ''
       },
+      currentSelectDepotId: '',
       depotList: [],
       accountList: [],
       accountIdList: [],
@@ -337,20 +338,25 @@ export const BillModalMixin = {
     onAdded(event) {
       const { row, target } = event
       target.setValues([{rowKey: row.id, values: {operNumber:0}}])
-      getAction('/depot/findDepotByCurrentUser').then((res) => {
-        if (res.code === 200) {
-          let arr = res.data
-          if(arr.length===1) {
-            target.setValues([{rowKey: row.id, values: {depotId: arr[0].id+''}}])
-          } else {
-            for (let i = 0; i < arr.length; i++) {
-              if(arr[i].isDefault){
-                target.setValues([{rowKey: row.id, values: {depotId: arr[i].id+''}}])
+      if(this.currentSelectDepotId) {
+        //如果单据选择过仓库，则直接从当前选择的仓库加载
+        target.setValues([{rowKey: row.id, values: {depotId: this.currentSelectDepotId}}])
+      } else {
+        getAction('/depot/findDepotByCurrentUser').then((res) => {
+          if (res.code === 200) {
+            let arr = res.data
+            if(arr.length===1) {
+              target.setValues([{rowKey: row.id, values: {depotId: arr[0].id+''}}])
+            } else {
+              for (let i = 0; i < arr.length; i++) {
+                if(arr[i].isDefault){
+                  target.setValues([{rowKey: row.id, values: {depotId: arr[i].id+''}}])
+                }
               }
             }
           }
-        }
-      })
+        })
+      }
     },
     //单元值改变一个字符就触发一次
     onValueChange(event) {
@@ -359,6 +365,7 @@ export const BillModalMixin = {
       let param,snList,batchNumber,operNumber,unitPrice,allPrice,taxRate,taxMoney,taxLastMoney
       switch(column.key) {
         case "depotId":
+          that.currentSelectDepotId = row.depotId
           if(row.barCode){
             that.getStockByDepotBarCode(row, target)
           }
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index 87db0d4d..32ef6df0 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -184,6 +184,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.changeColumnHide()
         this.changeFormTypes(this.materialTable.columns, 'snList', 0)
         this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index e92b84c1..773f2bea 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -184,6 +184,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.changeColumnHide()
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index b154c3cd..6c6ab792 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -184,6 +184,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.changeColumnHide()
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index 3b4b5008..d76c7d6c 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -208,6 +208,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.changeColumnHide()
         this.changeFormTypes(this.materialTable.columns, 'snList', 0)
         this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index ff244feb..8d56027c 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -208,6 +208,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.changeColumnHide()
         this.changeFormTypes(this.materialTable.columns, 'snList', 0)
         this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 28078ade..b857d218 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -290,6 +290,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.rowCanEdit = true
         this.materialTable.columns[1].type = FormTypes.popupJsh
         this.changeColumnHide()
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 946ed97f..878e3a60 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -322,6 +322,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.rowCanEdit = true
         this.materialTable.columns[1].type = FormTypes.popupJsh
         this.changeColumnHide()
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index fdbb1b87..6973c73d 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -278,6 +278,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.rowCanEdit = true
         this.materialTable.columns[0].type = FormTypes.popupJsh
         this.getSystemConfig()
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index 8d21555a..2bcabe67 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -272,6 +272,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.rowCanEdit = true
         this.materialTable.columns[1].type = FormTypes.popupJsh
         this.changeColumnHide()
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 795e6767..1b7e4a6c 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -282,6 +282,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.changeColumnHide()
         this.changeFormTypes(this.materialTable.columns, 'snList', 0)
         this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index daf55e37..2c9f088a 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -295,6 +295,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.rowCanEdit = true
         this.materialTable.columns[1].type = FormTypes.popupJsh
         this.changeColumnHide()
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 03df7ce1..378a808e 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -268,6 +268,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.changeColumnHide()
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 0206df60..ac404ff9 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -338,6 +338,7 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         this.billStatus = '0'
+        this.currentSelectDepotId = ''
         this.rowCanEdit = true
         this.materialTable.columns[1].type = FormTypes.popupJsh
         this.changeColumnHide()