From 85b5d8a267da29cbf22db2ed52e1e431b6d5e5cb Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 21 Mar 2023 22:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=B5=81=E7=A8=8B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/busType/bussinessTypeModify.vue     | 1075 ++++++++++++++++-
 src/views/basic/business/stockOrder.vue       |   93 +-
 .../basic/business/stockOrderQRCodeDetail.vue |    2 +-
 src/views/basic/product/product.vue           |    2 +-
 src/views/basic/product/productEdit.vue       |    2 +-
 src/views/basic/product/udiInfoRelevance.vue  |    6 +-
 .../basic/product/udiInfoselectErpUdi.vue     |    6 +-
 .../basic/product/udilnfoManageSpDetail.vue   |    2 +-
 src/views/inout/DialogReviewOrder.vue         |    4 +-
 src/views/inout/DialogSelectRl.vue            |    2 +-
 src/views/inout/DialogThrReviewOrder.vue      |    2 +
 src/views/inout/InvoiceRegistration.vue       |   14 +-
 src/views/inout/IoArrivalSearchOrder.vue      |    7 +-
 src/views/inout/IoAuditedOrder.vue            |    4 +-
 src/views/inout/IoCheckErrorOrder.vue         |    7 +-
 src/views/inout/IoCheckSuccessOrder.vue       |    6 +-
 src/views/inout/IoCreateBusOrder.vue          |   12 +-
 src/views/inout/IoCreateErrorOrder.vue        |    2 +-
 src/views/inout/IoCreateOrder.vue             |    6 +-
 src/views/inout/IoCreateScanOrder.vue         |   12 +-
 src/views/inout/IoDealOrder.vue               |   10 +-
 src/views/inout/IoDeliveryAuditOrder.vue      | 1023 ++++++++++++++++
 src/views/inout/IoDeliverySearchOrder.vue     |    6 +-
 src/views/inout/IoEditOrder.vue               |    6 +-
 src/views/inout/IoInoutSearchOrder.vue        |   11 +-
 src/views/inout/IoReturnedSearchOrder.vue     |   83 +-
 src/views/inout/IoSupAduitOrder.vue           |   17 +-
 src/views/inout/IoSupSearchOrder.vue          |   34 +-
 src/views/inout/IoSupSecAuditOrder.vue        |  928 ++++++++++++++
 src/views/inout/PanelCreateOrderBizDetail.vue |    5 +-
 .../inout/PanelCreateOrderCodeDetail.vue      |    4 +-
 src/views/inout/PanelCreateOrderCodes.vue     |   12 +-
 src/views/inout/receive/DialogNewReceive.vue  |    2 +-
 .../inout/receive/receiveAuditDetail.vue      |    2 +-
 src/views/inout/uploadManage/uploadOrder.vue  |    4 +-
 src/views/inventory/AllInoutSearchOrder.vue   |  245 ++++
 src/views/inventory/AssetManage.vue           |    2 +-
 .../inventory/DeviceMAOrderCompleted.vue      |    2 +-
 src/views/inventory/DeviceMAOrderModify.vue   |    2 +-
 .../inventory/DeviceReceiveOrderCompleted.vue |    2 +-
 src/views/inventory/InvMAOrderModify.vue      |    2 +-
 src/views/inventory/InvPlace.vue              |    2 +-
 src/views/inventory/InvPreInSerach.vue        |    2 +-
 src/views/inventory/InvPreProductsDetail.vue  |   25 +-
 src/views/inventory/InvProductsDetail.vue     |   30 +-
 src/views/inventory/InvStatistics.vue         |    4 +-
 src/views/inventory/InvSupPreInSerach.vue     |  289 +++--
 src/views/inventory/InvSupPreProducts.vue     |   78 +-
 src/views/inventory/InvSupProuducts.vue       |   81 +-
 src/views/inventory/supInoutSearchOrder.vue   |  101 +-
 .../inventory/trace/invUdiTraceOrder.vue      |    2 +-
 .../inventory/trace/sickerUdiTraceOrder.vue   |    2 +-
 .../purchase/purApply/purApplyEditDiaolog.vue |    2 +-
 .../purchase/purApply/pureApplySearch.vue     |    2 +-
 .../purArrival/purArrivalDetailDialog.vue     |    4 +-
 .../purArrival/purArrivalEditDialog.vue       |    2 +-
 .../purDelivery/purDeliveryAuditDialog.vue    |    2 +-
 .../purDelivery/purDeliveryDetailDialog.vue   |    4 +-
 .../purDelivery/purDeliverySearch.vue         |    2 +-
 .../purOrder/DialogSelectOrderList.vue        |    2 +-
 src/views/purchase/purOrder/purOrder.vue      |    2 +-
 src/views/purchase/purOrder/purOrderAudit.vue |    2 +-
 .../purOrder/purOrderDetailDialog.vue         |    4 +-
 .../purchase/purOrder/purOrderEditDialog.vue  |    6 +-
 .../purchase/purOrder/purOrderSearch.vue      |   74 +-
 src/views/purchase/purPlan/purPlan.vue        |    4 +-
 src/views/purchase/purPlan/purPlanAudit.vue   |    4 +-
 .../purchase/purPlan/purPlanDetailDialog.vue  |    4 +-
 .../purchase/purPlan/purPlanEditDialog.vue    |    6 +-
 src/views/purchase/purPlan/purPlanSearch.vue  |    4 +-
 .../purchase/purPlan/selectPlanListDialog.vue |    2 +-
 .../purReturned/purReturnedDetailDialog.vue   |    4 +-
 .../purReturned/purReturnedEditDialog.vue     |    2 +-
 src/views/remind/invRemindMsg.vue             |    2 +-
 .../products/supAddDiProductSelectUdi.vue     |   33 +-
 75 files changed, 3893 insertions(+), 564 deletions(-)
 create mode 100644 src/views/inout/IoDeliveryAuditOrder.vue
 create mode 100644 src/views/inout/IoSupSecAuditOrder.vue
 create mode 100644 src/views/inventory/AllInoutSearchOrder.vue

diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 16232e4..46491de 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -14,7 +14,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row type="flex">
         <el-col :span="11" type="flex">
           <el-form-item label="出入库类型" prop="mainAction">
@@ -70,28 +69,11 @@
               <el-option label="送货单管理" :value="2"></el-option>
               <el-option label="到货单管理" :value="3"></el-option>
               <el-option label="退货单管理" :value="4"></el-option>
+              <el-option label="发票登记" :value="5"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-
-      <!--        <el-col :span="11">-->
-      <!--          <el-form-item label="往来信息类型" prop="corpType">-->
-      <!--            <el-select v-model="inputQuery.corpType"-->
-      <!--                       size="small"-->
-      <!--                       style="width: 90%"-->
-      <!--                       placeholder="往来信息"-->
-      <!--                       @change="corpTypeChange">-->
-      <!--              <el-option-->
-      <!--                v-for="item in options"-->
-      <!--                :key="item.value"-->
-      <!--                :label="item.label"-->
-      <!--                :value="item.value">-->
-      <!--              </el-option>-->
-      <!--            </el-select>-->
-      <!--          </el-form-item>-->
-      <!--        </el-col>-->
-
       <!--      <el-row type="flex">-->
       <!--        <el-col :span="11">-->
       <!--          <el-form-item label="内部进出平衡补单" prop="supplementOrderType">-->
@@ -145,6 +127,14 @@
             <el-input v-model="inputQuery.prefix" size="small" style="width: 90%"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="11">
+          <el-form-item label="供应商使用" prop="prefix">
+            <el-select v-model="inputQuery.spUse" style="width: 90%" placeholder="是否允许" clearable>
+              <el-option label="允许" :value="true"></el-option>
+              <el-option label="不允许" :value="false"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <!--        <el-col :span="11" class="el-col">-->
         <!--          <el-form-item label="单据详情展示方式" prop="orderVisibleType">-->
         <!--            <el-select v-model="inputQuery.orderVisibleType"-->
@@ -159,6 +149,25 @@
         <!--        </el-col>-->
       </el-row>
 
+
+      <el-row type="flex">
+        <el-col :span="11">
+          <el-form-item label="往来单位类型" prop="corpType">
+            <el-select v-model="inputQuery.corpType"
+                       size="small"
+                       style="width: 90%"
+                       placeholder="往来信息"
+                       @change="corpTypeChange">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <!--      <el-row type="flex">-->
       <!--        <el-col :span="11">-->
       <!--          <el-form-item label="第三方单据类型" prop="prefix">-->
@@ -183,7 +192,6 @@
       <!--          </el-form-item>-->
       <!--        </el-col>-->
       <!--      </el-row>-->
-
       <el-row type="flex">
         <el-col :span="23" type="flex">
           <el-form-item prop="remark">
@@ -194,36 +202,983 @@
         </el-col>
       </el-row>
 
-      <el-row type="flex">
-        <el-col :span="23" type="flex">
-          <el-button type="text" size="large" style="margin-left: 10px;" @click="advancedSettings">高级设置</el-button>
+      <!--      <el-row type="flex">-->
+      <!--        <el-col :span="23" type="flex">-->
+      <!--          <el-button type="text" size="large" style="margin-left: 10px;" @click="advancedSettings">高级设置</el-button>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+    </el-form>
+    <!--    <el-dialog-->
+    <!--      title="单据类型高级设置"-->
+    <!--      :visible.sync="settingDialogVisible"-->
+    <!--      :close-on-click-modal="false"-->
+    <!--      :close-on-press-escape="false"-->
+    <!--      v-if="settingDialogVisible"-->
+    <!--      class="dialog-two"-->
+    <!--      width="60%"-->
+    <!--      top="5vh"-->
+    <!--      append-to-body-->
+    <!--    >-->
+    <!--      <busTypeAdvancedSettings :inputQuery="inputQuery"></busTypeAdvancedSettings>-->
+    <!--      <div slot="footer" class="dialog-footer">-->
+    <!--        <el-button type="primary" size="small" @click="saveSettings"-->
+    <!--        >提交-->
+    <!--        </el-button-->
+    <!--        >-->
+    <!--        <el-button size="small" @click="cancelDialog"-->
+    <!--        >取消-->
+    <!--        </el-button-->
+    <!--        >-->
+    <!--      </div>-->
+    <!--    </el-dialog>-->
+
+    <div style="margin-left: 25px">
+      <div style="width: 100%;margin: 0 auto;">
+        <el-row style="margin-bottom: 15px">
+          <el-col span="5">
+            <span class="spanTitle">单据设置</span>
+          </el-col>
+        </el-row>
+      </div>
+      <el-divider direction="horizontal"></el-divider>
+      <div style="width: 100%;margin: 0 auto">
+        <el-row>
+          <el-col span="5">
+            <span class="spanHeader">参数</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <span class="spanHeader">设置</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="spanHeader">参数设置说明</span>
+          </el-col>
+        </el-row>
+        <el-divider direction="horizontal"></el-divider>
+      </div>
+
+      <el-row>
+        <el-col span="5">
+          <span class="sptext">启用单据类型</span>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="5">
+          <el-select v-model="inputQuery.enable" style="width: 65%" placeholder="状态" clearable>
+            <el-option label="启用" :value="true"></el-option>
+            <el-option label="不启用" :value="false"></el-option>
+          </el-select>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="13">
+          <span class="sptext">是否启用此单据类型</span>
         </el-col>
       </el-row>
-    </el-form>
-    <el-dialog
-      title="单据类型高级设置"
-      :visible.sync="settingDialogVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="settingDialogVisible"
-      class="dialog-two"
-      width="60%"
-      top="5vh"
-      append-to-body
-    >
-      <busTypeAdvancedSettings :inputQuery="inputQuery"></busTypeAdvancedSettings>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" @click="saveSettings"
-        >提交
-        </el-button
-        >
-        <el-button size="small" @click="cancelDialog"
-        >取消
-        </el-button
-        >
+      <el-divider direction="horizontal"></el-divider>
+
+      <el-row>
+        <el-col span="5">
+          <span class="sptext">允许手动输入客户信息</span>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="5">
+          <el-select v-model="inputQuery.genUnit" :disabled="inputQuery.corpType != 1" style="width: 65%"
+                     placeholder="是否允许" clearable>
+            <el-option label="允许" :value="true"></el-option>
+            <el-option label="不允许" :value="false"></el-option>
+          </el-select>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="13">
+          <span class="sptext">允许客户在做单时手动输入客户信息</span>
+        </el-col>
+      </el-row>
+      <el-divider direction="horizontal"></el-divider>
+
+      <el-row>
+        <el-col span="5">
+          <span class="sptext">允许科室多次使用出库</span>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="5">
+          <el-select v-model="inputQuery.useDyCount" :disabled="inputQuery.corpType != 1" style="width: 65%"
+                     placeholder="是否启用" clearable>
+            <el-option label="允许" :value="true"></el-option>
+            <el-option label="不允许" :value="false"></el-option>
+          </el-select>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="13">
+          <span class="sptext">允许产品多次使用使用出库</span>
+        </el-col>
+      </el-row>
+      <el-divider direction="horizontal"></el-divider>
+
+      <!--      <el-row>-->
+      <!--        <el-col span="5">-->
+      <!--          <span class="sptext">手持终端提交单据至自助平台</span>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="5">-->
+      <!--          <el-select v-model="inputQuery.outToSpms" style="width: 65%" placeholder="是否启用" clearable>-->
+      <!--            <el-option label="启用" :value="true"></el-option>-->
+      <!--            <el-option label="不启用" :value="false"></el-option>-->
+      <!--          </el-select>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="13">-->
+      <!--          <span class="sptext">手持终端提交单据至自助平台</span>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-divider direction="horizontal"></el-divider>-->
+
+      <!--      <el-row>-->
+      <!--        <el-col span="5">-->
+      <!--          <span class="sptext">允许验收自助平台单据</span>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="5">-->
+      <!--          <el-select v-model="inputQuery.entrutSpms" style="width: 65%" placeholder="是否允许" clearable>-->
+      <!--            <el-option label="允许" :value="true"></el-option>-->
+      <!--            <el-option label="不允许" :value="false"></el-option>-->
+      <!--          </el-select>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="13">-->
+      <!--          <span class="sptext">允许验收自助平台单据</span>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-divider direction="horizontal"></el-divider>-->
+
+      <!--      <el-row>-->
+      <!--        <el-col span="5">-->
+      <!--          <span class="sptext">寄售类型单据</span>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="5">-->
+      <!--          <el-select v-model="inputQuery.advanceType" style="width: 65%" placeholder="是否启用" clearable>-->
+      <!--            <el-option label="启用" :value="true"></el-option>-->
+      <!--            <el-option label="不启用" :value="false"></el-option>-->
+      <!--          </el-select>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="13">-->
+      <!--          <span class="sptext">设置此单据是否为寄售单据类型</span>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-divider direction="horizontal"></el-divider>-->
+
+      <!--      <el-row>-->
+      <!--        <el-col span="5">-->
+      <!--          <span class="sptext">预验收</span>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="5">-->
+      <!--          <el-select v-model="inputQuery.preIn" style="width: 65%" :disabled="inputQuery.corpType!='2'" placeholder="是否启用" clearable>-->
+      <!--            <el-option label="启用" :value="true"></el-option>-->
+      <!--            <el-option label="不启用" :value="false"></el-option>-->
+      <!--          </el-select>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="13">-->
+      <!--          <span class="sptext">设置此单据类型为预验收单据类型</span>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-divider direction="horizontal"></el-divider>-->
+
+      <!--      <el-row>-->
+      <!--        <el-col span="5">-->
+      <!--          <span class="sptext">允许供应商使用</span>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="5">-->
+      <!--          <el-select v-model="inputQuery.spUse" style="width: 65%" placeholder="是否允许" clearable>-->
+      <!--            <el-option label="允许" :value="true"></el-option>-->
+      <!--            <el-option label="不允许" :value="false"></el-option>-->
+      <!--          </el-select>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="13">-->
+      <!--          <span class="sptext">是否允许供应商使用此单据类型</span>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-divider></el-divider>-->
+
+      <el-row>
+        <el-col span="5">
+          <span class="sptext">预验收是否带回</span>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="5">
+          <el-select v-model="inputQuery.preInBack" :disabled="inputQuery.actionType != 2" style="width: 65%"
+                     placeholder="是否带回" clearable>
+            <el-option label="是" :value="true"></el-option>
+            <el-option label="否" :value="false"></el-option>
+          </el-select>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="13">
+          <span class="sptext">预验收是否带回</span>
+        </el-col>
+      </el-row>
+      <el-divider direction="horizontal"></el-divider>
+
+      <div style="width: 100%;margin: 0 auto;margin-top: 20px">
+        <el-row style="margin-bottom: 15px">
+          <el-col span="5">
+            <span class="spanTitle">单据默认选项</span>
+          </el-col>
+        </el-row>
       </div>
