2/25 界面优化1.0

src/views/collect/IocCollectOrderCheckCode.vue

@@ -169,7 +169,7 @@
             <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
             <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
             <el-table-column label="医保编码" prop="ybbm"></el-table-column>
-            <el-table-column label="药品编码" prop="nameCode"></el-table-column>
+            <el-table-column label="产品编码" prop="nameCode"></el-table-column>
           </el-table>
           <el-row style="text-align: right;font-size: 12px;margin-top: 10px">
             <el-col span="24">
@@ -214,13 +214,14 @@
           >
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column label="追溯码" prop="udiCode" width="160"></el-table-column>
-            <el-table-column label="药品编码" prop="nameCode"></el-table-column>
-            <el-table-column label="药品通用名称" prop="cpmctymc" width="110"></el-table-column>
-            <el-table-column label="包装规格" prop="ggxh" width="110"></el-table-column>
+            <el-table-column label="产品编码" prop="nameCode"></el-table-column>
+            <el-table-column label="产品通用名称" prop="cpmctymc" width="110"></el-table-column>
+            <el-table-column label="制剂规格" prop="prepnSpec" width="160"></el-table-column>
+            <el-table-column label="包装规格" prop="ggxh" width="100"></el-table-column>
             <el-table-column label="扫码数量" prop="scanCount" width="110"></el-table-column>
             <el-table-column label="批次号" prop="batchNo"></el-table-column>
-            <el-table-column label="生产日期" prop="productDate"></el-table-column>
-            <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+            <el-table-column label="生产日期" prop="productDate" width="80"></el-table-column>
+            <el-table-column label="失效日期" prop="expireDate" width="80"></el-table-column>
             <el-table-column label="序列号" prop="serialNo"></el-table-column>
             <!--<el-table-column label="扫码数量" prop="scanActCount"></el-table-column>-->
             <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
@@ -314,7 +315,8 @@ export default {
         orderIdFk: null,
         code: null,
         page: 1,
-        limit: 10
+        limit: 10,
+        isOrderCheck : 1
       },
       filterQuery: {
         code: '',
@@ -822,6 +824,7 @@ export default {
       this.$message.success('单据审核完成')
     },
     finishOrder() {
+      this.orderData.isCheckFinish = 1
       finishCheckOrder(this.orderData).then(res => {
         if (res.code == 20000) {
         } else {