diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 415dbfa6..bfd89d07 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -11,377 +11,385 @@ export function getDraft(query) {
 
 
 export function orderList(query) {
-    return axios({
-        url: "/admin/warehouse/inout/order/list",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/order/list",
+    method: "get",
+    params: query
+  });
 }
 
 export function orderGetUdi(query) {
-    return axios({
-        url: "/udiwms/inout/order/getUdi",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/inout/order/getUdi",
+    method: "get",
+    params: query
+  });
 }
 
 export function deleteCodesTempById(query) {
-    return axios({
-        url: "/warehouse/inout/deleteCodesTempById",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/warehouse/inout/deleteCodesTempById",
+    method: "get",
+    params: query
+  });
 }
 
 export function submitOrderWeb(query) {
-    return axios({
-        url: "/warehouse/inout/submitOrderWeb",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/warehouse/inout/submitOrderWeb",
+    method: "get",
+    params: query
+  });
 }
 
 
 export function saveOrderWeb(query) {
-    return axios({
-        url: "/warehouse/inout/saveOrderWeb",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/saveOrderWeb",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function orderListError(query) {
-    return axios({
-        url: "/udiwms/inout/order/error",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/inout/order/error",
+    method: "get",
+    params: query
+  });
 }
 
 export function orderListRepeat(query) {
-    return axios({
-        url: "/admin/warehouse/inout/order/listRepeat",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/order/listRepeat",
+    method: "get",
+    params: query
+  });
 }
 
 export function codeList(query) {
-    return axios({
-        url: "/admin/warehouse/inout/findByOrderId",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/findByOrderId",
+    method: "get",
+    params: query
+  });
 }
 
 export function addOrderWeb(query) {
-    return axios({
-        url: "/warehouse/inout/addOrderWeb",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/addOrderWeb",
+    method: "post",
+    data: query
+  });
 }
 
 export function enterCodeWeb(query) {
-    return axios({
-        url: "/warehouse/inout/enterCode",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/enterCode",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function postOrdersWeb(query) {
-    return axios({
-        url: "/warehouse/inout/postOrdersWeb",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/postOrdersWeb",
+    method: "post",
+    data: query
+  });
 }
 
 export function mergeOrder(query) {
-    return axios({
-        url: "/warehouse/inout/order/mergeOrder",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/order/mergeOrder",
+    method: "post",
+    data: query
+  });
 }
 
 export function updateUnit(query) {
-    return axios({
-        url: "/udiwms/inout/order/updateUnit",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/inout/order/updateUnit",
+    method: "post",
+    data: query
+  });
 }
 
 export function filterOrder(query) {
-    return axios({
-        url: "/udiwms/inout/order/filter",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/inout/order/filter",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectNew(query) {
-    return axios({
-        url: "/admin/warehouse/inout/order/selectNew",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/order/selectNew",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectWait(query) {
-    return axios({
-        url: "/sale/inout/order/selectWait",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/sale/inout/order/selectWait",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectStatus(query) {
-    return axios({
-        url: "/sale/inout/order/selectStatus",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/sale/inout/order/selectStatus",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectDownload(query) {
-    return axios({
-        url: "/sale/inout/order/selectDownload",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/sale/inout/order/selectDownload",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectFinish(query) {
-    return axios({
-        url: "/sale/inout/order/selectFinish",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/sale/inout/order/selectFinish",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectSubOrders(query) {
-    return axios({
-        url: "/sale/inout/order/selectSubOrders",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/sale/inout/order/selectSubOrders",
+    method: "get",
+    params: query
+  });
 }
 
 
 export function errorCodeList(query) {
-    return axios({
-        url: "/admin/warehouse/inout/findErrorByOrderId",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/findErrorByOrderId",
+    method: "get",
+    params: query
+  });
 }
 
 export function deleteByOrderId(query) {
-    return axios({
-        url: "/udiwms/inout/order/delete",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/inout/order/delete",
+    method: "post",
+    data: query
+  });
 }
 
 export function deleteCodes(query) {
-    return axios({
-        url: "/warehouse/inout/code/deleteCodes",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/code/deleteCodes",
+    method: "post",
+    data: query
+  });
 }
 
 export function commitOrder(query) {
-    return axios({
-        url: "/warehouse/inout/commit",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/commit",
+    method: "post",
+    data: query
+  });
 }
 
 export function addCommitOrder(query) {
-    return axios({
-        url: "/warehouse/inout/addCommit",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/addCommit",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function updateExportStatus(query) {
-    return axios(
-        {
-            url: "/warehouse/inout/order/updateExportStatus",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/warehouse/inout/order/updateExportStatus",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function orderDetail(query) {
-    return axios(
-        {
-            url: "/warehouse/inout/order/detail",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/warehouse/inout/order/detail",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function updateBind(query) {
-    return axios(
-        {
-            url: "/udiwms/erpOrder/updateBind",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/erpOrder/updateBind",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function updateBindSup(query) {
-    return axios(
-        {
-            url: "/udiwms/erpOrder/updateBindSup",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/erpOrder/updateBindSup",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function updateCodeBindSup(query) {
-    return axios(
-        {
-            url: "/udiwms/addCode/updateBindSup",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/addCode/updateBindSup",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function backStock(query) {
-    return axios(
-        {
-            url: "/sale/inout/order/backStock",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/sale/inout/order/backStock",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function uploadOrder(query) {
-    return axios(
-        {
-            url: "/warehouse/inout/order/uploadOrder",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/warehouse/inout/order/uploadOrder",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function moveStock(query) {
-    return axios(
-        {
-            url: "/sale/inout/order/moveStock",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/sale/inout/order/moveStock",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 
 export function findAllByOrderId(query) {
-    return axios({
-        url: "/admin/warehouse/inout/findAllByOrderId",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/findAllByOrderId",
+    method: "get",
+    params: query
+  });
 }
 
 export function revokeOredr(query) {
-    return axios({
-        url: "/spms/inout/order/revoke",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/spms/inout/order/revoke",
+    method: "get",
+    params: query
+  });
 }
 
 export function exportJson(query) {
-    return axios({
-        url: "/warehouse/inout/order/exportXml",
-        method: "post",
-        data: query,
-        headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-        responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
-    });
+  return axios({
+    url: "/warehouse/inout/order/exportXml",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
 }
 
 
 export function expireTimeCheck(query) {
-    return axios(
-        {
-            url: "/warehouse/inout/expireTimeCheck",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/warehouse/inout/expireTimeCheck",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function filterOrderForDelete(params) {
-    return axios({
-        url: "/udiwms/inout/order/filterOrderForDelete",
-        method: "get",
-        params: params
-    });
+  return axios({
+    url: "/udiwms/inout/order/filterOrderForDelete",
+    method: "get",
+    params: params
+  });
 }
 
 export function updateOrderInfo(data) {
-    return axios({
-        url: "/udiwms/inout/order/updateOrderInfo",
-        method: "post",
-        data: data
-    })
+  return axios({
+    url: "/udiwms/inout/order/updateOrderInfo",
+    method: "post",
+    data: data
+  })
 }
 
 
 export function getOrderById(params) {
-    return axios({
-        url: "/udiwms/inout/order/getOrderById",
-        method: "get",
-        params: params
-    })
+  return axios({
+    url: "/udiwms/inout/order/getOrderById",
+    method: "get",
+    params: params
+  })
 }
 
 
 export function updateOrder(data) {
-    return axios({
-        url: "/udiwms/inout/order/updateOrder",
-        method: "post",
-        data: data
-    })
+  return axios({
+    url: "/udiwms/inout/order/updateOrder",
+    method: "post",
+    data: data
+  })
 }
 
 
 export function uploadSpms(query) {
-    return axios(
-        {
-            url: "/warehouse/inout/order/uploadSpms",
-            method: "post",
-            data: query
-        }
-    );
+  return axios(
+    {
+      url: "/warehouse/inout/order/uploadSpms",
+      method: "post",
+      data: query
+    }
+  );
 }
 
 export function updateOrderPrintRemark(data) {
-    return axios({
-        url: "/udiwms/inout/order/updateOrderPrintRemark",
-        method: "post",
-        data: data
-    });
+  return axios({
+    url: "/udiwms/inout/order/updateOrderPrintRemark",
+    method: "post",
+    data: data
+  });
+}
+
+export function getOrderList(params) {
+  return axios({
+    url: "/udiwms/inout/order/filter",
+    method: "get",
+    params: params
+  });
 }
diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js
new file mode 100644
index 00000000..c6ef9fe7
--- /dev/null
+++ b/src/api/inout/orderDetailBiz.js
@@ -0,0 +1,11 @@
+import axios from '@/utils/request'
+
+export function getBizDetailList(params) {
+  return axios({
+    url: "/udiwms/inout/bizDetail/filterList",
+    method: "get",
+    params: params
+  });
+}
+
+
diff --git a/src/api/inout/orderDetailCode.js b/src/api/inout/orderDetailCode.js
index 69abeaa9..332e1e82 100644
--- a/src/api/inout/orderDetailCode.js
+++ b/src/api/inout/orderDetailCode.js
@@ -44,5 +44,12 @@ export function delBizProduct(query) {
   });
 }
 
+export function getCodeDetailList(params) {
+  return axios({
+    url: "udiwms/inout/codeDetail/filterList",
+    method: "get",
+    params: params
+  });
+}
 
 
diff --git a/src/api/inout/orderDetailResult.js b/src/api/inout/orderDetailResult.js
new file mode 100644
index 00000000..1c84516b
--- /dev/null
+++ b/src/api/inout/orderDetailResult.js
@@ -0,0 +1,9 @@
+import axios from '@/utils/request'
+
+export function getResultDetailList(params) {
+  return axios({
+    url: "/udiwms/inout/resultDetail/filterList",
+    method: "get",
+    params: params
+  });
+}
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index e0012f83..d123673b 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -1018,7 +1018,6 @@
           </el-form>
         </el-card>
       </el-dialog>
-
       <el-dialog
         title="耗材字典-编辑"
         :visible.sync="editDiDialogVisible"
@@ -1062,8 +1061,6 @@
           </el-button>
         </div>
       </el-dialog>
-
-
       <el-dialog
         title="耗材字典-关联添加器械信息"
         :visible.sync="selectUdiDialogVisible"
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
new file mode 100644
index 00000000..4e46707b
--- /dev/null
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -0,0 +1,701 @@
+<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.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="6">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
+                         style="width: 90%">
+                <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.invWarehouseCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+                         @change="subInvChange"
+              >
+                <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-select>
+            </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 type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
+          <el-button type="primary" icon="el-icon-error" @click="errOrders">异常单据</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
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName">
+        </el-table-column>
+        <el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></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="fromCorp" width="220">
+
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="当前分库" prop="subInvName" width="120">
+        </el-table-column>
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">>
+        </el-table-column>
+
+
+        <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.actDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="校验状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150">
+          <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.id)"
+            >删除
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status !== -1"
+              @click.native.stop="onUpload(scope.row.id)"
+            >立即处理
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
+        <span>{{ errorDetail }}</span>
+        <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false"
+        >关 闭</el-button
+        >
+      </span>
+      </el-dialog>
+      <el-dialog
+        title="选择往来单位"
+        :visible.sync="dialogTableVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="70%"
+      >
+        <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
+          <el-form-item class="query-form-item">
+            <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="search"
+              @click.native.stop="getUnitList()"
+            >查询
+            </el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-table
+          v-loading="loading"
+          :data="unitlist"
+          style="width: 100%"
+          @row-click="selectUnit"
+        >
+          <el-table-column
+            label="往来单位ID"
+            prop="erpId"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="往来单位名称"
+            prop="name"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="往来单位简写"
+            prop="spell"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="地址"
+            prop="addr"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="状态" prop="status"></el-table-column>
+          <el-table-column label="类型" prop="type"></el-table-column>
+        </el-table>
+      </el-dialog>
+      <el-dialog
+        title="异常订单"
+        :visible.sync="errOrderVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+      >
+        <ioErrorOrder
+        ></ioErrorOrder>
+      </el-dialog>
+      <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"
+          :idQuery="idQuery"
+        ></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>
+      <el-pagination
+        :page-size="filterQuery.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next"
+        :total="total"
+        :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  getDraft,
+  filterOrder,
+  deleteByOrderId,
+  commitOrder,
+  updateUnit, mergeOrder,
+} from "../../api/inout/order";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
+import draggable from "vuedraggable";
+// import codeDetail from "./errorCode";
+// import ioErrorOrder from "./IOErrorOrder";todo
+import addOrder from "./IoCreateOrder";
+import store from "../../store";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoNewOrder",
+  data() {
+    return {
+
+      showSearch: true,
+      filterQuery: {
+        id: "",
+        mainAction: null,
+        action: null,
+        page: 1,
+        status: 10,
+        limit: 10,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+      },
+      checkStatus: {
+        '-1': "草稿",
+        // 1: "等待处理",
+        1: "等待处理",
+        2: "等待校验",
+        3: "校验异常",
+        4: "校验成功",
+      },
+      curIndex: "",
+      unitquery: {key: "", page: 1, limit: 20},
+      unitlist: [],
+      multipleSelection: [],
+      unitUpdateQuery: {
+        id: "",
+        fromCorpId: "",
+        fromCorp: "",
+      },
+      idQuery: {
+      },
+      storageList: [],
+      subInvList: [],
+      errOrderVisible: false,
+      list: [],
+      adId: [],
+      adSelectList: [],
+      adList: {},
+      adListNoDataText: "无数据",
+      queryAdIdAsyncLoading: false,
+      codeDetailVisible: false,
+      addOrderVisible: false,
+      total: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      errorDetail: "1111111111111",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点"
+      },
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      busTypes: [],
+    };
+  },
+  components: {
+    draggable,
+    // codeDetail,
+    addOrder,
+    // ioErrorOrder
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        status: 10,
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    handleUnitClick(row) {
+      this.curIndex = row.id;
+      this.dialogTableVisible = true;
+    },
+    closeDetailDialog(val) {
+      this.codeDetailVisible = false;
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
+    },
+    getBusType() {
+      if (this.subInvList.length > 0) {
+        this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
+      }
+      let query = {
+        code: this.filterQuery.invWarehouseCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.billAction = this.busTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getStorage() {
+      this.storageList = [];
+      filterAllByUser()
+        .then((response) => {
+          this.storageList = response.data || [];
+          if (this.storageList.length > 0) {
+            this.getSubInvList();
+            this.getList();
+          }
+        })
+        .catch(() => {
+        });
+    },
+    getStorageName(code) {
+      for (let i = 0; i < this.storageList.length; i++) {
+        if (this.storageList[i].code === code) {
+          return this.storageList[i].name;
+        }
+      }
+    },
+    getSubStorageName(code) {
+      for (let i = 0; i < this.subInvList.length; i++) {
+        if (this.subInvList[i].code === code) {
+          return this.subInvList[i].name;
+        }
+      }
+    },
+    addOrders(row) {
+      this.idQuery = {};
+      this.idQuery = row;
+      this.addOrderVisible = true;
+    },
+    errOrders() {
+      this.errOrderVisible = true;
+    },
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.addHosOrderVisible = false;
+      this.getList();
+    },
+    getUnitList() {
+      this.loading = true;
+      getBasicUnitMaintains(this.unitquery)
+        .then((response) => {
+          this.loading = false;
+          this.unitlist = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    selectUnit(row) {
+      this.unitUpdateQuery.id = this.curIndex;
+      this.unitUpdateQuery.fromCorp = row.name;
+      this.unitUpdateQuery.fromCorpId = row.unitid;
+      updateUnit(this.unitUpdateQuery)
+        .then((response) => {
+          this.dialogTableVisible = false;
+          this.getList();
+        })
+        .catch(() => {
+          this.dialogTableVisible = false;
+        });
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      getDraft(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;
+        });
+    },
+    mergesOrders() {
+      let repeatData = this.multipleSelection;
+      if (repeatData.length <= 1) {
+        this.$message.warning("未选择单据！");
+        return;
+      }
+      let orderid = repeatData[0].id;
+      let unit = repeatData[0].fromCorp;
+      let action = repeatData[0].action;
+      let orderList = [];
+      for (let index in repeatData) {
+        if (action !== repeatData[index].action) {
+          this.$message.warning("业务类型不一致！");
+          return;
+        }
+        if (unit !== repeatData[index].fromCorp) {
+          this.$message.warning("往来单位不一致！");
+          return;
+        }
+        orderList.push(repeatData[index].id);
+      }
+      let tquery = {
+        orderList: orderList,
+        type: 2,
+      };
+
+      this.$confirm(
+        "所选择的订单将会合并到订单号为" + orderid + "的订单下",
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          mergeOrder(tquery).then((response) => {
+            if (response.code === 20000) {
+              this.getList();
+              this.$message({
+                type: "success",
+                message: "合并成功",
+              });
+            } else {
+              this.$message.error(response.message);
+            }
+          });
+        })
+        .catch(() => {
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.id = 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();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(rowId);
+        })
+        .catch(() => {
+        });
+    },
+    onUpload(data) {
+      this.loading = true;
+      var idQuery = {
+        orderId: "",
+      };
+      idQuery.orderId = data;
+      commitOrder(idQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message.success(response.data);
+            for (let i = 0; i < this.list.length; i++) {
+              if (this.list[i].id === idQuery.orderId) {
+                this.list.splice(i, 1);
+                break;
+              }
+            }
+            this.loading = false;
+          } else {
+            this.loading = false
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
+    },
+    handleErrorDetail(poistion) {
+      var mOrder = this.list[poistion];
+      var corpOrderId = mOrder.remark;
+
+      this.errorDetail = mOrder.remark;
+      this.dialogVisible = true;
+    },
+    intentDetail(row) {
+      this.codeDetailVisible = true;
+      this.idQuery.id = row.id;
+
+    },
+    invChange() {
+      this.subInvList = [];
+      this.filterQuery.invWarehouseCode = "";
+      let query = {
+        pcode: this.filterQuery.locStorageCode
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    getSubInvList() {
+      let query = {
+        // pcode: this.filterQuery.locStorageCode
+        filter: 3,
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    subInvChange() {
+      this.getBusType();
+    },
+    init() {
+      axios.get("./config.json").then(res => {
+        // 基础地址
+        let response = res.data.BASE_URL;
+        this.uploadFileUrl = response + "/udiwms/orders/file/upload";
+      });
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getSubInvList();
+    this.getBusType();
+    let query = this.$route.query;
+    this.filterQuery = Object.assign(this.filterQuery, query);
+    this.filterQuery.limit = parseInt(this.filterQuery.limit);
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
new file mode 100644
index 00000000..4e46707b
--- /dev/null
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -0,0 +1,701 @@
+<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.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="6">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
+                         style="width: 90%">
+                <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.invWarehouseCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+                         @change="subInvChange"
+              >
+                <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-select>
+            </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 type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
+          <el-button type="primary" icon="el-icon-error" @click="errOrders">异常单据</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
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName">
+        </el-table-column>
+        <el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></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="fromCorp" width="220">
+
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="当前分库" prop="subInvName" width="120">
+        </el-table-column>
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">>
+        </el-table-column>
+
+
+        <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.actDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="校验状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150">
+          <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.id)"
+            >删除
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status !== -1"
+              @click.native.stop="onUpload(scope.row.id)"
+            >立即处理
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
+        <span>{{ errorDetail }}</span>
+        <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false"
+        >关 闭</el-button
+        >
+      </span>
+      </el-dialog>
+      <el-dialog
+        title="选择往来单位"
+        :visible.sync="dialogTableVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="70%"
+      >
+        <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
+          <el-form-item class="query-form-item">
+            <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="search"
+              @click.native.stop="getUnitList()"
+            >查询
+            </el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-table
+          v-loading="loading"
+          :data="unitlist"
+          style="width: 100%"
+          @row-click="selectUnit"
+        >
+          <el-table-column
+            label="往来单位ID"
+            prop="erpId"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="往来单位名称"
+            prop="name"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="往来单位简写"
+            prop="spell"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="地址"
+            prop="addr"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="状态" prop="status"></el-table-column>
+          <el-table-column label="类型" prop="type"></el-table-column>
+        </el-table>
+      </el-dialog>
+      <el-dialog
+        title="异常订单"
+        :visible.sync="errOrderVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+      >
+        <ioErrorOrder
+        ></ioErrorOrder>
+      </el-dialog>
+      <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"
+          :idQuery="idQuery"
+        ></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>
+      <el-pagination
+        :page-size="filterQuery.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next"
+        :total="total"
+        :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  getDraft,
+  filterOrder,
+  deleteByOrderId,
+  commitOrder,
+  updateUnit, mergeOrder,
+} from "../../api/inout/order";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
+import draggable from "vuedraggable";
+// import codeDetail from "./errorCode";
+// import ioErrorOrder from "./IOErrorOrder";todo
+import addOrder from "./IoCreateOrder";
+import store from "../../store";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoNewOrder",
+  data() {
+    return {
+
+      showSearch: true,
+      filterQuery: {
+        id: "",
+        mainAction: null,
+        action: null,
+        page: 1,
+        status: 10,
+        limit: 10,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+      },
+      checkStatus: {
+        '-1': "草稿",
+        // 1: "等待处理",
+        1: "等待处理",
+        2: "等待校验",
+        3: "校验异常",
+        4: "校验成功",
+      },
+      curIndex: "",
+      unitquery: {key: "", page: 1, limit: 20},
+      unitlist: [],
+      multipleSelection: [],
+      unitUpdateQuery: {
+        id: "",
+        fromCorpId: "",
+        fromCorp: "",
+      },
+      idQuery: {
+      },
+      storageList: [],
+      subInvList: [],
+      errOrderVisible: false,
+      list: [],
+      adId: [],
+      adSelectList: [],
+      adList: {},
+      adListNoDataText: "无数据",
+      queryAdIdAsyncLoading: false,
+      codeDetailVisible: false,
+      addOrderVisible: false,
+      total: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      errorDetail: "1111111111111",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点"
+      },
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      busTypes: [],
+    };
+  },
+  components: {
+    draggable,
+    // codeDetail,
+    addOrder,
+    // ioErrorOrder
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        status: 10,
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    handleUnitClick(row) {
+      this.curIndex = row.id;
+      this.dialogTableVisible = true;
+    },
+    closeDetailDialog(val) {
+      this.codeDetailVisible = false;
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
+    },
+    getBusType() {
+      if (this.subInvList.length > 0) {
+        this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
+      }
+      let query = {
+        code: this.filterQuery.invWarehouseCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.billAction = this.busTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getStorage() {
+      this.storageList = [];
+      filterAllByUser()
+        .then((response) => {
+          this.storageList = response.data || [];
+          if (this.storageList.length > 0) {
+            this.getSubInvList();
+            this.getList();
+          }
+        })
+        .catch(() => {
+        });
+    },
+    getStorageName(code) {
+      for (let i = 0; i < this.storageList.length; i++) {
+        if (this.storageList[i].code === code) {
+          return this.storageList[i].name;
+        }
+      }
+    },
+    getSubStorageName(code) {
+      for (let i = 0; i < this.subInvList.length; i++) {
+        if (this.subInvList[i].code === code) {
+          return this.subInvList[i].name;
+        }
+      }
+    },
+    addOrders(row) {
+      this.idQuery = {};
+      this.idQuery = row;
+      this.addOrderVisible = true;
+    },
+    errOrders() {
+      this.errOrderVisible = true;
+    },
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.addHosOrderVisible = false;
+      this.getList();
+    },
+    getUnitList() {
+      this.loading = true;
+      getBasicUnitMaintains(this.unitquery)
+        .then((response) => {
+          this.loading = false;
+          this.unitlist = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    selectUnit(row) {
+      this.unitUpdateQuery.id = this.curIndex;
+      this.unitUpdateQuery.fromCorp = row.name;
+      this.unitUpdateQuery.fromCorpId = row.unitid;
+      updateUnit(this.unitUpdateQuery)
+        .then((response) => {
+          this.dialogTableVisible = false;
+          this.getList();
+        })
+        .catch(() => {
+          this.dialogTableVisible = false;
+        });
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      getDraft(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;
+        });
+    },
+    mergesOrders() {
+      let repeatData = this.multipleSelection;
+      if (repeatData.length <= 1) {
+        this.$message.warning("未选择单据！");
+        return;
+      }
+      let orderid = repeatData[0].id;
+      let unit = repeatData[0].fromCorp;
+      let action = repeatData[0].action;
+      let orderList = [];
+      for (let index in repeatData) {
+        if (action !== repeatData[index].action) {
+          this.$message.warning("业务类型不一致！");
+          return;
+        }
+        if (unit !== repeatData[index].fromCorp) {
+          this.$message.warning("往来单位不一致！");
+          return;
+        }
+        orderList.push(repeatData[index].id);
+      }
+      let tquery = {
+        orderList: orderList,
+        type: 2,
+      };
+
+      this.$confirm(
+        "所选择的订单将会合并到订单号为" + orderid + "的订单下",
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          mergeOrder(tquery).then((response) => {
+            if (response.code === 20000) {
+              this.getList();
+              this.$message({
+                type: "success",
+                message: "合并成功",
+              });
+            } else {
+              this.$message.error(response.message);
+            }
+          });
+        })
+        .catch(() => {
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.id = 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();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(rowId);
+        })
+        .catch(() => {
+        });
+    },
+    onUpload(data) {
+      this.loading = true;
+      var idQuery = {
+        orderId: "",
+      };
+      idQuery.orderId = data;
+      commitOrder(idQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message.success(response.data);
+            for (let i = 0; i < this.list.length; i++) {
+              if (this.list[i].id === idQuery.orderId) {
+                this.list.splice(i, 1);
+                break;
+              }
+            }
+            this.loading = false;
+          } else {
+            this.loading = false
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
+    },
+    handleErrorDetail(poistion) {
+      var mOrder = this.list[poistion];
+      var corpOrderId = mOrder.remark;
+
+      this.errorDetail = mOrder.remark;
+      this.dialogVisible = true;
+    },
+    intentDetail(row) {
+      this.codeDetailVisible = true;
+      this.idQuery.id = row.id;
+
+    },
+    invChange() {
+      this.subInvList = [];
+      this.filterQuery.invWarehouseCode = "";
+      let query = {
+        pcode: this.filterQuery.locStorageCode
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    getSubInvList() {
+      let query = {
+        // pcode: this.filterQuery.locStorageCode
+        filter: 3,
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    subInvChange() {
+      this.getBusType();
+    },
+    init() {
+      axios.get("./config.json").then(res => {
+        // 基础地址
+        let response = res.data.BASE_URL;
+        this.uploadFileUrl = response + "/udiwms/orders/file/upload";
+      });
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getSubInvList();
+    this.getBusType();
+    let query = this.$route.query;
+    this.filterQuery = Object.assign(this.filterQuery, query);
+    this.filterQuery.limit = parseInt(this.filterQuery.limit);
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
new file mode 100644
index 00000000..4e46707b
--- /dev/null
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -0,0 +1,701 @@
+<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.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="6">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
+                         style="width: 90%">
+                <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.invWarehouseCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+                         @change="subInvChange"
+              >
+                <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-select>
+            </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 type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
+          <el-button type="primary" icon="el-icon-error" @click="errOrders">异常单据</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
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName">
+        </el-table-column>
+        <el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></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="fromCorp" width="220">
+
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="当前分库" prop="subInvName" width="120">
+        </el-table-column>
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">>
+        </el-table-column>
+
+
+        <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.actDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="校验状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150">
+          <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.id)"
+            >删除
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status !== -1"
+              @click.native.stop="onUpload(scope.row.id)"
+            >立即处理
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
+        <span>{{ errorDetail }}</span>
+        <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false"
+        >关 闭</el-button
+        >
+      </span>
+      </el-dialog>
+      <el-dialog
+        title="选择往来单位"
+        :visible.sync="dialogTableVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="70%"
+      >
+        <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
+          <el-form-item class="query-form-item">
+            <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="search"
+              @click.native.stop="getUnitList()"
+            >查询
+            </el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-table
+          v-loading="loading"
+          :data="unitlist"
+          style="width: 100%"
+          @row-click="selectUnit"
+        >
+          <el-table-column
+            label="往来单位ID"
+            prop="erpId"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="往来单位名称"
+            prop="name"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="往来单位简写"
+            prop="spell"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="地址"
+            prop="addr"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="状态" prop="status"></el-table-column>
+          <el-table-column label="类型" prop="type"></el-table-column>
+        </el-table>
+      </el-dialog>
+      <el-dialog
+        title="异常订单"
+        :visible.sync="errOrderVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+      >
+        <ioErrorOrder
+        ></ioErrorOrder>
+      </el-dialog>
+      <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"
+          :idQuery="idQuery"
+        ></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>
+      <el-pagination
+        :page-size="filterQuery.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next"
+        :total="total"
+        :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  getDraft,
+  filterOrder,
+  deleteByOrderId,
+  commitOrder,
+  updateUnit, mergeOrder,
+} from "../../api/inout/order";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
+import draggable from "vuedraggable";
+// import codeDetail from "./errorCode";
+// import ioErrorOrder from "./IOErrorOrder";todo
+import addOrder from "./IoCreateOrder";
+import store from "../../store";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoNewOrder",
+  data() {
+    return {
+
+      showSearch: true,
+      filterQuery: {
+        id: "",
+        mainAction: null,
+        action: null,
+        page: 1,
+        status: 10,
+        limit: 10,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+      },
+      checkStatus: {
+        '-1': "草稿",
+        // 1: "等待处理",
+        1: "等待处理",
+        2: "等待校验",
+        3: "校验异常",
+        4: "校验成功",
+      },
+      curIndex: "",
+      unitquery: {key: "", page: 1, limit: 20},
+      unitlist: [],
+      multipleSelection: [],
+      unitUpdateQuery: {
+        id: "",
+        fromCorpId: "",
+        fromCorp: "",
+      },
+      idQuery: {
+      },
+      storageList: [],
+      subInvList: [],
+      errOrderVisible: false,
+      list: [],
+      adId: [],
+      adSelectList: [],
+      adList: {},
+      adListNoDataText: "无数据",
+      queryAdIdAsyncLoading: false,
+      codeDetailVisible: false,
+      addOrderVisible: false,
+      total: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      errorDetail: "1111111111111",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点"
+      },
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      busTypes: [],
+    };
+  },
+  components: {
+    draggable,
+    // codeDetail,
+    addOrder,
+    // ioErrorOrder
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        status: 10,
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    handleUnitClick(row) {
+      this.curIndex = row.id;
+      this.dialogTableVisible = true;
+    },
+    closeDetailDialog(val) {
+      this.codeDetailVisible = false;
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
+    },
+    getBusType() {
+      if (this.subInvList.length > 0) {
+        this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
+      }
+      let query = {
+        code: this.filterQuery.invWarehouseCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.billAction = this.busTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getStorage() {
+      this.storageList = [];
+      filterAllByUser()
+        .then((response) => {
+          this.storageList = response.data || [];
+          if (this.storageList.length > 0) {
+            this.getSubInvList();
+            this.getList();
+          }
+        })
+        .catch(() => {
+        });
+    },
+    getStorageName(code) {
+      for (let i = 0; i < this.storageList.length; i++) {
+        if (this.storageList[i].code === code) {
+          return this.storageList[i].name;
+        }
+      }
+    },
+    getSubStorageName(code) {
+      for (let i = 0; i < this.subInvList.length; i++) {
+        if (this.subInvList[i].code === code) {
+          return this.subInvList[i].name;
+        }
+      }
+    },
+    addOrders(row) {
+      this.idQuery = {};
+      this.idQuery = row;
+      this.addOrderVisible = true;
+    },
+    errOrders() {
+      this.errOrderVisible = true;
+    },
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.addHosOrderVisible = false;
+      this.getList();
+    },
+    getUnitList() {
+      this.loading = true;
+      getBasicUnitMaintains(this.unitquery)
+        .then((response) => {
+          this.loading = false;
+          this.unitlist = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    selectUnit(row) {
+      this.unitUpdateQuery.id = this.curIndex;
+      this.unitUpdateQuery.fromCorp = row.name;
+      this.unitUpdateQuery.fromCorpId = row.unitid;
+      updateUnit(this.unitUpdateQuery)
+        .then((response) => {
+          this.dialogTableVisible = false;
+          this.getList();
+        })
+        .catch(() => {
+          this.dialogTableVisible = false;
+        });
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      getDraft(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;
+        });
+    },
+    mergesOrders() {
+      let repeatData = this.multipleSelection;
+      if (repeatData.length <= 1) {
+        this.$message.warning("未选择单据！");
+        return;
+      }
+      let orderid = repeatData[0].id;
+      let unit = repeatData[0].fromCorp;
+      let action = repeatData[0].action;
+      let orderList = [];
+      for (let index in repeatData) {
+        if (action !== repeatData[index].action) {
+          this.$message.warning("业务类型不一致！");
+          return;
+        }
+        if (unit !== repeatData[index].fromCorp) {
+          this.$message.warning("往来单位不一致！");
+          return;
+        }
+        orderList.push(repeatData[index].id);
+      }
+      let tquery = {
+        orderList: orderList,
+        type: 2,
+      };
+
+      this.$confirm(
+        "所选择的订单将会合并到订单号为" + orderid + "的订单下",
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          mergeOrder(tquery).then((response) => {
+            if (response.code === 20000) {
+              this.getList();
+              this.$message({
+                type: "success",
+                message: "合并成功",
+              });
+            } else {
+              this.$message.error(response.message);
+            }
+          });
+        })
+        .catch(() => {
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.id = 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();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(rowId);
+        })
+        .catch(() => {
+        });
+    },
+    onUpload(data) {
+      this.loading = true;
+      var idQuery = {
+        orderId: "",
+      };
+      idQuery.orderId = data;
+      commitOrder(idQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message.success(response.data);
+            for (let i = 0; i < this.list.length; i++) {
+              if (this.list[i].id === idQuery.orderId) {
+                this.list.splice(i, 1);
+                break;
+              }
+            }
+            this.loading = false;
+          } else {
+            this.loading = false
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
+    },
+    handleErrorDetail(poistion) {
+      var mOrder = this.list[poistion];
+      var corpOrderId = mOrder.remark;
+
+      this.errorDetail = mOrder.remark;
+      this.dialogVisible = true;
+    },
+    intentDetail(row) {
+      this.codeDetailVisible = true;
+      this.idQuery.id = row.id;
+
+    },
+    invChange() {
+      this.subInvList = [];
+      this.filterQuery.invWarehouseCode = "";
+      let query = {
+        pcode: this.filterQuery.locStorageCode
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    getSubInvList() {
+      let query = {
+        // pcode: this.filterQuery.locStorageCode
+        filter: 3,
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    subInvChange() {
+      this.getBusType();
+    },
+    init() {
+      axios.get("./config.json").then(res => {
+        // 基础地址
+        let response = res.data.BASE_URL;
+        this.uploadFileUrl = response + "/udiwms/orders/file/upload";
+      });
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getSubInvList();
+    this.getBusType();
+    let query = this.$route.query;
+    this.filterQuery = Object.assign(this.filterQuery, query);
+    this.filterQuery.limit = parseInt(this.filterQuery.limit);
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 3a974b45..5e3228a0 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card style="margin: 5px;margin-top: -20px">
-      <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px"
+      <el-form :model="orderFormData" :rules="formRules" ref="dataForm" label-width="100px"
                style="margin-bottom: -15px">
         <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
           <el-button
@@ -14,7 +14,7 @@
           <el-button
             size="mini"
             type="primary"
-            @click.native="submit('0')"
+            @click.native="submit()"
           >提交订单
           </el-button
           >
@@ -22,7 +22,7 @@
         <el-row>
           <el-col :span="11">
             <el-form-item prop="corpOrderId" label="单据号:">
-              <el-input v-model="formData.corpOrderId" auto-complete="off" style="width: 90%"
+              <el-input v-model="orderFormData.corpOrderId" auto-complete="off" style="width: 90%"
                         clearable
                         :disabled="corpOrderIdDisabled"></el-input>
             </el-form-item>
@@ -30,10 +30,11 @@
           <el-col :span="11">
             <el-form-item prop="createTime" label="单据时间:">
               <el-date-picker
-                v-model="formData.createTime"
+                v-model="orderFormData.createTime"
                 type="datetime"
                 placeholder="日期"
                 clearable
+                value-format="yyyy-MM-dd HH:mm:ss"
                 :disabled="true"
                 style="width: 90%"
               >
@@ -44,7 +45,7 @@
         <el-row>
           <el-col :span="11">
             <el-form-item prop="invCode" label="当前仓库:">
-              <el-select v-model="formData.invCode" placeholder="当前仓库信息"
+              <el-select v-model="orderFormData.invCode" placeholder="当前仓库信息"
                          style="width: 90%"
                          clearable
                          :disabled="corpOrderIdDisabled" @change="changeInv" filterable>
@@ -61,10 +62,9 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="11">
             <el-form-item prop="action" label="单据类型:">
-              <el-select v-model="formData.action" placeholder="请选择单据类型"
+              <el-select v-model="orderFormData.action" placeholder="请选择单据类型"
                          :disabled="corpOrderIdDisabled"
                          clearable
                          style="width: 90%"
@@ -87,7 +87,7 @@
                           v-if="curAction.corpType ==0 || curAction.corpType == 2 || (curAction.corpType == 1 && !curAction.genUnit)"
             >
               <el-select
-                v-model="formData.fromCorp"
+                v-model="orderFormData.fromCorp"
                 filterable
                 remote
                 clearable
@@ -112,7 +112,7 @@
                           v-if="curAction.corpType ==3"
                           label="往来信息:"
             >
-              <el-select v-model="formData.fromInvCode" placeholder="请选择往来仓库"
+              <el-select v-model="orderFormData.fromInvCode" placeholder="请选择往来仓库"
                          :disabled="corpOrderIdDisabled" filterable
                          clearable
                          style="width: 90%"
@@ -132,7 +132,7 @@
             </el-form-item>
             <el-form-item prop="fromCorp"
                           v-if="curAction.corpType ==1 && curAction.genUnit">
-              <el-input v-model="formData.fromCorp" auto-complete="off"
+              <el-input v-model="orderFormData.fromCorp" auto-complete="off"
                         clearable
                         style="width: 90%"
                         :disabled="corpOrderIdDisabled"
@@ -143,7 +143,7 @@
           </el-col>
           <el-col :span="11">
             <el-form-item prop="remark" label="备注:">
-              <el-input v-model="formData.remark" auto-complete="off"
+              <el-input v-model="orderFormData.remark" auto-complete="off"
                         clearable
                         style="width: 90%"
                         placeholder="请输入备注信息"
@@ -161,7 +161,7 @@
                 ref='inputRef'
                 style="ime-mode:disabled"
                 type="tel"
-                v-model="formData.code"
+                v-model="codeFormData.code"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -180,13 +180,13 @@
     </el-card>
     <el-tabs type="border-card" style="margin: 5px">
       <el-tab-pane label="业务详情">
-        <biz-detail-panel :idQuery="idQuery" v-if="isCodeAlive"></biz-detail-panel>
+        <biz-detail-panel :idQuery="orderFormData" v-if="isCodeAlive"></biz-detail-panel>
       </el-tab-pane>
       <el-tab-pane label="扫码详情">
-        <codeDetailPanel :idQuery="idQuery" v-if="isCodeAlive"></codeDetailPanel>
+        <codeDetailPanel :idQuery="orderFormData" v-if="isCodeAlive"></codeDetailPanel>
       </el-tab-pane>
       <el-tab-pane label="扫码明细">
-        <codesPanel :idQuery="idQuery" v-if="isCodeAlive"></codesPanel>
+        <codesPanel :idQuery="orderFormData" v-if="isCodeAlive"></codesPanel>
       </el-tab-pane>
 
     </el-tabs>
@@ -301,22 +301,27 @@ export default {
   data() {
     return {
 
-      formData: {
+      //单据相关
+      orderFormData: {
         billNo: null,
         corpOrderId: null,
         action: null,
-        createTime: new Date(),
         invCode: null,
         fromCorp: null,
         fromInvCode: null,
         remark: null,
-        code: "",
         fromType: 2,
+      },
+
+      //扫码相关
+      codeFormData: {
+        code: "",
         batchNo: null,
         produceDate: null,
         expireDate: null,
         serialNo: null,
       },
+
       curInvOptions: [],
       busTypeOptions: [],
       fromInvOptions: [],
@@ -348,12 +353,8 @@ export default {
       formVisible: false,
       deleteLoading: false,
       orderNo: null,
-
       fromStorageOptions: [],
-
-
       curRow: null,
-
       dialogTableVisible: false,
       sitcomScan: false,
       selectRlTitle: "绑定产品",
@@ -382,7 +383,7 @@ export default {
         .then((response) => {
           this.curInvOptions = response.data || [];
           if (this.curInvOptions != null && this.curInvOptions.length == 1) {
-            this.formData.invWarehouseCode = this.curInvOptions[0].code;
+            this.orderFormData.invWarehouseCode = this.curInvOptions[0].code;
             this.getBusTypeByInv()
           }
         })
@@ -392,14 +393,14 @@ export default {
 
     //仓库改变
     changeInv() {
-      this.formData.action = null;
+      this.orderFormData.action = null;
       this.getBusTypeByInv();
     },
 
     //根据仓库,用户获取单据类型
     getBusTypeByInv() {
       let query = {
-        code: this.formData.invCode,
+        code: this.orderFormData.invCode,
       };
       findByInvUser(query)
         .then((response) => {
@@ -442,11 +443,11 @@ export default {
       this.curAction = this.getActionItem(item);
       if (this.curAction.corpType == 0 || this.curAction.corpType == 2 || (this.curAction.corpType == 1 && !this.curAction.genUnit)) {
         //1.切换往来单位
-        this.formData.fromCorp = null;
+        this.orderFormData.fromCorp = null;
         this.findMethod();
       } else if (this.curAction.corpType == 3) {
         //2. 切换往来仓库
-        this.formData.fromInvCode = null;
+        this.orderFormData.fromInvCode = null;
         this.findFromInvList();
       }
     },
@@ -454,13 +455,13 @@ export default {
     //获取往来仓库列表
     findFromInvList(val) {
       let cQuery = {
-        locInvCode: this.formData.invCode,
+        locInvCode: this.orderFormData.invCode,
       };
       findByFrom(cQuery)
         .then((response) => {
           this.fromInvOptions = response.data || [];
           if (val == 1) {
-            this.formData.fromInvCode = this.fromInvOptions[0].code;
+            this.orderFormData.fromInvCode = this.fromInvOptions[0].code;
           }
         })
         .catch(() => {
@@ -480,30 +481,28 @@ export default {
     addCode(event) {
       this.originCode = "";
       this.sictomText = "";
-      this.formData.corpOrderId = this.formData.corpOrderId.trim();
-      this.formData.batchNo = "";
-      this.formData.produceDate = "";
-      this.formData.expireDate = "";
-      this.formData.serialNo = "";
+      this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim();
+      this.codeFormData.batchNo = "";
+      this.codeFormData.produceDate = "";
+      this.codeFormData.expireDate = "";
+      this.codeFormData.serialNo = "";
       this.actionEnable = true;
       if (event == null) {
       } else event.target.select();
       this.$refs.inputRef.select();
-      if (this.$isBlank(this.formData.action)) {
+      if (this.$isBlank(this.orderFormData.action)) {
         this.$message.warning("请选择单据类型！");
         return;
       }
-      if (this.$isBlank(this.formData.corpOrderId)) {
+      if (this.$isBlank(this.orderFormData.corpOrderId)) {
         let date = new Date();
-        this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
+        this.orderFormData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
       }
-      this.formData.code = this.formData.code.trim();
-      if (this.$isBlank(this.formData.code)) return;
+      this.codeFormData.code = this.codeFormData.code.trim();
+      if (this.$isBlank(this.codeFormData.code)) return;
       this.loading = true;
-      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
-      tQuery.orderId = this.idQuery.id;
-      tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
-      tQuery.action = this.formData.action;
+      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
+      tQuery.code = this.codeFormData.code;
       this.addCodeSubmit(tQuery);
       this.$refs.inputRef.select();
     },
@@ -565,10 +564,10 @@ export default {
           } else if (response.code == 507) {
             this.editOriginCodeVisible = true;
             this.editTitle = response.message;
-            this.formData.produceDate = response.data.produceDate;
-            this.formData.expireDate = response.data.expireDate;
-            this.formData.batchNo = response.data.batchNo;
-            this.formData.serialNo = response.data.serialNo;
+            this.codeFormData.produceDate = response.data.produceDate;
+            this.codeFormData.expireDate = response.data.expireDate;
+            this.codeFormData.batchNo = response.data.batchNo;
+            this.codeFormData.serialNo = response.data.serialNo;
             this.$message({
               type: 'error',
               message: "提交失败！" + this.editTitle,
@@ -592,32 +591,15 @@ export default {
 
     refreshCodesPanel() {
       this.isCodeAlive = false;
-      this.idQuery =
       this.$nextTick(() => {  //重新加载组件
         this.isCodeAlive = true
       })
     },
 
 
-    submit(formName) {
-      if (this.total < 1) {
-        this.$message.error('未添加条码');
-        return;
-      }
-      let tQuery = {
-        orderId: this.idQuery.id,
-        locStorageCode: this.formData.locStorageCode,
-        invStorageCode: this.formData.invStorageCode,
-        invWarehouseCode: this.formData.invWarehouseCode,
-        fromInvCode: this.formData.fromInvCode,
-        subInvCode: this.formData.subInvCode,
-        action: this.formData.action,
-        fromCorp: this.formData.fromCorp,
-        fromCorpId: this.formData.fromCorpId,
-        outChangeEnable: this.formData.outChangeEnable,
-        preCheck: this.formData.preCheck,
-        deptCode: this.formData.deptCode,
-      }
+    submit() {
+      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
+      tQuery.orderId = this.idQuery.billNo;
       submitOrderWeb(tQuery)
         .then((response) => {
           if (response.code === 20000) {
@@ -630,23 +612,8 @@ export default {
         });
     },
     saveOrder() {
-      if (this.total < 1) {
-        this.$message.error('未添加条码');
-        return;
-      }
-      if (this.formData.action == null || this.formData.action == '') {
-        this.$message.error('未选择扫码单据类型');
-        return
-      }
-
-
-      if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
-        this.$message.error('当前分库不能为空');
-        return;
-      }
-      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
+      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
       tQuery.orderId = this.idQuery.billNo;
-      tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
       saveOrderWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.closeDialog();
@@ -676,42 +643,40 @@ export default {
       this.checkSuccess = true;
       let tQuery = {
         originCode: this.originCode,
-        code: this.formData.code.trim(),
+        code: this.codeFormData.code.trim(),
       }
       enterCodeWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.$refs.inputRef.focus();
           this.$refs.inputRef.select();
-          this.formData.code = response.data;
+          this.codeFormData.code = response.data;
           this.addCode();
         } else {
           if (response.code == 502) {
             this.checkSuccess = false;
-            this.formData.code = response.data;
-            this.originCode = this.formData.code;
+            this.codeFormData.code = response.data;
+            this.originCode = this.codeFormData.code;
           } else if (response.code == 501) {
             this.checkSuccess = false;
-            // this.formData.code = response.data;
-            // this.originCode = this.formData.code;
             this.$message.error(response.message);
           } else if (response.code == 503) {
             this.checkSuccess = false;
-            this.formData.code = response.data;
+            this.codeFormData.code = response.data;
             this.$confirm(response.message, "提示", {
               type: "warning",
             })
               .then(() => {
-                this.formData.code = response.data;
+                this.codeFormData.code = response.data;
                 this.addCode();
               })
               .catch(() => {
-                this.formData.code = this.originCode;
+                this.codeFormData.code = this.originCode;
               });
 
           } else if (response.code == 508) {
             this.originCode = "";
-            this.formData.code = "01" + response.data.nameCode;
-            this.originCode = this.formData.code;
+            this.codeFormData.code = "01" + response.data.nameCode;
+            this.originCode = this.codeFormData.code;
           } else {
             this.$alert(response.message, '提示', {
               confirmButtonText: '确定',
@@ -732,8 +697,8 @@ export default {
     repeatAddCode(editData) {
       let tQuery = editData;
       tQuery.orderId = this.idQuery.id;
-      tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
-      tQuery.action = this.formData.action;
+      tQuery.actDate = parseTime(this.orderFormData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
+      tQuery.action = this.orderFormData.action;
       this.closeCodeDialog();
       this.addCodeSubmit(tQuery);
 
@@ -822,7 +787,7 @@ export default {
     window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
     sc.onInput = function (text) {
       if (text.includes("delete")) {
-        that.formData.code = "";
+        that.codeFormData.code = "";
         that.sictomText = "";
         that.originCode = "";
         return;
@@ -831,44 +796,34 @@ export default {
         let tempTxt = text;
         let str = tempTxt.replace(/[\r]/g, "");
         that.sictomText = that.sictomText + str;
-        that.formData.code = that.sictomText;
+        that.codeFormData.code = that.sictomText;
       } else {
 
-        that.formData.code = text;
-        // setTimeout(function(){  that.formData.code = text; }, 3000);
-
-
+        that.codeFormData.code = text;
       }
     };
     inputer.focus();
   },
   created() {
-    this.formData.code = '';
+    this.codeFormData.code = '';
     this.codeArray = [];
     if (this.$isNotBlank(this.idQuery.billNo)) {
-      this.formData.actDate = new Date(this.idQuery.actDate);
-      this.formData.corpOrderId = this.idQuery.corpOrderId;
       this.corpOrderIdDisabled = true;
-      this.formData.action = this.idQuery.action;
-      this.formData.fromCorp = this.idQuery.fromCorp;
-      this.formData.deptCode = this.idQuery.deptCode
-      this.formData.invCode = this.idQuery.invCode;
-      this.formData.fromInvCode = this.idQuery.fromInvCode;
-      this.formData.preCheck = this.idQuery.preCheck;
-      this.formData.remark = this.idQuery.remark;
+      this.orderFormData = this.idQuery;
       this.actionEnable = true;
       this.refreshCodesPanel();
       //选择框候选数据
       this.findInvByUser();
       this.getBusTypeByInv();
-      this.findMethod(this.formData.fromCorp);
+      this.findMethod(this.orderFormData.fromCorp);
       this.findFromInvList();
     } else {
       this.corpOrderIdDisabled = false;
-      this.formData.actDate = new Date();
       let date = new Date();
-      this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
-      this.formData.invCode = this.$store.getters.locInvCode;
+      this.orderFormData.createTime = parseTime(date, '{y}-{m}-{d} {h}:{i}:{s}');
+      this.orderFormData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
+      this.orderFormData.deptCode = this.$store.getters.deptCode;
+      this.orderFormData.invCode = this.$store.getters.locInvCode;
       this.findInvByUser();
     }
 
diff --git a/src/views/inout/IoCreateOrderBizDetail.vue b/src/views/inout/IoCreateOrderBizDetail.vue
index 143669d6..297c6f69 100644
--- a/src/views/inout/IoCreateOrderBizDetail.vue
+++ b/src/views/inout/IoCreateOrderBizDetail.vue
@@ -1,20 +1,33 @@
 <template>
   <div>
-    <el-button-group style="display: flex">
-      <el-button
-        type="primary"
-        size="mini"
-        ref="mainTable"
-        @click.native.stop="selectProductFunction()"
-        style="margin: 0px 60px 10px auto; height: 35px"
-        :loading="loading"
-      >产品录入
-      </el-button
-      >
-    </el-button-group>
+    <el-row>
+      <div style="margin: 0px 60px 10px auto; height: 35px;  float: right;">
+        <el-button-group>
+          <el-button
+            type="primary"
+            ref="mainTable"
+            @click.native.stop="selectProductFunction()"
+            :loading="loading"
+          >产品录入
+          </el-button
+          >
+          <el-button
+            type="primary"
+            ref="mainTable"
+            @click.native.stop="selectProductFunction()"
+            :loading="loading"
+          >第三方单据选入
+          </el-button
+          >
+        </el-button-group>
+      </div>
+
+    </el-row>
+
     <el-table v-loading="loading" :data="detailList" style="width: 100%;"
               :row-class-name="tableRowClassName"
               border
+              :row-style="rowStyle"
               max-height="350" height="350" ref="multipleTable">
       <el-table-column label="序号" type="index" width="50"></el-table-column>
       <el-table-column width="150"
@@ -67,7 +80,7 @@
 
       <el-table-column width="80"
                        label="扫码数量"
-                       prop="reCount"
+                       prop="scanCount"
                        show-overflow-tooltip
       ></el-table-column>
       <el-table-column width="150" label="价格">
@@ -239,7 +252,7 @@ export default {
 
     rowStyle({row, rowIndex}) {
       let rowBackground = {};
-      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
+      if (!row.checkSuccess) {
         rowBackground.color = '#f60303';
       }
       return rowBackground;
@@ -327,7 +340,8 @@ export default {
   }
   ,
   created() {
-    this.getOrderDetails();
+    if (this.idQuery.billNo != null)
+      this.getOrderDetails();
   }
   ,
 }
diff --git a/src/views/inout/IoCreateOrderCodeDetail.vue b/src/views/inout/IoCreateOrderCodeDetail.vue
index 819b6314..eb94fd3d 100644
--- a/src/views/inout/IoCreateOrderCodeDetail.vue
+++ b/src/views/inout/IoCreateOrderCodeDetail.vue
@@ -91,7 +91,8 @@ export default {
     },
   },
   created() {
-    this.getOrderDetails();
+    if (this.idQuery.billNo != null)
+      this.getOrderDetails();
   },
 }
 </script>
diff --git a/src/views/inout/IoCreateOrderCodes.vue b/src/views/inout/IoCreateOrderCodes.vue
index 5b68e513..33d45a75 100644
--- a/src/views/inout/IoCreateOrderCodes.vue
+++ b/src/views/inout/IoCreateOrderCodes.vue
@@ -200,7 +200,8 @@ export default {
     },
   },
   created() {
-    this.getCodeList();
+    if (this.idQuery.billNo != null)
+      this.getCodeList();
   },
 }
 </script>
diff --git a/src/views/inout/IoNewOrder.vue b/src/views/inout/IoNewOrder.vue
index 4e46707b..d06acf70 100644
--- a/src/views/inout/IoNewOrder.vue
+++ b/src/views/inout/IoNewOrder.vue
@@ -122,7 +122,7 @@
             <el-button
               type="text"
               size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
+              @click.native.stop="deleteDialog(scope.row.billNo)"
             >删除
             </el-button
             >
@@ -306,8 +306,7 @@ export default {
         fromCorpId: "",
         fromCorp: "",
       },
-      idQuery: {
-      },
+      idQuery: {},
       storageList: [],
       subInvList: [],
       errOrderVisible: false,
@@ -342,7 +341,7 @@ export default {
         "11": "仓库盘点"
       },
       deleteData: {
-        id: "",
+        billNo: "",
         status: 10,
       },
       dialogTableVisible: false,
@@ -558,7 +557,7 @@ export default {
     },
     deleteOrders(data) {
       this.loading = true;
-      this.deleteData.id = data;
+      this.deleteData.billNo = data;
       deleteByOrderId(this.deleteData)
         .then((response) => {
 
diff --git a/src/views/inout/IoUnCheckedOrder.vue b/src/views/inout/IoUnCheckedOrder.vue
new file mode 100644
index 00000000..99d1b612
--- /dev/null
+++ b/src/views/inout/IoUnCheckedOrder.vue
@@ -0,0 +1,856 @@
+<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.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="6">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
+                         style="width: 90%">
+                <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.invCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+                         @change="subInvChange"
+              >
+                <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-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <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
+                @current-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName"></el-table-column>
+        <el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></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="fromCorpName" 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="deptName" width="120" v-if="enableDept">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
+          <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="(scope.row.status ===-1 ) | statusFilterType">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150">
+          <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.id)"
+            >删除
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="checkOrder(scope.row.id)"
+            >校验单据
+            </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-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"
+                ></el-table-column>
+                <el-table-column
+                  label="批次号"
+                  prop="batchNo"
+                ></el-table-column>
+                <el-table-column
+                  label="DI标识"
+                  prop="nameCode"
+                ></el-table-column>
+                <el-table-column
+                  label="规格型号"
+                  prop="spec"
+                ></el-table-column>
+                <el-table-column
+                  label="生产日期"
+                  prop="productDate"
+                ></el-table-column>
+                <el-table-column
+                  label="失效日期"
+                  prop="expireDate"
+                ></el-table-column>
+                <el-table-column
+                  label="医疗器械注册备案证号"
+                  prop="ylqxzcrbarmc"
+                ></el-table-column>
+                <el-table-column
+                  label="生产企业"
+                  prop="manufacturer"
+                ></el-table-column>
+                <el-table-column
+                  label="价格"
+                  prop="price"
+                ></el-table-column>
+                <el-table-column
+                  label="价格"
+                  prop="price"
+                ></el-table-column>
+                <el-table-column
+                  label="价格"
+                  prop="price"
+                ></el-table-column>
+                <el-table-column
+                  label="价格"
+                  prop="price"
+                ></el-table-column>
+                <el-table-column
+                  label="价格"
+                  prop="price"
+                ></el-table-column>
+                <el-table-column
+                  label="价格"
+                  prop="price"
+                ></el-table-column>
+                <el-table-column
+                  label="价格"
+                  prop="price"
+                ></el-table-column>
+                <el-table-column label="操作">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      @click.native.stop="editBizDialog(scope.row)"
+                    >编辑
+                    </el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination
+                v-show="bizTotal>0"
+                :total="bizTotal"
+                :page.sync="bizQuery.page"
+                :limit.sync="codeQuery.limit"
+                @pagination="getBizDetailList"
+              />
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+      </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-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="employeeName"
+                ></el-table-column>
+                <el-table-column
+                  label="用户账号"
+                  prop="userName"
+                ></el-table-column>
+                <el-table-column label="备注" prop="comments">
+                </el-table-column>
+                <el-table-column label="操作">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      @click.native.stop="editCodeDialog(scope.row)"
+                    >编辑
+                    </el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination
+                v-show="codeTotal>0"
+                :total="codeTotal"
+                :page.sync="codeQuery.page"
+                :limit.sync="codeQuery.limit"
+                @pagination="getCodeDetailList"
+              />
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+      </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.productName"
+              placeholder="请输入产品名称"
+              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-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="用户名称"
+                  prop="employeeName"
+                ></el-table-column>
+                <el-table-column
+                  label="用户账号"
+                  prop="userName"
+                ></el-table-column>
+                <el-table-column label="备注" prop="comments">
+                </el-table-column>
+                <el-table-column label="操作">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      @click.native.stop="editResultDialog(scope.row)"
+                    >编辑
+                    </el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination
+                v-show="resultTotal>0"
+                :total="resultTotal"
+                :page.sync="resultQuery.page"
+                :limit.sync="resultQuery.limit"
+                @pagination="getResultDetailList"
+              />
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+    </el-tabs>
+
+  </div>
+</template>
+
+<script>
+import {
+  getDraft,
+  deleteByOrderId,
+  getOrderList
+} from "../../api/inout/order";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import {getBizDetailList} from "@/api/inout/orderDetailBiz";
+import {getCodeDetailList} from "@/api/inout/orderDetailCode";
+import {getResultDetailList} from "@/api/inout/orderDetailResult";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoNewOrder",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        id: "",
+        mainAction: null,
+        action: null,
+        page: 1,
+        status: 10,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+      checkStatus: {
+        '-1': "草稿",
+        // 1: "等待处理",
+        1: "等待处理",
+        2: "等待校验",
+        3: "校验异常",
+        4: "校验成功",
+      },
+      storageList: [],
+      subInvList: [],
+      total: 0,
+      loading: false,
+      index: null,
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点"
+      },
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      busTypes: [],
+      currentRow: {},
+      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]);
+            },
+          },
+        ],
+      },
+      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: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      resultTotal: 0,
+      resultDetailLoading: false,
+      resultDetailList: [],
+    };
+  },
+  components: {},
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        status: 10,
+        page: 1,
+        limit: 10,
+      };
+      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;
+      }
+      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();
+    },
+    getBusType() {
+      if (this.subInvList.length > 0) {
+        this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
+      }
+      let query = {
+        code: this.filterQuery.invWarehouseCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.billAction = this.busTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getStorage() {
+      this.storageList = [];
+      filterAllByUser()
+        .then((response) => {
+          this.storageList = response.data || [];
+          if (this.storageList.length > 0) {
+            this.getSubInvList();
+            this.getList();
+          }
+        })
+        .catch(() => {
+        });
+    },
+    getStorageName(code) {
+      for (let i = 0; i < this.storageList.length; i++) {
+        if (this.storageList[i].code === code) {
+          return this.storageList[i].name;
+        }
+      }
+    },
+    getSubStorageName(code) {
+      for (let i = 0; i < this.subInvList.length; i++) {
+        if (this.subInvList[i].code === code) {
+          return this.subInvList[i].name;
+        }
+      }
+    },
+    handleSelectionChange(val) {
+      this.currentRow = val;
+    },
+    //获取订单列表
+    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;
+          } 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.id = 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();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(rowId);
+        })
+        .catch(() => {
+        });
+    },
+    invChange() {
+      this.subInvList = [];
+      this.filterQuery.invWarehouseCode = "";
+      let query = {
+        pcode: this.filterQuery.locStorageCode
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    getSubInvList() {
+      let query = {
+        filter: 3,
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    subInvChange() {
+      this.getBusType();
+    },
+    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;
+      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;
+      })
+    },
+    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) {
+
+    },
+    onResultReset() {
+      this.resultQuery = {
+        orderIdFk: 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.orderIdFk = this.currentRow.billNo;
+      this.resultDetailLoading = true;
+      getResultDetailList(this.resultQuery).then((res) => {
+        this.resultDetailLoading = false;
+        if (res.code === 20000) {
+          this.resultDetailList = res.data.list || [];
+          this.resultTotal = 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;
+      });
+    },
+    editResultDialog(row) {
+
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getSubInvList();
+    this.getBusType();
+    let query = this.$route.query;
+    this.filterQuery = Object.assign(this.filterQuery, query);
+    this.filterQuery.limit = parseInt(this.filterQuery.limit);
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inout/stockOrderNewSelectProduct.vue b/src/views/inout/stockOrderNewSelectProduct.vue
index 2b409c27..45ffe0d3 100644
--- a/src/views/inout/stockOrderNewSelectProduct.vue
+++ b/src/views/inout/stockOrderNewSelectProduct.vue
@@ -1,126 +1,140 @@
 <template>
   <div>
     <el-card class="el-card">
-      <div>
-        <el-form :model="listQuery" size="mini">
-          <el-row style="margin-top: 15px;width: 1000px">
-            <el-form-item class="query-form-item">
+      <el-form :model="listQuery" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="18">
+            <el-form-item class="query-form-item" label="UDI码:">
               <el-input v-model="listQuery.udiCode"
-                        style="width: 600px"
+                        style="width: 97%"
                         placeholder="请扫描或输入UDI码"
                         clearable="true"
                         @keyup.enter.native="keyup_submit($event)"></el-input>
             </el-form-item>
-          </el-row>
-          <el-row>
-            <el-form-item class="query-form-item">
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="产品编码:">
               <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                        style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="产品通用名:">
+              <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"
+                        style="width: 90%"></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="规格型号:">
+              <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"
+                        style="width: 90%"></el-input>
             </el-form-item>
-          </el-row>
-          <el-row>
-            <el-form-item class="query-form-item">
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="注册备案人:">
               <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                        style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
-            </el-form-item>
-
-            <el-form-item>
-              <el-button-group>
-                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                <el-button type="primary" icon="search" @click="search">查询</el-button>
-                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
-              </el-button-group>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="外部产品编码:">
+              <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码"
+                        style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
-          </el-row>
-        </el-form>
-
-        <el-table
-          :data="dataList"
-          style="width: 100%"
-          highlight-current-row="false"
-          v-loading="loading"
-          border
-          @current-change="handleChange"
-          ref="multipleTable"
-        >
-          <el-table-column label width="45">
-            <template slot-scope="scope">
-              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-            </template>
-          </el-table-column>
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column
-            label="最小销售产品标识"
-            prop="nameCode"
-            width="140"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="产品编码"
-            prop="thirdId"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="医疗器械注册人"
-            prop="ylqxzcrbarmc"
-            show-overflow-tooltip
-          ></el-table-column>
-          <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="zczbhhzbapzbh"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="器械类别"
-            prop="qxlb"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="配送企业"
-            prop="companyName"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column label="操作" width="160">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                size="small"
-                @click.native.stop="handleDetailClick(scope.row)"
-              >详情
-              </el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          :page-size="listQuery.limit"
-          @current-change="handleErpPageChange"
-          layout="prev, pager, next"
-          :total="pageTotal"
-          :current-page="listQuery.page"
-        ></el-pagination>
+          </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="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-check" @click="confirmSelect">确定</el-button>
+        </el-button-group>
       </div>
+      <el-table
+        :data="dataList"
+        style="width: 100%"
+        highlight-current-row="false"
+        v-loading="loading"
+        border
+        @current-change="handleChange"
+        ref="multipleTable"
+      >
+        <el-table-column label width="45">
+          <template slot-scope="scope">
+            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+          label="最小销售产品标识"
+          prop="nameCode"
+          width="140"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="产品编码"
+          prop="thirdId"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="医疗器械注册人"
+          prop="ylqxzcrbarmc"
+          show-overflow-tooltip
+        ></el-table-column>
+        <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="zczbhhzbapzbh"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="器械类别"
+          prop="qxlb"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="配送企业"
+          prop="companyName"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column label="操作" width="160">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="handleDetailClick(scope.row)"
+            >详情
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :page-size="listQuery.limit"
+        @current-change="handleErpPageChange"
+        layout="prev, pager, next"
+        :total="pageTotal"
+        :current-page="listQuery.page"
+      ></el-pagination>
     </el-card>
-
     <el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
       <el-form :model="form">
         <el-form-item label="" prop="isGive">
@@ -134,7 +148,6 @@
         <el-button @click="dialogFormVisible = false">取 消</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
@@ -163,6 +176,7 @@ export default {
   data() {
     return {
       loading: false,
+      showSearch: true,
       listQuery: {
         udiCode: null,
         cpmctymc: null,
@@ -201,6 +215,10 @@ export default {
       this.getList();
     },
 
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+
     search() {
       this.listQuery.page = 1;
       this.getList();
@@ -257,7 +275,7 @@ export default {
       if (this.currentCert == null) {
         this.$message.error("请先选择对应的注册证！");
       } else {
-        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+        this.currentRow.zczbhhzbapzbh = this.currentCert;
         this.combine();
       }
     },
diff --git a/src/views/system/dept/invRelUsers.vue b/src/views/system/dept/invRelUsers.vue
index a9fe949f..3cc0b7b1 100644
--- a/src/views/system/dept/invRelUsers.vue
+++ b/src/views/system/dept/invRelUsers.vue
@@ -205,12 +205,14 @@ export default {
         limit: 10
       };
     },
-    loadUserList(val) {   //获取仓库用户列表
-      if (val != null) {
-        this.userQuery.page = val;
-      }
+    loadUserList() {   //获取仓库用户列表
+
+      // if (val != null) {
+      //   this.userQuery.page = val;
+      // }
       //加载用户数据
       warehouseUserList(this.userQuery).then((res) => {
+
         this.userData = res.data.list;
         this.userTotal = res.data.total;
       }).catch((error) => {
@@ -261,6 +263,10 @@ export default {
     },
 
     addUserData() {     //提交选入用户
+      if(this.selectAddUser.length==0){
+        this.$message.error("请选择要选入的用户！");
+        return;
+      }
       let query = {
         code: this.currentCode,
         userList: JSON.stringify(this.selectAddUser)
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 52e2f210..7629b259 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -33,7 +33,7 @@
         :default-expand-all="isExpandAll"
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       >
-        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
         <el-table-column
           prop="name"
           label="仓库名称"
@@ -93,13 +93,13 @@
 
         </el-table-column>
       </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="query.page"
-        :limit.sync="query.limit"
-        @pagination="getList"
-      />
+      <!--<pagination-->
+      <!--  v-show="total>0"-->
+      <!--  :total="total"-->
+      <!--  :page.sync="query.page"-->
+      <!--  :limit.sync="query.limit"-->
+      <!--  @pagination="getList"-->
+      <!--/>-->
       <!--仓库编辑对话框-->
       <el-dialog
         :title="formMap[formName]"
@@ -131,7 +131,7 @@
 
             <el-col :span="12" class="el-col">
               <el-form-item label="上级仓库" prop="parentCode">
-                <treeselect v-model="subData.parentCode" :options="invOptions" :normalizer="normalizer"
+                <treeselect v-model="subData.parentInvName" :options="invOptions" :normalizer="normalizer"
                             :disabled="isShow"
                             style="width: 80%"
                             placeholder="选择上级仓库"/>
@@ -263,7 +263,7 @@
           :total="subTotal"
           :page.sync="thirdSubQuery.page"
           :limit.sync="thirdSubQuery.limit"
-          @pagination="getList"
+          @pagination="intentSubSelect"
         />
 
         <div slot="footer" class="dialog-footer">
@@ -327,7 +327,7 @@
 <script>
 import {
   filterSubAll, saveSubWarehouse, deleteSubWarehouse,
-  getSubThrsysDetail, bindThrSubWarehouse, unbindSubThrWarehouse
+  getSubThrsysDetail, bindThrSubWarehouse, unbindSubThrWarehouse,
 } from "@/api/system/invSubWarehouse";
 import {getHospitalUserList, selectNotSelectUser} from "@/api/auth/authUser";
 import {getJoinBussinessType} from "@/api/basic/bussinessType";
@@ -353,8 +353,8 @@ export default {
         name: null,
         code: null,
         status: "1",
-        page: 1,
-        limit: 10,
+        // page: 1,
+        // limit: 10,
       },
       isShow: null,
       loading: true,
@@ -417,20 +417,20 @@ export default {
         name: "",
         status: "",
       };
-      this.busQuery.page = 1;
       this.getList();
     },
 
     onSubmit() { //提交查询
       this.getList();
     },
+
     getList() { //获取仓库信息
       this.loading = true;
       filterSubAll(this.query)
         .then((response) => {
           this.loading = false;
-          this.total = response.data.total;
-          let invlist = response.data.list || [];
+          //this.total = response.data.total;
+          let invlist = response.data || [];
           this.list = this.handleTree(invlist, "code", "parentCode");
 
         })
@@ -458,13 +458,25 @@ export default {
         })
         .catch(() => {
         });
-
+         this.sysSubList=null;
     },
+
     hideForm() {    // 新增，编辑---取消
       this.formVisible = false;
       this.subFormVisible = false;
+      this.resetForm();
       return true;
     },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
     forInvSubmit() {    // 新增，编辑---提交
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
@@ -533,10 +545,11 @@ export default {
       this.currentCode = row.code;
       this.currentRow = row;
       this.curSeleUser = null;
-      //加载单据类型
-      this.selsectBussinessType(row);
       //加载货位信息
       this.invSpaceManage(row);
+      //加载单据类型
+      this.selsectBussinessType(row);
+
     },
     //关联第三方仓库信息
     intentSubSelect(row) {
@@ -567,9 +580,15 @@ export default {
     hideThrWarehouseTable() {
       this.thrWareHouseVisible = false;
       this.thrSubWareHouseVisible = false;
+      //刷新表单
+      this.thirdSubQuery.name="";
+      this.subData.id=null;
+      this.checkSubThrWarehouseRow.code=null;
+      this.checkSubThrWarehouseRow.thirdSysFk=null;
     },
     //绑定第三方分库
     bindSubThrWarehouse() {
+
       let params = {
         id: this.subData.id,
         thridWarehouseId: this.checkSubThrWarehouseRow.code,
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 92b114d1..22c29cc2 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -54,7 +54,7 @@
 
         <el-col :span="11">
           <el-form-item label="目标往来仓库" prop="defaultInvCode">
-            <el-select v-model="inputQuery.defaultInvName" placeholder="目标往来仓库" clearable size="small"
+            <el-select v-model="inputQuery.defaultInvCode" placeholder="目标往来仓库" clearable size="small"
                        @change="invChange"
                        style="width: 90%">
               <el-option
@@ -199,7 +199,7 @@ export default {
       let params = {};
       filterSubAll(params).then((res) => {
         if (res.code === 20000){
-          this.locInvs = res.data.list || [];
+          this.locInvs = res.data || [];
         }
       });
     },
diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue
index 7bc4d8fd..8c4308ad 100644
--- a/src/views/thirdSys/inv/index.vue
+++ b/src/views/thirdSys/inv/index.vue
@@ -316,6 +316,7 @@ export default {
         thirdSysFk: null,
       },
       mainThirdSys:'',
+      ThirdSysName:"",
       mergeList: [],
       subList: [],
       subData: {},
@@ -482,6 +483,7 @@ export default {
       if (data && data.id) {
         this.index = this.mergeList.findIndex((d) => d.id === data.id);
       }
+      this.ThirdSysName=this.formData.thirdSysFk
     },
 
     handleSubForm(data, formName) {
@@ -495,6 +497,7 @@ export default {
         this.subData.thirdSysFk = data.thirdSysFk;
       }
       this.subFormVisible = true;
+      localStorage.setItem("code", JSON.stringify(this.subData.code));
     },
 
     handleSubDel(row) {
@@ -539,7 +542,9 @@ export default {
         this.$message.error("分库名称不能为空！");
         return;
       }
+
       saveSubWarehouse(this.subData, this.subFromName).then((response) => {
+
         if (response.code == 20000) {
           let row = {
             code: this.subData.parentId,
@@ -552,6 +557,7 @@ export default {
           this.subFormVisible = false;
         }
       }).catch(() => {
+        this.subData.code=JSON.parse(localStorage.getItem("code"));
         this.subFormVisible = false;
       });
       this.resetForm();
@@ -605,7 +611,8 @@ export default {
             })
             .catch(() => {
               this.formLoading = false;
-              this.$refs["dataForm"].resetFields();
+
+              this.formData.thirdSysFk=this.ThirdSysName;
             });
         }
       });