From 32260416dc889e4f6d478f203d28560e30194b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 24 Apr 2023 11:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/purApply/purApply.vue      |  3 +-
 .../purchase/purApply/pureApplyAudit.vue      | 38 ++++++++++++-------
 .../purchase/purApply/pureApplySearch.vue     | 24 +++++++++---
 src/views/purchase/purPlan/purPlan.vue        | 26 +++++++++----
 src/views/purchase/purPlan/purPlanAudit.vue   | 23 ++++++++---
 src/views/purchase/purPlan/purPlanSearch.vue  | 26 +++++++++----
 6 files changed, 99 insertions(+), 41 deletions(-)

diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index 9506a61c..36b10996 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.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.targetInvCode" style="width: 90%" clearable  placeholder="请选择所属仓库">
                       <el-option
                         v-for="item in invList"
                         :key="item.name"
@@ -407,7 +407,6 @@ export default {
           }
           filterSubAll(query).then((res) => {
             this.invList = res.data || [];
-            this.getBusType();
           })
         },
         getDeptList() {
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index ba0c05f4..2364418b 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.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.targetInvCode" @change="getInvList" style="width: 90%" clearable  placeholder="请选择所属仓库">
                       <el-option
                         v-for="item in invList"
                         :key="item.name"
@@ -149,6 +149,7 @@ import pureApplyDetail from "./pureApplyDetailDialog";
 import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
 import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getDeptListByUser} from "@/api/auth/authDept";