-    </el-dialog>
+      <el-divider direction="horizontal"></el-divider>
 
+
+      <div style="width: 100%;margin: 0 auto">
+        <el-row>
+          <el-col span="5">
+            <span class="spanHeader">参数</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <span class="spanHeader">设置</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="spanHeader">参数设置说明</span>
+          </el-col>
+        </el-row>
+        <el-divider direction="horizontal"></el-divider>
+      </div>
+      <el-row>
+        <el-col span="5">
+          <span class="sptext">出库时必须校验预验收库存</span>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="5">
+          <el-select v-model="inputQuery.scanPreIn" style="width: 65%" :disabled="inputQuery.corpType!='1'"
+                     placeholder="是否启用" clearable>
+            <el-option label="启用" :value="true"></el-option>
+            <el-option label="不启用" :value="false"></el-option>
+          </el-select>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="13">
+          <span class="sptext">出库时必须校验预验收库存</span>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+
+      <el-row>
+        <el-col span="5">
+          <span class="sptext">是否只允许有库存产品出库</span>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="5">
+          <el-select v-model="inputQuery.vailInv" style="width: 65%" :disabled="inputQuery.mainAction!='WareHouseOut'"
+                     placeholder="是否启用" clearable>
+            <el-option label="启用" :value="true"></el-option>
+            <el-option label="不启用" :value="false"></el-option>
+          </el-select>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="13">
+          <span class="sptext">设置是否只允许有库存产品出库</span>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+
+      <el-row>
+        <el-col span="5">
+          <span class="sptext">采集UDI码时进行三期校验</span>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="5">
+          <el-select v-model="inputQuery.codeFillCheck" style="width: 65%" placeholder="是否启用" clearable>
+            <el-option label="启用" :value="true"></el-option>
+            <el-option label="不启用" :value="false"></el-option>
+          </el-select>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="13">
+          <span class="sptext">采集UDI码时进行三期校验</span>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+
+      <el-row>
+        <el-col span="5">
+          <span class="sptext">校验产品是否可配送</span>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="5">
+          <el-select v-model="inputQuery.vailDispatch" style="width: 65%" placeholder="是否启用" clearable>
+            <el-option label="启用" :value="true"></el-option>
+            <el-option label="不启用" :value="false"></el-option>
+          </el-select>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="13">
+          <span class="sptext">校验产品是否可配送</span>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+
+      <el-row>
+        <el-col span="5">
+          <span class="sptext">校验是否集采产品</span>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="5">
+          <el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用" clearable>
+            <el-option label="无需校验" :value=0></el-option>
+            <el-option label="只采集集采产品" :value=1></el-option>
+            <el-option label="只采集非集采产品" :value=2></el-option>
+          </el-select>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="13">
+          <span class="sptext">校验是否集采产品</span>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+      <div>
+
+
+        <div style="width: 100%;margin: 0 auto;margin-top: 20px">
+          <el-row style="margin-bottom: 15px">
+            <el-col span="18">
+              <el-checkbox v-model="inputQuery.checkEnable">
+                <span class="spanTitle">单据是否必须手动校验业务单，请指定单据的来源类型(校验业务单)</span>
+              </el-checkbox>
+            </el-col>
+          </el-row>
+        </div>
+
+        <el-divider direction="horizontal"></el-divider>
+        <div style="width: 100%;margin: 0 auto">
+          <el-row>
+            <el-col span="5">
+              <span class="spanHeader">参数</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <span class="spanHeader">设置</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="spanHeader">参数设置说明</span>
+            </el-col>
+          </el-row>
+          <el-divider direction="horizontal"></el-divider>
+        </div>
+        <!--      <el-row>-->
+        <!--        <el-col span="5">-->
+        <!--          <span class="sptext">需要手动校验业务单的单据来源类型</span>-->
+        <!--        </el-col>-->
+        <!--        <el-divider direction="vertical"></el-divider>-->
+        <!--        <el-col span="5">-->
+        <!--          <el-select v-model="inputQuery.checkEnable" style="width: 65%" placeholder="是否启用" clearable>-->
+        <!--            <el-option label="启用" :value="true"></el-option>-->
+        <!--            <el-option label="不启用" :value="false"></el-option>-->
+        <!--          </el-select>-->
+        <!--        </el-col>-->
+        <!--        <el-divider direction="vertical"></el-divider>-->
+        <!--        <el-col span="13">-->
+        <!--          <span class="sptext">需要手动校验业务单的单据来源类型</span>-->
+        <!--        </el-col>-->
+        <!--      </el-row>-->
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">web端新增单据</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.checkWebNew" style="width: 65%" :disabled="!inputQuery.checkEnable"
+                       placeholder="是否启用" clearable>
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">web端新增单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">手持终端未校验单据</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.checkPdaUn" style="width: 65%" :disabled="!inputQuery.checkEnable"
+                       placeholder="是否启用" clearable>
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">手持终端未校验单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">手持终端已校验单据</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.checkPdaEd" style="width: 65%" :disabled="!inputQuery.checkEnable"
+                       placeholder="是否启用" clearable>
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">手持终端已校验单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">是否校验UDIMS平台单据</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.checkUdims" style="width: 65%" :disabled="!inputQuery.checkEnable"
+                       placeholder="是否启用" clearable>
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">是否校验UDIMS平台单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">UDI扫码通</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.checkPc" style="width: 65%" :disabled="!inputQuery.checkEnable"
+                       placeholder="是否启用" clearable>
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">UDI扫码通</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">自助平台同步</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.checkSp" style="width: 65%" :disabled="!inputQuery.checkEnable"
+                       placeholder="是否启用" clearable>
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">自助平台同步</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">缺量补单</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.checkChange" style="width: 65%" :disabled="!inputQuery.checkEnable"
+                       placeholder="是否启用" clearable>
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">缺量补单</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">平衡补单</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 65%"
+                       placeholder="是否启用" clearable>
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">平衡补单</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">手动补单</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.checkCopy" style="width: 65%" :disabled="!inputQuery.checkEnable"
+                       placeholder="是否启用" clearable>
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">手动补单</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+      </div>
+      <div>
+
+
+        <div style="width: 100%;margin: 0 auto;margin-top: 20px">
+          <el-row style="margin-bottom: 15px">
+            <el-col span="18">
+              <el-checkbox v-model="inputQuery.thrCheckEnable">
+                <span class="spanTitle">单据是否必须手动确认出入库(送/收货)，请指定单据的来源类型(一次审核)</span>
+              </el-checkbox>
+            </el-col>
+          </el-row>
+        </div>
+        <el-divider direction="horizontal"></el-divider>
+        <div style="width: 100%;margin: 0 auto">
+          <el-row>
+            <el-col span="5">
+              <span class="spanHeader">参数</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <span class="spanHeader">设置</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="spanHeader">参数设置说明</span>
+            </el-col>
+          </el-row>
+          <el-divider direction="horizontal"></el-divider>
+        </div>
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">web端新增单据</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.thrCheckWebNew" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.thrCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">web端新增单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">手持终端未校验单据</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.thrCheckPdaUn" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.thrCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">手持终端未校验单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">手持终端已校验单据</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.thrCheckPdaEd" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.thrCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">手持终端已校验单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">校验产品是否可配送</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.thrCheckUdims" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.thrCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">是否校验UDIMS平台单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">UDI扫码通</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.thrCheckPc" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.thrCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">UDI扫码通</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">校验产品是否可配送</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.thrCheckSp" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.thrCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">校验产品是否可配送</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">缺量补单</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.thrCheckChange" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.thrCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">缺量补单</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">平衡补单</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.thrCheckBalance" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.thrCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">平衡补单</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">手动补单</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.thrCheckCopy" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.thrCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">手动补单</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+      </div>
+      <div>
+
+
+        <div style="width: 100%;margin: 0 auto;margin-top: 20px">
+          <el-row style="margin-bottom: 15px">
+            <el-col span="18">
+              <el-checkbox v-model="inputQuery.secCheckEnable">
+                <span class="spanTitle">单据是否必须手动审核，请指定单据的来源类型(二次审核)</span>
+              </el-checkbox>
+            </el-col>
+          </el-row>
+        </div>
+
+        <el-divider direction="horizontal"></el-divider>
+        <div style="width: 100%;margin: 0 auto">
+          <el-row>
+            <el-col span="5">
+              <span class="spanHeader">参数</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <span class="spanHeader">设置</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="spanHeader">参数设置说明</span>
+            </el-col>
+          </el-row>
+          <el-divider direction="horizontal"></el-divider>
+        </div>
+
+        <!--      <el-row>-->
+        <!--        <el-col span="5">-->
+        <!--          <span class="sptext">必须手工审核的单据来源类型</span>-->
+        <!--        </el-col>-->
+        <!--        <el-divider direction="vertical"></el-divider>-->
+        <!--        <el-col span="5">-->
+        <!--          <el-select v-model="inputQuery.secCheckEnable" style="width: 65%" placeholder="是否启用" clearable>-->
+        <!--            <el-option label="启用" :value="true"></el-option>-->
+        <!--            <el-option label="不启用" :value="false"></el-option>-->
+        <!--          </el-select>-->
+        <!--        </el-col>-->
+        <!--        <el-divider direction="vertical"></el-divider>-->
+        <!--        <el-col span="13">-->
+        <!--          <span class="sptext">必须手工审核的单据来源类型</span>-->
+        <!--        </el-col>-->
+        <!--      </el-row>-->
+        <!--      <el-divider></el-divider>-->
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">web端新增单据</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.secCheckWebNew" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.secCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">web端新增单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">手持终端未校验单据</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.secCheckPdaUn" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.secCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">手持终端未校验单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">手持终端已校验单据</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.secCheckPdaEd" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.secCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">手持终端已校验单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">校验产品是否可配送</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.secCheckUdims" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.secCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">是否校验UDIMS平台单据</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">UDI扫码通</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.secCheckPc" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.secCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">UDI扫码通</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">校验产品是否可配送</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.secCheckSp" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.secCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">校验产品是否可配送</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">缺量补单</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.secCheckChange" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.secCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">缺量补单</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">平衡补单</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.secCheckBalance" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.secCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">平衡补单</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <el-row>
+          <el-col span="5">
+            <span class="sptext">手动补单</span>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="5">
+            <el-select v-model="inputQuery.secCheckCopy" style="width: 65%" placeholder="是否启用" clearable
+                       :disabled="!inputQuery.secCheckEnable">
+              <el-option label="启用" :value="true"></el-option>
+              <el-option label="不启用" :value="false"></el-option>
+            </el-select>
+          </el-col>
+          <el-divider direction="vertical"></el-divider>
+          <el-col span="13">
+            <span class="sptext">手动补单</span>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -425,4 +1380,32 @@ export default {
   font-family: "Microsoft YaHei";
 }
 
+.check-box-group {
+  margin-left: 25px;
+  margin-bottom: 12px;
+}
+
+.el-divider {
+  margin: 6px 0px 8px 0px;
+  background: 0 0;
+  border-top: 1px solid #E6EBF5;
+}
+
+.spanTitle {
+  font-size: 15px;
+  font-weight: bold;
+  color: #000000
+}
+
+.spanHeader {
+  font-size: 14px;
+  font-weight: bold;
+  color: #3d3b3b
+}
+
+
+.sptext {
+  font-size: 13px;
+  font-weight: normal;
+}
 </style>
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 75858bd..19c43ce 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -3,36 +3,33 @@
     <el-card class="el-card">
       <el-form :model="query" label-width="100px" v-show="showSearch">
         <el-row style="width: 100%">
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="单号:">
               <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="送货单位:">
-              <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="收货仓库:">
-              <el-select v-model="query.invCode" style="width: 90%" placeholder="请选择收货仓库" clearable="true"
-                         @change="subInvChange"
-                         size="mini">
-                <el-option
-                  v-for="item in subInvList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
+
+          <el-col :span="6">
+
+            <el-form-item label="状态：" prop="inCodeStatus">
+              <el-select v-model="query.inCodeStatus" style="width: 90%">
+                <el-option label="未打印" value="1"></el-option>
+                <el-option label="已打印" value="2"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="单据类型:">
-              <el-select v-model="query.action" style="width: 90%" placeholder="请选择单据类型" clearable="true" size="mini">
+
+          <!--          <el-col :span="8">-->
+          <!--            <el-form-item label="送货单位:">-->
+          <!--              <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="query.action" placeholder="请选择单据类型"
+                         style="width: 90%"
+                         clearable>
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -43,7 +40,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -59,7 +56,9 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+
         </el-row>
+
       </el-form>
 
 
@@ -79,24 +78,21 @@
         <el-table-column type="selection" width="55">
         </el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
-        <el-table-column label="送货单位" prop="fromName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="单据来源" prop="fromType" width="150">
-          <template slot-scope="scope">
-            <span>{{ sourceMap[scope.row.fromType] }}</span>
-          </template>
+        <el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="120">
         </el-table-column>
-        <el-table-column label="单据日期" prop="createTime"></el-table-column>
-        <el-table-column label="单据状态">
-          <template slot-scope="scope">
-            {{ scope.row.status | statusFilterName }}
-          </template>
+        <el-table-column label="创建时间" prop="createTime" width="150"></el-table-column>
+        <el-table-column label="打印状态" width="100" prop="inCodeStatus">
         </el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="150">
+
+        <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
-        <el-table-column label="送货部门" prop="deptName" width="120">
+        <el-table-column label="收货仓库" prop="invName" width="150">
         </el-table-column>
