From 782df9cee4001e62a86e5fc0f8e6100f7d9e226e 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:54:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=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/purOrder/purOrder.vue      | 12 +--
 src/views/purchase/purOrder/purOrderAudit.vue | 83 ++++++++++-------
 .../purOrder/purOrderDetailDialog.vue         | 59 +++++++-----
 .../purchase/purOrder/purOrderEditDialog.vue  | 93 ++++++++++---------
 .../purchase/purOrder/purOrderSearch.vue      | 59 ++++++++----
 src/views/purchase/purPlan/purPlan.vue        | 12 +--
 src/views/purchase/purPlan/purPlanAudit.vue   | 12 +--
 src/views/purchase/purPlan/purPlanSearch.vue  | 10 +-
 8 files changed, 199 insertions(+), 141 deletions(-)

diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index dc3098b3..82b69796 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -11,7 +11,7 @@
 
           <el-col :span="8">
             <el-form-item label="采购部门">
-              <el-select v-model="filterQuery.targetDeptCode" @change="getInvList" 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"
@@ -176,7 +176,7 @@ export default {
         type: 1,
         editStatus: 1,
         emergency:'',
-        targetDeptCode:'',
+        deptCode:'',
       },
       formName: null,
       invCodebe:null,
@@ -259,7 +259,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        targetDeptCode: this.invCodebe,
+        deptCode: this.invCodebe,
       };
       this.actDateRange = [];
       this.getList();
@@ -402,7 +402,7 @@ export default {
     },
     getInvList() {
       var query={
-        parentId:this.filterQuery.targetDeptCode
+        parentId:this.filterQuery.deptCode
       }
       filterSubAll(query).then((res) => {
         this.invList = res.data || [];
@@ -412,8 +412,8 @@ export default {
       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.filterQuery.deptCode=this.deptList[0].code
+          this.invCodebe=this.filterQuery.deptCode
         }
         this.getList();
         this. getInvList();
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index 917897b3..cc48b686 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -3,14 +3,15 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="采购订单单号">
+          <el-col :span="8">
+            <el-form-item label="采购单号">
               <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+
+          <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"
@@ -23,12 +24,9 @@
             </el-form-item>
           </el-col>
 
-        </el-row>
-
-        <el-row>
-          <el-col :span="10">
+          <el-col :span="8">
             <el-form-item label="采购仓库">
-              <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.targetInvCode" clearable style="width: 90%"  placeholder="请选择所属仓库">
                 <el-option
                   v-for="item in invList"
                   :key="item.name"
@@ -39,7 +37,19 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="紧急程度：" prop="emergency">
+              <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
+                <el-option label="正常" :value=1></el-option>
+                <el-option label="较急" :value=2></el-option>
+                <el-option label="特急" :value=3></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -70,8 +80,7 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
                 @current-change="handleDetail">
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="采购订单单号" prop="billNo"></el-table-column>
-        <el-table-column label="创建时间" prop="createTime"></el-table-column>
+        <el-table-column label="采购单号" prop="billNo"></el-table-column>
         <el-table-column label="采购部门" prop="deptName"></el-table-column>
         <el-table-column label="采购仓库" prop="invName"></el-table-column>
         <el-table-column label="紧急程度" prop="emergency">
@@ -79,17 +88,15 @@
             {{ emergencyMap[scope.row.emergency] }}
           </template>
         </el-table-column>
-        <el-table-column label="到货时间" prop="arrivalTime"></el-table-column>
-        <el-table-column label="采购说明" prop="remark"></el-table-column>
-        <el-table-column label="状态" prop="status">
+        <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
+        <el-table-column label="单据状态" prop="status">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.status) | statusFilterType">
               {{ statusMap[scope.row.status] }}
             </el-tag>
           </template>
         </el-table-column>
-
-
+        <el-table-column label="创建时间" prop="createTime"></el-table-column>
         <el-table-column label="操作" width="60px">
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.status!=2"
@@ -112,15 +119,15 @@
     </el-card>
     <el-card class="el-card">
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
-        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
         <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="采购数量" prop="count"></el-table-column>
-        <el-table-column label="计量单位" prop="measname"></el-table-column>
-        <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+        <el-table-column label="申购数量" prop="count"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
       </el-table>
     </el-card>
 
@@ -146,6 +153,7 @@ import purPlanEdit from "./purOrderDetailDialog";
 import {delOrder, auditListOrder, listOrderDetail} from "@/api/purchase/purOrder";
 import {getInvListByUser} from '@/api/system/invWarehouse'
 import {getDeptListByUser} from '@/api/auth/authDept'
+import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -161,8 +169,11 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        emergency:'',
+        deptCode:'',
       },
       formName: null,
+      invCodebe:null,
       formMap: {
         add: "新增采购计划",
         update: "采购计划审核",
@@ -173,10 +184,10 @@ export default {
         3: "已审核",
         4: "已拒绝"
       },
-      emergencyMap: {
-        1: "普通",
-        2: "紧急",
-        3: "不紧急",
+      emergencyMap:{
+        1: "正常",
+        2: "较急",
+        3: "特急",
       },
       invList: {},
       deptList: {},
@@ -243,6 +254,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        deptCode: this.invCodebe,
       };
       this.actDateRange = [];
       this.getList();
@@ -269,6 +281,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);
           }