+import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
     data() {
@@ -164,6 +165,8 @@ export default {
                 corpName: null,
                 type: 1,
                 editStatus: 1,
+                emergency:'',
+                targetDeptCode:'',
             },
             formName: null,
             formMap: {
@@ -185,6 +188,7 @@ export default {
             editType: 1,
             total: 0,
             thirdSys: [],
+            invCodebe:null,
             thirdSysDetail: null,
             busTypes: [],
             originTypes: [],
@@ -246,6 +250,7 @@ export default {
                 corpName: null,
                 type: 1,
                 editStatus: 1,
+                targetDeptCode: this.invCodebe,
             };
             this.actDateRange = [];
             this.getList();
@@ -272,6 +277,7 @@ export default {
                     if (response.code == 20000) {
                         this.list = response.data.list || [];
                         this.total = response.data.total || 0;
+                        this.detailList=[]
                     } else {
                         this.$message.error(response.message);
                     }
@@ -364,16 +370,24 @@ export default {
                 this.formName = "add";
             this.newSpDistributionVisible = true;
         },
-        getInvList() {
-            getInvListByUser().then((res) => {
-            this.invList = res.data || [];
-            this.getBusType();
-          })
-        },
-        getDeptList() {
-          getDeptListByUser().then((res) => {
-            this.deptList = res.data || [];
-          });
+      getInvList() {
+        var query={
+          parentId:this.filterQuery.targetDeptCode
+        }
+        filterSubAll(query).then((res) => {
+          this.invList = res.data || [];
+        })
+      },
+      getDeptList() {
+        getDeptListByUser().then((res) => {
+          this.deptList = res.data || [];
+          if(this.deptList.length>0){
+            this.filterQuery.targetDeptCode=this.deptList[0].code
+            this.invCodebe=this.filterQuery.targetDeptCode
+          }
+          this.getList();
+          this. getInvList();
+        });
       },
     }
     ,
@@ -401,8 +415,6 @@ export default {
         let start = new Date();
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
         this.actDateRange = [start, end];
-        this.getList();
-        this.getInvList();
         this.getDeptList();
     }
     ,
diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue
index daa24c9c..d278bf74 100644
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.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="getInvList" placeholder="请选择申购部门" style="width: 90%">
                 <el-option
                   v-for="item in deptList"
                   :key="item.code"
@@ -25,7 +25,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="申购仓库">
-              <el-select v-model="filterQuery.targetInvCode" style="width: 90%" placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
                 <el-option
                   v-for="item in invList"
                   :key="item.name"
@@ -173,6 +173,7 @@ import pureApplyDetail from "./pureApplyDetailDialog";
 import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
 import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getDeptListByUser} from "@/api/auth/authDept";
+import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -190,6 +191,8 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        emergency:'',
+        targetDeptCode:'',
       },
       formName: null,
       formMap: {
@@ -211,6 +214,7 @@ export default {
       editType: 2,
       total: 0,
       thirdSys: [],
+      invCodebe:null,
       thirdSysDetail: null,
       busTypes: [],
       originTypes: [],
@@ -304,6 +308,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        targetDeptCode: this.invCodebe,
       };
       this.actDateRange = [];
       this.getList();
@@ -338,6 +343,7 @@ export default {
           if (response.code == 20000) {
             this.list = response.data.list || [];
             this.total = response.data.total || 0;
+            this.detailList=[]
           } else {
             this.$message.error(response.message);
           }
@@ -431,14 +437,22 @@ export default {
       this.newSpDistributionVisible = true;
     },
     getInvList() {
-      getInvListByUser().then((res) => {
+      var query={
+        parentId:this.filterQuery.targetDeptCode
+      }
+      filterSubAll(query).then((res) => {
         this.invList = res.data || [];
-        this.getBusType();
       })
     },
     getDeptList() {
       getDeptListByUser().then((res) => {
         this.deptList = res.data || [];
+        if(this.deptList.length>0){
+          this.filterQuery.targetDeptCode=this.deptList[0].code
+          this.invCodebe=this.filterQuery.targetDeptCode
+        }
+        this.getList();
+        this. getInvList();
       });
     },
   }
@@ -463,8 +477,6 @@ export default {
   }
   ,
   created() {
-    this.getList();
-    this.getInvList();
     this.getDeptList();
   }
   ,
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index 62bce91d..1466489f 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.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="getInvList" 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" style="width: 90%"  placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.targetInvCode" style="width: 90%"  clearable placeholder="请选择所属仓库">
                 <el-option
                   v-for="item in invList"
                   :key="item.name"
@@ -159,6 +159,7 @@ import {delApply, inserThrOrderWeb, listPlan, listApplyDetail, delPlanDetailAll}
 import {delApplyDetailAll} from "@/api/purchase/purApply";
 import { getInvListByUser } from '@/api/system/invWarehouse'
 import { getDeptListByUser } from '@/api/auth/authDept'
+import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -176,8 +177,10 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        emergency:''
+        emergency:'',
+        targetDeptCode:'',
       },
+      invCodebe:null,
       formName: null,
       formMap: {
         add: "新增采购计划",
@@ -258,6 +261,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        targetDeptCode: this.invCodebe,
       };
       this.actDateRange = [];
       this.getList();
@@ -307,6 +311,7 @@ export default {
           if (response.code == 20000) {
             this.list = response.data.list || [];
             this.total = response.data.total || 0;
+            this.detailList=[]
           } else {
             this.$message.error(response.message);
           }
@@ -397,17 +402,26 @@ export default {
       this.detailList = [];
     },
     getInvList() {
-      getInvListByUser().then((res) => {
+      var query={
+        parentId:this.filterQuery.targetDeptCode
+      }
+      filterSubAll(query).then((res) => {
         this.invList = res.data || [];
-        this.getBusType();
       })
     },
     getDeptList() {
       getDeptListByUser().then((res) => {
         this.deptList = res.data || [];
+        if(this.deptList.length>0){
+          this.filterQuery.targetDeptCode=this.deptList[0].code
+          this.invCodebe=this.filterQuery.targetDeptCode
+        }
+        this.getList();
+        this. getInvList();
       });
     },
 
+
     newDistributionForm(index, row) {
       this.idQuery.id = '';
       if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
@@ -440,8 +454,6 @@ export default {
   }
   ,
   created() {
-    this.getList();
-    this.getInvList();
     this.getDeptList();
   }
   ,
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index 902b9d93..ed1bbefa 100644
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.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" placeholder="请选择申购部门" @change="getInvList" style="width: 90%">
                 <el-option
                   v-for="item in deptList"
                   :key="item.code"
@@ -155,6 +155,7 @@ import purPlanEdit from "./purPlanDetailDialog";
 import {delApply, auditListPlan, listApplyDetail} from "@/api/purchase/purPlan";
 import { getInvListByUser } from '@/api/system/invWarehouse'
 import { getDeptListByUser } from '@/api/auth/authDept'
+import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -170,6 +171,8 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        emergency:'',
+        targetDeptCode:'',
       },
       formName: null,
       formMap: {
@@ -199,6 +202,7 @@ export default {
       list: [],
       detailList: [],
       loading: false,
+      invCodebe:null,
       actDateRange: [],
       newSpDistributionVisible: false,
       pickerOptions: {
@@ -252,6 +256,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        targetDeptCode: this.invCodebe,
       };
       this.actDateRange = [];
       this.getList();
@@ -278,6 +283,7 @@ export default {
           if (response.code == 20000) {
             this.list = response.data.list || [];
             this.total = response.data.total || 0;
+            this.detailList=[]
           } else {
             this.$message.error(response.message);
           }
@@ -350,14 +356,22 @@ export default {
       this.newSpDistributionVisible = true;
     },
     getInvList() {
-      getInvListByUser().then((res) => {
+      var query={
+        parentId:this.filterQuery.targetDeptCode
+      }
+      filterSubAll(query).then((res) => {
         this.invList = res.data || [];
-        this.getBusType();
       })
     },
     getDeptList() {
       getDeptListByUser().then((res) => {
         this.deptList = res.data || [];
+        if(this.deptList.length>0){
+          this.filterQuery.targetDeptCode=this.deptList[0].code
+          this.invCodebe=this.filterQuery.targetDeptCode
+        }
+        this.getList();
+        this. getInvList();
       });
     },
   }
@@ -381,9 +395,6 @@ export default {
   }
   ,
   created() {
-
-    this.getList();
-    this.getInvList();
     this.getDeptList();
   }
   ,
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
index 25bc8965..7758f0fe 100644
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -5,12 +5,12 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="采购单号">
-              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入采购单号" clearable></el-input>
+              <el-input v-model="filterQuery.billNo" style="width: 90%"  placeholder="请输入采购单号" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="采购部门">
-              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" style="width: 90%">
+              <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择采购部门" style="width: 90%">
                 <el-option
                   v-for="item in deptList"
                   :key="item.code"
@@ -24,7 +24,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="采购仓库">
-              <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">
                 <el-option
                   v-for="item in invList"
                   :key="item.name"
@@ -172,6 +172,7 @@ import purPlanEdit from "./purPlanDetailDialog";
 import {delApply, listPlan, listApplyDetail, delPlanDetailAll} from "@/api/purchase/purPlan";
 import { getInvListByUser } from '@/api/system/invWarehouse'
 import { getDeptListByUser } from '@/api/auth/authDept'
+import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -186,6 +187,8 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        emergency:'',
+        targetDeptCode:'',
       },
       formName: null,
       formMap: {
@@ -206,6 +209,7 @@ export default {
       invList:{},
       deptList:{},
       showSearch:true,
+      invCodebe:null,
       idQuery: {},
       editType: 1,
       total: 0,
@@ -301,6 +305,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        targetDeptCode: this.invCodebe,
       };
       this.actDateRange = [];
       this.getList();
@@ -335,6 +340,7 @@ export default {
           if (response.code == 20000) {
             this.list = response.data.list || [];
             this.total = response.data.total || 0;
+            this.detailList=[]
           } else {
             this.$message.error(response.message);
           }
@@ -396,14 +402,22 @@ export default {
       this.detailList = [];
     },
     getInvList() {
-      getInvListByUser().then((res) => {
+      var query={
+        parentId:this.filterQuery.targetDeptCode
+      }
+      filterSubAll(query).then((res) => {
         this.invList = res.data || [];
-        this.getBusType();
       })
     },
     getDeptList() {
       getDeptListByUser().then((res) => {
         this.deptList = res.data || [];
+        if(this.deptList.length>0){
+          this.filterQuery.targetDeptCode=this.deptList[0].code
+          this.invCodebe=this.filterQuery.targetDeptCode
+        }
+        this.getList();
+        this. getInvList();
       });
     },
 
@@ -440,8 +454,6 @@ export default {
   }
   ,
   created() {
-    this.getList();
-    this.getInvList();
     this.getDeptList();
   }
   ,