diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 24280f0f..9ac57337 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -552,10 +552,10 @@
                 <el-select v-model="inputQuery.checkWebNew" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
 
                 </el-select>
               </el-col>
@@ -575,10 +575,10 @@
                 <el-select v-model="inputQuery.checkPdaUn" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
 
                 </el-select>
               </el-col>
@@ -598,10 +598,10 @@
                 <el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
 
                 </el-select>
               </el-col>
@@ -621,10 +621,10 @@
                 <el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
 
                 </el-select>
               </el-col>
@@ -644,10 +644,10 @@
                 <el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
 
                 </el-select>
               </el-col>
@@ -667,10 +667,10 @@
                 <el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
 
                 </el-select>
               </el-col>
@@ -689,10 +689,10 @@
                 <el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
 
                 </el-select>
               </el-col>
@@ -712,10 +712,10 @@
                 <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
 
                 </el-select>
               </el-col>
@@ -734,11 +734,10 @@
                 <el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
-                  <el-option label="有业务单有三期拣货" :value="1"></el-option>
-                  <el-option label="有业务单无三期拣货" :value="2"></el-option>
-                  <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
-
+                  <el-option label="扫码直接生成业务单" :value="0"></el-option>
+                  <el-option label="有三期业务单配/拣货" :value="1"></el-option>
+                  <el-option label="无三期业务单配/拣货" :value="2"></el-option>
+                  <el-option label="有三期业务单校验" :value="3"></el-option>
                 </el-select>
               </el-col>
               <el-divider direction="vertical"></el-divider>
@@ -747,7 +746,6 @@
               </el-col>
             </el-row>
             <el-divider></el-divider>
-
           </div>
         </el-collapse-item>
         <el-collapse-item title="是否人工核对单据设置(一次审核)">
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index e4c53f00..05dad06a 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -386,6 +386,14 @@
       </el-form>
     </el-card>
     <el-tabs type="border-card" style="margin: 5px">
+      <el-tab-pane label="校验详情" v-if="viewCheckVisible || viewType == 7">
+        <biz-detail-panel
+          :idQuery="orderFormData"
+          :viewType="viewType"
+          :curBustype="curAction"
+          v-if="isCheckResultAlive"
+        ></biz-detail-panel>
+      </el-tab-pane>
       <el-tab-pane label="业务详情" v-if="bizShow && viewBizVisible || (viewType ==5 || viewType==6)">
         <biz-detail-panel
           :idQuery="orderFormData"
@@ -524,6 +532,7 @@ import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain";
 import editCodeDialog from "./DialogEditCode";
 import DialogCreateOrderSelect from "./DialogCreateOrderSelect";
 
+import checkResultPanel from "./PanelCreateOrderCheckDetail";
 import codesPanel from "./PanelCreateOrderCodes";
 import codeDetailPanel from "./PanelCreateOrderCodeDetail";
 import bizDetailPanel from "./PanelCreateOrderBizDetail";
@@ -551,7 +560,7 @@ export default {
       required: true,
     },
     viewType: {
-      //1、新增业务单据页面，2.新增扫码单据页面，3、正常单据处理页面,4.带配货页面,5:有三期验收,6:无三期验收
+      //1、新增业务单据页面，2.新增扫码单据页面，3、正常单据处理页面,4.待配货页面,5:有三期验收,6:无三期验收；7.待校验页面
       type: Object,
       required: true,
     },