-        <el-table-column label="送货仓库" prop="invName" width="150">
+        <el-table-column label="单据来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ sourceMap[scope.row.fromType] }}</span>
+          </template>
         </el-table-column>
         <el-table-column label="操作" width="200">
           <template slot-scope="scope">
@@ -104,7 +100,7 @@
               type="text"
               size="small"
               @click.native="qrcodeDetail(scope.row)"
-            >内部码详情
+            >内部码
             </el-button
             >
           </template>
@@ -209,6 +205,7 @@ export default {
         limit: 10,
         startTime: "",
         endTime: "",
+        inCodeStatus: null,
       },
       detailQuery: {
         orderIdFk: "",
@@ -269,6 +266,7 @@ export default {
       qrcodeExportVisible: false,
       filterUDIType: true,
       actDateRange: [],
+      auditDateRange: [],
       pickerOptions: {
         shortcuts: [
           {
@@ -325,6 +323,21 @@ export default {
     },
     onSubmit() {
       this.query.page = 1;
+      if (this.actDateRange !== null) {
+        this.query.startTime = this.actDateRange[0];
+        this.query.endTime = this.actDateRange[1];
+      } else {
+        this.query.startTime = null;
+        this.query.endTime = null;
+      }
+
+      if (this.auditDateRange !== null) {
+        this.query.startAduditTime = this.auditDateRange[0];
+        this.query.endAduditTime = this.auditDateRange[1];
+      } else {
+        this.query.startAduditTime = null;
+        this.query.endAduditTime = null;
+      }
       this.getList();
       this.haveDistributionVisible = true;
     },
@@ -416,8 +429,8 @@ export default {
     },
     getBusType() {
       let query = {
-        code: this.query.invWarehouseCode,
         enabled: true,
+        busType: 2,//默认只能选择送货单
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/basic/business/stockOrderQRCodeDetail.vue b/src/views/basic/business/stockOrderQRCodeDetail.vue
index 3c0f1d3..f5d8fcf 100644
--- a/src/views/basic/business/stockOrderQRCodeDetail.vue
+++ b/src/views/basic/business/stockOrderQRCodeDetail.vue
@@ -24,7 +24,7 @@
 
             <el-row>
                 <el-col :span="11">
-                    <el-form-item label="供应商名称" prop="corpName">
+                    <el-form-item label="送货单位" prop="corpName">
                         <el-input v-model="formData.customerName" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
                     </el-form-item>
                 </el-col>
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 22a9fd9..d7b0fd7 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -199,7 +199,7 @@
                 <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
                 <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-                <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
               </el-table>
             </el-card>
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 1c5fb48..af6e15b 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -14,7 +14,7 @@
           <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
           <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
diff --git a/src/views/basic/product/udiInfoRelevance.vue b/src/views/basic/product/udiInfoRelevance.vue
index 6a7b5a3..1dedb0a 100644
--- a/src/views/basic/product/udiInfoRelevance.vue
+++ b/src/views/basic/product/udiInfoRelevance.vue
@@ -37,7 +37,7 @@
                         <el-form-item class="query-form-item">
                             <el-input v-model="erpQuery.registerNo"
                                       clearable="true"
-                                      placeholder="注册/备案凭证号"></el-input>
+                                      placeholder="注册/备案号"></el-input>
                         </el-form-item>
                         <el-form-item class="query-form-item">
                             <el-input v-model="erpQuery.manufactory"
@@ -88,7 +88,7 @@
                     <el-table-column label="产品名称" prop="name"></el-table-column>
                     <el-table-column label="计量单位" prop="measname"></el-table-column>
                     <el-table-column label="规格型号" prop="spec"></el-table-column>
-                    <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
+                    <el-table-column label="注册/备案号" prop="registerNo"></el-table-column>
                     <el-table-column label="生产企业" prop="manufactory"></el-table-column>
                 </el-table>
                 <el-pagination
@@ -162,7 +162,7 @@
                                 v-model="unionQuery.zczbhhzbapzbh"
                                 clearable="true"
                                 :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                                placeholder="注册/备案凭证号"
+                                placeholder="注册/备案号"
                                 size="mini"
                             ></el-input>
                         </el-form-item>
diff --git a/src/views/basic/product/udiInfoselectErpUdi.vue b/src/views/basic/product/udiInfoselectErpUdi.vue
index dd5fe88..caca9b7 100644
--- a/src/views/basic/product/udiInfoselectErpUdi.vue
+++ b/src/views/basic/product/udiInfoselectErpUdi.vue
@@ -19,8 +19,8 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
-                        <el-form-item label="注册/备案凭证号:">
-                            <el-input v-model="erpQuery.registerNo" style="width: 90%" clearable="true" placeholder="请输入注册/备案凭证号" @keyup.enter.native="keyup_submit($event)"></el-input>
+                        <el-form-item label="注册/备案号:">
+                            <el-input v-model="erpQuery.registerNo" style="width: 90%" clearable="true" placeholder="请输入注册/备案号" @keyup.enter.native="keyup_submit($event)"></el-input>
                         </el-form-item>
                       </el-col>
                     </el-row>
@@ -73,7 +73,7 @@
                     <el-table-column label="产品名称" prop="name"></el-table-column>
                     <el-table-column label="计量单位" prop="measname"></el-table-column>
                     <el-table-column label="规格型号" prop="spec"></el-table-column>
-                    <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
+                    <el-table-column label="注册/备案号" prop="registerNo"></el-table-column>
                     <el-table-column label="生产企业" prop="manufactory"></el-table-column>
                     <el-table-column label="配送企业" prop="supName"></el-table-column>
                 </el-table>
diff --git a/src/views/basic/product/udilnfoManageSpDetail.vue b/src/views/basic/product/udilnfoManageSpDetail.vue
index da36a90..0cbc9f3 100644
--- a/src/views/basic/product/udilnfoManageSpDetail.vue
+++ b/src/views/basic/product/udilnfoManageSpDetail.vue
@@ -7,7 +7,7 @@
       <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
       <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
       <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-      <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+      <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
       <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
     </el-table>
 
diff --git a/src/views/inout/DialogReviewOrder.vue b/src/views/inout/DialogReviewOrder.vue
index 9ea6e14..5e82922 100644
--- a/src/views/inout/DialogReviewOrder.vue
+++ b/src/views/inout/DialogReviewOrder.vue
@@ -104,7 +104,9 @@
         <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 label="注册/备案凭证号" width="150" prop="certCode"></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-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
         </el-table-column>
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index d745fb0..25f4e6d 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -91,7 +91,7 @@
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
 
       </el-table>
diff --git a/src/views/inout/DialogThrReviewOrder.vue b/src/views/inout/DialogThrReviewOrder.vue
index f3179af..e13b9d7 100644
--- a/src/views/inout/DialogThrReviewOrder.vue
+++ b/src/views/inout/DialogThrReviewOrder.vue
@@ -104,6 +104,8 @@
         <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-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index af9ce2d..174812c 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -122,8 +122,8 @@
         <el-table-column label="单据类型" prop="billTypeName" width="150">
         </el-table-column>
         <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="送货单位" prop="fromName" width="220">
-        </el-table-column>
+<!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+        <!--        </el-table-column>-->
         <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
         </el-table-column>
         <el-table-column label="收货仓库" prop="invName" width="120">
@@ -199,7 +199,6 @@
             label="发票代码"
             prop="invoiceCode"
           ></el-table-column>
-
           <el-table-column
             label="发票编码"
             prop="invoiceEncode"
@@ -264,7 +263,7 @@
       </el-tab-pane>
     </el-tabs>
     <el-dialog
-      :title="发票编辑"
+      title="发票编辑"
       :visible.sync="Upinvoice"
       :before-close="freshen"
       width="60%"
@@ -358,6 +357,7 @@ export default {
       },
       certFileUrl: "",
       Upinvoice: false,
+      currentManufacturer: {},
       InvoiceRegisterv: false,
       checkStatus: {
         1: "草稿",
@@ -368,7 +368,7 @@ export default {
         6: "校验异常",
         7: "已审核",
         8: "审核拒绝",
-        9: "正在处理",10: "待审核",
+        9: "正在处理", 10: "待审核",
       },
       storageList: [],
       invList: [],
@@ -384,7 +384,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
@@ -588,7 +588,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
-      this.filterQuery.busType = 2;   //默认只查询送货单
+      this.filterQuery.busType = 4;   //默认只查询送货单
       filterInvoice(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoArrivalSearchOrder.vue b/src/views/inout/IoArrivalSearchOrder.vue
index 9d60fb6..0fce208 100644
--- a/src/views/inout/IoArrivalSearchOrder.vue
+++ b/src/views/inout/IoArrivalSearchOrder.vue
@@ -267,7 +267,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode" width="180"
             show-overflow-tooltip
           ></el-table-column>
@@ -354,7 +354,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号" width="180"
+            label="注册/备案号" width="180"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -533,7 +533,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
@@ -707,6 +707,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
+        busType: 3,//默认只能选择送货单
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index f68b89b..b853785 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -230,7 +230,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -389,7 +389,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index 74c2a35..935f1d0 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -233,7 +233,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -320,7 +320,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -495,7 +495,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
@@ -631,6 +631,7 @@ export default {
       let query = {
         code: this.filterQuery.invWarehouseCode,
         enabled: true,
+        busType: 2,//默认只能选择送货单
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 3c809d7..eed9508 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -242,7 +242,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -329,7 +329,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -505,7 +505,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 918f350..4c44156 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -116,9 +116,9 @@
         </el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
         <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
-        <el-table-column label="送货单位" prop="fromName" width="220">
-        </el-table-column>
-        <el-table-column label="送货部门" prop="deptName" width="120">
+        <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+        <!--        </el-table-column>-->
+        <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
         <el-table-column label=收货仓库 prop="invName" width="120">
         </el-table-column>
@@ -263,7 +263,7 @@ export default {
         6: "校验异常",
         7: "已审核",
         8: "审核拒绝",
-        9: "正在处理",10: "待审核",
+        9: "正在处理", 10: "待审核",
       },
       curIndex: "",
       idQuery: {},
@@ -287,7 +287,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
@@ -381,6 +381,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
+        busType: 2,//默认只能选择送货单
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -413,6 +414,7 @@ export default {
     //获取订单列表
     getList() {
       this.loading = true;
+      this.filterQuery.busType = 2;
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue
index 8e3e95b..db861c6 100644
--- a/src/views/inout/IoCreateErrorOrder.vue
+++ b/src/views/inout/IoCreateErrorOrder.vue
@@ -258,7 +258,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 895ea25..6a70462 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -111,8 +111,8 @@
         <el-table-column label="单据类型" prop="billTypeName" width="150">
         </el-table-column>
         <el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="送货单位" prop="fromName" width="220">
-        </el-table-column>
+<!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+        <!--        </el-table-column>-->
         <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
         </el-table-column>
         <el-table-column label="收货仓库" prop="invName" width="120">
@@ -273,7 +273,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index 86ccca1..64e9796 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -106,9 +106,9 @@
         </el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
         <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
-        <el-table-column label="送货单位" prop="fromName" width="220">
-        </el-table-column>
-        <el-table-column label="送货部门" prop="deptName" width="120">
+<!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+        <!--        </el-table-column>-->
+        <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
         <el-table-column label=收货仓库 prop="invName" width="120">
         </el-table-column>
@@ -223,7 +223,7 @@ export default {
         6: "校验异常",
         7: "已审核",
         8: "审核拒绝",
-        9: "正在处理",10: "待审核",
+        9: "正在处理", 10: "待审核",
       },
       curIndex: "",
       idQuery: {},
@@ -247,7 +247,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
@@ -338,6 +338,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
+        busType: 2,//默认只能选择送货单
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -368,6 +369,7 @@ export default {
     //获取订单列表
     getList() {
       this.loading = true;
+      this.filterQuery.busType = 2;
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index 6bc497e..32c455f 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -295,13 +295,15 @@
             label="价格"
             prop="price" width="100"
           ></el-table-column>
+          <el-table-column width="100" label="计量单位" prop="measname">
+          </el-table-column>
           <el-table-column
             label="生产企业"
             prop="manufacturer" width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号" width="160"
+            label="注册/备案号" width="160"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -358,7 +360,7 @@ export default {
         6: "校验异常",
         7: "审核通过",
         8: "审核拒绝",
-        9: "正在处理",10: "待审核",
+        9: "正在处理", 10: "待审核",
       },
       curIndex: "",
       idQuery: {},
@@ -383,7 +385,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
@@ -500,6 +502,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
+        busType: 2,//默认只能选择送货单
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -525,6 +528,7 @@ export default {
     //获取订单列表
     getList() {
       this.loading = true;
+      this.filterQuery.busType = 2;
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue
new file mode 100644
index 0000000..d2b4a8d
--- /dev/null
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@@ -0,0 +1,1023 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="送货单号:">
+              <el-input v-model="filterQuery.billNo" placeholder="请输入送货单号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <!--          <el-col :span="6">-->
+          <!--            <el-form-item class="query-form-item" label="出入库类型:">-->
+          <!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
+          <!--                <el-option label="全部" value=""></el-option>-->
+          <!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
+          <!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="送货仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择送货仓库" clearable="true"
+                         style="width: 90%"
+                         @change="invChange"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :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 class="query-form-item" label="单据类型:">
+              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
+                         style="width: 90%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="审核状态:">
+              <el-select v-model="filterQuery.status" placeholder="请选择出入库类型" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="已审核" :value="7"></el-option>
+                <el-option label="待审核" :value="10"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="审核时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="auditDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                border
+                @current-change="handleSelectionChange">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
+        <el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="送货单位" prop="fromName" width="220">
+        </el-table-column>
+        <el-table-column label="采购部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="收货仓库" prop="invName" width="120">
+        </el-table-column>
+
+        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.createTime }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="审核时间" prop="createTime" show-overflow-tooltip width="150">
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.createTime }}</span>
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="审核状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="statusFilterType(scope.row.status)">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="验收状态" prop="status" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
+        <!--                reviceStatus[scope.row.status]-->
+        <!--              }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="审核状态" prop="status" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
+        <!--                checkStatus[scope.row.status]-->
+        <!--              }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="操作" width="160" fixed="right">
+          <template slot-scope="scope">
+
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="printOrder(scope.row)"
+            >打印
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="rollback(scope.row)"
+            >撤回
+            </el-button
+            >
+
+
+            <el-button
+              type="text"
+              size="small"
+              v-if="customerId == 110 && scope.row.status == 10"
+              @click.native.stop="reviewOrder(scope.row)"
+            >审核/验收
+            </el-button
+            >
+
+            <!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              v-if="customerId == 110"-->
+            <!--              @click.native.stop="deleteDialog(scope.row)"-->
+            <!--            >删除-->
+            <!--            </el-button-->
+            <!--            >-->
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ currentRow.billNo }}-业务详情</span>
+        <el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
+          <el-form-item class="query-form-item" label="产品名称:">
+            <el-input
+              v-model="bizQuery.productName"
+              placeholder="请输入产品名称"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                @click="onBizReset"
+              >重置
+              </el-button>
+              <el-button type="primary" @click="onBizSubmit"
+                         icon="el-icon-search"
+              >查询
+              </el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="物资名称"
+            prop="coName" width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="规格型号" width="160"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号" width="120"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期" width="120"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate" width="120"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量" width="100"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="scanCount" width="100"
+          ></el-table-column>
+          <el-table-column
+            label="价格" width="100"
+            prop="price"
+          ></el-table-column>
+          <el-table-column
+            label="生产企业" width="180"
+            prop="manufacturer"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案号"
+            prop="certCode" width="180"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+        <pagination
+          v-show="bizTotal>0"
+          :total="bizTotal"
+          :page.sync="bizQuery.page"
+          :limit.sync="bizQuery.limit"
+          @pagination="getBizDetailList"
+        />
+      </el-tab-pane>
+      <!--单据扫码详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ currentRow.billNo }}-扫码详情</span>
+        <el-form :inline="true" :model="codeQuery" class="query-form" size="mini">
+          <el-form-item class="query-form-item" label="产品名称:">
+            <el-input
+              v-model="codeQuery.productName"
+              placeholder="请输入产品名称"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                @click="onCodeReset"
+              >重置
+              </el-button>
+              <el-button type="primary" @click="onCodeSubmit"
+                         icon="el-icon-search"
+              >查询
+              </el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="codeDetailLoading" :data="codeDetailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="物资名称" width="160"
+            prop="coName"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="规格型号" width="160"
+            prop="spec"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="批次号" width="120"
+            prop="batchNo"
+            show-overflow-tooltip
+          ></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="100"
+            prop="orderCount"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount" width="100"
+          ></el-table-column>
+          <el-table-column
+            label="供应商"
+            prop="supName" width="180"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="生产企业" width="180"
+            prop="manufacturer"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案号" width="180"
+            prop="certCode"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+        <pagination
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getCodeDetailList"
+        />
+      </el-tab-pane>
+      <!--单据扫码明细-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
+        <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
+          <el-form-item class="query-form-item" label="产品名称:">
+            <el-input
+              v-model="resultQuery.code"
+              placeholder="请输入UDI码"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                @click="onResultReset"
+              >重置
+              </el-button>
+              <el-button type="primary" @click="onResultSubmit"
+                         icon="el-icon-search"
+              >查询
+              </el-button
+              >
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="resultDetailLoading" :data="resultDetailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="UDI码"
+            prop="code"
+            width="220"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="produceDate"
+            width="120"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+            width="120"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo" width="120"
+          ></el-table-column>
+          <el-table-column
+            label="序列号"
+            prop="serialNo" width="120"
+          ></el-table-column>
+          <el-table-column
+            label="供应商"
+            prop="supName" width="180"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="count" width="100"
+          ></el-table-column>
+          <el-table-column
+            label="实际数量"
+            prop="reCount" width="100"
+          ></el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="resultTotal>0"
+          :total="resultTotal"
+          :page.sync="resultQuery.page"
+          :limit.sync="resultQuery.limit"
+          @pagination="getResultDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-dialog
+      title="单据验收"
+      :visible.sync="acceptOrderVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="acceptOrderVisible"
+    >
+      <accept-order
+        :closeDialog="closeAcceptDialog"
+        :orderQuery="acceptQuery"
+        v-on:childByValue="parentByFn"
+      ></accept-order>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {
+  deleteByOrderId,
+  getOrderList, rollUnReceivebackOrder
+} from "../../api/inout/order";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {isBlank} from "@/utils/strUtil";
+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 {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
+
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoCheckSuccessOrder",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        status:10,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+      customerId: this.$store.getters.customerId,
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "待核对",
+        6: "校验异常",
+        7: "已审核",
+        8: "审核拒绝",
+        9: "正在处理", 10: "待审核",
+      },
+      reviceStatus: {
+        1: "未验收",
+        5: "已验收",
+      },
+
+      storageList: [],
+      invList: [],
+      list: [],
+      total: 0,
+      loading: false,
+      index: null,
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "流转自动补单",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点",
+        "12": "采购计划",
+        "13": "领用单据",
+        "14": "第三方系统单据",
+      },
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      busTypes: [],
+      currentRow: {
+        billNo: ""
+      },
+      actDateRange: [],
+      auditDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      bizQuery: {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      bizTotal: 0,
+      bizDetailLoading: false,
+      bizDetailList: [],
+      codeQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      codeTotal: 0,
+      codeDetailLoading: false,
+      codeDetailList: [],
+      resultQuery: {
+        orderId: null,
+        code: null,
+        page: 1,
+        limit: 10
+      },
+      resultTotal: 0,
+      resultDetailLoading: false,
+      resultDetailList: [],
+      acceptQuery: null,
+      acceptOrderVisible: false,
+    };
+  },
+  components: {AcceptOrder},
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        status:10,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+
+      if (this.auditDateRange !== null) {
+        this.filterQuery.startAduditTime = this.auditDateRange[0];
+        this.filterQuery.endAduditTime = this.auditDateRange[1];
+      } else {
+        this.filterQuery.startAduditTime = null;
+        this.filterQuery.endAduditTime = null;
+      }
+
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    invChange() {
+      this.filterQuery.action = null;
+      this.getBusType();
+    },
+    printOrder(row) {
+      let tQuery = {
+        action: row.action,
+        moduleId: 2,
+      }
+      this.loading = true;
+      inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
+        if (response.code === 20000) {
+          tQuery = {
+            templateId: response.data,
+            orderIdFk: row.billNo,
+            action: row.action,
+            moduleId: 2,
+          }
+          orderPDFFromTemplateFile(tQuery).then((response) => {
+            //将pdf文件转换为url。
+            const binaryData = [];
+            binaryData.push(response);
+            //获取blob链接。
+            let url = window.URL.createObjectURL(
+              new Blob(binaryData, {type: "application/pdf"})
+            );
+            this.loading = false;
+            window.open(url);//打开新标签页，预览pdf。
+          }).catch(() => {
+            this.loading = false;
+          });
+        } else {
+          this.loading = false;
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invCode,
+        enabled: true,
+        busType: 2,//默认只能选择送货单
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+    handleSelectionChange(val) {
+      this.currentRow = val;
+      this.getOrderDetails();
+    },
+    // 获取单据 业务详情、扫码详情、扫码明细
+    getOrderDetails() {
+      this.bizQuery.page = 1;
+      this.codeQuery.page = 1;
+      this.resultQuery.page = 1;
+
+      this.getBizDetailList();
+      this.getCodeDetailList();
+      this.getResultDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      // 清空业务详情
+      this.bizDetailList = [];
+      this.bizTotal = 0;
+      // 清空扫码详情
+      this.codeDetailList = [];
+      this.codeTotal = 0;
+      // 清空扫码明细
+      this.resultDetailList = [];
+      this.resultTotal = 0;
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.currentRow = {billNo: ""};
+      this.clearDetailList();
+      this.filterQuery.busType = 2;     //送货出入库单据类型
+      getOrderList(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data.billNo;
+      deleteByOrderId(this.deleteData)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else if (response.code == 520) {
+            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+            this.getList();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(row);
+        })
+        .catch(() => {
+        });
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    onBizReset() {
+      this.bizQuery = {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getBizDetailList();
+    },
+    onBizSubmit() {
+      this.bizQuery.page = 1;
+      this.getBizDetailList();
+    },
+    getBizDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+      this.bizDetailLoading = true;
+      this.bizQuery.orderIdFk = this.currentRow.billNo;
+      getBizDetailList(this.bizQuery).then((res) => {
+        this.bizDetailLoading = false;
+        if (res.code === 20000) {
+          this.bizDetailList = res.data.list || [];
+          this.bizTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.bizDetailList = [];
+          this.bizTotal = 0;
+        }
+      }).catch((error) => {
+        this.bizDetailLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        this.bizTotal = 0;
+      })
+    },
+    onCodeReset() {
+      this.codeQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getCodeDetailList();
+    },
+    onCodeSubmit() {
+      this.codeQuery.page = 1;
+      this.getCodeDetailList();
+    },
+    getCodeDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.codeQuery.orderIdFk = this.currentRow.billNo;
+      this.codeDetailLoading = true;
+      getCodeDetailList(this.codeQuery).then((res) => {
+        this.codeDetailLoading = false;
+        if (res.code === 20000) {
+          this.codeDetailList = res.data.list || [];
+          this.codeTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.codeDetailList = [];
+          this.codeTotal = 0;
+        }
+      }).catch((error) => {
+        this.codeDetailLoading = true;
+        this.$message.error(error.message);
+        this.codeDetailList = [];
+        this.codeTotal = 0;
+      })
+    },
+    onResultReset() {
+      this.resultQuery = {
+        orderId: null,
+        code: null,
+        page: 1,
+        limit: 10
+      };
+      this.getResultDetailList();
+    },
+    onResultSubmit() {
+      this.resultQuery.page = 1;
+      this.getResultDetailList();
+    },
+    getResultDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.resultQuery.orderId = this.currentRow.billNo;
+      this.resultDetailLoading = true;
+      getCodeList(this.resultQuery).then((res) => {
+        this.resultDetailLoading = false;
+        if (res.code === 20000) {
+          this.resultDetailList = res.data.list || [];
+          this.resultTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.resultDetailList = [];
+          this.resultTotal = 0;
+        }
+      }).catch((error) => {
+        this.resultDetailLoading = false;
+        this.$message.error(error.message);
+        this.resultDetailList = [];
+        this.resultTotal = 0;
+      });
+    },
+
+    //单据撤回
+    rollback(row) {
+      this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let param = {billNo: row.billNo};
+        rollUnReceivebackOrder(param).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("撤回成功");
+            this.getList();
+          } else {
+            this.$message.error(res.message);
+          }
+        })
+      }).catch(() => {
+        // this.$message.info('回退失败');
+      });
+    },
+
+    //验收结束
+    closeAcceptDialog() {
+      this.acceptOrderVisible = false;
+    },
+
+    //开始验收
+    reviewOrder(row) {
+      this.acceptQuery = row;
+      this.acceptOrderVisible = true;
+    },
+
+    parentByFn: function (childValue) {
+      this.getList();
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        5: "warning",
+        1: "warning",
+        6: "danger",
+        7: "success",
+      };
+      return statusMap[status];
+    },
+  }
+  ,
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  }
+  ,
+  created() {
+    this.getInvList();
+    this.getBusType();
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    });
+    this.getList();
+  }
+  ,
+}
+;
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index bb7d78b..83d5d87 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -295,7 +295,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode" width="180"
             show-overflow-tooltip
           ></el-table-column>