@@ -329,14 +342,22 @@ export default {
       this.detailList = [];
     },
     getInvList() {
-      getInvListByUser().then((res) => {
+      var query={
+        parentId:this.filterQuery.deptCode
+      }
+      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.deptCode=this.deptList[0].code
+          this.invCodebe=this.filterQuery.deptCode
+        }
+        this.getList();
+        this. getInvList();
       });
     },
 
@@ -372,8 +393,6 @@ export default {
   }
   ,
   created() {
-    this.getList();
-    this.getInvList();
     this.getDeptList();
   }
   ,
diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index 3447a4ee..dfd9738c 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -12,16 +12,17 @@
             <el-card style="margin-top: -5px;">
                 <el-row>
                     <el-col  :span="11">
-                        <el-form-item label="单据号:"  prop="billNo">
+                        <el-form-item label="采购单号:"  prop="billNo">
                             <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="11">
-                        <el-form-item label="单据日期:"  prop="billdate">
+                        <el-form-item label="创建时间:"  prop="createTime">
                             <el-date-picker
-                                v-model="formData.billDate"
+                                :disabled="true"
+                                v-model="formData.createTime"
                                 type="datetime"
-                                placeholder="选择日期" :disabled="true"
+                                placeholder="选择日期"
                                 style="width: 90%"
                                 :clearable="false"
                                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -34,14 +35,14 @@
                 <el-col :span="11">
                   <el-form-item label="紧急程度：" prop="emergency">
                     <el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%" clearable>
-                      <el-option label="普通" :value=1></el-option>
-                      <el-option label="紧急" :value=2></el-option>
-                      <el-option label="不紧急" :value=3></el-option>
+                      <el-option label="正常" :value=1></el-option>
+                      <el-option label="较急" :value=2></el-option>
+                      <el-option label="特急" :value=3></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="11">
-                  <el-form-item label="到货时间：" prop="arrivalTime">
+                  <el-form-item label="到货截止：" prop="arrivalTime">
                     <el-date-picker
                       :disabled="true"
                       v-model="formData.arrivalTime"
@@ -124,21 +125,24 @@
 
             <el-card>
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
-                    <el-table-column label="序号" type="index" width="50"></el-table-column>
-                    <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
-                    <el-table-column width="150" label="单据数量">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.count"
-                                      placeholder="请输入数量" style="width: 80%"
-                                      type='number'
-                                      @change="tableCountChange(scope.row)"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                        </template>
-                    </el-table-column>
+                  <el-table-column label="序号" type="index" width="60"></el-table-column>
+                  <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
+                  <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
+                  <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+                  <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+                  <el-table-column width="150" label="采购数量">
+                    <template slot-scope="scope">
+                      <el-input size="small" v-model="scope.row.count"
+                                placeholder="请输入数量" style="width: 80%"
+                                type='number'
+                                @change="tableCountChange(scope.row)"
+                                :disabled="scope.row.index !== selectedIndex"
+                                oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+                  <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+                  <el-table-column label="供应商" prop="supName"></el-table-column>
                 </el-table>
             </el-card>
         </el-form>
