From 511ecdfdaaa7ad51dbb767c16cac37f7919e451e Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Wed, 10 May 2023 14:31:01 +0800
Subject: [PATCH 1/3] this.getList();

---
 src/views/basic/product/udiInfoManageSp.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index b54a9cab..db8fd27e 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/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();

From 9ecd0c5c40b6fd4b1829dd9004f342956dfb2afa Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Wed, 10 May 2023 15:00:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/purApply/purApply.vue       | 13 +++++++++----
 src/views/purchase/purApply/pureApplyAudit.vue | 18 +++++++++++++++---
 .../purchase/purApply/pureApplySearch.vue      |  1 +
 src/views/purchase/purPlan/purPlan.vue         |  4 ++++
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index c5b787d7..e5c4ff25 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/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();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
+      this.initActDateRange()
         this.getDeptList();
     }
     ,
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index 2364418b..6bf1b49a 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -11,7 +11,7 @@
 
                 <el-col :span="8">
                   <el-form-item label="申购部门">
-                    <el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" style="width: 90%">
+                    <el-select v-model="filterQuery.targetDeptCode" @change="deptChange" placeholder="请选择申购部门" style="width: 90%">
                       <el-option
                         v-for="item in deptList"
                         :key="item.code"
@@ -26,7 +26,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"
@@ -167,6 +167,7 @@ export default {
                 editStatus: 1,
                 emergency:'',
                 targetDeptCode:'',
+                targetInvCode: null
             },
             formName: null,
             formMap: {
@@ -238,6 +239,7 @@ export default {
             this.$router.push({
                 path: "",
             });
+            let deptCode = this.filterQuery.targetDeptCode
             this.filterQuery = {
                 billNo: "",
                 thirdSysFk: "",
@@ -251,7 +253,11 @@ export default {
                 type: 1,
                 editStatus: 1,
                 targetDeptCode: this.invCodebe,
+                targetInvCode: null
             };
+            if(deptCode!=this.invCodebe){
+              this.getInvList()
+            }
             this.actDateRange = [];
             this.getList();
         },
@@ -370,10 +376,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 || [];
         })
@@ -385,8 +397,8 @@ export default {
             this.filterQuery.targetDeptCode=this.deptList[0].code
             this.invCodebe=this.filterQuery.targetDeptCode
           }
-          this.getList();
           this. getInvList();
+          this.getList();
         });
       },
     }
diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue
index d278bf74..128417f6 100644
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@@ -311,6 +311,7 @@ export default {
         targetDeptCode: this.invCodebe,
       };
       this.actDateRange = [];
+      this.actAuditDateRange = [];
       this.getList();
     },
 
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index 63419ab1..42401c74 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/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 || [];
       })

From d0d686bac997d2808da03430e3e727e54ce66fe9 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Wed, 10 May 2023 15:18:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogSelectReceiveOrder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index 348e5759..ada5cd42 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/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">