@@ -382,7 +382,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号" width="180"
+            label="注册/备案号" width="180"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -565,7 +565,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index e7d3811..24dd907 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -133,7 +133,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -221,7 +221,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -436,7 +436,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
diff --git a/src/views/inout/IoInoutSearchOrder.vue b/src/views/inout/IoInoutSearchOrder.vue
index 851606c..2f5e5f2 100644
--- a/src/views/inout/IoInoutSearchOrder.vue
+++ b/src/views/inout/IoInoutSearchOrder.vue
@@ -20,8 +20,8 @@
           <!--            </el-form-item>-->
           <!--          </el-col>-->
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="采购仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择采购仓库" clearable="true"
+            <el-form-item class="query-form-item" label="收货仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
                          style="width: 90%"
                          @change="invChange"
               >
@@ -262,7 +262,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode" width="180"
             show-overflow-tooltip
           ></el-table-column>
@@ -349,7 +349,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号" width="180"
+            label="注册/备案号" width="180"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -526,7 +526,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
@@ -698,6 +698,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
+        inStock:true,
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
index 00b68e7..95f8a7c 100644
--- a/src/views/inout/IoReturnedSearchOrder.vue
+++ b/src/views/inout/IoReturnedSearchOrder.vue
@@ -10,6 +10,21 @@
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
+                         style="width: 90%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <!--          <el-col :span="6">-->
           <!--            <el-form-item class="query-form-item" label="出入库类型:">-->
           <!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
@@ -36,23 +51,18 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="单据类型:">
-              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%"
-                         clearable>
-                <el-option
-                  v-for="item in busTypes"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.action">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
+            <el-form-item label="审核状态:">
+              <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择审核状态">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="已审核" :value="7"></el-option>
+                <el-option label="未审核" :value="10"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
@@ -109,9 +119,9 @@
                 @current-change="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
-        <el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="供应商" prop="fromName" width="220">
-        </el-table-column>
+        <el-table-column label="退货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
+        <!--        <el-table-column label="供应商" prop="fromName" width="220">-->
+        <!--        </el-table-column>-->
         <el-table-column label="退货部门" prop="deptName" width="120">
         </el-table-column>
         <el-table-column label="退货仓库" prop="invName" width="120">
@@ -149,7 +159,6 @@
         </el-table-column>
         <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
-
             <el-button
               type="text"
               size="small"
@@ -164,8 +173,6 @@
             >撤回
             </el-button
             >
-
-
             <el-button
               type="text"
               size="small"
@@ -174,7 +181,6 @@
             >审核
             </el-button
             >
-
             <el-button
               type="text"
               size="small"
@@ -183,7 +189,6 @@
             >删除
             </el-button
             >
-
           </template>
         </el-table-column>
       </el-table>
@@ -250,13 +255,14 @@
             prop="expireDate" width="120"
           ></el-table-column>
           <el-table-column
-            label="单据数量" width="100"
+            label="退货数量" width="100"
             prop="count"
           ></el-table-column>
           <el-table-column
             label="扫码数量"
             prop="scanCount" width="100"
           ></el-table-column>
+          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
           <el-table-column
             label="价格" width="100"
             prop="price"
@@ -267,7 +273,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode" width="180"
             show-overflow-tooltip
           ></el-table-column>
@@ -336,25 +342,26 @@
             prop="expireDate"
           ></el-table-column>
           <el-table-column
-            label="单据数量" width="100"
+            label="退货数量" width="100"
             prop="orderCount"
           ></el-table-column>
           <el-table-column
             label="扫码数量"
             prop="reCount" width="100"
           ></el-table-column>
-          <el-table-column
-            label="供应商"
-            prop="supName" width="180"
-            show-overflow-tooltip
-          ></el-table-column>
+          <!--          <el-table-column-->
+          <!--            label="供应商"-->
+          <!--            prop="supName" width="180"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
           <el-table-column
             label="生产企业" width="180"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号" width="180"
+            label="注册/备案号" width="180"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -424,10 +431,10 @@
             label="序列号"
             prop="serialNo" width="120"
           ></el-table-column>
-          <el-table-column
-            label="供应商"
-            prop="supName" width="180"
-          ></el-table-column>
+          <!--          <el-table-column-->
+          <!--            label="供应商"-->
+          <!--            prop="supName" width="180"-->
+          <!--          ></el-table-column>-->
           <el-table-column
             label="扫码数量"
             prop="count" width="100"
@@ -506,6 +513,7 @@ export default {
         endTime: null,
         startAduditTime: null,
         endAduditTime: null,
+        status: 10,
         invCode: this.$store.getters.locInvCode,
       },
       customerId: this.$store.getters.customerId,
@@ -518,7 +526,7 @@ export default {
         6: "校验异常",
         7: "已审核",
         8: "审核拒绝",
-        9: "正在处理",10: "待审核",
+        9: "正在处理", 10: "待审核",
       },
       storageList: [],
       invList: [],