@@ -609,6 +618,7 @@ export default {
       fromOptions: [],
       isCodeAlive: true,
       bizShow: true,
+      isCheckResultAlive: false,
       isBizDetailAlive: true,
       isCodeDetailAlive: true,
       editCodeVisible: false,
@@ -659,7 +669,7 @@ export default {
       editTitle: "编辑条码",
       fromDeptOptions: [],
       enableDept: false,
-
+      viewCheckVisible: false,
       viewBizVisible: false,
       viewCodeVisible: false,
       viewCodeDetailVisible: false,
@@ -673,6 +683,7 @@ export default {
   },
   components: {
     codesPanel,
+    checkResultPanel,
     codeDetailPanel,
     bizDetailPanel,
     editCodeDialog,
@@ -1435,6 +1446,10 @@ export default {
       this.viewCodeDetailVisible = true;
     } else if (this.viewType == 1) {
       this.viewBizVisible = true;
+    } else if (this.viewType == 7) {
+      this.viewCheckVisible = true;
+      this.viewCodeVisible = true;
+      this.viewCodeDetailVisible = true;
     } else {
       this.viewCodeVisible = true;
       this.viewCodeDetailVisible = true;
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 155705c5..c6689fd4 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -166,14 +166,14 @@
             >删除
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.status == 1"
-              @click.native.stop="onUpload(scope.row.billNo)"
-            >提交校验
-            </el-button
-            >
+<!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              v-if="scope.row.status == 1"-->
+            <!--              @click.native.stop="onUpload(scope.row.billNo)"-->
+            <!--            >提交校验-->
+            <!--            </el-button-->
+            <!--            >-->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue
index da88a6ba..2697302a 100644
--- a/src/views/inout/IoCreateErrorOrder.vue
+++ b/src/views/inout/IoCreateErrorOrder.vue
@@ -151,14 +151,14 @@
             >删除
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.status == 1"
-              @click.native.stop="onUpload(scope.row.billNo)"
-            >校验提交
-            </el-button
-            >
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              v-if="scope.row.status == 1"-->
+<!--              @click.native.stop="onUpload(scope.row.billNo)"-->
+<!--            >校验提交-->
+<!--            </el-button-->
+<!--            >-->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 32bccd1c..f24a02b1 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -186,14 +186,14 @@
             >删除
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.status == 1"
-              @click.native.stop="onUpload(scope.row.billNo)"
-            >校验提交
-            </el-button
-            >
+<!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              v-if="scope.row.status == 1"-->
+            <!--              @click.native.stop="onUpload(scope.row.billNo)"-->
+            <!--            >校验提交-->
+            <!--            </el-button-->
+            <!--            >-->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index daaf65f9..b5a2cefb 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -104,11 +104,12 @@
           </el-button
           >
           <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
+          <el-button type="danger" icon="el-icon-error" @click="errOrderDialog">异常扫码单</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  :default-sort="defaultSort"
+                border :default-sort="defaultSort"
                 @sort-change="handleSortChange"
       >
         <el-table-column label="序号" type="index"></el-table-column>
@@ -155,14 +156,14 @@
             >删除
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.status == 1"
-              @click.native.stop="onUpload(scope.row.billNo)"
-            >提交校验
-            </el-button
-            >
+<!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              v-if="scope.row.status == 1"-->
+            <!--              @click.native.stop="onUpload(scope.row.billNo)"-->
+            <!--            >提交校验-->
+            <!--            </el-button-->
+            <!--            >-->
           </template>
         </el-table-column>
       </el-table>
@@ -182,6 +183,19 @@
           :viewType="viewType"
         ></addOrder>
       </el-dialog>
+      <el-dialog
+        title="异常扫码单"
+        :visible.sync="errOrderVisible"
+        width="85%"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="errOrderVisible"
+        @close='closeDialog'
+      >
+        <err-order
+        ></err-order>
+      </el-dialog>
       <pagination
         v-show="total>0"
         :total="total"
@@ -199,6 +213,7 @@ import {
   getOrderList, submitCodes
 } from "../../api/inout/order";
 import addOrder from "./DialogCreateOrder";
+import errOrder from "./IoCreateErrorOrder";
 import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
@@ -244,6 +259,7 @@ export default {
       invList: [],
       list: [],
       addOrderVisible: false,
+      errOrderVisible: false,
       total: 0,
       loading: false,
       index: null,
@@ -314,7 +330,7 @@ export default {
   },
 
   components: {
-    addOrder,
+    addOrder, errOrder
   },
   methods: {
     onReset() {
@@ -487,6 +503,10 @@ export default {
       return statusMap[status];
     },
 
+    errOrderDialog() {
+      this.errOrderVisible = true;
+    },
+
   },
   mounted() {
     document.body.ondrop = function (event) {
diff --git a/src/views/inout/IoDealCheckOrder.vue b/src/views/inout/IoDealCheckOrder.vue
new file mode 100644
index 00000000..edc56719
--- /dev/null
+++ b/src/views/inout/IoDealCheckOrder.vue
@@ -0,0 +1,705 @@
+<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.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.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="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-row>
+        <el-row>
+          <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-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
+                @row-click="handleSelectionChange"
+                border
+                :default-sort="defaultSort"
+                @sort-change="handleSortChange"
+      >
+        <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="billTypeName" width="150">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
+                         sortable="custom"
+                         :sort-orders="['ascending', 'descending']">
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.createTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="往来单位" prop="fromName" width="220" show-overflow-tooltip>
+        </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="140">
+          <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="操作" width="150" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="addOrders(scope.row)"
+            >编辑
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteDialog(scope.row.billNo)"
+            >删除
+            </el-button
+            >
+            <!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              @click.native.stop="onUpload(scope.row.billNo)"-->
+            <!--            >校验提交-->
+            <!--            </el-button-->
+            <!--            >-->
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog
+        title="编辑单据"
+        :visible.sync="addOrderVisible"
+        width="85%"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="addOrderVisible"
+        @close='closeDialog'
+      >
+        <addOrder
+          :closeDialog="closeDialog"
+          :orderQuery="idQuery"
+          :viewType="viewType"
+        ></addOrder>
+      </el-dialog>
+      <el-dialog
+        title="单号详情"
+        :visible.sync="codeDetailVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="80%"
+        v-if="codeDetailVisible"
+      >
+        <codeDetail
+          :idQuery="idQuery"
+          v-on:closeDetailDialog="closeDetailDialog"
+        ></codeDetail>
+      </el-dialog>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
+    </el-card>
+
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
+        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+                  :row-style="rowStyle"
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="物资名称" width="150"
+            prop="coName"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="规格型号" width="150"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column label="批次号" header-align="center">
+            <el-table-column header-align="center"
+                             label="手录" width="100"
+                             prop="bbatchNo"
+                             show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column header-align="center"
+                             label="扫码"
+                             prop="sbatchNo" width="100"
+                             show-overflow-tooltip
+            ></el-table-column>
+          </el-table-column>
+
+          <el-table-column label="生产日期" header-align="center">
+            <el-table-column header-align="center"
+                             label="手录" width="100"
+                             prop="bproductDate"
+                             show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column header-align="center"
+                             label="扫码" width="100"
+                             prop="sproductDate"
+                             show-overflow-tooltip
+            ></el-table-column>
+          </el-table-column>
+
+          <el-table-column label="失效日期" header-align="center">
+            <el-table-column header-align="center"
+                             label="手录" width="100"
+                             prop="bexpireDate"
+                             show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column header-align="center"
+                             label="扫码" width="100"
+                             prop="sexpireDate"
+                             show-overflow-tooltip
+            ></el-table-column>
+          </el-table-column>
+          <el-table-column label="数量" header-align="center">
+            <el-table-column
+              header-align="center"
+              label="单据数量" width="100"
+              prop="count"
+            ></el-table-column>
+            <el-table-column
+              header-align="center"
+              label="扫码数量" width="100"
+              prop="scanCount"
+            ></el-table-column>
+          </el-table-column>
+
+          <el-table-column
+            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"
+            prop="certCode"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  deleteByOrderId,
+  submitOrderWeb,
+  updateUnit, mergeOrder,
+  getOrderList
+} from "../../api/inout/order";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
+import draggable from "vuedraggable";
+import addOrder from "./DialogCreateOrder";
+import store from "../../store";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import {isBlank} from "@/utils/strUtil";
+import {getBizDetailList, getCheckDetailList} from "@/api/inout/orderDetailBiz";
+
+
+export default {
+  name: "IoDealCheckOrder",
+  data() {
+    return {
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      showSearch: true,
+      filterQuery: {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "unCheck",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+      viewType: 7,
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "校验成功",
+        6: "校验异常",
+        7: "审核通过",
+        8: "审核拒绝",
+        9: "正在处理", 10: "待审核", 11: "待配货",
+      },
+      curIndex: "",
+      idQuery: {},
+      storageList: [],
+      invList: [],
+      list: [],
+      codeDetailVisible: false,
+      addOrderVisible: false,
+      total: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      errorDetail: "",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "流转自动补单",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点",
+        "12": "采购计划",
+        "13": "领用单据",
+        "14": "第三方系统单据",
+      },
+      deleteData: {
+        billNo: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      deleteLoading: false,
+      busTypes: [],
+      actDateRange: [],
+      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]);
+            },
+          },
+        ],
+      },
+      currentRow: {
+        billNo: ""
+      },
+      bizQuery: {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      bizTotal: 0,
+      bizDetailLoading: false,
+      bizDetailList: [],
+
+    };
+  },
+  components: {
+    addOrder,
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "unCheck",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      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;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    closeDetailDialog(val) {
+      this.codeDetailVisible = false;
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invCode,
+        enabled: true,
+        vueType: "supDelivery",
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    addOrders(row) {
+      this.currentRow = row;
+      this.idQuery = {};
+      this.idQuery = row;
+      this.addOrderVisible = true;
+    },
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.addHosOrderVisible = false;
+      this.getList();
+    },
+
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.filterQuery.sort = 'desc'
+      } else {
+        this.filterQuery.sort = 'asc'
+      }
+      this.filterQuery.orderBy = column.prop;
+      this.getList();
+    },
+
+
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      getOrderList(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+            if (this.list.length == 0) {
+              this.bizDetailList = [];
+            }
+          } 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;
+      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();
+          } else {
+            this.$message.error(response.message);
+            this.getList();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(rowId);
+          this.currentRow = null;
+          this.bizDetailList = [];
+        })
+        .catch(() => {
+        });
+    },
+    onUpload(data) {
+      this.loading = true;
+      var idQuery = {
+        billNo: "",
+      };
+      idQuery.billNo = data;
+      submitOrderWeb(idQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+            this.getList();
+            this.bizDetailList = [];
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        });
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    invChange() {
+      this.filterQuery.action = null;
+      this.getBusType();
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        1: "warning",
+        4: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
+        rowBackground.color = '#f60303';
+        return rowBackground;
+      }
+      if (!row.checkSuccess) {
+        rowBackground.color = '#f60303';
+      }
+      return rowBackground;
+    },
+
+
+    onBizReset() {
+      this.bizQuery = {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getBizDetailList();
+    },
+    onBizSubmit() {
+      this.bizQuery.page = 1;
+      this.getBizDetailList();
+    },
+
+    handleSelectionChange(val) {
+      this.currentRow = val;
+      this.getBizDetailList();
+    },
+    getBizDetailList() {
+      if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+      this.bizDetailLoading = true;
+      this.bizQuery.orderIdFk = this.currentRow.billNo;
+      getCheckDetailList(this.bizQuery).then((res) => {
+        this.bizDetailLoading = false;
+        if (res.code === 20000) {
+          this.bizDetailList = res.data || [];
+        } else {
+          this.$message.error(res.message);
+          this.bizDetailList = [];
+        }
+      }).catch((error) => {
+        this.bizDetailLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        this.bizTotal = 0;
+      })
+    },
+
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+    this.getBusType();
+    this.getList();
+
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index e9f24dc7..d5fcd26a 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -128,7 +128,7 @@
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="往来单位" prop="fromName" width="220">
+        <el-table-column label="往来单位" prop="fromName" width="220" show-overflow-tooltip>
         </el-table-column>
         <el-table-column label="所属部门" prop="deptName" width="120">
         </el-table-column>
@@ -165,13 +165,13 @@
             >删除
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="onUpload(scope.row.billNo)"
-            >校验提交
-            </el-button
-            >
+            <!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              @click.native.stop="onUpload(scope.row.billNo)"-->
+            <!--            >校验提交-->
+            <!--            </el-button-->
+            <!--            >-->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/inout/PanelCreateOrderCheckDetail.vue b/src/views/inout/PanelCreateOrderCheckDetail.vue
new file mode 100644
index 00000000..c8759171
--- /dev/null
+++ b/src/views/inout/PanelCreateOrderCheckDetail.vue
@@ -0,0 +1,413 @@
+<template>
+  <div>
+    <el-table v-loading="loading" :data="detailList" style="width: 100%" border
+              :row-style="rowStyle"
+              row-key="id"
+    >
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column
+        label="物资名称" width="150"
+        prop="coName"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="规格型号" width="150"
+        prop="spec"
+      ></el-table-column>
+      <el-table-column label="批次号" header-align="center">
+        <el-table-column header-align="center"
+                         label="手录" width="100"
+                         prop="bbatchNo"
+                         show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column header-align="center"
+                         label="扫码"
+                         prop="sbatchNo" width="100"
+                         show-overflow-tooltip
+        ></el-table-column>
+      </el-table-column>
+
+      <el-table-column label="生产日期" header-align="center">
+        <el-table-column header-align="center"
+                         label="手录" width="100"
+                         prop="bproductDate"
+                         show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column header-align="center"
+                         label="扫码" width="100"
+                         prop="sproductDate"
+                         show-overflow-tooltip
+        ></el-table-column>
+      </el-table-column>
+
+      <el-table-column label="失效日期" header-align="center">
+        <el-table-column header-align="center"
+                         label="手录" width="100"
+                         prop="bexpireDate"
+                         show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column header-align="center"
+                         label="扫码" width="100"
+                         prop="sexpireDate"
+                         show-overflow-tooltip
+        ></el-table-column>
+      </el-table-column>
+      <el-table-column label="数量" header-align="center">
+        <el-table-column
+          header-align="center"
+          label="单据数量" width="100"
+          prop="count"
+        ></el-table-column>
+        <el-table-column
+          header-align="center"
+          label="扫码数量" width="100"
+          prop="scanCount"
+        ></el-table-column>
+      </el-table-column>
+
+      <el-table-column
+        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"
+        prop="certCode"
+        show-overflow-tooltip
+      ></el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import stockOrderNewSelectProduct from "./DialogSelectProduct";
+import dialogInvProduct from "./DialogSelectInvProduct";
+import {addBizProduct, getDetailBizs, updateBizProduct, delBizProduct} from "@/api/inout/orderDetailCode";
+import {updateBizBind} from "@/api/inout/order";
+import selectRlDialog from "@/views/inout/DialogSelectRl";
+import DialogSelectUnit from "@/views/inout/DialogSelectUnit";
+import {getCheckDetailList} from "@/api/inout/orderDetailBiz";
+
+export default {
+  name: "PanelCreateOrderCheckDetail",
+  props: {
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+    refreshPanel: {
+      type: Function,
+      required: true,
+    },
+    refreshOrder: {
+      type: Function,
+      required: true,
+    },
+    viewType: {
+      type: Object,
+      required: true,
+    },
+    curBustype: {
+      type: Object,
+      required: true,
+    },
+
+  },
+  data() {
+    return {
+      bizType: 1,
+      loading: false,
+      query: {
+        orderId: null,
+        code: "",
+        corpOrderId: "",
+      },
+      detailList: [],
+      total: 0,
+      iCount: 0,
+      selectProductVisible: false,
+      selectInvProductVisible: false,
+      thisData: {},
+      selectedIndex: null,
+      invQueryData: {
+        invCode: null,
+      },
+      selectRlVisible: false,
+      dialogTableVisible: false,
+      curRow: null,
+    };
+  },
+  components: {
+    selectRlDialog, DialogSelectUnit,
+    stockOrderNewSelectProduct,
+    dialogInvProduct,
+  },
+  methods: {
+    getOrderDetails() {
+      this.loading = true;
+      this.query.orderId = this.idQuery.billNo;
+      getCheckDetailList(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+
+    rowChange(val) {
+      this.currentRow = val;
+      if (this.currentRow.batchNo == '')
+        this.currentRow.batchNo = null;
+      this.selectedIndex = val.index;
+    },
+
+    closeDialog(rData) {
+      this.selectProductVisible = false;
+      this.selectInvProductVisible = false;
+      this.idQuery = rData;
+      this.getOrderDetails();
+    },
+
+    closeDialogC2(rData) {
+      this.idQuery = rData;
+      this.selectInvProductVisible = false;
+      this.getOrderDetails();
+    },
+
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
+        rowBackground.color = '#f60303';
+        return rowBackground;
+      }
+
+      if (this.viewType == 1)
+        return null;
+
+      if (!row.checkSuccess) {
+        rowBackground.color = '#f60303';
+      }
+      return rowBackground;
+    },
+
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
+    },
+
+    selectProductFunction() {
+      this.thisData = this.idQuery;
+      if (this.$isBlank(this.idQuery.action)) {
+        this.$message.error("单据类型不能为空！")
+        return;
+      }
+      if (this.$isBlank(this.idQuery.invCode)) {
+        this.$message.error("当前仓库不能为空！");
+        return;
+      }
+
+      if (this.$isBlank(this.idQuery.fromCorp) && this.$isBlank(this.idQuery.fromInvCode)) {
+        this.$message.error("往来信息不能为空！");
+        return;
+      }
+      if (this.curBustype.corpType == 3) {//内部科室
+        this.invQueryData.invCode = this.idQuery.invCode;
+        this.selectInvProductVisible = true;
+      } else if (this.curBustype.corpType == 2) { //供应商信息
+        this.selectProductVisible = true;
+      } else if (this.curBustype.corpType === 1) {//客户信息
+        this.invQueryData.invCode = this.idQuery.invCode;
+        this.selectInvProductVisible = true;
+      }
+
+    },
+
+    saveChange(row) {
+      if (row.batchNo == '') {
+        row.batchNo = null;
+      }
+      updateBizProduct(row)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("保存成功！");
+            this.selectedIndex = null;
+            this.refreshPanel();
+
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+
+    copyDetail(row) {
+      let data = {
+        relId: row.bindRlFk,
+        supId: row.supId,
+        zczbhhzbapzbh: row.certCode,
+        orderEntity: this.idQuery,
+      }
+      this.loading = true;
+      addBizProduct(data)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.getOrderDetails();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+
+    deleteDetail(row) {
+      let data = {
+        id: row.id,
+      }
+      this.loading = true;
+      delBizProduct(data)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.getOrderDetails();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+    bindRl(val) {
+      this.curRow = val;
+      this.selectRlVisible = true;
+    },
+
+    handleUnitClick(row) {
+      this.curRow = row;
+      this.dialogTableVisible = true;
+    },
+
+    selectBindRl(row) {
+      let query = {
+        id: this.curRow.id,
+        bindRlFk: row.id,
+      };
+      updateBizBind(query).then((response) => {
+          if (response.code == 20000) {
+            this.$message.success("绑定成功");
+            this.getOrderDetails();
+          } else
+            this.$message.error(response.message);
+        }
+      ).catch(() => {
+
+      });
+    },
+
+    selectSupUnit(row) {
+      let query = {
+        id: this.curRow.id,
+        supId: row.erpId,
+      };
+      updateBizBind(query).then((response) => {
+        if (response.code == 20000) {
+          this.$message.success("绑定成功");
+          this.getOrderDetails();
+        } else {
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+      });
+    }
+    ,
+
+
+    closeBindDialog() {
+      this.selectRlVisible = false;
+      this.dialogTableVisible = false;
+      this.refreshPanel();
+    }
+    ,
+  }
+  ,
+  filters: {}
+  ,
+
+  watch: {
+    'idQuery.billNo':
+      {
+        handler() {
+          this.refreshOrder(this.idQuery);
+        }
+        ,
+      }
+  }
+  ,
+
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  }
+  ,
+  created() {
+    if (this.idQuery.billNo != null)
+      this.getOrderDetails();
+  }
+  ,
+}
+;
+</script>
+<style scoped>
+.el-table_fixed, el-table__fixed-right {
+  height: 80% !important;
+}
+
+.el-table__fixed-body-wrapper {
+  height: 80% !important;
+}
+
+
+.ao-text {
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
+}
+
+/**
+解决el-input输入框 type=number时，输入中文光标上移问题
+ */
+.el-input__inner {
+  line-height: 1px !important;
+}
+
+</style>
+
+
+