From 87397ea20ef4197cfba11f7a33d7e4cba630a068 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 2 Aug 2024 19:12:44 +0800
Subject: [PATCH] =?UTF-8?q?8/02=201.1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drugInventory/supInoutSearchOrder.vue     |   3 +-
 .../distribution/DialogSelectProduct.vue      |   7 +-
 .../distribution/IoDealOrder.vue              |   4 +-
 .../distribution/IoSupAduitOrder.vue          |   8 +-
 .../distribution/drugDetail.vue               | 462 +++++++++++++
 .../pharmaceuticals/inout/DialogCheck.vue     | 607 ++++++++++++++++++
 .../inout/DialogReviewOrder.vue               | 471 ++++++++++++++
 .../inout/IoDeliverySearchOrder.vue           |   4 +-
 .../pharmaceuticals/inout/IoEditOrderDrug.vue |   2 +-
 .../supplier/drugMaintain/drugMaintain.vue    |   2 +
 10 files changed, 1557 insertions(+), 13 deletions(-)
 create mode 100644 src/views/pharmaceuticals/distribution/drugDetail.vue
 create mode 100644 src/views/pharmaceuticals/inout/DialogCheck.vue
 create mode 100644 src/views/pharmaceuticals/inout/DialogReviewOrder.vue

diff --git a/src/views/drugInventory/supInoutSearchOrder.vue b/src/views/drugInventory/supInoutSearchOrder.vue
index 0bc0c70..63385e8 100644
--- a/src/views/drugInventory/supInoutSearchOrder.vue
+++ b/src/views/drugInventory/supInoutSearchOrder.vue
@@ -461,6 +461,7 @@ export default {
         confirmStarTime:null,  //发票确认起始日期
         confirmEndTime:null,
         corpName:null,
+        productType: 2
       },
 
       printMap: {
@@ -873,7 +874,7 @@ export default {
       this.showSup = true;
     }
     this.actionType = this.$route.query.name;
-    getHead("supDrugInoutSearchOrder","1").then((re) => {
+    getHead("supDrugInoutSearchOrder-2","1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
diff --git a/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue b/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue
index 1cb28db..d68c6f8 100644
--- a/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue
+++ b/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue
@@ -180,7 +180,7 @@
 
 
     <el-dialog
-      title="耗材字典详情"
+      title="药品字典详情"
       :visible.sync="udiRlDetailVisible"
       width="85%"
       :close-on-click-modal="false"
@@ -188,7 +188,7 @@
       append-to-body
       v-if="udiRlDetailVisible"
     >
-      <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
+      <drugDetail :editQuery="currentRow"></drugDetail>
     </el-dialog>
   </div>
 </template>
@@ -198,6 +198,7 @@
 import {addBizProduct} from "@/api/inout/orderDetailCode";
 import {filterCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance";
 import udiRlDetailDialog from "./purUdiRlDetailDialog";
+import drugDetail from "./drugDetail"
 
 export default {
   name: "stockOrderNewSelectProduct",//选入耗材字典产品对话框
@@ -370,7 +371,7 @@ export default {
 
 
   },
-  components: {udiRlDetailDialog}
+  components: {udiRlDetailDialog,drugDetail}
   ,
 
   created() {
diff --git a/src/views/pharmaceuticals/distribution/IoDealOrder.vue b/src/views/pharmaceuticals/distribution/IoDealOrder.vue
index 365e7b7..60f1336 100644
--- a/src/views/pharmaceuticals/distribution/IoDealOrder.vue
+++ b/src/views/pharmaceuticals/distribution/IoDealOrder.vue
@@ -391,7 +391,7 @@
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            label="DI/物资编码" width="150"
+            label="药品编码" width="150"
             prop="nameCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -404,7 +404,7 @@
             label="规格型号" width="150"
             prop="spec"
           ></el-table-column>
-          <el-table-column label="批次号" header-align="center">
+          <el-table-column  label="批次号" header-align="center">
             <el-table-column header-align="center"
                              label="手录" width="100"
                              prop="bbatchNo"
diff --git a/src/views/pharmaceuticals/distribution/IoSupAduitOrder.vue b/src/views/pharmaceuticals/distribution/IoSupAduitOrder.vue
index 68d3fbc..6ce8cef 100644
--- a/src/views/pharmaceuticals/distribution/IoSupAduitOrder.vue
+++ b/src/views/pharmaceuticals/distribution/IoSupAduitOrder.vue
@@ -919,7 +919,7 @@ import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {getResultDetailList} from "@/api/inout/orderDetailResult";
-import {getCodeList,getCodeDetailList,getBizDetaiDruglList} from "@/api/pharmaceuticals/drugOrderDetail";
+import {getCodeList} from "@/api/inout/code";
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
 import AcceptOrder from "./DialogThrReviewOrder";
 import {getDeptListByUser} from "@/api/auth/authDept";
@@ -929,6 +929,8 @@ import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 import {
   getHead,executeFuc
 } from "@/utils/customConfig";
+import {getBizDetailList} from '@/api/inout/orderDetailBiz'
+import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 
 
 const formJson = {
@@ -1064,7 +1066,6 @@ export default {
         orderIdFk: null,
         page: 1,
         limit: 10,
-        productType: 2
       },
       bizTotal: 0,
       bizDetailLoading: false,
@@ -1073,7 +1074,6 @@ export default {
         orderIdFk: null,
         page: 1,
         limit: 10,
-        productType: 2
       },
       codeTotal: 0,
       codeDetailLoading: false,
@@ -1390,7 +1390,7 @@ export default {
       }
       this.bizDetailLoading = true;
       this.bizQuery.orderIdFk = this.currentRow.billNo;
-      getBizDetaiDruglList(this.bizQuery).then((res) => {
+      getBizDetailList(this.bizQuery).then((res) => {
         this.bizDetailLoading = false;
         if (res.code === 20000) {
           this.bizDetailList = res.data.list || [];
diff --git a/src/views/pharmaceuticals/distribution/drugDetail.vue b/src/views/pharmaceuticals/distribution/drugDetail.vue
new file mode 100644
index 0000000..19b44f3
--- /dev/null
+++ b/src/views/pharmaceuticals/distribution/drugDetail.vue
@@ -0,0 +1,462 @@
+<template>
+  <div>
+    <!--<el-table :data="sysList" style="width: 100%" border highlight-current-row>-->
+    <!--  <el-table-column label="序号" type="index"></el-table-column>-->
+    <!--  <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>-->
+    <!--  <el-table-column label="第三方产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>-->
+    <!--  <el-table-column label="第三方产品ID" prop="thirdId" show-overflow-tooltip></el-table-column>-->
+    <!--</el-table>-->
+
+    <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border
+              @current-change="handleDetail" border highlight-current-row
+    >
+      <el-table-column label="药品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+      <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
+      <el-table-column label="层级单位" prop="packUnit" show-overflow-tooltip></el-table-column>
+      <el-table-column label="上级标识" prop="sjcpbm" show-overflow-tooltip></el-table-column>
+      <el-table-column label="下级标识" prop="bhxjcpbm" show-overflow-tooltip></el-table-column>
+      <el-table-column label="下级数量" prop="bhxjsl" show-overflow-tooltip></el-table-column>
+    </el-table>
+
+
+    <el-form :model="editQuery" :rules="rules" ref="editQuery" label-width="190px" style="margin-top: 20px">
+      <!--<el-row>-->
+      <!--  <el-col :span="12">-->
+      <!--    <el-form-item label="药品通用名称" prop="cpmctymc">-->
+      <!--      <el-input style="width: 90%" size="small" splaceholder="请输入物资名称" :disabled="true" v-model="editQuery.cpmctymc"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="药品标识" prop="nameCode">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品标识" v-model="editQuery.nameCode"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <!--<el-row>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="规格型号" prop="ggxh">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ggxh"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <!--<el-row>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="产品类别" prop="cplb">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品类别" v-model="editQuery.cplb"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="分类编码" prop="flbm">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入分类编码" v-model="editQuery.flbm"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <!--<el-row>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="商品条码" prop="sptm">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码" v-model="editQuery.sptm"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="医保编码" prop="ybbm">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医保编码" v-model="editQuery.ybbm"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <!--<el-row>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医疗器械注册人" v-model="editQuery.ylqxzcrbarmc"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="注册人英文名称" prop="ylqxzcrbarywmc">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册人英文名称" v-model="editQuery.ylqxzcrbarywmc"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <!--<el-row>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="统一社会信用号" prop="tyshxydm">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入统一社会信用号" v-model="editQuery.tyshxydm"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="注册证/备案号" prop="zczbhhzbapzbh">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册证/备案号" v-model="editQuery.zczbhhzbapzbh"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <!--<el-row>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="上级产品编码" prop="sjcpbm">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入上级产品编码" v-model="editQuery.sjcpbm"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="包装级别" prop="packLevel">-->
+      <!--      <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" :disabled="true" v-model="editQuery.packLevel"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <!--<el-row>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="包装层级" prop="bzcj">-->
+      <!--      <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="包含下级包装数量" prop="bhxjsl">-->
+      <!--      <el-input style="width: 90%" size="small" splaceholder="请输入包含下级包装数量" :disabled="true" v-model="editQuery.bhxjsl"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <!--<el-row>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="包含下级产品编码" prop="bhxjcpbm">-->
+      <!--      <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含下级产品编码" v-model="editQuery.bhxjcpbm"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="包含最小销售包装数量" prop="bhzxxsbzsl">-->
+      <!--      <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含最小销售包装数量" v-model="editQuery.bhzxxsbzsl"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <!--<el-row>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="是否包含批号" prop="scbssfbhph">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.scbssfbhph"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="是否包含序列号" prop="scbssfbhxlh">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhxlh" splaceholder="请输入内容"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <!--<el-row>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="是否包含生产日期" prop="scbssfbhscrq">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhscrq"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="是否包含失效日期" prop="scbssfbhsxrq">-->
+      <!--      <el-input style="width: 90%" :disabled="true" v-model="editQuery.scbssfbhsxrq" ></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <!--<el-row>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="产品描述" prop="cpms">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.cpms"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="计量单位" prop="measname">-->
+      <!--      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+      <!--<el-row >-->
+      <!--  <el-col :span="12" class="el-col">-->
+      <!--    <el-form-item label="使用单元数量" prop="zxxsbzbhsydysl">-->
+      <!--      <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="药品通用名称:" prop="cpmctymc">
+            <el-input style="width: 90%" size="small" placeholder="请输入药品通用名称"
+                      disabled
+                      v-model.trim="editQuery.cpmctymc"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="商品名称:" prop="spmc">
+            <el-input style="width: 90%" size="small" placeholder="请输入商品名称"
+                      disabled
+                      v-model.trim="editQuery.spmc"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="包装规格:" prop="bzgg">
+            <el-input style="width: 90%" size="small" placeholder="请输入包装规格"
+                      disabled
+                      v-model.trim="editQuery.bzgg"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="包装单位:" prop="packUnit">
+            <el-input style="width: 90%" size="small" placeholder="请输入包装单位"
+                      disabled
+                      v-model.trim="editQuery.packUnit"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="制剂规格:" prop="prepnSpec">
+            <el-input style="width: 90%" size="small" placeholder="请输入制剂规格"
+                      disabled
+                      v-model.trim="editQuery.prepnSpec"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="制剂单位:" prop="prepnUnit">
+            <el-input style="width: 90%" size="small" placeholder="请输入制剂单位"
+                      disabled
+                      v-model.trim="editQuery.prepnUnit"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="包装材质:" prop="packMatrial">
+            <el-input style="width: 90%" size="small" placeholder="请输入包装材质"
+                      disabled
+                      v-model.trim="editQuery.packMatrial"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="包装比例:" prop="packRatio">
+            <el-input style="width: 90%" size="small" placeholder="请输入制剂单位"
+                      disabled
+                      v-model.trim="editQuery.packRatio"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="批准文号:" prop="zczbhhzbapzbh">
+            <el-input style="width: 90%" size="small" placeholder="请输入批准文号"
+                      disabled
+                      v-model.trim="editQuery.zczbhhzbapzbh"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="生产企业:" prop="manufactory">
+            <el-input style="width: 90%" size="small" placeholder="请输入生产企业"
+                      disabled
+                      v-model.trim="editQuery.manufactory"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="药品类型:" prop="physicType">
+            <el-select v-model="editQuery.physicType" style="width: 90%" placeholder="选择药品类型" clearable disabled>
+              <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="9"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" type="flex">
+          <el-form-item label="药品分类:" prop="majorType">
+            <el-select v-model="editQuery.majorType" style="width: 90%" placeholder="选择药品分类" clearable disabled>
+              <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-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="医保编码:" prop="ybbm">
+            <el-input style="width: 90%" size="small" placeholder="请输入医保编码"
+                      disabled
+                      v-model.trim="editQuery.ybbm"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="医保分类:" prop="medicareType">
+            <el-select v-model="editQuery.medicareType" style="width: 90%" placeholder="选择医保分类"
+                       clearable disabled
+            >
+              <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-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="药品价格:" prop="productPrice">
+            <el-input
+              disabled
+              style="width: 90%"
+              size="small"
+              placeholder="请输入药品价格"
+              type="number"
+              :precision="2"
+              :min="0"
+              v-model.number="editQuery.productPrice"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="有效期:" prop="indate">
+            <el-date-picker
+              disabled
+              style="width: 90%"
+              v-model="editQuery.indate"
+              type="datetime"
+              format="yyyy 年 MM 月 dd 日 HH 点 mm 分 ss 秒"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择有效期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="存储条件:" prop="ylqxzcrbarmc">
+            <el-input style="width: 90%" size="small" placeholder="请输入存储条件"
+                      disabled
+                      v-model.trim="editQuery.storageCondition"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="运输条件:" prop="transportCondition">
+            <el-input style="width: 90%" size="small" placeholder="请输入运输条件"
+                      disabled
+                      v-model.trim="editQuery.transportCondition"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="统一社会信用号:" prop="tyshxydm">
+            <el-input style="width: 90%" size="small" placeholder="请输入统一社会信用号"
+                      disabled
+                      v-model.trim="editQuery.tyshxydm"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="药品状态:" prop="majorStatus">
+            <el-select v-model="editQuery.majorStatus" style="width: 90%" placeholder="选择药品状态" clearable disabled>
+              <el-option label="停用" :value="0"></el-option>
+              <el-option label="在用" :value="1"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+  </div>
+</template>
+
+<script>
+import { thirdSysDetail } from '@/api/basic/udiRelevance'
+import { filterByUuid } from '@/api/basic/udiInfo'
+
+export default {
+  name: 'UdiRlDetail',
+  props: {
+    editQuery: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      sysList: [],
+      checked: false,
+      detailList: [],
+      loading: false
+    }
+  },
+  methods: {
+    getThirdSysDetail() {
+      let query = {
+        id: this.editQuery.id
+      }
+
+      thirdSysDetail(query)
+        .then((response) => {
+          this.loading = false
+          this.sysList = response.data.list || []
+        })
+        .catch(() => {
+          this.loading = false
+          this.sysList = []
+        })
+    },
+    //获取层级标识
+    getDetailList() {
+      this.loading = true
+      if (this.editQuery.uuid != null) {
+        let query = {
+          uuid: this.editQuery.uuid,
+          id: this.editQuery.id
+        }
+        filterByUuid(query)
+          .then((response) => {
+            this.loading = false
+            this.detailList = response.data || []
+          })
+          .catch(() => {
+            this.loading = false
+            this.detailList = []
+          })
+      }
+    }
+  },
+
+  created() {
+    if (this.editQuery.isUseDy == 1) {
+      this.checked = true
+    }
+    let ttquery = {
+      id: this.editQuery.id,
+      page: 1,
+      limit: 10
+    }
+    // this.getDetailList(ttquery)
+    this.getDetailList();
+    this.getThirdSysDetail()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/pharmaceuticals/inout/DialogCheck.vue b/src/views/pharmaceuticals/inout/DialogCheck.vue
new file mode 100644
index 0000000..1b55c32
--- /dev/null
+++ b/src/views/pharmaceuticals/inout/DialogCheck.vue
@@ -0,0 +1,607 @@
+<template>
+  <div>
+    <el-form :model="inputQuery" :rules="formRules" ref="dataForm">
+      <el-card style="margin-top: -30px">
+        <el-button-group style="display: flex">
+          <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
+                     :loading="loading">提交
+          </el-button>
+        </el-button-group>
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>规格型号：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="name">
+              <el-input v-model="inputQuery.spec" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>药品名称：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <el-input v-model="inputQuery.coName" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>批次号：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="name">
+              <el-input v-model="inputQuery.batchNo" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>价格：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <el-input v-model="inputQuery.price" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>生产企业：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="name">
+              <el-input v-model="inputQuery.manufacturer" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>批准文号：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <el-input v-model="inputQuery.certCode" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>生产日期：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <el-input v-model="inputQuery.productDate" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>计量单位：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <el-input v-model="inputQuery.measname" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>送货数量：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="name">
+              <el-input v-model="inputQuery.count" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>扫码数量：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <el-input v-model="inputQuery.scanCount" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>检验报告上传：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-upload
+                :disabled="formData.auditStatus == 1"
+                class="upload-demo"
+                ref="upload"
+                :action="this.uploadUrl"
+                :on-preview="uploadHandlePreview"
+                :on-remove="uploadHandleRemove"
+                :limit="1"
+                :headers="headers"
+                :on-exceed="uploadHandleExceed"
+                accept=".jpg,.png,.pdf"
+                :on-change="uploadOnchange"
+                :on-success="uploadHandleSuccess"
+                :on-error="uploadHandleError"
+                :on-before="uploadHandleBefore"
+                :file-list="fileList"
+                :data="{type:'image2'}"
+                :auto-upload="true">
+                <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
+                  {{ choiceFile }}
+                </el-button>
+                <div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div>
+              </el-upload>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="ao-text" v-if="this.inputQuery.filePath!=null">
+              <span>检验报告预览：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.filePath!=null"
+                       style="text-align:right" @click="showImgViewer">
+              检验报告预览
+            </el-button>
+            <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
+                             :url-list="imgList"/>
+          </el-col>
+
+
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>冷链报告上传：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-upload
+                :disabled="formData.auditStatus == 1"
+                class="upload-demo"
+                ref="upload"
+                :action="this.uploadUrl"
+                :on-preview="uploadHandlePreview"
+                :on-remove="uploadHandleRemove1"
+                :limit="1"
+                :headers="headers"
+                :on-exceed="uploadHandleExceed"
+                accept=".jpg,.png,.pdf"
+                :on-change="uploadOnchange1"
+                :on-success="uploadHandleSuccess1"
+                :on-error="uploadHandleError"
+                :on-before="uploadHandleBefore"
+                :file-list="fileList"
+                :data="{type:'image2'}"
+                :auto-upload="true">
+                <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
+                  {{ choiceFile1 }}
+                </el-button>
+                <div>只能上传 jpg,png,pdf 文件，且不超过 10 MB</div>
+              </el-upload>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="ao-text" v-if="this.inputQuery.coldFilePath!=null">
+              <span>冷链报告预览：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.coldFilePath!=null"
+                       style="text-align:right" @click="showImgViewerCold">
+              冷链报告预览
+            </el-button>
+            <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>
+
+          </el-col>
+
+
+        </el-row>
+
+
+
+      </el-card>
+    </el-form>
+
+  </div>
+</template>
+
+<script>
+import draggable from "vuedraggable";
+import store from "@/store";
+import {updateBizById, updateById} from '@/api/inout/orderDetailBiz'
+import {previewImage,previewFile} from '@/api/purchase/supCompany'
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+
+
+export default {
+  name: "DialogCheck",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+    checkFileName: {
+      type: Object,
+      required: true,
+    },
+
+
+  },
+  data() {
+    return {
+      imgList: [],
+      imgListCold:[],
+      imgViewerVisible: false,
+      imgViewerVisibleCold:false,
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      code: "",
+      formData: {
+        ggxh: "",
+        cpmctymc: "",
+        machineNo: "",
+        invoiceCode: "",
+        invoiceEncode: "",
+        price: "",
+        remark: "",
+        licenseUrl: ""
+      },
+      // formRules: {
+      //   name: [
+      //     {required: true, message: "请输入证书名称", trigger: "blur"}
+      //   ],
+      //   code: [
+      //     {required: true, message: "请输入证书编号", trigger: "blur"}
+      //   ],
+      // },
+      loading: false,
+      uploadUrl: "",
+      fileList: [],
+      headers: {},
+      choiceFile: "选取文件",
+      choiceFile1: "选取文件",
+
+    };
+  },
+  components: {
+    draggable, ElImageViewer
+  },
+  methods: {
+    submitUpload() {
+      updateBizById(this.inputQuery).then((res) => {
+        if (res.code == 20000) {
+          this.$message({
+            type: "success",
+            message: "修改成功！",
+          });
+          this.closeDialog();
+        }
+
+      })
+
+
+    },
+
+    // onSubmit() {
+    //   this.loading = true;
+    //   this.formData.customerId = this.inputQuery.customerId;
+    //   if (this.formData.customerId == null) {
+    //     this.formData.customerId = store.getters.customerId
+    //   }
+    //   this.formData.type = this.addType;
+    //   //证书类型：1:供应商；2.生产企业；3.产品品种
+    //   if (this.addType == 2) {
+    //     this.formData.manufacturerIdFk = this.inputQuery.manufacturerId;
+    //   } else if (this.addType == 3) {
+    //     this.formData.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
+    //     this.formData.productIdFk = this.inputQuery.productId;
+    //   }
+    //   if (this.formData.auditStatus != 1)
+    //     this.formData.auditStatus = "6";
+    //
+    //   if (this.editTye == 1) {
+    //     insertCompanyCert(this.formData).then(response => {
+    //       this.loading = false;
+    //       if (response.code === 20000) {
+    //         this.$message.success("添加成功");
+    //         this.closeDialog(true);
+    //       } else {
+    //         this.$message.error(response.message);
+    //       }
+    //     });
+    //   } else {
+    //     updateCompanyCert(this.formData).then(response => {
+    //       this.loading = false;
+    //       if (response.code === 20000) {
+    //         this.$message.success("添加成功");
+    //         this.closeDialog(true);
+    //       } else {
+    //         this.$message.error(response.message);
+    //       }
+    //     });
+    //   }
+    //
+    //
+    // },
+    uploadHandleRemove(file, fileList) {
+      this.inputQuery.filePath = null;
+      this.inputQuery.checkFileName = null;
+      console.log(file, fileList);
+    },
+    uploadHandleRemove1(file, fileList) {
+      this.inputQuery.coldFilePath = null;
+      this.inputQuery.checkColdFileName = null;
+      console.log(file, fileList);
+    },
+    uploadHandlePreview(file) {
+      console.log(file);
+      console.log(this.fileList);
+    },
+    uploadHandleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    uploadOnchange(file, fileList) {
+      this.inputQuery.checkFileName = file.name;
+      let fileName = file.name;
+      let uid = file.uid
+      let pos = fileName.lastIndexOf(".");
+      let lastName = fileName.substring(pos, fileName.length);
+      if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png" && lastName.toLowerCase() !== ".doc" && lastName.toLowerCase() !== ".pdf") {
+        this.$message.error("上传文件只能是 jpg,png,doc,pdf 格式");
+        for (let i = 0; i < fileList.length; i++) {//从list删除
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+        return;
+      }
+      // 限制上传文件的大小
+      const isLt = file.size / 1024 / 1024 / 30 <= 1;
+      if (!isLt) {
+        this.$message.error("上传文件大小不能超过 30MB");
+        for (let i = 0; i < fileList.length; i++) {
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+      }
+      return isLt;
+    },
+    uploadOnchange1(file, fileList) {
+      this.inputQuery.checkColdFileName = file.name;
+      let fileName = file.name;
+      let uid = file.uid
+      let pos = fileName.lastIndexOf(".");
+      let lastName = fileName.substring(pos, fileName.length);
+      if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png" && lastName.toLowerCase() !== ".doc" && lastName.toLowerCase() !== ".pdf") {
+        this.$message.error("上传文件只能是 jpg,png,doc,pdf 格式");
+        for (let i = 0; i < fileList.length; i++) {//从list删除
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+        return;
+      }
+      // 限制上传文件的大小
+      const isLt = file.size / 1024 / 1024 / 30 <= 1;
+      if (!isLt) {
+        this.$message.error("上传文件大小不能超过 30MB");
+        for (let i = 0; i < fileList.length; i++) {
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+      }
+      return isLt;
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      if (response.code === 20000) {
+        this.inputQuery.filePath = response.data.name;
+        // this.onSubmit();
+      } else {
+        this.$message.error("文件上传失败：" + response.message);
+      }
+    },
+    uploadHandleSuccess1(response, file, fileList) {
+      if (response.code === 20000) {
+        this.inputQuery.coldFilePath = response.data.name;
+        // this.onSubmit();
+      } else {
+        this.$message.error("文件上传失败：" + response.message);
+      }
+    },
+    uploadHandleError() {
+
+    },
+    uploadHandleBefore(file) {
+      console.log(file)
+      let isJPG = file.type === 'image/jpeg';
+      let isPNG = file.type === 'image/png';
+      if (!isJPG && !isPNG) {
+        this.$message.error('只能上传jpg或png格式');
+      }
+      return isJPG || isPNG;
+    },
+    showImgViewer(row) {
+      if(this.inputQuery.filePath.substr(-1) == ','){
+        this.inputQuery.filePath=this.inputQuery.filePath.slice(0, this.inputQuery.filePath.length-1);
+      }
+
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.filePath;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = this.inputQuery.filePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(this.inputQuery.filePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      const m = (e) => {
+        e.preventDefault();
+      };
+      document.body.style.overflow = "hidden";
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
+    },
+
+    showImgViewerCold(row){
+      if(this.inputQuery.coldFilePath.substr(-1) == ','){
+        this.inputQuery.coldFilePath=this.inputQuery.coldFilePath.slice(0, this.inputQuery.coldFilePath.length-1);
+      }
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.coldFilePath;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = this.inputQuery.coldFilePath.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(this.inputQuery.coldFilePath.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      const m = (e) => {
+        e.preventDefault();
+      };
+      document.body.style.overflow = "hidden";
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
+    },
+
+
+    closeImgViewer() {
+      this.imgViewerVisible = false;
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
+    },
+
+    closeImgViewerCold(){
+      this.imgViewerVisibleCold = false;
+      const m = (e) => { e.preventDefault() };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
+    },
+
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+    if (this.formData.formData == null) {
+      this.formData = {}
+    } else if (this.inputQuery.formData != null && this.inputQuery.formData.addType == 1) {
+      this.formData = {}
+    } else {
+      this.formData = this.inputQuery.formData;
+      console.log(this.inputQuery.formData);
+    }
+    if (this.inputQuery.filePath != null) {
+      this.choiceFile = "更换检验报告";
+    } else {
+      this.choiceFile = "选取检验报告";
+    }
+
+    if (this.inputQuery.coldFilePath != null) {
+      this.choiceFile1 = "更换冷链报告";
+    } else {
+      this.choiceFile1 = "选取冷链报告";
+    }
+  },
+};
+</script>
+<style>
+
+.ao-text {
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
+}
+
+</style>
+
+
+
diff --git a/src/views/pharmaceuticals/inout/DialogReviewOrder.vue b/src/views/pharmaceuticals/inout/DialogReviewOrder.vue
new file mode 100644
index 0000000..337d3b2
--- /dev/null
+++ b/src/views/pharmaceuticals/inout/DialogReviewOrder.vue
@@ -0,0 +1,471 @@
+<template>
+  <div>
+    <el-card style="margin-top: -20px">
+      <el-form :model="formData" ref="dataForm" label-width="100px">
+        <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
+          <el-button
+            type="primary"
+            @click.native="checkFinish()"
+          >完成审核
+          </el-button
+          >
+          <el-button
+            type="primary"
+            @click.native="renewAccept()"
+          >重新审核
+          </el-button
+          >
+        </el-button-group>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="fromCorp" label="单据编号:">
+              <el-input v-model="formData.billNo" auto-complete="off"
+                        disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="fromCorp" label="单据时间:">
+              <el-input v-model="formData.createTime" auto-complete="off"
+                        disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="fromCorp" label="单据类型:">
+              <el-input v-model="formData.billTypeName" auto-complete="off"
+                        disabled
+                        clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="fromCorp" label="收货仓库:">
+              <el-input v-model="formData.invName" auto-complete="off"
+                        disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+
+          <el-col :span="11">
+            <el-form-item prop="fromCorp" label="送货单位:">
+              <el-input v-model="formData.fromCorpName" auto-complete="off"
+                        disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="20">
+            <el-form-item prop="code" label="扫码校验:">
+              <el-input
+                id="inputer"
+                placeholder="请输入UDI码"
+                @focus="getInputFocus($event)"
+                @keypress.enter.native="enterKey($event)"
+                ref='inputRef'
+                style="ime-mode:disabled"
+                type="tel"
+                v-model="udiCode"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-button
+              type="primary"
+              size="small"
+              @click.native.stop="addCode()"
+              style="height: 31px; margin-left: 20px"
+            >添加
+            </el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="detailLoading"
+                :data="detailList"
+                border
+                :row-style="rowStyle"
+                :cell-style="{padding:6+'px'}"
+                style="width: 100%">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="药品名称" width="160" prop="coName"></el-table-column>
+        <el-table-column label="规格型号" width="160" prop="spec"></el-table-column>
+        <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
+        <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
+        <el-table-column label="审核数量" width="100" prop="acceptCount"></el-table-column>
+        <el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
+        <el-table-column label="价格" width="120" prop="price"></el-table-column>
+        <el-table-column width="100" label="计量单位" prop="measname">
+        </el-table-column>
+        <el-table-column label="批准文号" width="150" prop="certCode"></el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+
+</template>
+
+<script>
+import A from "@/plugins/KeyScaner"
+import {updateStatus, enterCodeWeb, thirdUpdateStatus} from "@/api/pharmaceuticals/drugDistribution";
+import {getAcceptOrder, acceptClear, acceptAddCode, getAcceptStatus} from "@/api/inout/acceptOrder";
+
+
+export default {
+  name: "acceptOrder",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    orderQuery: {
+      type: Object,
+      required: true,
+    },
+    reviewType: {
+      type: Object,
+      required: true,
+    }
+
+  },
+  data() {
+    return {
+      formData: {},
+      loading: false,
+      detailLoading: false,
+      udiCode: null,
+      sictomText: "",
+      originCode: "",
+      checkSuccess: false,
+      detailList: [],
+      query: {
+        code: "",
+        corpOrderId: "",
+        page: 1,
+        limit: 10,
+      },
+    }
+  },
+
+  components: {},
+
+  methods: {
+
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (row.reCount != row.acceptCount) {
+        rowBackground.color = '#f60303';
+      }
+      return rowBackground;
+    },
+
+
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getCodeList();
+    },
+
+
+    enterKey(event) {
+      this.checkSuccess = true;
+      let tQuery = {
+        originCode: this.originCode,
+        code: this.udiCode.trim(),
+      }
+      enterCodeWeb(tQuery).then((response) => {
+        if (response.code === 20000) {
+          this.$refs.inputRef.focus();
+          this.$refs.inputRef.select();
+          this.udiCode = response.data;
+          this.originCode = "";
+          this.addCode(event);
+        } else {
+          if (response.code == 502) {
+            this.checkSuccess = false;
+            this.udiCode = response.data;
+            this.originCode = this.udiCode;
+          } else if (response.code == 501) {
+            this.checkSuccess = false;
+            // this.$refs.inputRef.focus();
+            // this.$refs.inputRef.select();
+            this.originCode = "";
+            this.$message.error(response.message);
+          } else if (response.code == 503) {
+            this.checkSuccess = false;
+            this.udiCode = response.data;
+            this.$confirm(response.message, "提示", {
+              type: "warning",
+            })
+              .then(() => {
+                this.udiCode = response.data;
+                this.addCode();
+              })
+              .catch(() => {
+                this.udiCode = this.originCode;
+              });
+
+          } else if (response.code == 508) {
+            this.originCode = "";
+            this.udiCode = "01" + response.data.nameCode;
+            this.originCode = this.udiCode;
+          } else {
+            this.originCode = "";
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+                this.$refs.inputRef.select();
+              }
+            });
+          }
+        }
+        this.loading = false;
+      });
+    },
+
+    addCode(event) {
+      if (this.$isBlank(this.udiCode)) {
+        this.$message.error("UDI码不能为空！");
+        return;
+      }
+      let postQuery = {
+        billNo: this.orderQuery.billNo,
+        orderDetailEntities: this.detailList,
+        code: this.udiCode,
+      }
+
+
+      acceptAddCode(postQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.detailLoading = false;
+            this.detailList = response.data.orderDetailEntities || [];
+            if (response.data.finishAccept) {
+              this.$confirm("审核结果正确，是否立即完成审核?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+              })
+                .then(() => {
+                  this.postAccept();
+                })
+                .catch(() => {
+                });
+            } else {
+              this.$message.success("匹配成功！");
+              if (event == null) {
+              } else event.target.select();
+              this.$refs.inputRef.select();
+            }
+
+          } else {
+            this.$message.error(response.message);
+            if (event == null) {
+            } else event.target.select();
+            this.$refs.inputRef.select();
+          }
+
+
+        })
+        .catch(() => {
+          this.detailLoading = false;
+        });
+
+
+    },
+
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+
+
+    checkFinish() {
+      let query = {
+        // orderId: this.orderQuery.billNo,
+        billNo: this.orderQuery.billNo,
+      };
+      getAcceptStatus(query)
+        .then((response) => {
+          if (response.code == 20000) {
+            let tip = "审核结果正确，是否立即完成审核?";
+            this.finishAccept(tip);
+          } else {
+            let tip = "审核未完成,是否强制完成审核此单据？";
+            this.finishAccept(tip);
+          }
+        })
+        .catch(() => {
+        });
+
+
+    },
+
+
+    finishAccept(tip) {
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.postAccept();
+
+      }).catch(() => {
+        // this.$message.info('回退失败');
+      });
+
+    },
+    postAccept() {
+      let query = {
+        orderId: this.orderQuery.billNo,
+      };
+      if (this.reviewType != null && this.reviewType == 2) {
+        thirdUpdateStatus(query)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.$message.success("核对成功！");
+              this.closeDialog();
+              this.$emit('childByValue', 1)
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+          });
+
+      } else {
+        updateStatus(query)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.$message.success("审核成功！");
+              this.closeDialog();
+              this.$emit('childByValue', 1)
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+          });
+      }
+    },
+
+    renewAccept() {
+      let query = {
+        billNo: this.orderQuery.billNo,
+      }
+      acceptClear(query)
+        .then((response) => {
+          this.detailLoading = false;
+          this.detailList = response.data.orderDetailEntities || [];
+        })
+        .catch(() => {
+          this.detailLoading = false;
+          this.detailList = [];
+        });
+    },
+
+
+    getOrderDetail() {
+      this.detailLoading = true;
+      let query = {
+        billNo: this.orderQuery.billNo,
+      }
+      getAcceptOrder(query)
+        .then((response) => {
+          this.detailLoading = false;
+          this.detailList = response.data.orderDetailEntities || [];
+          if (response.data.exitAccept) {
+            this.$confirm("检测到上一次验收操作未完成, 是否继续上一次验收?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            })
+              .then(() => {
+              })
+              .catch(() => {
+                this.renewAccept();
+              });
+          }
+
+        })
+        .catch(() => {
+          this.detailLoading = false;
+          this.detailList = [];
+        });
+    }
+
+  },
+
+
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+    var that = this;
+    var inputer = document.getElementById("inputer");
+    window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
+    sc.onInput = function (text) {
+      if (text.includes("delete")) {
+        that.udiCode = "";
+        that.sictomText = "";
+        that.originCode = "";
+        return;
+      }
+      if (that.sitcomScan) {
+        let tempTxt = text;
+        let str = tempTxt.replace(/[\r]/g, "");
+        that.sictomText = that.sictomText + str;
+        that.udiCode = that.sictomText;
+      } else {
+        that.udiCode = text;
+      }
+    };
+    inputer.focus();
+
+
+  },
+  created() {
+
+    this.formData = this.orderQuery;
+    this.getOrderDetail()
+  },
+
+
+}
+</script>
+
+<style scoped>
+
+
+#inputer {
+  width: 100%;
+  min-height: 30px;
+  background-color: white;
+  border: #d0d0d0;
+  border-style: solid;
+  border-width: 0.1px;
+  color: #4a4a4a;
+
+}
+
+#inputer:focus {
+  width: 100%;
+  min-height: 30px;
+  background-color: white;
+  border: #0080FF;
+  border-style: solid;
+  border-width: 0.1px;
+  color: #4a4a4a;
+
+}
+</style>
diff --git a/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue b/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue
index a4fde3f..d941dcb 100644
--- a/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue
+++ b/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue
@@ -1299,11 +1299,11 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {getCodeList} from "@/api/inout/code";
-import AcceptOrder from "@/views/inout/DialogReviewOrder";
+import AcceptOrder from "./DialogReviewOrder";
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
 import {getBasicUnitMaintainsOptimize} from "@/api/basic/basicUnitMaintain";
 import {previewImage, previewFile} from '@/api/purchase/supCompany'
-import DialogCheck from "@/views/inout/DialogCheck";
+import DialogCheck from "./DialogCheck";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 import {
   getHead,executeFuc
diff --git a/src/views/pharmaceuticals/inout/IoEditOrderDrug.vue b/src/views/pharmaceuticals/inout/IoEditOrderDrug.vue
index 914ef8e..1f7b46a 100644
--- a/src/views/pharmaceuticals/inout/IoEditOrderDrug.vue
+++ b/src/views/pharmaceuticals/inout/IoEditOrderDrug.vue
@@ -488,7 +488,7 @@ export default {
   data() {
     return {
       filterQuery: {
-        billNo: null
+        billNo: null,
       },
       checkStatus: {
         1: "草稿",
diff --git a/src/views/supplier/drugMaintain/drugMaintain.vue b/src/views/supplier/drugMaintain/drugMaintain.vue
index 80694d7..9704959 100644
--- a/src/views/supplier/drugMaintain/drugMaintain.vue
+++ b/src/views/supplier/drugMaintain/drugMaintain.vue
@@ -159,6 +159,8 @@
 
     </el-card>
 
+
+
   </div>
 </template>