@@ -533,7 +541,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
@@ -703,8 +711,9 @@ export default {
     },
     getBusType() {
       let query = {
-        code: this.filterQuery.invCode,
+        // code: this.filterQuery.invCode,
         enabled: true,
+        busType: 4,//默认只能选择送货单
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue
index 07d55c4..6efc18a 100644
--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@@ -105,13 +105,12 @@
         </el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
         <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
-        <el-table-column label="送货单位" prop="fromName" width="220">
-        </el-table-column>
-        <el-table-column label="送货部门" prop="deptName" width="120">
+<!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+<!--        </el-table-column>-->
+        <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
         <el-table-column label=收货仓库 prop="invName" width="120">
         </el-table-column>
-
         <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
         <el-table-column label="来源" prop="fromType">
           <template slot-scope="scope">
@@ -246,6 +245,8 @@
             prop="expireDate"
             width="100"
           ></el-table-column>
+          <el-table-column width="100" label="计量单位" prop="measname">
+          </el-table-column>
           <el-table-column
             label="生产厂家"
             prop="manufacturer"
@@ -253,7 +254,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             width="160"
             prop="certCode"
             show-overflow-tooltip
@@ -275,7 +276,7 @@
           <el-form-item class="query-form-item" label="产品名称:">
             <el-input
               v-model="resultQuery.code"
-              placeholder="请输入UDI码"
+              placeholder="请输入产品名称"
               clearable
             >
             </el-input>
@@ -406,7 +407,7 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       },
-      reviewType:2,
+      reviewType: 2,
       checkStatus: {
         1: "草稿",
         2: "等待处理",
@@ -432,7 +433,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 35fb059..4f973bd 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -96,6 +96,12 @@
       <div class="top-right-btn">
         <el-button-group>
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >发票登记
+          </el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh"
@@ -117,9 +123,9 @@
         </el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
         <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
-        <el-table-column label="送货单位" prop="fromName" width="220">
-        </el-table-column>
-        <el-table-column label="送货部门" prop="deptName" width="120">
+<!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+<!--        </el-table-column>-->
+        <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
         <el-table-column label="送货仓库" prop="invName" width="120">
         </el-table-column>
@@ -139,7 +145,7 @@
             </el-tag>
           </template>
         </el-table-column>
-<!--        <el-table-column label="验收状态" prop="status" width="100">-->
+        <!--        <el-table-column label="验收状态" prop="status" width="100">-->
         <!--          <template slot-scope="scope">-->
         <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
         <!--                reviceStatus[scope.row.status]-->
@@ -257,6 +263,7 @@
             prop="price"
             width="100"
           ></el-table-column>
+
           <el-table-column
             label="生产日期"
             prop="productDate"
@@ -267,6 +274,8 @@
             prop="expireDate"
             width="100"
           ></el-table-column>
+          <el-table-column width="100" label="计量单位" prop="measname">
+          </el-table-column>
           <el-table-column
             label="生产企业"
             prop="manufacturer"
@@ -274,7 +283,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             width="160"
             prop="certCode"
             show-overflow-tooltip
@@ -346,11 +355,11 @@
             label="序列号"
             prop="serialNo"
           ></el-table-column>
-          <el-table-column
-            label="供应商"
-            prop="supName"
-            show-overflow-tooltip
-          ></el-table-column>
+<!--          <el-table-column-->
+<!--            label="供应商"-->
+<!--            prop="supName"-->
+<!--            show-overflow-tooltip-->
+<!--          ></el-table-column>-->
           <el-table-column
             label="扫码数量"
             prop="reCount"
@@ -442,7 +451,7 @@ export default {
         6: "校验异常",
         7: "已审核",
         8: "审核拒绝",
-        9: "正在处理",10: "待审核",
+        9: "正在处理", 10: "待审核",
       },
       invList: [],
       deptList: [],
@@ -457,7 +466,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
@@ -577,7 +586,6 @@ export default {
         this.filterQuery.startAduditTime = null;
         this.filterQuery.endAduditTime = null;
       }
-
       this.filterQuery.page = 1;
       this.getList();
     },
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
new file mode 100644
index 0000000..97e8590
--- /dev/null
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -0,0 +1,928 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="单号:">
+              <el-input v-model="filterQuery.billNo" placeholder="单号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <!--          <el-col :span="8">-->
+          <!--            <el-form-item class="query-form-item" label="采购部门:">-->
+          <!--              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
+          <!--                         style="width: 90%"-->
+          <!--              >-->
+          <!--                <el-option-->
+          <!--                  v-for="item in deptList"-->
+          <!--                  :key="item.name"-->
+          <!--                  :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 class="query-form-item" label="收货仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
+                         style="width: 90%"
+                         @change="invChange"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :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 class="query-form-item" label="单据类型:">
+              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
+                         style="width: 90%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="审核时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="auditDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                border
+                @current-change="handleSelectionChange">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="审核时间" prop="auditTime" width="140" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
+        <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+        <!--        </el-table-column>-->
+        <el-table-column label="采购部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="送货仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
+        <el-table-column label="来源" prop="fromType">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="statusFilterType(scope.row.status)">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="验收状态" prop="status" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
+        <!--                reviceStatus[scope.row.status]-->
+        <!--              }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="操作" width="120" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="printOrder(scope.row)"
+            >打印
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status == 10"
+              @click.native.stop="reviewOrder(scope.row)"
+            >审核
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status == 10"
+              @click.native.stop="rollback(scope.row)"
+            >撤回
+            </el-button
+            >
+
+            <!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              @click.native.stop="deleteDialog(scope.row)"-->
+            <!--            >删除-->
+            <!--            </el-button-->
+            <!--            >-->
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
+        <el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
+          <el-form-item class="query-form-item" label="产品名称:">
+            <el-input
+              v-model="bizQuery.productName"
+              placeholder="请输入产品名称"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                @click="onBizReset"
+              >重置
+              </el-button>
+              <el-button type="primary" @click="onBizSubmit"
+                         icon="el-icon-search"
+              >查询
+              </el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="物资名称"
+            prop="coName"
+            width="150"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            width="150"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            width="100"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="数量"
+            prop="count"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            label="价格"
+            prop="price"
+            width="100"
+          ></el-table-column>
+
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+            width="100"
+          ></el-table-column>
+          <el-table-column width="100" label="计量单位" prop="measname">
+          </el-table-column>
+          <el-table-column
+            label="生产企业"
+            prop="manufacturer"
+            width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案号"
+            width="160"
+            prop="certCode"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+        <pagination
+          v-show="bizTotal>0"
+          :total="bizTotal"
+          :page.sync="bizQuery.page"
+          :limit.sync="bizQuery.limit"
+          @pagination="getBizDetailList"
+        />
+      </el-tab-pane>
+
+      <!--单据扫码明细-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
+        <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
+          <el-form-item class="query-form-item" label="产品名称:">
+            <el-input
+              v-model="resultQuery.code"
+              placeholder="请输入UDI码"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                @click="onResultReset"
+              >重置
+              </el-button>
+              <el-button type="primary" @click="onResultSubmit"
+                         icon="el-icon-search"
+              >查询
+              </el-button
+              >
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="resultDetailLoading" :data="resultDetailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="UDI码"
+            prop="code"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="produceDate"
+            width="120"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+            width="120"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="序列号"
+            prop="serialNo"
+          ></el-table-column>
+          <!--          <el-table-column-->
+          <!--            label="供应商"-->
+          <!--            prop="supName"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="实际数量"
+            prop="reCount"
+          ></el-table-column>
+        </el-table>
+        <pagination
+          v-show="resultTotal>0"
+          :total="resultTotal"
+          :page.sync="resultQuery.page"
+          :limit.sync="resultQuery.limit"
+          @pagination="getResultDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-dialog
+      title="送货单审核"
+      :visible.sync="acceptOrderVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="acceptOrderVisible"
+    >
+      <accept-order
+        :closeDialog="closeAcceptDialog"
+        :orderQuery="acceptQuery"
+        v-on:childByValue="parentByFn"
+      ></accept-order>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  deleteInvByBillNo,
+  getOrderList, rollbackOrder, rollUnReceivebackOrder
+} from "../../api/inout/order";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {isBlank} from "@/utils/strUtil";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import {getResultDetailList} from "@/api/inout/orderDetailResult";
+import {getCodeDetailList} from "@/api/inout/orderDetailCode";
+import {getCodeList} from "@/api/inout/code";
+import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
+import AcceptOrder from "@/views/inout/DialogReviewOrder";
+import {getDeptListByUser} from "@/api/auth/authDept";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoSupSearchOrder",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        id: "",
+        billNo: null,
+        // statusType: "audited",
+        status:10,
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+
+      reviceStatus: {
+        1: "未验收",
+        5: "已验收",
+      },
+
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "待核对",
+        6: "校验异常",
+        7: "已审核",
+        8: "审核拒绝",
+        9: "正在处理", 10: "待审核",
+      },
+      invList: [],
+      deptList: [],
+      list: [],
+      total: 0,
+      loading: false,
+      index: null,
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "流转自动补单",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点",
+        "12": "采购计划",
+        "13": "领用单据",
+        "14": "第三方系统单据",
+      },
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      busTypes: [],
+      currentRow: {},
+      actDateRange: [],
+      auditDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      bizQuery: {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      bizTotal: 0,
+      bizDetailLoading: false,
+      bizDetailList: [],
+      codeQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      codeTotal: 0,
+      codeDetailLoading: false,
+      codeDetailList: [],
+      resultQuery: {
+        orderId: null,
+        code: null,
+        page: 1,
+        limit: 10
+      },
+      resultTotal: 0,
+      resultDetailLoading: false,
+      resultDetailList: [],
+      acceptQuery: null,
+      acceptOrderVisible: false,
+    };
+  },
+  components: {AcceptOrder},
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        status:10,
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+
+      if (this.auditDateRange !== null) {
+        this.filterQuery.startAduditTime = this.auditDateRange[0];
+        this.filterQuery.endAduditTime = this.auditDateRange[1];
+      } else {
+        this.filterQuery.startAduditTime = null;
+        this.filterQuery.endAduditTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invCode,
+        enabled: true,
+        busType: 2,//默认只能选择送货单
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+    handleSelectionChange(val) {
+      this.currentRow = val;
+      this.getOrderDetails();
+    },
+    // 获取单据 业务详情、扫码详情、扫码明细
+    getOrderDetails() {
+      this.bizQuery.page = 1;
+      this.codeQuery.page = 1;
+      this.resultQuery.page = 1;
+
+      this.getBizDetailList();
+      this.getCodeDetailList();
+      this.getResultDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      // 清空业务详情
+      this.bizDetailList = [];
+      this.bizTotal = 0;
+      // 清空扫码详情
+      this.codeDetailList = [];
+      this.codeTotal = 0;
+      // 清空扫码明细
+      this.resultDetailList = [];
+      this.resultTotal = 0;
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.currentRow = {billNo: ""};
+      this.clearDetailList();
+      this.filterQuery.busType = 2;
+      getOrderList(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data.billNo;
+      deleteInvByBillNo(this.deleteData)
+        .then((response) => {
+
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else if (response.code == 520) {
+            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+            this.getList();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(row);
+        })
+        .catch(() => {
+        });
+    },
+    invChange() {
+      this.filterQuery.action = null;
+      this.getBusType();
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+      });
+    },
+    checkOrder(orderId) {
+    },
+    onBizReset() {
+      this.bizQuery = {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getBizDetailList();
+    },
+    onBizSubmit() {
+      this.bizQuery.page = 1;
+      this.getBizDetailList();
+    },
+    getBizDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+      this.bizDetailLoading = true;
+      this.bizQuery.orderIdFk = this.currentRow.billNo;
+      getResultDetailList(this.bizQuery).then((res) => {
+        this.bizDetailLoading = false;
+        if (res.code === 20000) {
+          this.bizDetailList = res.data.list || [];
+          this.bizTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.bizDetailList = [];
+          this.bizTotal = 0;
+        }
+      }).catch((error) => {
+        this.bizDetailLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        this.bizTotal = 0;
+      })
+    },
+    editBizDialog(row) {
+
+    },
+    onCodeReset() {
+      this.codeQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getCodeDetailList();
+    },
+    onCodeSubmit() {
+      this.codeQuery.page = 1;
+      this.getCodeDetailList();
+    },
+    getCodeDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.codeQuery.orderIdFk = this.currentRow.billNo;
+      this.codeDetailLoading = true;
+      getCodeDetailList(this.codeQuery).then((res) => {
+        this.codeDetailLoading = false;
+        if (res.code === 20000) {
+          this.codeDetailList = res.data.list || [];
+          this.codeTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.codeDetailList = [];
+          this.codeTotal = 0;
+        }
+      }).catch((error) => {
+        this.codeDetailLoading = true;
+        this.$message.error(error.message);
+        this.codeDetailList = [];
+        this.codeTotal = 0;
+      })
+    },
+    editCodeDialog(row) {
+
+    },
+    printOrder(row) {
+      let tQuery = {
+        action: row.action,
+        moduleId: 1,
+      }
+      this.loading = true;
+      inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
+        if (response.code === 20000) {
+          tQuery = {
+            templateId: response.data,
+            orderIdFk: row.billNo,
+            action: row.action,
+            moduleId: 1,
+          }
+          orderPDFFromTemplateFile(tQuery).then((response) => {
+            //将pdf文件转换为url。
+            const binaryData = [];
+            binaryData.push(response);
+            //获取blob链接。
+            let url = window.URL.createObjectURL(
+              new Blob(binaryData, {type: "application/pdf"})
+            );
+            this.loading = false;
+            window.open(url);//打开新标签页，预览pdf。
+          }).catch(() => {
+            this.loading = false;
+          });
+        } else {
+          this.loading = false;
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+    onResultReset() {
+      this.resultQuery = {
+        orderId: null,
+        code: null,
+        page: 1,
+        limit: 10
+      };
+      this.getResultDetailList();
+    },
+    onResultSubmit() {
+      this.resultQuery.page = 1;
+      this.getResultDetailList();
+    },
+    getResultDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.resultQuery.orderId = this.currentRow.billNo;
+      this.resultDetailLoading = true;
+      getCodeList(this.resultQuery).then((res) => {
+        this.resultDetailLoading = false;
+        if (res.code === 20000) {
+          this.resultDetailList = res.data.list || [];
+          this.resultTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.resultDetailList = [];
+          this.resultTotal = 0;
+        }
+      }).catch((error) => {
+        this.resultDetailLoading = false;
+        this.$message.error(error.message);
+        this.resultDetailList = [];
+        this.resultTotal = 0;
+      });
+    },
+    //单据撤回
+    rollback(row) {
+      this.$confirm('此操作将撤回单据至已校验未审核状态并删除对应库存信息, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let param = {billNo: row.billNo};
+        rollUnReceivebackOrder(param).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("撤回成功");
+            this.getList();
+          } else {
+            this.$message.error(res.message);
+          }
+        })
+      }).catch(() => {
+        // this.$message.info('回退失败');
+      });
+    },
+
+    //开始验收
+    reviewOrder(row) {
+      this.acceptQuery = row;
+      this.acceptOrderVisible = true;
+    },
+
+
+    //验收结束
+    closeAcceptDialog() {
+      this.acceptOrderVisible = false;
+    },
+
+    parentByFn: function (childValue) {
+      this.getList();
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        5: "warning",
+        1: "warning",
+        6: "danger",
+        7: "success",
+      };
+      return statusMap[status];
+    },
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+    this.getDeptList();
+    this.getBusType();
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+    this.getList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 67a7e7f..ec8b696 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -86,13 +86,14 @@
           ></el-input>
         </template>
       </el-table-column>