@@ -168,6 +172,7 @@ import {auditOrder, delOrderDetail, listOrderDetail} from "@/api/purchase/purOrd
 import {filterAllByUser,selectByCode} from "@/api/system/invWarehouse";
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busType";
+import {parseTime} from "@/utils/coTools";
 
 export default {
     name: "idQuery",
@@ -196,7 +201,7 @@ export default {
             formData: {
                 id: null,
                 billNo: null,
-                billDate: "",
+                createTime: "",
                 remark: "",
                 deptCode: null,
                 locStorageCode: null,
@@ -461,10 +466,10 @@ export default {
             this.sValue = this.formData.corpName;
             this.getStockOrderDetailList();
         } else {
+            var date = new Date();
             this.formData = {
                 id: null,
                 billNo: null,
-                billDate: "",
                 remark: "",
                 deptCode: null,
                 locStorageCode: null,
@@ -474,6 +479,10 @@ export default {
                 targetInv: 1000,
                 targetSubInv: null,
                 targetBillAction: null,
+                createTime: parseTime(
+                  date,
+                  "{y}-{m}-{d} {h}:{i}:{s}"
+                ),
             };
             this.orderEditor = false;
         }
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 6d642305..af29f1f4 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -11,14 +11,15 @@
       <el-card style="margin-top: -5px;">
         <el-row>
           <el-col :span="11">
-            <el-form-item label="单据号:" prop="billNo">
+            <el-form-item label="采购单号:" prop="billNo">
               <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="单据时间:" prop="billdate">
+            <el-form-item label="创建时间:" prop="createTime">
               <el-date-picker
-                v-model="formData.billDate"
+                :disabled="true"
+                v-model="formData.createTime"
                 type="datetime"
                 placeholder="选择日期"
                 style="width: 100%"
@@ -30,6 +31,33 @@
           </el-col>
         </el-row>
 
+
+        <el-row style="margin-top: -10px">
+          <el-col :span="11">
+            <el-form-item label="紧急程度：" prop="emergency">
+              <el-select v-model="formData.emergency" placeholder="请选择紧急程度" style="width: 100%" clearable>
+                <el-option label="正常" :value=1></el-option>
+                <el-option label="较急" :value=2></el-option>
+                <el-option label="特急" :value=3></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="到货截止：" prop="arrivalTime">
+              <el-date-picker
+                v-model="formData.arrivalTime"
+                type="datetime"
+                placeholder="选择日期"
+                style="width: 100%"
+                :clearable="false"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
         <el-row>
           <el-col :span="11">
             <el-form-item label="采购仓库:" prop="invCode">
@@ -53,30 +81,7 @@
           </el-col>
         </el-row>
 
-        <el-row style="margin-top: -10px">
-          <el-col :span="11">
-            <el-form-item label="紧急程度：" prop="emergency">
-              <el-select v-model="formData.emergency" placeholder="请选择紧急程度" style="width: 100%" clearable>
-                <el-option label="普通" :value=1></el-option>
-                <el-option label="紧急" :value=2></el-option>
-                <el-option label="不紧急" :value=3></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="到货时间：" prop="arrivalTime">
-              <el-date-picker
-                v-model="formData.arrivalTime"
-                type="datetime"
-                placeholder="选择日期"
-                style="width: 100%"
-                :clearable="false"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
+
 
         <el-row>
           <el-col :span="11" v-show="formData.status==4">
@@ -92,9 +97,8 @@
         <el-row type="flex" justify="end">
           <el-button-group style="display: flex">
             <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-              <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入
-              </el-button>
-              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入采购单</el-button>
+              <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
+<!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入采购单</el-button>-->
             </el-button-group>
 
 
@@ -102,10 +106,12 @@
         </el-row>
         <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
                   highlight-current-row max-height="300" height="300" ref="multipleTable">
-          <el-table-column label="序号" type="index" width="50"></el-table-column>
-          <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-          <el-table-column width="150" label="申购数量">
+          <el-table-column label="序号" type="index" width="60"></el-table-column>
+          <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
+          <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+          <el-table-column width="150" label="采购数量">
             <template slot-scope="scope">
               <el-input size="small" v-model="scope.row.count"
                         placeholder="请输入数量" style="width: 80%"
@@ -115,10 +121,9 @@
                         oninput="value=value.replace(/[^\d]/g,'')"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
-          <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+          <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+          <el-table-column label="供应商" prop="supName"></el-table-column>
           <el-table-column label="操作" width="120">
             <template slot-scope="scope">
               <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
@@ -181,7 +186,7 @@ import {
 } from "@/api/purchase/purOrder";
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import SelectPlanListDialog from "@/views/purchase/purPlan/selectPlanListDialog";
-
+import {parseTime} from "@/utils/coTools";
 
 export default {
   name: "idQuery",
@@ -210,7 +215,7 @@ export default {
       formData: {
         id: null,
         billNo: null,
-        billDate: "",
+        createTime: "",
         remark: "",
         billType: "CGDD",
         deptCode: null,
@@ -273,7 +278,7 @@ export default {
           }
           if (status === '2') {
 
-            if (this.formData.billDate == "" || this.formData.billDate == null) {
+            if (this.formData.createTime == "" || this.formData.createTime == null) {
               return this.$message.error("单据日期不能为空！");
             }
             // if (this.formData.billType == "" || this.formData.billType == null) {
@@ -496,14 +501,18 @@ export default {
       this.sValue = this.formData.corpName;
       this.getStockOrderDetailList();
     } else {
+      var date = new Date();
       this.formData = {
         id: null,
         billNo: null,
-        billDate: "",
         remark: "",
         billType: "CGDD",
         deptCode: null,
         incCode: null,
+        createTime: parseTime(
+          date,
+          "{y}-{m}-{d} {h}:{i}:{s}"
+        ),
       };
       this.orderEditor = false;
     }
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 234aa000..09ce2289 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -4,13 +4,13 @@
       <el-form :model="filterQuery" class="query-form" label-width="100px" size="mini" v-show="showSearch">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="采购订单单号">
+            <el-form-item label="采购单号">
               <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"
@@ -38,6 +38,15 @@
         </el-row>
 
         <el-row>
+          <el-col :span="8">
+            <el-form-item label="紧急程度：" prop="emergency">
+              <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
+                <el-option label="正常" :value=1></el-option>
+                <el-option label="较急" :value=2></el-option>
+                <el-option label="特急" :value=3></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="创建时间:">
               <el-date-picker
@@ -87,8 +96,7 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
                 @current-change="handleDetail">
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="采购订单单号" prop="billNo"></el-table-column>
-        <el-table-column label="创建时间" prop="createTime"></el-table-column>
+        <el-table-column label="采购单号" prop="billNo"></el-table-column>
         <el-table-column label="采购部门" prop="deptName"></el-table-column>
         <el-table-column label="采购仓库" prop="invName"></el-table-column>
         <el-table-column label="紧急程度" prop="emergency">
@@ -96,9 +104,7 @@
             {{ emergencyMap[scope.row.emergency] }}
           </template>
         </el-table-column>
-        <el-table-column label="到货时间" prop="arrivalTime"></el-table-column>
-        <el-table-column label="采购说明" prop="remark"></el-table-column>
-        <el-table-column label="审核时间" prop="auditTime"></el-table-column>
+        <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
         <el-table-column label="状态" prop="status">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.status) | statusFilterType">
@@ -106,6 +112,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="创建时间" prop="createTime"></el-table-column>
+        <el-table-column label="审核时间" prop="auditTime"></el-table-column>
 
 
         <el-table-column label="操作">
@@ -130,15 +138,15 @@
     </el-card>
     <el-card class="el-card">
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row="true">
-        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
         <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="采购数量" prop="count"></el-table-column>
-        <el-table-column label="计量单位" prop="measname"></el-table-column>
-        <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+        <el-table-column label="申购数量" prop="count"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
       </el-table>
     </el-card>
 
@@ -167,6 +175,7 @@ import {delApply, listOrder, listOrderDetail, delOrderDetailAll} from "@/api/pur
 import {getInvListByUser} from '@/api/system/invWarehouse'
 import {getDeptListByUser} from '@/api/auth/authDept'
 import {selectAuthMenu} from "@/api/system/sysMenuHelp";
+import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 
 export default {
@@ -183,6 +192,8 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        emergency:'',
+        deptCode:'',
       },
       Menustatus:null,
       filePath:"",
@@ -209,6 +220,7 @@ export default {
       editType: 1,
       total: 0,
       thirdSys: [],
+      invCodebe:null,
       thirdSysDetail: null,
       busTypes: [],
       originTypes: [],
@@ -300,6 +312,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        deptCode: this.invCodebe,
       };
       this.actDateRange = [];
       this.getList();
@@ -338,6 +351,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);
           }
@@ -410,16 +424,25 @@ export default {
     },
 
     getInvList() {
-      getInvListByUser().then((res) => {
+      var query={
+        parentId:this.filterQuery.deptCode
+      }
+      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.deptCode=this.deptList[0].code
+          this.invCodebe=this.filterQuery.deptCode
+        }
+        this.getList();
+        this. getInvList();
       });
     },
+
     newDistributionForm(index, row) {
       this.idQuery.id = '';
       if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
@@ -454,8 +477,6 @@ export default {
   ,
   created() {
     this.selectAuthMenu();
-    this.getList();
-    this.getInvList();
     this.getDeptList();
   }
   ,
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index 1466489f..ee905824 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" @change="getInvList" 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"
@@ -178,7 +178,7 @@ export default {
         type: 1,
         editStatus: 1,
         emergency:'',
-        targetDeptCode:'',
+        deptCode:'',
       },
       invCodebe:null,
       formName: null,
@@ -261,7 +261,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        targetDeptCode: this.invCodebe,
+        deptCode: this.invCodebe,
       };
       this.actDateRange = [];
       this.getList();
@@ -403,7 +403,7 @@ export default {
     },
     getInvList() {
       var query={
-        parentId:this.filterQuery.targetDeptCode
+        parentId:this.filterQuery.deptCode
       }
       filterSubAll(query).then((res) => {
         this.invList = res.data || [];
@@ -413,8 +413,8 @@ export default {
       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.filterQuery.deptCode=this.deptList[0].code
+          this.invCodebe=this.filterQuery.deptCode
         }
         this.getList();
         this. getInvList();
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index ed1bbefa..8fe86c55 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="请选择申购部门" @change="getInvList" style="width: 90%">
+              <el-select v-model="filterQuery.deptCode" placeholder="请选择申购部门" @change="getInvList" style="width: 90%">
                 <el-option
                   v-for="item in deptList"
                   :key="item.code"
@@ -172,7 +172,7 @@ export default {
         type: 1,
         editStatus: 1,
         emergency:'',
-        targetDeptCode:'',
+        deptCode:'',
       },
       formName: null,
       formMap: {
@@ -256,7 +256,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        targetDeptCode: this.invCodebe,
+        deptCode: this.invCodebe,
       };
       this.actDateRange = [];
       this.getList();
@@ -357,7 +357,7 @@ export default {
     },
     getInvList() {
       var query={
-        parentId:this.filterQuery.targetDeptCode
+        parentId:this.filterQuery.deptCode
       }
       filterSubAll(query).then((res) => {
         this.invList = res.data || [];
@@ -367,8 +367,8 @@ export default {
       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.filterQuery.deptCode=this.deptList[0].code
+          this.invCodebe=this.filterQuery.deptCode
         }
         this.getList();
         this. getInvList();
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
index 7758f0fe..635a9de5 100644
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -188,7 +188,7 @@ export default {
         type: 1,
         editStatus: 1,
         emergency:'',
-        targetDeptCode:'',
+        deptCode:'',
       },
       formName: null,
       formMap: {
@@ -305,7 +305,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        targetDeptCode: this.invCodebe,
+        deptCode: this.invCodebe,
       };
       this.actDateRange = [];
       this.getList();
@@ -403,7 +403,7 @@ export default {
     },
     getInvList() {
       var query={
-        parentId:this.filterQuery.targetDeptCode
+        parentId:this.filterQuery.deptCode
       }
       filterSubAll(query).then((res) => {
         this.invList = res.data || [];
@@ -413,8 +413,8 @@ export default {
       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.filterQuery.deptCode=this.deptList[0].code
+          this.invCodebe=this.filterQuery.deptCode
         }
         this.getList();
         this. getInvList();