diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index abef9ea1..9b62907e 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -3,13 +3,28 @@
         <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-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.targetDeptCode" placeholder="请选择申购部门" style="width: 90%">
+                      <el-option
+                        v-for="item in deptList"
+                        :key="item.code"
+                        :label="item.name"
+                        :value="item.code"
+                      >
+                        <span style="float: left">{{ item.name }}</span>
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
                   <el-form-item label="申购仓库">
                     <el-select v-model="filterQuery.targetInvCode" style="width: 90%"  placeholder="请选择所属仓库">
                       <el-option
@@ -25,21 +40,16 @@
               </el-row>
 
               <el-row>
-                <el-col :span="10">
-                  <el-form-item label="申购部门">
-                    <el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" style="width: 90%">
-                      <el-option
-                        v-for="item in deptList"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.code"
-                      >
-                        <span style="float: left">{{ item.name }}</span>
-                      </el-option>
+                <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="10">
+                <el-col :span="8">
                   <el-form-item label="创建时间:">
                     <el-date-picker
                       :picker-options="pickerOptions"
@@ -73,7 +83,6 @@
             <el-table v-loading="loading" :data="list" style="width: 100%"  @current-change="handleDetail" border highlight-current-row>
                 <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="targetDeptName"></el-table-column>
                 <el-table-column label="申购仓库" prop="targetInvName"></el-table-column>
                 <el-table-column label="紧急程度" prop="emergency" >
@@ -81,15 +90,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="120px">
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button>
@@ -110,15 +119,15 @@
 
         <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="物资名称" 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="序号" 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>
 
@@ -162,6 +171,7 @@ export default {
                 corpName: null,
                 type: 1,
                 editStatus: 1,
+                emergency:''
             },
             isChang:false,
             formName: null,
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 208d8169..4785afe2 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -11,15 +11,16 @@
       <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="选择日期"
                 style="width: 90%"
@@ -35,14 +36,14 @@
           <el-col :span="11">
             <el-form-item label="紧急程度：" prop="emergency">
               <el-select v-model="formData.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-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
                 v-model="formData.arrivalTime"
                 type="datetime"
@@ -58,8 +59,8 @@
 
         <el-row style="margin-top: -10px">
           <el-col :span="11">
-            <el-form-item label="申购科室：" prop="locStorageCode">
-              <el-select v-model="formData.targetInvCode" placeholder="当前分库信息" @change="setWarehouseName"
+            <el-form-item label="申购仓库：" prop="locStorageCode">
+              <el-select v-model="formData.targetInvCode" placeholder="请选择当前申购仓库" @change="setWarehouseName"
                          style="width: 90%" clearable>
                 <el-option
                   v-for="item in subInvList"
@@ -95,18 +96,18 @@
           <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" :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 label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></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"
@@ -117,10 +118,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"
@@ -185,6 +185,7 @@ import {
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import {addPlanId} from "@/api/purchase/purPlan";
 import SelectRecelveListDialog from "@/views/inout/receive/selectReveiceListDialog";
+import {parseTime} from "@/utils/coTools";
 
 export default {
   name: "idQuery",
@@ -218,7 +219,7 @@ export default {
         billType: "CPSG",
         id: null,
         billNo: null,
-        billDate: "",
+        createTime: "",
         remark: "",
         deptCode: null,
         invCode: null,
@@ -281,7 +282,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.targetInvCode == "" || this.formData.targetInvCode == null) {
@@ -456,6 +457,7 @@ export default {
       });
     },
     getStockOrderDetailList() {
+      debugger
       this.loading = true;
       listApplyDetail(this.query) //查找该单号下的所有条码
         .then((response) => {
@@ -506,15 +508,18 @@ export default {
       this.sValue = this.formData.corpName;
       this.getStockOrderDetailList();
     } else {
+      var date = new Date();
       this.formData = {
         id: null,
         billNo: null,
-        billDate: "",
         remark: "",
-        billType: "CPSG",
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
+        createTime: parseTime(
+          date,
+          "{y}-{m}-{d} {h}:{i}:{s}"
+        ),
       };
       this.orderEditor = false;
     }