-
+      <el-table-column width="100" label="计量单位" prop="measname">
+      </el-table-column>
       <el-table-column width="100" label="订单数量" prop="purCount">
       </el-table-column>
 
 
       <el-table-column width="160"
-                       label="注册/备案凭证号"
+                       label="注册/备案号"
                        prop="certCode"
                        show-overflow-tooltip
       >
diff --git a/src/views/inout/PanelCreateOrderCodeDetail.vue b/src/views/inout/PanelCreateOrderCodeDetail.vue
index 28351dd..3da6367 100644
--- a/src/views/inout/PanelCreateOrderCodeDetail.vue
+++ b/src/views/inout/PanelCreateOrderCodeDetail.vue
@@ -21,8 +21,10 @@
       <el-table-column label="扫码数量" width="80" prop="count" show-overflow-tooltip></el-table-column>
       <el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column>
       <el-table-column label="价格" width="150" prop="price" show-overflow-tooltip></el-table-column>
+      <el-table-column width="100" label="计量单位" prop="measname">
+      </el-table-column>
       <el-table-column label="生产企业" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column>
-      <el-table-column label="注册/备案凭证号" width="150" prop="certCode" show-overflow-tooltip></el-table-column>
+      <el-table-column label="注册/备案号" width="150" prop="certCode" show-overflow-tooltip></el-table-column>
     </el-table>
   </div>
 </template>
diff --git a/src/views/inout/PanelCreateOrderCodes.vue b/src/views/inout/PanelCreateOrderCodes.vue
index e3e5260..e18a0d8 100644
--- a/src/views/inout/PanelCreateOrderCodes.vue
+++ b/src/views/inout/PanelCreateOrderCodes.vue
@@ -52,12 +52,12 @@
         width="120"
         show-overflow-tooltip
       ></el-table-column>
-      <el-table-column
-        label="供应商"
-        prop="supName"
-        width="180"
-        show-overflow-tooltip
-      ></el-table-column>
+<!--      <el-table-column-->
+<!--        label="供应商"-->
+<!--        prop="supName"-->
+<!--        width="180"-->
+<!--        show-overflow-tooltip-->
+<!--      ></el-table-column>-->
 
       <el-table-column label="操作" width="220" fixed="right">
         <template slot-scope="scope">
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index a7aa532..1b68975 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -124,7 +124,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="150">
             <template slot-scope="scope">
diff --git a/src/views/inout/receive/receiveAuditDetail.vue b/src/views/inout/receive/receiveAuditDetail.vue
index 800dc7b..85b21b6 100644
--- a/src/views/inout/receive/receiveAuditDetail.vue
+++ b/src/views/inout/receive/receiveAuditDetail.vue
@@ -74,7 +74,7 @@
           <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
           <el-table-column label="单据数量" prop="count" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
         </el-table>
       </el-card>
diff --git a/src/views/inout/uploadManage/uploadOrder.vue b/src/views/inout/uploadManage/uploadOrder.vue
index 4e64685..ffd92fa 100644
--- a/src/views/inout/uploadManage/uploadOrder.vue
+++ b/src/views/inout/uploadManage/uploadOrder.vue
@@ -220,7 +220,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案凭证号"
+            label="注册/备案号"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -421,7 +421,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
diff --git a/src/views/inventory/AllInoutSearchOrder.vue b/src/views/inventory/AllInoutSearchOrder.vue
new file mode 100644
index 0000000..1c3ad7b
--- /dev/null
+++ b/src/views/inventory/AllInoutSearchOrder.vue
@@ -0,0 +1,245 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库单号:">
+              <el-input v-model="filterQuery.orderIdFk" placeholder="请输入出入库单号" style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="DI/物资编码:">
+              <el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码" style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="物资名称:">
+              <el-input v-model="filterQuery.coName" placeholder="请输入物资名称" style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="批次号:">
+              <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="规格型号:">
+              <el-input v-model="filterQuery.spec" placeholder="请输入规格型号" style="width: 90%" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="注册/备案号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="生产企业:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="出入库单号" prop="orderIdFk" width="160"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode" width="160"></el-table-column>
+        <el-table-column label="物资名称" prop="coName" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="spec" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+        <el-table-column label="入库数量" prop="count" width="100"></el-table-column>
+        <el-table-column label="出库数量" prop="reCount" width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="120"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufacturer" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="certCode" width="160" show-overflow-tooltip></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {getResultDetailList, getResultOrderList} from '@/api/inout/orderDetailResult'
+
+export default {
+  name: "supInoutSearchOrder",
+  data() {
+    return {
+      showSearch: true,
+      list: {},
+      filterQuery: {
+        id: "",
+        orderIdFk: null,
+        fromCorpName: null,
+        coName: null,
+        spec: null,
+        batchNo: null,
+        page: 1,
+        limit: 10,
+        startAduditTime: null,
+        endAduditTime: null,
+      },
+      loading: false,
+      total: 0,
+      customerId: this.$store.getters.customerId,
+      actDateRange: [],
+      auditDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  components: {},
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        orderIdFk: null,
+        fromCorpName: null,
+        coName: null,
+        spec: null,
+        batchNo: null,
+        page: 1,
+        limit: 10,
+        startAduditTime: null,
+        endAduditTime: null,
+      };
+      this.getList();
+    },
+
+
+    onSubmit() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startAduditTime = this.actDateRange[0];
+        this.filterQuery.endAduditTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startAduditTime = null;
+        this.filterQuery.endAduditTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      this.loading = true;
+      getResultOrderList(this.filterQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+  }
+  ,
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  }
+  ,
+  created() {
+    this.getList();
+  }
+  ,
+}
+;
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/AssetManage.vue b/src/views/inventory/AssetManage.vue
index 9763dba..bb86cfd 100644
--- a/src/views/inventory/AssetManage.vue
+++ b/src/views/inventory/AssetManage.vue
@@ -55,7 +55,7 @@
           <el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>
           <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
           <el-table-column label="医疗器械注册/备案人名称" prop="ylqxzcrbarmc" width="180"></el-table-column>
-          <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="180"></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
           <el-table-column label="操作" >
             <template slot-scope="scope">
               <el-button
diff --git a/src/views/inventory/DeviceMAOrderCompleted.vue b/src/views/inventory/DeviceMAOrderCompleted.vue
index fd714b4..832596e 100644
--- a/src/views/inventory/DeviceMAOrderCompleted.vue
+++ b/src/views/inventory/DeviceMAOrderCompleted.vue
@@ -63,7 +63,7 @@
         <el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
diff --git a/src/views/inventory/DeviceMAOrderModify.vue b/src/views/inventory/DeviceMAOrderModify.vue
index c459a72..875bd80 100644
--- a/src/views/inventory/DeviceMAOrderModify.vue
+++ b/src/views/inventory/DeviceMAOrderModify.vue
@@ -95,7 +95,7 @@
           <el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
           <el-table-column label="失效日期(yyMMdd)" prop="expireDate"
                            show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"
                            show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                            show-overflow-tooltip></el-table-column>
diff --git a/src/views/inventory/DeviceReceiveOrderCompleted.vue b/src/views/inventory/DeviceReceiveOrderCompleted.vue
index 2c24df0..abe79cb 100644
--- a/src/views/inventory/DeviceReceiveOrderCompleted.vue
+++ b/src/views/inventory/DeviceReceiveOrderCompleted.vue
@@ -89,7 +89,7 @@
         <el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
diff --git a/src/views/inventory/InvMAOrderModify.vue b/src/views/inventory/InvMAOrderModify.vue
index 8d507bd..91c8d57 100644
--- a/src/views/inventory/InvMAOrderModify.vue
+++ b/src/views/inventory/InvMAOrderModify.vue
@@ -144,7 +144,7 @@
           <el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
           <el-table-column  label="失效日期(yyMMdd)" prop="expireDate"
                            show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"
                            show-overflow-tooltip></el-table-column>
           <el-table-column  label="生产企业" prop="ylqxzcrbarmc"
                            show-overflow-tooltip></el-table-column>
diff --git a/src/views/inventory/InvPlace.vue b/src/views/inventory/InvPlace.vue
index 3ece1e8..320e882 100644
--- a/src/views/inventory/InvPlace.vue
+++ b/src/views/inventory/InvPlace.vue
@@ -47,7 +47,7 @@
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
-        <el-table-column label="批准文号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
diff --git a/src/views/inventory/InvPreInSerach.vue b/src/views/inventory/InvPreInSerach.vue
index 157ef1c..a594084 100644
--- a/src/views/inventory/InvPreInSerach.vue
+++ b/src/views/inventory/InvPreInSerach.vue
@@ -232,7 +232,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue
index dadf06a..6de2539 100644
--- a/src/views/inventory/InvPreProductsDetail.vue
+++ b/src/views/inventory/InvPreProductsDetail.vue
@@ -3,13 +3,13 @@
     <el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
       <el-descriptions-item>
         <template slot="label">
