diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index ec17444..020db00 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -83,14 +83,15 @@
       <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="productId"></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="spec" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="采购数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" 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="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="供应商" prop="supName" 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="price" 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/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index 08c3a8e..d50542e 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -81,13 +81,15 @@
             <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="productId"></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="zczbhhzbapzbh" 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="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></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="price" 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/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index 81b2454..7f74f3b 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -30,7 +30,32 @@
             </el-form-item>
           </el-col>
         </el-row>
-
+        <el-row>
+          <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-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="到货截止:" prop="arrivalTime">
+              <el-date-picker
+                :disabled="true"
+                v-model="formData.arrivalTime"
+                type="datetime"
+                placeholder="选择日期"
+                style="width: 90%"
+                :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="locStorageCode">
@@ -105,24 +130,23 @@
                   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 width="150"></el-table-column>
-          <el-table-column label="规格型号" prop="spec" show-overflow-tooltip width="160"></el-table-column>
-          <el-table-column width="120" label="订单数量">
+          <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="price" 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"
+                        type='number'
                         @change="tableCountChange(scope.row)"
                         :disabled="scope.row.index !== selectedIndex"
-                        oninput="value=value.replace(/[^\d]/g,'')"
-              ></el-input>
+                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip width="100"></el-table-column>
-          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip width="160"></el-table-column>
-          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"
-                           width="160"
-          ></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+          <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
 
         </el-table>
       </el-card>
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index cdcdb93..5804062 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -239,54 +239,15 @@
         highlight-current-row="true"
       >
         <el-table-column label="序号" type="index" width="50"></el-table-column>
-        <el-table-column
-          label="物资名称"
-          prop="productName"
-          show-overflow-tooltip
-          width="150"
-        ></el-table-column>
-        <el-table-column
-          label="规格型号"
-          prop="spec"
-          show-overflow-tooltip
-          width="160"
-        ></el-table-column>
-        <el-table-column
-          label="计量单位"
-          prop="measname"
-          show-overflow-tooltip
-          width="100"
-        ></el-table-column>
-        <el-table-column
-          label="计划数量"
-          prop="planCount"
-          width="100"
-        ></el-table-column>
-        <el-table-column
-          label="订单数量"
-          prop="count"
-          width="100"
-        ></el-table-column>
-        <el-table-column
-          label="计量单位"
-          prop="spec"
-          show-overflow-tooltip="true"
-          width="100"
-        ></el-table-column>
-
-        <el-table-column
-          label=" 生产企业
-        "
-          prop="manufactory"
-          show-overflow-tooltip="true"
-          width="160"
-        ></el-table-column>
-        <el-table-column
-          label="注册/备案号"
-          prop="zczbhhzbapzbh"
-          show-overflow-tooltip="true"
-          width="160"
-        ></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="price" 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-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>-->
       </el-table>
     </el-card>
@@ -364,9 +325,9 @@ export default {
       },
 
       dealStatus: {
+        0: "未处理",
         1: "已处理",
-        2: "未处理",
-        3: "已作废",
+        2: "已作废",
       },
       showSup: false,
       invList: {}, //采购部门