Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!581

src/views/purchase/catalogue/index.vue

@@ -93,7 +93,7 @@ export default {
     // 导出全部
     exportAll() {
       this.$modal.loading("正在导出数据，请稍后...");
-      exportAll().then(res => {
+      exportAll(this.params).then(res => {
         this.$modal.closeLoading();
         const blob = new Blob([res], {
           type: "application/vnd.ms-excel;charset=UTF-8",

src/views/purchase/purchase-order/add/index.vue

@@ -683,6 +683,7 @@ export default {
 
         let tabList = {
           puOrderItemList: [...this.params.puOrderItemList],
+          warehouse: this.params.warehouse,
           // puOrderExecuteList: [...this.params.puOrderExecuteList],
         };
 
@@ -694,13 +695,17 @@ export default {
 
         this.$modal.loading("正在上传文件，请稍候...");
 
-        let { code, data } = await orderApi.orderImport(formData);
+        let {
+          code,
+          data: { puOrderItemList, puOrderExecuteList },
+        } = await orderApi.orderImport(formData);
 
         if (code == 200) {
-          for (const key in data) {
-            this.params[key].push(...data[key]);
-          }
-
+          // for (const key in data) {
+          //   this.params[key].push(...data[key]);
+          // }
+          this.params["puOrderItemList"] = [...puOrderItemList];
+          this.params["puOrderExecuteList"] = [...puOrderExecuteList];
           let { setVisible } = this.$refs.batchImport;
 
           setVisible(false);

src/views/purchase/purchase-order/edit/index.vue

@@ -641,6 +641,7 @@ export default {
 
         let tabList = {
           puOrderItemList: [...this.params.puOrderItemList],
+          warehouse: this.params.warehouse,
           // puOrderExecuteList: [...this.params.puOrderExecuteList],
         };
 
@@ -652,13 +653,17 @@ export default {
 
         this.$modal.loading("正在上传文件，请稍候...");
 
-        let { code, data } = await orderApi.orderImport(formData);
+        let {
+          code,
+          data: { puOrderItemList, puOrderExecuteList },
+        } = await orderApi.orderImport(formData);
 
         if (code == 200) {
-          for (const key in data) {
-            this.params[key].push(...data[key]);
-          }
-
+          // for (const key in data) {
+          //   this.params[key].push(...data[key]);
+          // }
+          this.params["puOrderItemList"] = [...puOrderItemList];
+          this.params["puOrderExecuteList"] = [...puOrderExecuteList];
           let { setVisible } = this.$refs.batchImport;
 
           setVisible(false);