-          产品名称
+          物资名称
         </template>
         {{ inputQuery.cpmctymc }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
-          产品标识
+          DI/物资编码
         </template>
         {{ inputQuery.nameCode }}
       </el-descriptions-item>
@@ -41,9 +41,9 @@
     </el-descriptions>
 
     <el-form :inline="true" :model="invPreProductDetailQuery" style="margin-top: 10px;" size="mini">
-      <el-form-item class="query-form-item" label="条码:">
+      <el-form-item class="query-form-item" label="UDI码:">
         <el-input v-model="invPreProductDetailQuery.code"
-                  placeholder="条码查询"
+                  placeholder="请输入UDI码查询"
                   clearable
                   style="width: 100%"
         ></el-input>
@@ -61,9 +61,15 @@
     <el-table v-loading="loading" :data="list" style="width: 100%">
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
-        label="条码"
+        label="UDI码"
         prop="code"
-        width="500"
+        width="350"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="出入库单号"
+        prop="orderId"
+        width="180"
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
@@ -90,16 +96,11 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="订单日期"
+        label="单据日期"
         prop="orderTime"
         width="150"
         show-overflow-tooltip
       ></el-table-column>
-      <el-table-column
-        label="所属单据"
-        prop="orderId"
-        show-overflow-tooltip
-      ></el-table-column>
     </el-table>
 
     <pagination
diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue
index 204c1fa..db7d874 100644
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -3,17 +3,16 @@
     <el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
       <el-descriptions-item>
         <template slot="label">
-          产品名称
+          物资名称
         </template>
         {{ inputQuery.cpmctymc }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
-          产品标识
+          DI/物资编码
         </template>
         {{ inputQuery.nameCode }}
       </el-descriptions-item>
-
       <el-descriptions-item>
         <template slot="label">
           批次号
@@ -41,14 +40,13 @@
     </el-descriptions>
 
     <el-form :inline="true" :model="invProductDetailQuery" style="margin-top: 10px;" size="mini">
-      <el-form-item class="query-form-item" label="条码:">
+      <el-form-item class="query-form-item" label="UDI码:">
         <el-input v-model="invProductDetailQuery.code"
-                  placeholder="条码查询"
+                  placeholder="请输入UDI码查询"
                   clearable
                   style="width: 100%"
         ></el-input>
       </el-form-item>
-
       <el-form-item>
         <el-button-group>
           <el-button type="primary" icon="search" @click="onSubmit"
@@ -58,12 +56,18 @@
         </el-button-group>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="list" style="width: 100%">
+    <el-table v-loading="loading" :data="list" style="width: 100%" border>
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
-        label="条码"
+        label="UDI码"
         prop="code"
-        width="500"
+        width="350"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="出入库单号"
+        prop="orderId"
+        width="180"
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
@@ -90,18 +94,12 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="订单日期"
+        label="单据日期"
         prop="orderTime"
         width="150"
         show-overflow-tooltip
       ></el-table-column>
-      <el-table-column
-        label="所属单据"
-        prop="orderId"
-        show-overflow-tooltip
-      ></el-table-column>
     </el-table>
-
     <pagination
       v-show="total>0"
       :total="total"
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 483c9c1..e6197e8 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -61,8 +61,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item class="query-form-item" label="批准文号:">
-              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
+            <el-form-item class="query-form-item" label="注册/备案号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
diff --git a/src/views/inventory/InvSupPreInSerach.vue b/src/views/inventory/InvSupPreInSerach.vue
index c5831b1..79aa12f 100644
--- a/src/views/inventory/InvSupPreInSerach.vue
+++ b/src/views/inventory/InvSupPreInSerach.vue
@@ -1,160 +1,182 @@
 <template>
   <div>
-    <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+    <el-card>
+      <el-form :model="codeQuery" class="query-form" size="mini" label-width="100px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="18">
+            <el-form-item class="query-form-item" label="扫码查询:">
+              <el-input v-model="codeQuery.udiCode"
+                        style="width: 97%"
+                        placeholder="请扫描或输入UDI码"
+                        clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="预验收单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="单号"
+              <el-input v-model="codeQuery.orderId" placeholder="预验收单号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="收货仓库:">
+              <el-select v-model="codeQuery.invCode" placeholder="请选择收货仓库" clearable="true"
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :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="6">
+            <el-form-item class="query-form-item" label="收货时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="auditDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="DI/物资编码:">
+              <el-input v-model="codeQuery.nameCode" placeholder="DI/物资编码"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="物资名称:">
+              <el-input v-model="codeQuery.cpmctymc" placeholder="物资名称"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="规格型号:">
+              <el-input v-model="codeQuery.ggxh" placeholder="规格型号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="批次号:">
+              <el-input v-model="codeQuery.batchNo" placeholder="批次号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="注册/备案号:">
+              <el-input v-model="codeQuery.zczbhhzbapzbh" placeholder="注册/备案号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="生产企业:">
+              <el-input v-model="codeQuery.ylqxzcrbarmc" placeholder="生产企业"
+                        style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
 
         </el-row>
       </el-form>
+
       <div class="top-right-btn">
         <el-button-group>
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh"
-            @click="onReset"
+            @click="onCodeReset"
           >重置
           </el-button>
-          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          <el-button type="primary" icon="el-icon-search" @click="onCodeSubmit"
           >查询
           </el-button
           >
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
-      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
-                border
-                @current-change="handleSelectionChange">
-        <el-table-column type="selection" width="55"></el-table-column>
+
+      <el-table v-loading="codeDetailLoading" :data="codeDetailList" style="width: 100%" border
+                row-key="id"
+      >
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="来源" prop="fromType" width="150">
-          <template slot-scope="scope">
-            <span>{{ fromTypeMap[scope.row.orderFromType] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="往来单位" prop="fromCorpName" width="180">
-        </el-table-column>
-        <el-table-column label="当前部门" prop="deptName" width="120">
-        </el-table-column>
-        <el-table-column label="当前仓库" prop="invName" width="120">
-        </el-table-column>
-        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="160">
-          <template slot-scope="scope">
-            <i class="el-icon-time"></i>
-            <span>{{ scope.row.createTime }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column
+          label="UDI码"
+          prop="code"
+          width="180"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="产品名称"
+          prop="productName"
+          width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="批次号"
+          prop="batchNo" width="120"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="扫码数量"
+          prop="reCount"
+        ></el-table-column>
+        <el-table-column
+          label="实际数量"
+          prop="reCount"
+        ></el-table-column>
+        <el-table-column
+          label="生产日期"
+          prop="produceDate"
+          width="120"
+        ></el-table-column>
+        <el-table-column
+          label="失效日期"
+          prop="expireDate"
+          width="120"
+        ></el-table-column>
+        <el-table-column
+          label="序列号"
+          prop="serialNo"
+          width="120"
+        ></el-table-column>
       </el-table>
       <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="getList"
-      ></pagination>
+        v-show="codeTotal>0"
+        :total="codeTotal"
+        :page.sync="codeQuery.page"
+        :limit.sync="codeQuery.limit"
+        @pagination="getCodeDetailList"
+      />
     </el-card>
-
-    <el-tabs type="border-card" style="margin: 15px">
-      <!--单据扫码明细-->
-      <el-tab-pane>
-        <span slot="label">预验收库存详情</span>
-        <el-form :model="codeQuery" class="query-form" size="mini" label-width="100px">
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item class="query-form-item" label="UDI码:">
-                <el-input
-                  v-model="codeQuery.code"
-                  placeholder="请输入UDI码"
-                  clearable
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item>
-                <el-button-group>
-                  <el-button
-                    type="primary"
-                    icon="el-icon-refresh"
-                    @click="onCodeReset"
-                  >重置
-                  </el-button>
-                  <el-button type="primary" @click="onCodeSubmit"
-                             icon="el-icon-search"
-                  >查询
-                  </el-button
-                  >
-                </el-button-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-        </el-form>
-
-        <el-table v-loading="codeDetailLoading" :data="codeDetailList" style="width: 100%" border
-                  row-key="id"
-        >
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column
-            label="UDI码"
-            prop="code"
-            width="180"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="产品名称"
-            prop="productName"
-            width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="批次号"
-            prop="batchNo" width="120"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="扫码数量"
-            prop="reCount"
-          ></el-table-column>
-          <el-table-column
-            label="实际数量"
-            prop="reCount"
-          ></el-table-column>
-          <el-table-column
-            label="生产日期"
-            prop="produceDate"
-            width="120"
-          ></el-table-column>
-          <el-table-column
-            label="失效日期"
-            prop="expireDate"
-            width="120"
-          ></el-table-column>
-          <el-table-column
-            label="序列号"
-            prop="serialNo"
-            width="120"
-          ></el-table-column>
-        </el-table>
-        <pagination
-          v-show="codeTotal>0"
-          :total="codeTotal"
-          :page.sync="codeQuery.page"
-          :limit.sync="codeQuery.limit"
-          @pagination="getCodeDetailList"
-        />
-      </el-tab-pane>
-    </el-tabs>
-
   </div>
 </template>
 
@@ -201,7 +223,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
@@ -387,6 +409,13 @@ export default {
       };
       this.getCodeDetailList();
     },
+
+    keyup_submit(event) {
+      this.filterQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+
     onCodeSubmit() {
       this.codeQuery.page = 1;
       this.getCodeDetailList();
diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
index 980b050..bb8247f 100644
--- a/src/views/inventory/InvSupPreProducts.vue
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -2,10 +2,21 @@
   <div>
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="18">
+            <el-form-item class="query-form-item" label="扫码查询:">
+              <el-input v-model="filterQuery.udiCode"
+                        style="width: 97%"
+                        placeholder="请扫描或输入UDI码"
+                        clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="DI标识:">
-              <el-input v-model="filterQuery.nameCode" placeholder="DI标识"
+            <el-form-item class="query-form-item" label="DI/物资编码:">
+              <el-input v-model="filterQuery.nameCode" placeholder="DI/物资编码"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
@@ -18,51 +29,50 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="批次号:">
-              <el-input v-model="filterQuery.batchNo" placeholder="批次号"
+            <el-form-item class="query-form-item" label="规格型号:">
+              <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="所属仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
-                         style="width: 90%"
-              >
-                <el-option
-                  v-for="item in invList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
+            <el-form-item class="query-form-item" label="批次号:">
+              <el-input v-model="filterQuery.batchNo" placeholder="批次号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="规格型号:">
-              <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
+            <el-form-item class="query-form-item" label="注册/备案号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="批准文号:">
-              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
+            <el-form-item class="query-form-item" label="生产企业:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="生产企业:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
-                        style="width: 90%"
-                        clearable="true"></el-input>
+            <el-form-item class="query-form-item" label="所属仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -84,8 +94,8 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="DI标识" prop="nameCode" width="150"></el-table-column>
-        <el-table-column label="物资名称" prop="cpmctymc" width="180"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
@@ -97,11 +107,15 @@
                          show-overflow-tooltip width="120"></el-table-column>
         <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" width="120"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+
+
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip
                          width="120"></el-table-column>
-        <el-table-column label="操作" width="150">
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作" width="80" fixed="right">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -224,6 +238,12 @@ export default {
       this.filterQuery.page = val;
       this.getList();
     },
+    keyup_submit(event) {
+      this.filterQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+
     getList() {
       this.loading = true;
       this.filterQuery.supId = this.$store.getters.customerId;
diff --git a/src/views/inventory/InvSupProuducts.vue b/src/views/inventory/InvSupProuducts.vue
index 7657897..43a6670 100644
--- a/src/views/inventory/InvSupProuducts.vue
+++ b/src/views/inventory/InvSupProuducts.vue
@@ -2,10 +2,21 @@
   <div>
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="18">
+            <el-form-item class="query-form-item" label="扫码查询:">
+              <el-input v-model="filterQuery.udiCode"
+                        style="width: 97%"
+                        placeholder="请扫描或输入UDI码"
+                        clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="DI标识:">
-              <el-input v-model="filterQuery.nameCode" placeholder="DI标识"
+            <el-form-item class="query-form-item" label="DI/物资编码:">
+              <el-input v-model="filterQuery.nameCode" placeholder="DI/物资编码"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
@@ -18,51 +29,50 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="批次号:">
-              <el-input v-model="filterQuery.batchNo" placeholder="批次号"
+            <el-form-item class="query-form-item" label="规格型号:">
+              <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="所属仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
-                         style="width: 90%"
-              >
-                <el-option
-                  v-for="item in invList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
+            <el-form-item class="query-form-item" label="批次号:">
+              <el-input v-model="filterQuery.batchNo" placeholder="批次号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="规格型号:">
-              <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
+            <el-form-item class="query-form-item" label="注册/备案号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="批准文号:">
-              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
+            <el-form-item class="query-form-item" label="生产企业:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="生产企业:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
-                        style="width: 90%"
-                        clearable="true"></el-input>
+            <el-form-item class="query-form-item" label="所属仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -74,7 +84,7 @@
             @click="onReset"
           >重置
           </el-button>
-          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          <el-button type="primary"  icon="el-icon-search" @click="onSubmit"
           >查询
           </el-button
           >
@@ -84,8 +94,8 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="DI标识" prop="nameCode" width="150"></el-table-column>
-        <el-table-column label="物资名称" prop="cpmctymc" width="180"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
@@ -97,11 +107,13 @@
                          show-overflow-tooltip width="120"></el-table-column>
         <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" width="120"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip
                          width="120"></el-table-column>
-        <el-table-column label="操作" width="150">
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作" width="80" fixed="right">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -162,6 +174,7 @@ export default {
         invCode: this.$store.getters.locInvCode,
         page: 1,
         limit: 10,
+        udiCode: null,
       },
       list: [],
       total: 0,
@@ -208,6 +221,14 @@ export default {
       };
       this.getList();
     },
+
+    keyup_submit(event) {
+      this.filterQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+
+
     onSubmit() {
       this.filterQuery.page = 1;
       this.getList();
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index cf4ed5d..fe5c82c 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -3,35 +3,53 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="单号:">
-              <el-input v-model="filterQuery.orderIdFk" placeholder="请输入单号" style="width: 90%" clearable="true"></el-input>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库单号:">
+              <el-input v-model="filterQuery.orderIdFk" placeholder="请输入出入库单号" style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="往来单位:">
-              <el-input v-model="filterQuery.fromCorpName" placeholder="请输入往来单位" style="width: 90%" clearable="true"></el-input>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="DI/物资编码:">
+              <el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码" style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="物资名称:">
-              <el-input v-model="filterQuery.coName" placeholder="请输入物资名称" style="width: 90%" clearable="true"></el-input>
+              <el-input v-model="filterQuery.coName" placeholder="请输入物资名称" style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="规格型号:">
               <el-input v-model="filterQuery.spec" placeholder="请输入规格型号" style="width: 90%" clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+        </el-row>
+        <el-row>
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="批次号:">
-              <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" style="width: 90%" clearable="true"></el-input>
+              <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="注册/备案号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="生产企业:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
+                        style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="创建时间:">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -66,14 +84,19 @@
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据号" prop="orderIdFk"></el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
-        <el-table-column label="往来单位" prop="fromCorpName"show-overflow-tooltip></el-table-column>
-        <el-table-column label="物资名称，" prop="coName"show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="spec"></el-table-column>
-        <el-table-column label="批次号" prop="batchNo"></el-table-column>
-<!--        <el-table-column label="入库数量" prop="count"></el-table-column>-->
-        <el-table-column label="数量" prop="reCount" show-overflow-tooltip ></el-table-column>
+        <el-table-column label="出入库单号" prop="orderIdFk" width="160"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode" width="160"></el-table-column>
+        <el-table-column label="物资名称" prop="coName" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="spec" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+        <el-table-column label="入库数量" prop="count" width="100"></el-table-column>
+        <el-table-column label="出库数量" prop="reCount" width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column label="计量单位" prop="measname" width="120"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="120"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufacturer" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="certCode" width="160" show-overflow-tooltip></el-table-column>
       </el-table>
 
       <pagination
@@ -88,14 +111,14 @@
 </template>
 
 <script>
-import { getResultDetailList, getResultOrderList } from '@/api/inout/orderDetailResult'
+import {getResultDetailList, getResultOrderList} from '@/api/inout/orderDetailResult'
 
 export default {
   name: "supInoutSearchOrder",
   data() {
     return {
       showSearch: true,
-      list:{},
+      list: {},
       filterQuery: {
         id: "",
         orderIdFk: null,
@@ -105,13 +128,15 @@ export default {
         batchNo: null,
         page: 1,
         limit: 10,
-        startTime: null,
-        endTime: null,
+        startAduditTime: null,
+        endAduditTime: null,
+        vueType: null,
       },
-      loading:false,
-      total:0,
+      loading: false,
+      total: 0,
       customerId: this.$store.getters.customerId,
       actDateRange: [],
+      vueType: "normal",
       auditDateRange: [],
       pickerOptions: {
         shortcuts: [
@@ -161,19 +186,21 @@ export default {
         batchNo: null,
         page: 1,
         limit: 10,
-        startTime: null,
-        endTime: null,
+        startAduditTime: null,
+        endAduditTime: null,
       };
       this.getList();
     },
+
+
     onSubmit() {
       this.loading = true;
       if (this.actDateRange !== null) {
-        this.filterQuery.startTime = this.actDateRange[0];
-        this.filterQuery.endTime = this.actDateRange[1];
+        this.filterQuery.startAduditTime = this.actDateRange[0];
+        this.filterQuery.endAduditTime = this.actDateRange[1];
       } else {
-        this.filterQuery.startTime = null;
-        this.filterQuery.endTime = null;
+        this.filterQuery.startAduditTime = null;
+        this.filterQuery.endAduditTime = null;
       }
       this.filterQuery.page = 1;
       this.getList();
@@ -181,8 +208,9 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    getList(){
+    getList() {
       this.loading = true;
+      this.filterQuery.vueType = this.vueType;
       getResultOrderList(this.filterQuery)
         .then((response) => {
           if (response.code === 20000) {
@@ -209,6 +237,7 @@ export default {
   }
   ,
   created() {
+    this.vueType = this.$route.query.name;
     this.getList();
   }
   ,
diff --git a/src/views/inventory/trace/invUdiTraceOrder.vue b/src/views/inventory/trace/invUdiTraceOrder.vue
index 2b2cc42..c6e9899 100644
--- a/src/views/inventory/trace/invUdiTraceOrder.vue
+++ b/src/views/inventory/trace/invUdiTraceOrder.vue
@@ -265,7 +265,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单",
diff --git a/src/views/inventory/trace/sickerUdiTraceOrder.vue b/src/views/inventory/trace/sickerUdiTraceOrder.vue
index fd5ea8b..252f5c7 100644
--- a/src/views/inventory/trace/sickerUdiTraceOrder.vue
+++ b/src/views/inventory/trace/sickerUdiTraceOrder.vue
@@ -190,7 +190,7 @@ export default {
         "3": "pda即时校验",
         "4": "pda未校验",
         "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
+        "6": "流转自动补单",
         "7": "UDI供应商平台",
         "8": "平衡补录单据",
         "10": "手动补单"
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index bc9d9e9..a7abf83 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -92,7 +92,7 @@
                         </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="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="操作"  width="120">
diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue
index a648231..cdcbf0d 100644
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@@ -81,7 +81,7 @@
                 <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="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>
diff --git a/src/views/purchase/purArrival/purArrivalDetailDialog.vue b/src/views/purchase/purArrival/purArrivalDetailDialog.vue
index 5afcc25..26621fd 100644
--- a/src/views/purchase/purArrival/purArrivalDetailDialog.vue
+++ b/src/views/purchase/purArrival/purArrivalDetailDialog.vue
@@ -33,8 +33,8 @@
 
         <el-row>
           <el-col :span="11">
-            <el-form-item label="采购仓库:" prop="locStorageCode">
-              <el-select v-model="formData.invName" placeholder="采购仓库信息" style="width: 90%"
+            <el-form-item label="收货仓库:" prop="locStorageCode">
+              <el-select v-model="formData.invName" placeholder="收货仓库信息" style="width: 90%"
                          :disabled="true" clearable>
                 <el-option
                   v-for="item in subInvList"
diff --git a/src/views/purchase/purArrival/purArrivalEditDialog.vue b/src/views/purchase/purArrival/purArrivalEditDialog.vue
index 4cecac8..93873b1 100644
--- a/src/views/purchase/purArrival/purArrivalEditDialog.vue
+++ b/src/views/purchase/purArrival/purArrivalEditDialog.vue
@@ -313,7 +313,7 @@ export default {
               return this.$message.error("单据日期不能为空！");
             }
             if (this.formData.invCode == "" || this.formData.invCode == null) {
-              return this.$message.error("采购仓库不能为空！");
+              return this.$message.error("收货仓库不能为空！");
             }
             for (let i = 0; i < this.codeArray.length; i++) {
               if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
diff --git a/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue b/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue
index b80aa36..d60fe85 100644
--- a/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue
@@ -91,7 +91,7 @@
         <el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate"></el-table-column>
         <el-table-column width="150" label="送货数量" prop="count"></el-table-column>
         <el-table-column width="150" label="验收数量" prop="acceptCount"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
       </el-table>
diff --git a/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue b/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue
index 915b584..a67b950 100644
--- a/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue
@@ -33,8 +33,8 @@
 
         <el-row>
           <el-col :span="11">
-            <el-form-item label="采购仓库:"  prop="locStorageCode">
-              <el-select v-model="formData.invName" placeholder="采购仓库信息"  style="width: 90%"
+            <el-form-item label="收货仓库:"  prop="locStorageCode">
+              <el-select v-model="formData.invName" placeholder="收货仓库信息"  style="width: 90%"
                          :disabled="true" clearable>
                 <el-option
                   v-for="item in subInvList"
diff --git a/src/views/purchase/purDelivery/purDeliverySearch.vue b/src/views/purchase/purDelivery/purDeliverySearch.vue
index 1b8d606..07e0074 100644
--- a/src/views/purchase/purDelivery/purDeliverySearch.vue
+++ b/src/views/purchase/purDelivery/purDeliverySearch.vue
@@ -46,7 +46,7 @@
           </template>
         </el-table-column>
         <el-table-column label="供应商" prop="createUser"></el-table-column>
-        <el-table-column label="送货部门" prop="deptName"></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="remark"></el-table-column>
         <el-table-column label="状态" prop="status">
diff --git a/src/views/purchase/purOrder/DialogSelectOrderList.vue b/src/views/purchase/purOrder/DialogSelectOrderList.vue
index 4d09714..bf992f4 100644
--- a/src/views/purchase/purOrder/DialogSelectOrderList.vue
+++ b/src/views/purchase/purOrder/DialogSelectOrderList.vue
@@ -48,7 +48,7 @@
         <el-table-column label="创建人" prop="createUserName"></el-table-column>
         <el-table-column label="审核人" prop="auditUserName"></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="invName"></el-table-column>
         <el-table-column label="采购说明" prop="remark"></el-table-column>
       </el-table>
 
diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index a3f5a7b..8d066eb 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -49,7 +49,7 @@
         </el-table-column>
         <el-table-column label="采购员" prop="createUser"></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="invName"></el-table-column>
         <el-table-column label="采购说明" prop="remark"></el-table-column>
         <el-table-column label="状态" prop="status">
           <template slot-scope="scope">
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index 0fab9a9..c8ed018 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -47,7 +47,7 @@
                 <el-table-column label="创建人" prop="createUserName"></el-table-column>
                 <el-table-column label="审核人" prop="auditUserName"></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="invName"></el-table-column>
                 <el-table-column label="采购说明" prop="remark"></el-table-column>
                 <el-table-column label="状态" prop="status">
                     <template slot-scope="scope">
diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index 518121c..fa93b7b 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -33,8 +33,8 @@
 
                 <el-row>
                     <el-col :span="11">
-                        <el-form-item label="采购仓库:"  prop="locStorageCode">
-                            <el-select v-model="formData.invName" placeholder="采购仓库信息"  style="width: 90%"
+                        <el-form-item label="收货仓库:"  prop="locStorageCode">
+                            <el-select v-model="formData.invName" placeholder="收货仓库信息"  style="width: 90%"
                                        :disabled="true" clearable>
                                 <el-option
                                     v-for="item in subInvList"
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 2bd478e..49ed890 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -32,8 +32,8 @@
 
                 <el-row >
                     <el-col :span="11">
-                        <el-form-item label="采购仓库:" prop="invCode">
-                            <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="采购仓库信息" style="width: 100%"
+                        <el-form-item label="收货仓库:" prop="invCode">
+                            <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="收货仓库信息" style="width: 100%"
                                        clearable>
                                 <el-option
                                     v-for="item in invCodeList"
@@ -249,7 +249,7 @@ export default {
                         //     return this.$message.error("采购类型不能为空！");
                         // }
                         if (this.formData.invCode == "" || this.formData.invCode == null) {
-                            return this.$message.error("采购仓库不能为空！");
+                            return this.$message.error("收货仓库不能为空！");
                         }
 
                         for (let i = 0; i < this.codeArray.length; i++) {
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 3e8d865..8221e28 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -4,14 +4,14 @@
       <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-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">
             <el-form-item label="采购部门">
-              <el-select v-model="filterQuery.invCode" style="width: 90%"  placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择所属仓库">
                 <el-option
                   v-for="item in invList"
                   :key="item.name"
@@ -25,8 +25,8 @@
 
 
           <el-col :span="8">
-            <el-form-item label="采购仓库">
-              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" style="width: 90%">
+            <el-form-item label="收货仓库">
+              <el-select v-model="filterQuery.deptCode" placeholder="请选择收货仓库" style="width: 90%">
                 <el-option
                   v-for="item in deptList"
                   :key="item.code"
@@ -90,19 +90,19 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
                 @current-change="handleDetail">
-        <el-table-column label="序号" type="index" ></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="invName" ></el-table-column>
-        <el-table-column label="采购仓库" prop="deptName" ></el-table-column>
-        <el-table-column label="紧急程度" prop="emergency" >
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="采购订单号" prop="billNo" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="采购部门" prop="invName" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="收货仓库" prop="deptName" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="紧急程度" prop="emergency" width="120">
           <template slot-scope="scope">
-              {{ emergencyMap[scope.row.emergency] }}
+            {{ 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" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="采购说明" prop="remark" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="审核时间" prop="auditTime" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作">
           <!--          <template slot-scope="scope">-->
           <!--            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"-->
@@ -124,15 +124,15 @@
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row="true">
         <el-table-column label="序号" type="index" width="50"></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="planCount" ></el-table-column>
-        <el-table-column label="计量单位" prop="spec" 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="manufactory" show-overflow-tooltip="true" ></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="planCount"></el-table-column>
+        <el-table-column label="计量单位" prop="spec" 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="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true" width="160"></el-table-column>
-        <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true" ></el-table-column>
+        <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
     </el-card>
 
@@ -176,11 +176,11 @@ export default {
         type: 1,
         editStatus: 1,
       },
-      Menustatus:null,
-      filePath:"",
-      createTimes:null,
-      auditTimes:null,
-      showSearch:true,
+      Menustatus: null,
+      filePath: "",
+      createTimes: null,
+      auditTimes: null,
+      showSearch: true,
       formName: null,
       formMap: {
         add: "新增采购订单",
@@ -192,13 +192,13 @@ export default {
         3: "已审核",
         4: "已拒绝"
       },
-      emergencyMap:{
+      emergencyMap: {
         1: "普通",
         2: "紧急",
         3: "不紧急",
       },
-      invList:{},
-      deptList:{},
+      invList: {},
+      deptList: {},
       idQuery: {},
       editType: 1,
       total: 0,
@@ -306,7 +306,7 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    help(){
+    help() {
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
       window.open(this.certFileUrl + this.filePath);
     },
@@ -386,12 +386,12 @@ export default {
       this.filterQuery.page = val.page;
       this.getList();
     },
-    selectAuthMenu(){
-      let params={menuName:this.$route.meta.title}
-      selectAuthMenu(params).then((res) =>{
-        if(res.code === 20000){
-          this.Menustatus=res.data.status;
-          this.filePath=res.data.filePath;
+    selectAuthMenu() {
+      let params = {menuName: this.$route.meta.title}
+      selectAuthMenu(params).then((res) => {
+        if (res.code === 20000) {
+          this.Menustatus = res.data.status;
+          this.filePath = res.data.filePath;
         }
       })
     },
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index 11a2cc8..8ce5956 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.vue
@@ -47,7 +47,7 @@
                 </el-table-column>
                 <el-table-column label="采购员" prop="createUser"></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="invName"></el-table-column>
                 <el-table-column label="采购说明" prop="remark"></el-table-column>
                 <el-table-column label="状态" prop="status">
                     <template slot-scope="scope">
@@ -83,7 +83,7 @@
                 <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="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>
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index 6c806ea..dc71b37 100644
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.vue
@@ -47,7 +47,7 @@
                 <el-table-column label="创建人" prop="createUserName"></el-table-column>
                 <el-table-column label="审核人" prop="auditUserName"></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="invName"></el-table-column>
                 <el-table-column label="采购说明" prop="remark"></el-table-column>
                 <el-table-column label="状态" prop="status">
                     <template slot-scope="scope">
@@ -84,7 +84,7 @@
                 <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="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>
diff --git a/src/views/purchase/purPlan/purPlanDetailDialog.vue b/src/views/purchase/purPlan/purPlanDetailDialog.vue
index 8d1bc8b..eec326f 100644
--- a/src/views/purchase/purPlan/purPlanDetailDialog.vue
+++ b/src/views/purchase/purPlan/purPlanDetailDialog.vue
@@ -33,8 +33,8 @@
 
                 <el-row>
                     <el-col :span="11">
-                        <el-form-item label="采购仓库:"  prop="locStorageCode">
-                            <el-select v-model="formData.invName" placeholder="采购仓库信息"  style="width: 90%"
+                        <el-form-item label="收货仓库:"  prop="locStorageCode">
+                            <el-select v-model="formData.invName" placeholder="收货仓库信息"  style="width: 90%"
                                        :disabled="true" clearable>
                                 <el-option
                                     v-for="item in subInvList"
diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue
index cd8d109..b4c4a74 100644
--- a/src/views/purchase/purPlan/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlan/purPlanEditDialog.vue
@@ -32,8 +32,8 @@
 
                 <el-row >
                     <el-col :span="11">
-                        <el-form-item label="采购仓库:" prop="invCode">
-                            <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="采购仓库信息" style="width: 100%"
+                        <el-form-item label="收货仓库:" prop="invCode">
+                            <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="收货仓库信息" style="width: 100%"
                                        clearable>
                                 <el-option
                                     v-for="item in invCodeList"
@@ -248,7 +248,7 @@ export default {
                         //     return this.$message.error("采购类型不能为空！");
                         // }
                         if (this.formData.invCode == "" || this.formData.invCode == null) {
-                            return this.$message.error("采购仓库不能为空！");
+                            return this.$message.error("收货仓库不能为空！");
                         }
 
                         for (let i = 0; i < this.codeArray.length; i++) {
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
index 0a12a1f..23605a2 100644
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -43,7 +43,7 @@
                 </el-table-column>
                 <el-table-column label="创建人" prop="createUserName"></el-table-column>
                 <el-table-column label="审核人" prop="auditUserName"></el-table-column>
-                <el-table-column label="采购仓库" prop="invName"></el-table-column>
+                <el-table-column label="收货仓库" prop="invName"></el-table-column>
                 <!--<el-table-column label="采购分库" prop="subInvName"></el-table-column>-->
                 <el-table-column label="采购说明" prop="remark"></el-table-column>
                 <el-table-column label="状态" prop="status">
@@ -82,7 +82,7 @@
                 <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="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>
diff --git a/src/views/purchase/purPlan/selectPlanListDialog.vue b/src/views/purchase/purPlan/selectPlanListDialog.vue
index 7d76d8a..9771cb1 100644
--- a/src/views/purchase/purPlan/selectPlanListDialog.vue
+++ b/src/views/purchase/purPlan/selectPlanListDialog.vue
@@ -68,7 +68,7 @@
         <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="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>
diff --git a/src/views/purchase/purReturned/purReturnedDetailDialog.vue b/src/views/purchase/purReturned/purReturnedDetailDialog.vue
index fb856df..1102f29 100644
--- a/src/views/purchase/purReturned/purReturnedDetailDialog.vue
+++ b/src/views/purchase/purReturned/purReturnedDetailDialog.vue
@@ -33,8 +33,8 @@
 
         <el-row>
           <el-col :span="11">
-            <el-form-item label="采购仓库:"  prop="locStorageCode">
-              <el-select v-model="formData.invName" placeholder="采购仓库信息"  style="width: 90%"
+            <el-form-item label="收货仓库:"  prop="locStorageCode">
+              <el-select v-model="formData.invName" placeholder="收货仓库信息"  style="width: 90%"
                          :disabled="true" clearable>
                 <el-option
                   v-for="item in subInvList"
diff --git a/src/views/purchase/purReturned/purReturnedEditDialog.vue b/src/views/purchase/purReturned/purReturnedEditDialog.vue
index d32591c..ccc461e 100644
--- a/src/views/purchase/purReturned/purReturnedEditDialog.vue
+++ b/src/views/purchase/purReturned/purReturnedEditDialog.vue
@@ -261,7 +261,7 @@ export default {
               return this.$message.error("单据日期不能为空！");
             }
             if (this.formData.invCode == "" || this.formData.invCode == null) {
-              return this.$message.error("采购仓库不能为空！");
+              return this.$message.error("收货仓库不能为空！");
             }
             for (let i = 0; i < this.codeArray.length; i++) {
               if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
diff --git a/src/views/remind/invRemindMsg.vue b/src/views/remind/invRemindMsg.vue
index befd6f2..c678751 100644
--- a/src/views/remind/invRemindMsg.vue
+++ b/src/views/remind/invRemindMsg.vue
@@ -167,7 +167,7 @@
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
         <el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
-        <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index 555b5ba..6638ac0 100644
--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@@ -124,21 +124,18 @@
           <H3 style="margin-left: 10px;margin-bottom: 15px">产品信息补齐：</H3>
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
-          <el-col :span="7" class="el-col">
-            <div class="text item">
-              <span>产品编码预上传至第三方系统:&nbsp;</span>
-            </div>
-          </el-col>
-          <el-col :span="8" class="el-col">
-            <el-checkbox-group v-model="editQuery.selectThirdSys">
-              <el-checkbox
-                v-for="item in thirdSys"
-                :key="item.thirdId"
-                :label="item.thirdId"
-              >{{ item.thirdName }}
-              </el-checkbox
-              >
-            </el-checkbox-group>
+          <el-col :span="18" class="el-col">
+            <el-form-item label="产品编码预上传至第三方系统:" label-width="220px">
+              <el-checkbox-group v-model="editQuery.selectThirdSys">
+                <el-checkbox
+                  v-for="item in thirdSys"
+                  :key="item.thirdId"
+                  :label="item.thirdId"
+                >{{ item.thirdName }}
+                </el-checkbox
+                >
+              </el-checkbox-group>
+            </el-form-item>
           </el-col>
 
         </el-row>
@@ -478,6 +475,12 @@ export default {
       this.currentRow = val
       this.curSelectDi = val
       this.multipleUdiSelection.push(val)
+      this.editQuery.sptm = this.currentRow.sptm;
+      this.editQuery.ybbm = this.currentRow.ybbm;
+      this.editQuery.measname = this.currentRow.measname;
+      this.editQuery.manufactory = this.currentRow.ylqxzcrbarmc;
+      this.editQuery.spmc = this.currentRow.cpmctymc;
+      this.editQuery.cpms = this.currentRow.cpms;
     },
     intentBack() {
       this.closeDialog()