diff --git a/src/views/inout/DialogNewReviewOrder.vue b/src/views/inout/DialogNewReviewOrder.vue
index 9fcb896b..249a0bc9 100644
--- a/src/views/inout/DialogNewReviewOrder.vue
+++ b/src/views/inout/DialogNewReviewOrder.vue
@@ -257,7 +257,6 @@ export default {
     },
 
     searchOrder() {
-      debugger
       let query = {
         billNo: this.formData.billNo
       };
diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index 04615495..8c02f18f 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -285,7 +285,6 @@ export default {
       this.selectedIndex = "";
     },
     stockOrderList(){
-      debugger
       if(this.query.id==null) {
         inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
           .then(response => {
@@ -308,7 +307,6 @@ export default {
       this.haveDistributionVisible = true;
     },
     selectProductFunction() {
-      debugger
       if(this.query.id==null) {
         inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
           .then(response => {
diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index a1f532ed..9506a61c 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.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 pureApplyEdit from "./purApplyEditDiaolog";
 import {delApply, delApplyDetailAll, inserThrOrderWeb, listApply, listApplyDetail} 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() {
@@ -171,7 +172,8 @@ export default {
                 corpName: null,
                 type: 1,
                 editStatus: 1,
-                emergency:''
+                emergency:'',
+                targetDeptCode:'',
             },
             isChang:false,
             formName: null,
@@ -194,6 +196,7 @@ export default {
             total: 0,
             thirdSys: [],
             invList:{},
+            invCodebe:null,
             deptList:{},
             thirdSysDetail: null,
             busTypes: [],
@@ -256,6 +259,7 @@ export default {
                 corpName: null,
                 type: 1,
                 editStatus: 1,
+                targetDeptCode: this.invCodebe,
             };
             this.actDateRange = [];
             this.getList();
@@ -298,6 +302,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,7 +402,10 @@ 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();
           })
@@ -405,6 +413,12 @@ export default {
         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();
           });
         },
 
@@ -433,8 +447,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/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 4785afe2..19bdd36d 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -103,7 +103,7 @@
 
         <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="60"></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>
@@ -457,7 +457,6 @@ export default {
       });
     },
     getStockOrderDetailList() {
-      debugger
       this.loading = true;
       listApplyDetail(this.query) //查找该单号下的所有条码
         .then((response) => {
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index 5e70260b..62bce91d 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.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.targetDeptCode" 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" 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"
@@ -73,8 +83,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">
@@ -82,16 +91,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="120">
           <template slot-scope="scope">
@@ -114,15 +122,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>
 
@@ -168,6 +176,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        emergency:''
       },
       formName: null,
       formMap: {
@@ -190,10 +199,10 @@ export default {
       detailList: [],
       loading: false,
       actDateRange: [],
-      emergencyMap: {
-        1: "普通",
-        2: "紧急",
-        3: "不紧急",
+      emergencyMap:{
+        1: "正常",
+        2: "较急",
+        3: "特急",
       },
       invList:{},
       deptList:{},
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index 1da45fe0..902b9d93 100644
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.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.targetDeptCode" 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" 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,15 +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">
@@ -112,15 +121,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>
 
diff --git a/src/views/purchase/purPlan/purPlanDetailDialog.vue b/src/views/purchase/purPlan/purPlanDetailDialog.vue
index 12ebb2ef..fb3f59fe 100644
--- a/src/views/purchase/purPlan/purPlanDetailDialog.vue
+++ b/src/views/purchase/purPlan/purPlanDetailDialog.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"
@@ -126,21 +127,15 @@
 
             <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 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>
         </el-form>
@@ -198,7 +193,7 @@ export default {
             formData: {
                 id: null,
                 billNo: null,
-                billDate: "",
+                createTime: "",
                 remark: "",
                 deptCode: null,
                 locStorageCode: null,
@@ -466,7 +461,7 @@ export default {
             this.formData = {
                 id: null,
                 billNo: null,
-                billDate: "",
+                createTime: "",
                 remark: "",
                 deptCode: null,
                 locStorageCode: null,
diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue
index 3486ed63..8a2487ea 100644
--- a/src/views/purchase/purPlan/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlan/purPlanEditDialog.vue
@@ -11,14 +11,40 @@
       <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%"
+                :clearable="false"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </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%"
@@ -53,31 +79,6 @@
           </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">
             <el-form-item label="拒绝原因:">
@@ -92,20 +93,19 @@
         <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>
-
-
           </el-button-group>
         </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 +115,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,6 +180,7 @@ import {
 } from "@/api/purchase/purPlan";
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import SelectApplyListDialog from "@/views/purchase/purApply/selectApplyListDialog";
+import {parseTime} from "@/utils/coTools";
 
 
 export default {
@@ -210,7 +210,7 @@ export default {
       formData: {
         id: null,
         billNo: null,
-        billDate: "",
+        createTime: "",
         remark: "",
         billType: "CGJH",
         deptCode: null,
@@ -273,7 +273,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) {
@@ -495,14 +495,18 @@ export default {
       this.sValue = this.formData.corpName;
       this.getStockOrderDetailList();
     } else {
+      var date = new Date();
       this.formData = {
         id: null,
         billNo: null,
-        billDate: "",
         remark: "",
         billType: "CGJH",
         deptCode: null,
         incCode: null,
+        createTime: parseTime(
+          date,
+          "{y}-{m}-{d} {h}:{i}:{s}"
+        ),
       };
       this.orderEditor = false;
     }
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
index 1f5892cb..25bc8965 100644
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -4,8 +4,8 @@
       <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-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
+            <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">
@@ -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,7 +96,6 @@
                 @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="deptName"></el-table-column>
         <el-table-column label="采购仓库" prop="invName"></el-table-column>
         <el-table-column label="紧急程度" prop="emergency">
@@ -95,9 +103,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">
@@ -105,7 +111,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="操作">
           <template slot-scope="scope">
@@ -129,15 +136,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>
 
@@ -191,10 +198,10 @@ export default {
         3: "已审核",
         4: "已拒绝"
       },
-      emergencyMap: {
-        1: "普通",
-        2: "紧急",
-        3: "不紧急",
+      emergencyMap:{
+        1: "正常",
+        2: "较急",
+        3: "特急",
       },
       invList:{},
       deptList:{},