diff --git a/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue b/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
new file mode 100644
index 00000000..1f6c6d5f
--- /dev/null
+++ b/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
@@ -0,0 +1,112 @@
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+ {{ depot.depotName }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index a5164ba0..47ea6143 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -229,6 +229,11 @@ export const BillModalMixin = {
this.$refs.memberModalForm.title = "新增会员";
this.$refs.memberModalForm.disableSubmit = false;
},
+ handleBatchSetDepot() {
+ this.$refs.batchSetDepotModalForm.add();
+ this.$refs.batchSetDepotModalForm.title = "批量设置仓库";
+ this.$refs.batchSetDepotModalForm.disableSubmit = false;
+ },
addDepot() {
this.$refs.depotModalForm.add();
this.$refs.depotModalForm.title = "新增仓库";
@@ -248,6 +253,21 @@ export const BillModalMixin = {
memberModalFormOk() {
this.initRetail()
},
+ batchSetDepotModalFormOk(depotId) {
+ this.getAllTable().then(tables => {
+ return getListData(this.form, tables)
+ }).then(allValues => {
+ //获取单据明细列表信息
+ let detailArr = allValues.tablesValue[0].values
+ //构造新的列表数组,用于存放单据明细信息
+ let newDetailArr = []
+ for(let detail of detailArr){
+ detail.depotId = depotId
+ newDetailArr.push(detail)
+ }
+ this.materialTable.dataSource = newDetailArr
+ })
+ },
depotModalFormOk() {
this.initDepot()
},
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index f401aba3..286a5864 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -42,12 +42,7 @@
@added="onAdded"
@deleted="onDeleted">
-
-
- 新增仓库
-
-
-
+
扫码录入
@@ -58,6 +53,17 @@
收起扫码
+
+
+
+
+ 批量设置
+ 新增仓库
+
+ 仓库操作
+
+
+
@@ -77,11 +83,13 @@
+