Merge remote-tracking branch 'origin/master'

.env.test

@@ -15,8 +15,8 @@ ENV = 'test'
 # 测试服务器
 # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
 
-# 文明东
-VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
+# 192.168.0.66测试服务器
+VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/'
 
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'

src/views/basic/corpMaintain/corpSelect.vue

@@ -353,13 +353,17 @@ import {
             },
 
             selectExport() {
-                var selectData = this.multipleSelection;
+               /* var selectData = this.multipleSelection;
                 selectData.forEach((obj) => {
                     this.query.ids.push(obj.id);
-                });
+                });*/
                 this.allExport();
             },
             allExport() {
+              var selectData = this.multipleSelection;
+              selectData.forEach((obj) => {
+                this.query.ids.push(obj.id);
+              });
                 exportExcel(this.query)
                     .then((response) => {
                         if (response.code == 20000) {

src/views/purchase/purPlan/purPlanAudit.vue

@@ -26,7 +26,7 @@
 
           <el-col :span="8">
             <el-form-item label="采购仓库">
-              <el-select v-model="filterQuery.targetInvCode" style="width: 90%"  placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.invCode" style="width: 90%"  placeholder="请选择所属仓库">
                 <el-option
                   v-for="item in invList"
                   :key="item.name"
@@ -173,6 +173,7 @@ export default {
         editStatus: 1,
         emergency:'',
         deptCode:'',   
+        invCode:null
       },
       formName: null,
       formMap: {
@@ -257,7 +258,9 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,        
+        invCode:null
       };
+      this.getInvList()
       this.actDateRange = [];
       this.getList();
     },
@@ -359,6 +362,7 @@ export default {
       var query={
         parentId:this.filterQuery.deptCode
       }
+      this.filterQuery.invCode = null
       filterSubAll(query).then((res) => {
         this.invList = res.data || [];
       })