Merge remote-tracking branch 'origin/master'

src/views/basic/product/udiInfoManageSp.vue

@@ -281,6 +281,7 @@ export default {
       };
       this.total = 0;
       this.list = [];
+      this.getList();
     },
     search() {
       this.filterQuery.page = 1;
@@ -671,7 +672,7 @@ export default {
   }
   ,
   created() {
-    // this.getList();
+    this.getList();
     this.selectSysParam();
     this.getSysFilter();
     this.findMethod();

src/views/inout/DialogSelectReceiveOrder.vue

@@ -90,7 +90,7 @@
           <el-table-column label="单据号" prop="billNo"></el-table-column>
           <el-table-column label="领用仓库" prop="invName"></el-table-column>
           <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="单据日期" prop="billDate"></el-table-column>
+          <el-table-column label="单据日期" prop="createTime"></el-table-column>
           <el-table-column label="状态" prop="status">
             <template slot-scope="scope">
               <el-tag :type="(scope.row.status) | statusFilterType">

src/views/purchase/purApply/purApply.vue

@@ -264,6 +264,7 @@ export default {
                 targetDeptCode: this.invCodebe,
                 targetInvCode:null
             };
+            this.initActDateRange()
             if(deptCode!=this.invCodebe){
               this.getInvList()
             }
@@ -428,6 +429,13 @@ export default {
             this. getInvList();
           });
         },
+        initActDateRange(){
+          
+          let end = new Date();
+          let start = new Date();
+          start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+          this.actDateRange = [start, end];
+        }
 
     }
     ,
@@ -450,10 +458,7 @@ export default {
     }
     ,
     created() {
-        let end = new Date();
+      this.initActDateRange()
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
         this.getDeptList();
     }
     ,

src/views/purchase/purApply/pureApplyAudit.vue

@@ -28,7 +28,7 @@
 
                 <el-col :span="8">
                   <el-form-item label="申购仓库">
-                    <el-select v-model="filterQuery.targetInvCode" @change="getInvList" style="width: 90%" clearable  placeholder="请选择所属仓库">
+                    <el-select v-model="filterQuery.targetInvCode" @change="getList" style="width: 90%" clearable  placeholder="请选择所属仓库">
                       <el-option
                         v-for="item in invList"
                         :key="item.name"
@@ -169,6 +169,7 @@ export default {
                 editStatus: 1,
                 emergency:'',
                 targetDeptCode:'',
+                targetInvCode: null
             },
             formName: null,
             formMap: {
@@ -240,6 +241,7 @@ export default {
             this.$router.push({
                 path: "",
             });
+            let deptCode = this.filterQuery.targetDeptCode
             this.filterQuery = {
                 billNo: "",
                 thirdSysFk: "",
@@ -253,7 +255,11 @@ export default {
                 type: 1,
                 editStatus: 1,
                 targetDeptCode: this.invCodebe,
+                targetInvCode: null
             };
+            if(deptCode!=this.invCodebe){
+              this.getInvList()
+            }
             this.actDateRange = [];
             this.getList();
         },
@@ -372,10 +378,16 @@ export default {
                 this.formName = "add";
             this.newSpDistributionVisible = true;
         },
+        deptChange(){
+
+          this. getInvList();
+          this.getList();
+        },
       getInvList() {
         var query={
           parentId:this.filterQuery.targetDeptCode
         }
+        this.filterQuery.targetInvCode = null
         filterSubAll(query).then((res) => {
           this.invList = res.data || [];
         })
@@ -387,8 +399,8 @@ export default {
             this.filterQuery.targetDeptCode=this.deptList[0].code
             this.invCodebe=this.filterQuery.targetDeptCode
           }
-          this.getList();
           this. getInvList();
+          this.getList();
         });
       },
     }

src/views/purchase/purApply/pureApplySearch.vue

@@ -311,6 +311,7 @@ export default {
         targetDeptCode: this.invCodebe,
       };
       this.actDateRange = [];
+      this.actAuditDateRange = [];
       this.getList();
     },
 

src/views/purchase/purPlan/purPlan.vue

@@ -179,6 +179,7 @@ export default {
         editStatus: 1,
         emergency:'',
         deptCode:'',
+        invCode:null
       },
       invCodebe:null,
       formName: null,
@@ -262,8 +263,10 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
+        invCode:null
       };
       this.actDateRange = [];
+      this.getInvList()
       this.getList();
     },
     handleClose() {
@@ -406,6 +409,7 @@ export default {
       var query={
         parentId:this.filterQuery.deptCode
       }
+      this.filterQuery.invCode = null
       filterSubAll(query).then((res) => {
         this.invList = res.data || [];
       })