diff --git a/src/api/inout/receiveOrder.js b/src/api/inout/receiveOrder.js
new file mode 100644
index 00000000..a66e284d
--- /dev/null
+++ b/src/api/inout/receiveOrder.js
@@ -0,0 +1,33 @@
+import axios from '@/utils/request'
+
+//--------------获取领用单据-------------------
+export function getReceiveOrder(query) {
+  return axios({
+    url: "/udiwms/receive/order/filter",
+    method: "get",
+    params: query
+  });
+}
+
+
+export function addDetail(query) {
+  return axios({
+    url: "/udiwms/receive/detail/add",
+    method: "post",
+    data: query
+  });
+}
+
+
+export function getOrderDetail(query) {
+  return axios({
+    url: "/udiwms/receive/order/detail",
+    method: "get",
+    params: query
+  });
+}
+
+
+
+
+
diff --git a/src/utils/request.js b/src/utils/request.js
index b0b74332..a36d2ec3 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -78,7 +78,7 @@ service.interceptors.request.use(config => {
 // 响应拦截器
 service.interceptors.response.use(res => {
     // 未设置状态码则默认成功状态
-    const code = res.data.code || 20000;
+    const code = res.data.code || 200;
     // 获取错误信息
     const msg = errorCode[code] || res.data.message
     // 二进制数据则直接返回
@@ -103,21 +103,27 @@ service.interceptors.response.use(res => {
         });
       }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-    } else if (code === 500) {
+    }else {
+      return res.data
+    }
+  },
+
+  /**
+   * else if (code === 500) {
       Message({
         message: msg,
         type: 'error'
       })
       return Promise.reject(new Error(msg))
-    } else if (code !== 20000) {
+    }
+
+   else if (code !== 20000) {
       Notification.error({
         title: msg
       })
       return Promise.reject('error')
-    } else {
-      return res.data
     }
-  },
+   */
   error => {
     console.log('err' + error)
     let {message} = error;
diff --git a/src/views/inout/DialogEditCode.vue b/src/views/inout/DialogEditCode.vue
index 2d05e763..aabe6fca 100644
--- a/src/views/inout/DialogEditCode.vue
+++ b/src/views/inout/DialogEditCode.vue
@@ -109,7 +109,6 @@ export default {
       if (this.editTye == 1) {
         this.repeatAddCode(this.editData);
       } else {
-
         saveCode(this.editData)
           .then((response) => {
             console.log(response)
diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue
new file mode 100644
index 00000000..312c6f6b
--- /dev/null
+++ b/src/views/inout/DialogSelectInvProduct.vue
@@ -0,0 +1,231 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+        <el-row>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.batchNo" placeholder="批次号"></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="onSubmit"
+              >查询
+              </el-button
+              >
+              <el-button type="primary" icon="search" @click="combine">确定</el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-table v-loading="loading" :data="list" style="width: 100%"
+                highlight-current-row="false"
+                ref="multipleTable">
+        <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="产品标识" prop="nameCode"></el-table-column>
+        <el-table-column label="产品名称" prop="cpmctymc">
+        </el-table-column>
+        <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productionDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <el-table-column label="入库数量" prop="inCount"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount"></el-table-column>
+        <el-table-column label="结余数量" prop="reCount"></el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-pagination
+      :page-size="filterQuery.limit"
+      @current-change="handleCurrentChange"
+      layout="prev, pager, next"
+      :total="total"
+      :current-page="filterQuery.page"
+    ></el-pagination>
+  </div>
+</template>
+
+<script>
+import {
+  getInvProduct,
+} from "@/api/inventory/invPorduct";
+import {addDetail} from "@/api/inout/receiveOrder";
+
+
+export default {
+  name: "DialogInvProduct",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    invQueryData: {
+      type: Object,
+      required: true,
+    },
+    type: {
+      type: Object,
+      required: true,
+    }
+  },
+  data() {
+    return {
+      filterQuery: {
+        cpmctymc: null,
+        nameCode: null,
+        relIdFk: null,
+        batchNo: null,
+        page: 1,
+        limit: 10,
+        customerId: null,
+        supId: null,
+        unitFk: null,
+        invCode: this.invQueryData.invCode,
+      },
+      detailQuery: {
+        code: null,
+        productIdFk: null,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      total: 0,
+      loading: true,
+      index: null,
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      deleteLoading: false,
+      busTypes: [],
+      idQuery: null,
+      showSup: false,
+      fromOptions: [],
+    };
+  },
+  components: {},
+  methods: {
+    onReset() {
+
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        cpmctymc: null,
+        nameCode: null,
+        relIdFk: null,
+        batchNo: null,
+        customerId: null,
+        unitFk: null,
+        supId: null,
+        page: 1,
+        limit: 10,
+        invCode: this.invQueryData.targetInvCode,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    closeDetailDialog(val) {
+      this.codeDetailVisible = false;
+    },
+
+    getList() {
+      this.loading = true;
+      getInvProduct(this.filterQuery)
+        .then((response) => {
+          this.showSup = response.data.showSup;
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+    combine() {
+      let selection = this.$refs.multipleTable.selection;
+      if (selection.length < 1) {
+        this.$message.error('未选择产品');
+        return;
+      }
+      let ids = [];
+      selection.forEach((obj, index) => {
+        let data = {
+          relId: obj.relIdFk,
+          batchNo: obj.batchNo,
+          productDate: obj.productionDate,
+          expireDate: obj.expireDate,
+        }
+        ids.push(data);
+      });
+
+      this.loading = true;
+      let tQuery = {
+        datas: ids,
+        purReceiveEntity: this.invQueryData,
+      };
+      addDetail(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.closeDialog(response.data);
+        } else {
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "danger",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.filterQuery.invCode = this.invQueryData.targetInvCode;
+    // 加载表格数据
+    this.getList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/inout/stockOrderNewSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue
similarity index 99%
rename from src/views/inout/stockOrderNewSelectProduct.vue
rename to src/views/inout/DialogSelectProduct.vue
index 7b2a083d..25c6ed84 100644
--- a/src/views/inout/stockOrderNewSelectProduct.vue
+++ b/src/views/inout/DialogSelectProduct.vue
@@ -158,7 +158,7 @@ import {addBizProduct} from "@/api/inout/orderDetailCode";
 import {filterCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance";
 
 export default {
-  name: "stockOrderNewSelectProduct",
+  name: "stockOrderNewSelectProduct",//选入耗材字典产品对话框
   props: {
     data: {
       type: Object,
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index a9c675d1..07995f05 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -22,7 +22,8 @@
           <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%">
+                         style="width: 90%"
+                         clearable>
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -113,37 +114,30 @@
             <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="校验状态" 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)"
-            >编辑
+              @click.native.stop="printDialog(scope.row)"
+            >打印
             </el-button
             >
             <el-button
               type="text"
               size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
+              @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="checkOrder(scope.row.id)"
-            >校验单据
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>
@@ -230,16 +224,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></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"
@@ -676,7 +660,7 @@ export default {
     },
     deleteOrders(data) {
       this.loading = true;
-      this.deleteData.id = data;
+      this.deleteData.billNo = data.billNo;
       deleteByOrderId(this.deleteData)
         .then((response) => {
 
@@ -695,7 +679,7 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(rowId) {
+    deleteDialog(row) {
       this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index a42d6b48..2b5d4ad2 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -22,7 +22,8 @@
           <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%">
+                         style="width: 90%"
+                         clearable>
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -115,7 +116,7 @@
         </el-table-column>
         <el-table-column label="校验状态" prop="status" width="100">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+            <el-tag :type="statusFilterType(scope.row.status)">{{
                 checkStatus[scope.row.status]
               }}
             </el-tag>
@@ -133,17 +134,10 @@
             <el-button
               type="text"
               size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
+              @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="checkOrder(scope.row.id)"
-            >校验单据
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>
@@ -230,16 +224,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></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"
@@ -322,16 +306,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></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"
@@ -423,16 +397,6 @@
             label="发票有效期"
             prop="invoiceDate"
           ></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"
@@ -444,6 +408,22 @@
       </el-tab-pane>
     </el-tabs>
 
+    <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"
+        :errView="1"
+        :orderQuery="idQuery"
+      ></addOrder>
+    </el-dialog>
   </div>
 </template>
 
@@ -461,6 +441,8 @@ import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {getResultDetailList} from "@/api/inout/orderDetailResult";
 
+import addOrder from "./IoCreateOrder";
+
 const formJson = {
   site_id: "",
   site_name: "",
@@ -581,9 +563,15 @@ export default {
       resultTotal: 0,
       resultDetailLoading: false,
       resultDetailList: [],
+
+
+      idQuery: {},
+      addOrderVisible: false,
     };
   },
-  components: {},
+  components: {
+    addOrder
+  },
   methods: {
     onReset() {
       this.$router.push({
@@ -701,7 +689,7 @@ export default {
     },
     deleteOrders(data) {
       this.loading = true;
-      this.deleteData.id = data;
+      this.deleteData.billNo = data.billNo;
       deleteByOrderId(this.deleteData)
         .then((response) => {
 
@@ -720,14 +708,14 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(rowId) {
+    deleteDialog(row) {
       this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.deleteOrders(rowId);
+          this.deleteOrders(row);
         })
         .catch(() => {
         });
@@ -879,18 +867,31 @@ export default {
         this.resultTotal = 0;
       });
     },
-    editResultDialog(row) {
 
+
+    //单据编辑---
+    addOrders(row) {
+      this.idQuery = {};
+      this.idQuery = row;
+      this.addOrderVisible = true;
+    },
+
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.getList();
     },
-  },
-  filters: {
     statusFilterType(status) {
       const statusMap = {
-        false: "success",
-        true: "warning",
+        2: "warning",
+        1: "warning",
+        4: "danger",
+        6: "danger",
+        3: "success",
       };
       return statusMap[status];
     },
+
+
   },
   mounted() {
     document.body.ondrop = function (event) {
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 3da0e751..57733a86 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -22,7 +22,8 @@
           <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%">
+                         style="width: 90%"
+                         clearable>
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -115,7 +116,7 @@
         </el-table-column>
         <el-table-column label="校验状态" prop="status" width="100">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+            <el-tag :type="statusFilterType(scope.row.status)">{{
                 checkStatus[scope.row.status]
               }}
             </el-tag>
@@ -123,17 +124,19 @@
         </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)"
-            >编辑
+              @click.native.stop="printDialog(scope.row.id)"
+            >打印
             </el-button
             >
+
             <el-button
               type="text"
               size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
+              @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button
             >
@@ -230,16 +233,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></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"
@@ -322,16 +315,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></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"
@@ -423,16 +406,6 @@
             label="发票有效期"
             prop="invoiceDate"
           ></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"
@@ -444,7 +417,6 @@
       </el-tab-pane>
     </el-tabs>
 
-
     <el-dialog
       title="单据验收"
       :visible.sync="acceptOrderVisible"
@@ -502,12 +474,15 @@ export default {
         invCode: this.$store.getters.locInvCode,
       },
       checkStatus: {
-        '-1': "草稿",
-        // 1: "等待处理",
-        1: "等待处理",
-        2: "等待校验",
-        3: "校验异常",
-        4: "校验成功",
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "待验收",
+        6: "校验异常",
+        7: "审核通过",
+        8: "审核拒绝",
+        9: "正在处理"
       },
       storageList: [],
       invList: [],
@@ -700,7 +675,7 @@ export default {
     },
     deleteOrders(data) {
       this.loading = true;
-      this.deleteData.id = data;
+      this.deleteData.billNo = data.billNo;
       deleteByOrderId(this.deleteData)
         .then((response) => {
           if (response.code == 20000) {
@@ -718,14 +693,14 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(rowId) {
+    deleteDialog(row) {
       this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.deleteOrders(rowId);
+          this.deleteOrders(row);
         })
         .catch(() => {
         });
@@ -776,9 +751,6 @@ export default {
         this.bizDetailList = [];
         this.bizTotal = 0;
       })
-    },
-    editBizDialog(row) {
-
     },
     onCodeReset() {
       this.codeQuery = {
@@ -816,9 +788,6 @@ export default {
         this.codeDetailList = [];
         this.codeTotal = 0;
       })
-    },
-    editCodeDialog(row) {
-
     },
     onResultReset() {
       this.resultQuery = {
@@ -876,12 +845,13 @@ export default {
     parentByFn: function (childValue) {
       this.getList();
     },
-  },
-  filters: {
+
     statusFilterType(status) {
       const statusMap = {
-        false: "success",
-        true: "warning",
+        5: "warning",
+        1: "warning",
+        6: "danger",
+        7: "success",
       };
       return statusMap[status];
     },
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
new file mode 100644
index 00000000..d12f8669
--- /dev/null
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -0,0 +1,482 @@
+<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%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="所属仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+                         @change="invChange"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="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 type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                border
+      >
+        <el-table-column 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="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="statusFilterType(scope.row.status)">{{
+                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="editOrder(scope.row)"
+            >编辑
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteDialog(scope.row.billNo)"
+            >删除
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status == 1"
+              @click.native.stop="onUpload(scope.row.billNo)"
+            >立即提交
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog
+        :title="titleMap[title]"
+        :visible.sync="addOrderVisible"
+        width="85%"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="addOrderVisible"
+        @close='closeDialog'
+      >
+        <addOrder
+          :closeDialog="closeDialog"
+          :orderQuery="idQuery"
+          :viewType="viewType"
+        ></addOrder>
+      </el-dialog>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  deleteByOrderId,
+  submitOrderWeb,
+  getOrderList
+} from "../../api/inout/order";
+import addOrder from "./IoCreateOrder";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+
+export default {
+  name: "IoCreateBusOrder",
+  data() {
+    return {
+      showSearch: true,
+      titleMap: {
+        add: "新增单据",
+        edit: "编辑单据",
+      },
+      title: "add",
+
+      filterQuery: {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "newOrder",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "校验成功",
+        6: "校验异常",
+        7: "审核通过",
+        8: "审核拒绝",
+        9: "正在处理"
+      },
+      curIndex: "",
+      idQuery: {},
+      storageList: [],
+      invList: [],
+      list: [],
+      addOrderVisible: false,
+      total: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      errorDetail: "",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点"
+      },
+      deleteData: {
+        billNo: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      deleteLoading: false,
+      busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      viewType: 2,
+    };
+  },
+
+  components: {
+    addOrder,
+  },
+  methods: {
+    onReset() {
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "newOrder",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.action = this.busTypes[0].action;
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    addOrders() {
+      this.idQuery = {};
+      this.title = "add";
+      this.addOrderVisible = true;
+    },
+
+    editOrder(row) {
+      this.idQuery = row;
+      this.title = "edit";
+      this.addOrderVisible = true;
+    },
+
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.addHosOrderVisible = false;
+      this.getList();
+    },
+
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      getOrderList(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data;
+      deleteByOrderId(this.deleteData)
+        .then((response) => {
+
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else if (response.code == 520) {
+            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+            this.getList();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(rowId);
+        })
+        .catch(() => {
+        });
+    },
+    onUpload(data) {
+      this.loading = true;
+      var idQuery = {
+        billNo: "",
+      };
+      idQuery.billNo = data;
+      submitOrderWeb(idQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        });
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    invChange() {
+      this.filterQuery.action = null;
+      this.getBusType();
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        1: "warning",
+        4: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+    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 624a4f7d..fd621bf8 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -151,6 +151,16 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-if="errView==1">
+          <el-col :span="20">
+            <el-form-item prop="errMsg" label="异常信息:">
+              <el-input
+                v-model="orderFormData.errMsg"
+                disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="20">
             <el-form-item prop="code" label="扫码录入:">
@@ -179,15 +189,15 @@
       </el-form>
     </el-card>
     <el-tabs type="border-card" style="margin: 5px">
-      <el-tab-pane label="业务详情" v-if="bizShow">
+      <el-tab-pane label="业务详情" v-if="bizShow && viewBizVisible">
         <biz-detail-panel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel" :refreshOrder="refreshOrder"
                           v-if="isBizDetailAlive"></biz-detail-panel>
       </el-tab-pane>
-      <el-tab-pane label="扫码详情">
+      <el-tab-pane label="扫码详情" v-if="viewCodeVisible">
         <codeDetailPanel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel"
                          v-if="isCodeDetailAlive"></codeDetailPanel>
       </el-tab-pane>
-      <el-tab-pane label="扫码明细">
+      <el-tab-pane label="扫码明细" v-if="viewCodeDetailVisible">
         <codesPanel :idQuery="orderFormData"
                     :refreshPanel="refreshCodesPanel"
                     v-if="isCodeAlive"
@@ -196,59 +206,7 @@
                     :selectUnitTitle="selectUnitTitle"></codesPanel>
       </el-tab-pane>
     </el-tabs>
-
-
-    <!--        <el-dialog-->
-    <!--            :title="selectUnitTitle"-->
-    <!--            :visible.sync="dialogTableVisible"-->
-    <!--            :close-on-click-modal="false"-->
-    <!--            :close-on-press-escape="false"-->
-    <!--            v-if="dialogTableVisible"-->
-    <!--            width="70%"-->
-    <!--            append-to-body-->
-    <!--        >-->
-    <!--            <DialogSelectUnit-->
-    <!--                :codeId="curRow"-->
-    <!--                v-on:selectSupUnit="selectSupUnit"-->
-    <!--                v-on:closeBindDialog="closeBindDialog"-->
-    <!--            ></DialogSelectUnit>-->
-    <!--        </el-dialog>-->
-
-
-    <!--        <el-dialog-->
-    <!--            :title="editTitle"-->
-    <!--            :visible.sync="editCodeVisible"-->
-    <!--            append-to-body width="70%"-->
-    <!--            :close-on-click-modal="false"-->
-    <!--            :close-on-press-escape="false"-->
-    <!--            v-if="editCodeVisible"-->
-    <!--        >-->
-    <!--            <editCodeDialog-->
-    <!--                editTye="2"-->
-    <!--                :closeCodeDialog="closeCodeDialog"-->
-    <!--                :codeDetail="codeDetail">-->
-    <!--            </editCodeDialog>-->
-    <!--        </el-dialog>-->
-
-    <!--        <el-dialog-->
-    <!--            :title="editTitle"-->
-    <!--            :visible.sync="editOriginCodeVisible"-->
-    <!--            append-to-body width="70%"-->
-    <!--            :close-on-click-modal="false"-->
-    <!--            :close-on-press-escape="false"-->
-    <!--            v-if="editOriginCodeVisible">-->
-    <!--            <editCodeDialog-->
-    <!--                :closeCodeDialog="closeCodeDialog"-->
-    <!--                :repeatAddCode="repeatAddCode"-->
-    <!--                :codeDetail="formData"-->
-    <!--                editTye="1">-->
-    <!--            </editCodeDialog>-->
-    <!--        </el-dialog>-->
-
-
   </div>
-
-
 </template>
 
 <script>
@@ -257,7 +215,6 @@ import {
   updateCodeBindSup, enterCodeWeb
 } from "../../api/inout/order";
 import {findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
-import draggable from "vuedraggable";
 import {parseTime} from "../../utils/coTools";
 import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
 
@@ -268,7 +225,6 @@ import bizDetailPanel from "./IoCreateOrderBizDetail"
 import A from "../../plugins/KeyScaner"
 import {findByInvUser} from "@/api/basic/busType";
 
-
 export default {
   name: "ioCreateOrder",
   props: {
@@ -280,6 +236,15 @@ export default {
       type: Object,
       required: true,
     },
+    errView: {
+      type: Object,
+      required: true,
+    },
+    viewType: {      //1.新增扫码单据页面，2、新增业务单据页面，3、正常单据处理页面
+      type: Object,
+      required: true,
+    },
+
   },
   data() {
     return {
@@ -295,6 +260,7 @@ export default {
         remark: null,
         fromType: 2,
       },
+      errView: 0,
 
       //扫码相关
       codeFormData: {
@@ -317,7 +283,6 @@ export default {
       bizShow: true,
       isBizDetailAlive: true,
       isCodeDetailAlive: true,
-
       editCodeVisible: false,
       actionEnable: false,
       editOriginCodeVisible: false,
@@ -351,12 +316,14 @@ export default {
       codeDetail: null,
       editTitle: "编辑条码",
       fromDeptOptions: [],
-      enableDept: false
+      enableDept: false,
+
+      viewBizVisible: false,
+      viewCodeVisible: false,
+      viewCodeDetailVisible: false,
     };
   },
   components: {
-    draggable,
-    // DialogSelectUnit, selectRlDialog, editCodeDialog
     codesPanel, codeDetailPanel, bizDetailPanel
   },
   methods: {
@@ -395,7 +362,6 @@ export default {
     },
 
     initBusType() {
-
       let query = {
         code: this.orderFormData.invCode,
       };
@@ -545,6 +511,7 @@ export default {
             this.orderFormData.billNo = this.curRow.orderId;
             this.refreshCodesPanel();
             this.selectUnitTitle = response.message;
+            this.$message.error(response.message);
             this.handleUnitClick(response.data);
           } else if (response.code == 504) {
 
@@ -630,7 +597,7 @@ export default {
     },
     saveOrder() {
       let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
-      tQuery.orderId = this.orderFormData.billNo;
+      tQuery.billNo = this.orderFormData.billNo;
       saveOrderWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.closeDialog();
@@ -725,8 +692,6 @@ export default {
     intentBack() {
       this.$router.go(-1);
     },
-
-
     selectSupUnit(row) {
       let query = {
         id: this.curRow.id,
@@ -744,8 +709,6 @@ export default {
 
       });
     },
-
-
   },
   filters: {},
   mounted() {
@@ -776,19 +739,33 @@ export default {
     inputer.focus();
   },
   created() {
+
+    //页面初始化
     this.codeFormData.code = '';
-    this.codeArray = [];
-    if (this.$isNotBlank(this.orderQuery.billNo)) {
+
+    //页面类型
+    if (this.viewType == 1) {//1.新增扫码单据页面，2、新增业务单据页面，3、正常页面
+      this.viewCodeVisible = true;
+      this.viewCodeDetailVisible = true;
+    } else if (this.viewType == 2) {
+      this.viewBizVisible = true;
+    } else {
+      this.viewCodeVisible = true;
+      this.viewCodeDetailVisible = true;
+      this.viewBizVisible = true;
+    }
+
+    if (this.$isNotBlank(this.orderQuery.billNo)) {   //编辑页面
       this.corpOrderIdDisabled = true;
       this.orderFormData = this.orderQuery;
       this.actionEnable = true;
       this.refreshCodesPanel();
-      //选择框候选数据
+      //加载选择框候选数据
       this.findInvListByUser();
       this.initBusType();
       this.findMethod(this.orderFormData.fromCorp);
       this.findFromInvList();
-    } else {
+    } else {                                            //新增页面
       this.corpOrderIdDisabled = false;
       let date = new Date();
       this.orderFormData.createTime = parseTime(date, '{y}-{m}-{d} {h}:{i}:{s}');
@@ -797,8 +774,6 @@ export default {
       this.orderFormData.invCode = this.$store.getters.locInvCode;
       this.findInvListByUser();
     }
-
-
   }
   ,
 }
diff --git a/src/views/inout/IoCreateOrderBizDetail.vue b/src/views/inout/IoCreateOrderBizDetail.vue
index 050de55e..4bdb7b6e 100644
--- a/src/views/inout/IoCreateOrderBizDetail.vue
+++ b/src/views/inout/IoCreateOrderBizDetail.vue
@@ -11,14 +11,6 @@
           >产品录入
           </el-button
           >
-          <el-button
-            type="primary"
-            ref="mainTable"
-            @click.native.stop="selectProductFunction()"
-            :loading="loading"
-          >第三方单据选入
-          </el-button
-          >
         </el-button-group>
       </div>
 
@@ -186,7 +178,7 @@
 </template>
 
 <script>
-import stockOrderNewSelectProduct from "./stockOrderNewSelectProduct";
+import stockOrderNewSelectProduct from "./DialogSelectProduct";
 // import dialogInvProduct from "../inventory/DialogInvProduct"
 import {addBizProduct, getDetailBizs, updateBizProduct, delBizProduct} from "@/api/inout/orderDetailCode";
 
diff --git a/src/views/inout/IoCreateOrderCodes.vue b/src/views/inout/IoCreateOrderCodes.vue
index 581f32e2..0d4d0a90 100644
--- a/src/views/inout/IoCreateOrderCodes.vue
+++ b/src/views/inout/IoCreateOrderCodes.vue
@@ -5,85 +5,87 @@
               border
               ref="multipleTable">
       <el-table-column
-          type="selection"
-          width="55">
+        type="selection"
+        width="55">
       </el-table-column>
       <el-table-column label="序号" type="index" width="55"></el-table-column>
       <el-table-column
-          label="UDI码"
-          prop="code"
-          width="280"
-          show-overflow-tooltip
+        label="UDI码"
+        prop="code"
+        width="280"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="生产日期"
-          prop="produceDate"
-          width="120"
-          show-overflow-tooltip
+        label="生产日期"
+        prop="produceDate"
+        width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="失效日期"
-          prop="expireDate"
-          width="120"
-          show-overflow-tooltip
+        label="失效日期"
+        prop="expireDate"
+        width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="批次号"
-          prop="batchNo"
-          width="120"
-          show-overflow-tooltip
+        label="批次号"
+        prop="batchNo"
+        width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="序列号"
-          prop="serialNo"
-          width="120"
-          show-overflow-tooltip
+        label="序列号"
+        prop="serialNo"
+        width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="供应商"
-          prop="supName"
-          width="180"
-          show-overflow-tooltip
+        label="供应商"
+        prop="supName"
+        width="180"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="扫码数量"
-          prop="count"
-          width="80"
-          show-overflow-tooltip
+        label="扫码数量"
+        prop="count"
+        width="80"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-          label="实际数量"
-          prop="reCount"
-          width="80"
-          show-overflow-tooltip
+        label="实际数量"
+        prop="reCount"
+        width="80"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column label="操作" width="240">
         <template slot-scope="scope">
           <el-button
-              type="text"
-              size="small"
-              @click.native.stop="deleteCode(scope.$index, scope.row)"
+            type="text"
+            size="small"
+            @click.native.stop="deleteCode(scope.$index, scope.row)"
           >减一
           </el-button
           >
           <el-button
-              type="text"
-              size="small"
-              @click.native.stop="bindRl(scope.row)"
+            type="text"
+            size="small"
+            :disabled="scope.row.relId!=null"
+            @click.native.stop="bindRl(scope.row)"
           >绑定产品
           </el-button
           >
           <el-button
-              type="text"
-              size="small"
-              @click.native.stop="handleUnitClick(scope.row)"
+            type="text"
+            size="small"
+            :disabled="scope.row.supId!=null"
+            @click.native.stop="handleUnitClick(scope.row)"
           >绑定供应商
           </el-button
           >
           <el-button
-              type="text"
-              size="small"
-              @click.native.stop="editCode(scope.row)"
+            type="text"
+            size="small"
+            @click.native.stop="editCode(scope.row)"
           >编辑
           </el-button
           >
@@ -92,78 +94,78 @@
     </el-table>
     <div class="block">
       <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="query.page"
-          :limit.sync="query.limit"
-          @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        :page.sync="query.page"
+        :limit.sync="query.limit"
+        @pagination="getList"
       />
     </div>
 
     <!--    绑定产品-->
     <el-dialog
-        :title="selectRlTitle"
-        :visible.sync="selectRlVisible"
-        width="80%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="selectRlVisible"
-        append-to-body
+      :title="selectRlTitle"
+      :visible.sync="selectRlVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="selectRlVisible"
+      append-to-body
     >
       <selectRlDialog
-          :curRow="curRow"
-          :fromCorp="fromCorp"
-          v-on:selectBindRl="selectBindRl"
-          v-on:closeBindDialog="closeBindDialog"
+        :curRow="curRow"
+        :fromCorp="fromCorp"
+        v-on:selectBindRl="selectBindRl"
+        v-on:closeBindDialog="closeBindDialog"
       ></selectRlDialog>
     </el-dialog>
 
 
     <!--    绑定供应商-->
     <el-dialog
-        :title="selectUnitTitle"
-        :visible.sync="dialogTableVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="dialogTableVisible"
-        width="80%"
-        append-to-body
+      :title="selectUnitTitle"
+      :visible.sync="dialogTableVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="dialogTableVisible"
+      width="80%"
+      append-to-body
     >
       <DialogSelectUnit
-          :codeId="curRow"
-          :fromCorp="fromCorp"
-          v-on:selectSupUnit="selectSupUnit"
-          v-on:closeBindDialog="closeBindDialog"
+        :codeId="curRow"
+        :fromCorp="fromCorp"
+        v-on:selectSupUnit="selectSupUnit"
+        v-on:closeBindDialog="closeBindDialog"
       ></DialogSelectUnit>
     </el-dialog>
 
     <el-dialog
-        :title="editTitle"
-        :visible.sync="editCodeVisible"
-        append-to-body width="70%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="editCodeVisible"
+      :title="editTitle"
+      :visible.sync="editCodeVisible"
+      append-to-body width="70%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="editCodeVisible"
     >
       <editCodeDialog
-          editTye="2"
-          :closeCodeDialog="closeCodeDialog"
-          :codeDetail="codeDetail">
+        editTye="2"
+        :closeCodeDialog="closeCodeDialog"
+        :codeDetail="codeDetail">
       </editCodeDialog>
     </el-dialog>
 
     <el-dialog
-        :title="editTitle"
-        :visible.sync="editOriginCodeVisible"
-        append-to-body width="70%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="editOriginCodeVisible">
+      :title="editTitle"
+      :visible.sync="editOriginCodeVisible"
+      append-to-body width="70%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="editOriginCodeVisible">
       <editCodeDialog
-          :closeCodeDialog="closeCodeDialog"
-          :repeatAddCode="repeatAddCode"
-          :codeDetail="idQuery"
-          editTye="1">
+        :closeCodeDialog="closeCodeDialog"
+        :repeatAddCode="repeatAddCode"
+        :codeDetail="idQuery"
+        editTye="1">
       </editCodeDialog>
     </el-dialog>
 
@@ -227,21 +229,21 @@ export default {
       this.loading = true;
       this.query.orderId = this.idQuery.billNo;
       errorCodeList(this.query) //查找该单号下的所有条码
-          .then((response) => {
-            this.codeArray = response.data.list || [];
-            this.total = response.data.total || 0;
-            for (let i = 0; i < this.codeArray.length; i++) {
-              this.codeArray[i].fromType = this.formData.fromType;
-              this.codeArray[i].billType = this.formData.billType;
-            }
-            this.tableSelection();
-            this.loading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+        .then((response) => {
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          for (let i = 0; i < this.codeArray.length; i++) {
+            this.codeArray[i].fromType = this.formData.fromType;
+            this.codeArray[i].billType = this.formData.billType;
+          }
+          this.tableSelection();
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
     },
 
     deleteCode(index, row) {
@@ -255,14 +257,14 @@ export default {
           id: row.id
         }
         deleteCodesTempById(tQuery)
-            .then((response) => {
-              if (response.code === 20000) {
-                this.refreshPanel();
-              } else {
-                this.$message.error(response.message);
-              }
-              this.loading = false;
-            });
+          .then((response) => {
+            if (response.code === 20000) {
+              this.refreshPanel();
+            } else {
+              this.$message.error(response.message);
+            }
+            this.loading = false;
+          });
       }).catch(() => {
       });
     },
@@ -336,15 +338,16 @@ export default {
     },
 
 
-    closeBindDialog(val) {
+    closeBindDialog() {
       this.selectRlVisible = false;
       this.dialogTableVisible = false;
+      this.refreshPanel();
     },
 
     closeCodeDialog() {
       this.editCodeVisible = false;
       this.editOriginCodeVisible = false;
-      this.getCodeList();
+      this.refreshPanel();
     },
 
     repeatAddCode(editData) {
@@ -353,7 +356,6 @@ export default {
       tQuery.actDate = parseTime(this.orderFormData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
       tQuery.action = this.orderFormData.action;
       this.closeCodeDialog();
-      this.addCodeSubmit(tQuery);
 
     },
 
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
new file mode 100644
index 00000000..6322f1d6
--- /dev/null
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -0,0 +1,482 @@
+<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%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="所属仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+                         @change="invChange"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="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 type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                border
+      >
+        <el-table-column 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="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="statusFilterType(scope.row.status)">{{
+                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="editOrder(scope.row)"
+            >编辑
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteDialog(scope.row.billNo)"
+            >删除
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status == 1"
+              @click.native.stop="onUpload(scope.row.billNo)"
+            >立即提交
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog
+        :title="titleMap[title]"
+        :visible.sync="addOrderVisible"
+        width="85%"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="addOrderVisible"
+        @close='closeDialog'
+      >
+        <addOrder
+          :closeDialog="closeDialog"
+          :orderQuery="idQuery"
+          :viewType="viewType"
+        ></addOrder>
+      </el-dialog>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  deleteByOrderId,
+  submitOrderWeb,
+  getOrderList
+} from "../../api/inout/order";
+import addOrder from "./IoCreateOrder";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+
+export default {
+  name: "IoCreateScanOrder",
+  data() {
+    return {
+      showSearch: true,
+      titleMap: {
+        add: "新增单据",
+        edit: "编辑单据",
+      },
+      title: "add",
+
+      filterQuery: {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "newOrder",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "校验成功",
+        6: "校验异常",
+        7: "审核通过",
+        8: "审核拒绝",
+        9: "正在处理"
+      },
+      curIndex: "",
+      idQuery: {},
+      storageList: [],
+      invList: [],
+      list: [],
+      addOrderVisible: false,
+      total: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      errorDetail: "",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点"
+      },
+      deleteData: {
+        billNo: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      deleteLoading: false,
+      busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      viewType: 1,
+    };
+  },
+
+  components: {
+    addOrder,
+  },
+  methods: {
+    onReset() {
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "newOrder",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.action = this.busTypes[0].action;
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    addOrders() {
+      this.idQuery = {};
+      this.title = "add";
+      this.addOrderVisible = true;
+    },
+
+    editOrder(row) {
+      this.idQuery = row;
+      this.title = "edit";
+      this.addOrderVisible = true;
+    },
+
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.addHosOrderVisible = false;
+      this.getList();
+    },
+
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      getOrderList(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data;
+      deleteByOrderId(this.deleteData)
+        .then((response) => {
+
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else if (response.code == 520) {
+            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+            this.getList();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(rowId);
+        })
+        .catch(() => {
+        });
+    },
+    onUpload(data) {
+      this.loading = true;
+      var idQuery = {
+        billNo: "",
+      };
+      idQuery.billNo = data;
+      submitOrderWeb(idQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        });
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    invChange() {
+      this.filterQuery.action = null;
+      this.getBusType();
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        1: "warning",
+        4: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+    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/IoNewOrder.vue b/src/views/inout/IoDealOrder.vue
similarity index 68%
rename from src/views/inout/IoNewOrder.vue
rename to src/views/inout/IoDealOrder.vue
index 482b8bbe..3963f521 100644
--- a/src/views/inout/IoNewOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -22,7 +22,8 @@
           <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%">
+                         style="width: 90%"
+                         clearable>
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -33,6 +34,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item class="query-form-item" label="所属仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
@@ -49,9 +52,6 @@
               </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
@@ -83,14 +83,13 @@
           >查询
           </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-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">
@@ -116,7 +115,7 @@
         </el-table-column>
         <el-table-column label="校验状态" prop="status" width="100">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+            <el-tag :type="statusFilterType(scope.row.status)">{{
                 checkStatus[scope.row.status]
               }}
             </el-tag>
@@ -141,82 +140,14 @@
             <el-button
               type="text"
               size="small"
-              v-if="scope.row.status === 4"
-              @click.native.stop="errorMsgDialog(scope.row)"
-            >删除
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.status !== -1"
-              @click.native.stop="onUpload(scope.row.id)"
-            >立即处理
+              v-if="scope.row.status == 1"
+              @click.native.stop="onUpload(scope.row.billNo)"
+            >立即提交
             </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="addOrderVisible"
@@ -245,7 +176,6 @@
           v-on:closeDetailDialog="closeDetailDialog"
         ></codeDetail>
       </el-dialog>
-
       <pagination
         v-show="total>0"
         :total="total"
@@ -260,30 +190,21 @@
 <script>
 import {
   deleteByOrderId,
-  commitOrder,
+  submitOrderWeb,
   updateUnit, mergeOrder,
   getOrderList
 } 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 {getInvListByUser} from "@/api/system/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busType";
-import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
-const formJson = {
-  site_id: "",
-  site_name: "",
-  describe: "",
-  ads: [],
-};
 
 export default {
-  name: "IoNewOrder",
+  name: "IoDealOrder",
   data() {
     return {
       showSearch: true,
@@ -307,26 +228,14 @@ export default {
         5: "校验成功",
         6: "校验异常",
         7: "审核通过",
-        8: "审核拒绝"
+        8: "审核拒绝",
+        9: "正在处理"
       },
       curIndex: "",
-      unitQuery: {key: "", page: 1, limit: 20},
-      unitList: [],
-      multipleSelection: [],
-      unitUpdateQuery: {
-        id: "",
-        fromCorpId: "",
-        fromCorp: "",
-      },
       idQuery: {},
       storageList: [],
       invList: [],
       list: [],
-      adId: [],
-      adSelectList: [],
-      adList: {},
-      adListNoDataText: "无数据",
-      queryAdIdAsyncLoading: false,
       codeDetailVisible: false,
       addOrderVisible: false,
       total: 0,
@@ -357,8 +266,6 @@ export default {
       },
       dialogTableVisible: false,
       formLoading: false,
-      dialogVisible: false,
-      formData: formJson,
       deleteLoading: false,
       busTypes: [],
       actDateRange: [],
@@ -396,7 +303,6 @@ export default {
     };
   },
   components: {
-    draggable,
     // codeDetail,
     addOrder,
     // ioErrorOrder
@@ -422,7 +328,6 @@ export default {
       this.getList();
     },
     onSubmit() {
-      this.loading = true;
       if (this.actDateRange !== null) {
         this.filterQuery.startTime = this.actDateRange[0];
         this.filterQuery.endTime = this.actDateRange[1];
@@ -472,33 +377,7 @@ export default {
       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;
@@ -519,57 +398,6 @@ export default {
           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.billNo = data;
@@ -606,40 +434,20 @@ export default {
     onUpload(data) {
       this.loading = true;
       var idQuery = {
-        orderId: "",
+        billNo: "",
       };
-      idQuery.orderId = data;
-      commitOrder(idQuery)
+      idQuery.billNo = data;
+      submitOrderWeb(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;
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
           } else {
-            this.loading = false
             this.$message.error(response.message);
           }
-        })
-        .catch(() => {
+          this.loading = false;
         });
     },
-    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;
-
-    },
     getInvList() {
       getInvListByUser()
         .then((response) => {
@@ -653,29 +461,17 @@ export default {
       this.filterQuery.action = null;
       this.getBusType();
     },
-    init() {
-      axios.get("./config.json").then(res => {
-        // 基础地址
-        let response = res.data.BASE_URL;
-        this.uploadFileUrl = response + "/udiwms/orders/file/upload";
-      });
-    },
-    errorMsgDialog(row) {
-      this.$alert(row.remark, '错误信息', {
-        confirmButtonText: '确定',
-        callback: action => {
-        }
-      });
-    },
-  },
-  filters: {
+
     statusFilterType(status) {
       const statusMap = {
-        false: "success",
-        true: "warning",
+        2: "warning",
+        1: "warning",
+        4: "danger",
+        3: "success",
       };
       return statusMap[status];
     },
+
   },
   mounted() {
     document.body.ondrop = function (event) {
diff --git a/src/views/inout/IoReviewOrder.vue b/src/views/inout/IoReviewOrder.vue
index d8db591b..0fdb2712 100644
--- a/src/views/inout/IoReviewOrder.vue
+++ b/src/views/inout/IoReviewOrder.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card>
+    <el-card style="margin-top: -20px">
       <el-form :model="formData" ref="dataForm" label-width="100px">
         <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
           <el-button
@@ -37,6 +37,7 @@
             <el-form-item prop="fromCorp" label="单据类型:">
               <el-input v-model="formData.billTypeName" auto-complete="off"
                         disabled
+                        clearable
               ></el-input>
             </el-form-item>
           </el-col>
diff --git a/src/views/inout/IoUnCheckedOrder.vue b/src/views/inout/IoUnCheckedOrder.vue
index dfa9838a..1761c809 100644
--- a/src/views/inout/IoUnCheckedOrder.vue
+++ b/src/views/inout/IoUnCheckedOrder.vue
@@ -22,7 +22,8 @@
           <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%">
+                         style="width: 90%"
+                         clearable>
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -133,17 +134,10 @@
             <el-button
               type="text"
               size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
+              @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="checkOrder(scope.row.id)"
-            >校验单据
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>
@@ -230,16 +224,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></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"
@@ -322,16 +306,6 @@
             label="注册/备案凭证号"
             prop="ylqxzcrbarmc"
           ></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"
@@ -423,16 +397,6 @@
             label="发票有效期"
             prop="invoiceDate"
           ></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"
@@ -444,6 +408,24 @@
       </el-tab-pane>
     </el-tabs>
 
+
+
+    <el-dialog
+      title="单据编辑"
+      :visible.sync="addOrderVisible"
+      width="85%"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="addOrderVisible"
+      @close='closeDialog'
+    >
+      <addOrder
+        :closeDialog="closeDialog"
+        :orderQuery="idQuery"
+      ></addOrder>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -460,6 +442,9 @@ import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {getResultDetailList} from "@/api/inout/orderDetailResult";
 
+
+import addOrder from "./IoCreateOrder";
+
 const formJson = {
   site_id: "",
   site_name: "",
@@ -581,9 +566,15 @@ export default {
       resultTotal: 0,
       resultDetailLoading: false,
       resultDetailList: [],
+
+
+      idQuery: {},
+      addOrderVisible: false,
     };
   },
-  components: {},
+  components: {
+    addOrder
+  },
   methods: {
     onReset() {
       this.$router.push({
@@ -682,7 +673,7 @@ export default {
     },
     deleteOrders(data) {
       this.loading = true;
-      this.deleteData.id = data;
+      this.deleteData.billNo = data.billNo;
       deleteByOrderId(this.deleteData)
         .then((response) => {
           if (response.code == 20000) {
@@ -700,14 +691,14 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(rowId) {
+    deleteDialog(row) {
       this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.deleteOrders(rowId);
+          this.deleteOrders(row);
         })
         .catch(() => {
         });
@@ -720,8 +711,6 @@ export default {
         .catch(() => {
         });
     },
-    checkOrder(orderId) {
-    },
     onBizReset() {
       this.bizQuery = {
         productName: null,
@@ -840,7 +829,18 @@ export default {
       });
     },
     editResultDialog(row) {
+    },
 
+    //单据编辑---
+    addOrders(row) {
+      this.idQuery = {};
+      this.idQuery = row;
+      this.addOrderVisible = true;
+    },
+
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.getList();
     },
   },
   filters: {
diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue
new file mode 100644
index 00000000..5149ba1d
--- /dev/null
+++ b/src/views/inout/receive/receiveAdd.vue
@@ -0,0 +1,474 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :inline="true" :model="filterQuery"
+               class="query-form" size="mini">
+        <el-row>
+          <el-form-item class="query-form-item">
+            <el-input
+              v-model="filterQuery.billNo"
+              placeholder="单据号"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-input
+              v-model="filterQuery.corpName"
+              placeholder="往来信息"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-select v-model="filterQuery.billAction" placeholder="领用类型" clearable="true">
+              <el-option
+                v-for="item in originTypes"
+                :key="item.name"
+                :label="item.name"
+                :value="item.action">
+                <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                    item.thirdSysName
+                  }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+            <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="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group style="display:flex;">
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
+              <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
+                新增单据
+              </el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
+                border
+                @current-change="handleDetail">
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="领用类型" prop="billType"></el-table-column>
+        <el-table-column label="单据号" prop="billNo"></el-table-column>
+        <el-table-column label="领用仓库" prop="invName"></el-table-column>
+        <el-table-column label="往来信息" prop="targetInvName"
+                         show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="单据日期" prop="billDate"></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native="newDistributionForm(scope.$index, scope.row)"
+            >编辑
+            </el-button
+            >
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :page-size="filterQuery.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next"
+        :total="total"
+        :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
+        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="产品编码" prop="productId"></el-table-column>
+        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <el-table-column label="单据数量" prop="count"></el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="newSpDistributionVisible"
+      width="80%"
+      v-if="newSpDistributionVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <thrOrderNew
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+        :closeConfirmFunction="closeConfirmFunction"
+        :editType="formName"
+      ></thrOrderNew>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  delThrOrders, delAll, downloadAll
+} from "@/api/thrsys/thrOrder";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {getOriginBusType} from "@/api/basic/busOriginType";
+
+import {filterDetailByKey} from "@/api/basic/basicThirdSys";
+import {selectIp} from "@/api/param/systemParamConfig";
+import thrOrderNew from "./thrOrderNew";
+import {getReceiveOrder} from "@/api/inout/receiveOrder";
+
+export default {
+  data() {
+    return {
+      filterQuery: {
+        billType: null,
+        billNo: "",
+        page: 1,
+        limit: 10,
+        type: 1,
+        editStatus: 1,
+        thirdPartyDate: 2,
+      },
+      formName: null,
+      formMap: {
+        add: "新增领用单据",
+        update: "编辑领用单据",
+      },
+
+      idQuery: {},
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      uploadFileUrl: null,
+      fileList: [],
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      closeConfirm: false,
+      loading: false,
+      actDateRange: [],
+      newSpDistributionVisible: false,
+      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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+        thirdPartyDate: 2,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+
+    getList() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      this.loading = true;
+      getReceiveOrder(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      this.detailList = row.subErpOrders;
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            id: row.id,
+          };
+          delThrOrders(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+
+        })
+        .catch(() => {
+        });
+    },
+    clearAll() {
+      this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delAll()
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.success(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+
+        })
+        .catch(() => {
+        });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    handleChange(response, files, fileList) {
+      console.log(response);
+      if (response.code != 20000) {
+        this.$message.error(response.message);
+      } else {
+        console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+        this.$message.success("文件上传成功,请稍后刷新查看！");
+      }
+    },
+    selectSysParam() {
+      let query = {
+        key: "thirdIpUrl",
+        thirdSysFk: this.filterQuery.thirdSysFk
+      };
+      selectIp(query).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
+        }
+      });
+    },
+    thirdSysChange() {
+      this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+      this.getThirdSysDetail();
+    },
+    getThirdSysDetail() {
+      let query = {
+        thirdSysFk: this.filterQuery.thirdSysFk,
+        key: "orderQueryUrl",
+      };
+      filterDetailByKey(query)
+        .then((response) => {
+          this.thirdSysDetail = response.data;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+
+    },
+    downloadDatas() {
+      let query = {
+        billAction: this.filterQuery.billAction
+      };
+      downloadAll(query).then((response) => {
+        if (response.code == 20000) {
+          this.$message.success(response.data);
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
+    },
+    closeConfirmFunction(type) {
+      if (this.$isNotBlank(type) && type) {
+        this.closeConfirm = type;
+      }
+    },
+    getlocalName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].localName;
+        }
+      }
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+        corpType: 1,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          // this.getList();
+        })
+        .catch(() => {
+        });
+      getOriginBusType(query)
+        .then((response) => {
+          this.originTypes = response.data.list || [];
+          // this.filterQuery.originType = this.originTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
+
+
+    },
+
+    closeDialog() {
+      this.newSpDistributionVisible = false;
+      this.getList();
+      this.detailList = [];
+    },
+
+
+    newDistributionForm(index, row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.formName = "update";
+      } else
+        this.formName = "add";
+      this.newSpDistributionVisible = true;
+    },
+
+  },
+  components: {
+    thrOrderNew,
+  },
+  mounted() {
+  },
+  created() {
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+    this.getList();
+  },
+};
+</script>
+<style scoped>
+.itemTag {
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
+}
+
+.text {
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+}
+
+.query-form-item {
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
+}
+
+.el-row {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.el-col {
+  border-radius: 4px;
+  flex-wrap: wrap;
+}
+</style>
+
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
new file mode 100644
index 00000000..177f9ba6
--- /dev/null
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -0,0 +1,435 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :inline="true" :model="filterQuery"
+               class="query-form" size="mini">
+        <el-row>
+          <el-form-item class="query-form-item">
+            <el-input
+              v-model="filterQuery.billNo"
+              placeholder="单据号"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-input
+              v-model="filterQuery.corpName"
+              placeholder="往来单位"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+
+            <el-select v-model="filterQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
+              <el-option
+                v-for="item in originTypes"
+                :key="item.name"
+                :label="item.name"
+                :value="item.action">
+                <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                    item.thirdSysName
+                  }}</span>
+              </el-option>
+
+            </el-select>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+            <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="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group style="display:flex;">
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
+                @current-change="handleDetail">
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
+        <el-table-column label="单据号" prop="billNo"></el-table-column>
+        <el-table-column label="往来信息" prop="corpName"
+                         show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="单据日期" prop="billdate"></el-table-column>
+        <el-table-column label="操作" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :page-size="filterQuery.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next"
+        :total="total"
+        :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%">
+        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="产品编码" prop="productId"></el-table-column>
+        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <el-table-column label="单据数量" prop="reCount"></el-table-column>
+        <el-table-column label="实际数量" prop="count"></el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+<script>
+import {
+  delThrOrders, delAll, downloadAll
+} from "@/api/thrsys/thrOrder";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {getOriginBusType} from "@/api/basic/busOriginType";
+
+import {getBasicThirdSys, filterDetailByKey} from "@/api/basic/basicThirdSys";
+import {selectIp} from "@/api/param/systemParamConfig";
+import {getReceiveOrder} from "@/api/inout/receiveOrder";
+
+export default {
+  data() {
+    return {
+      filterQuery: {
+        billAction: null,
+        billNo: "",
+        originType: null,
+        thirdSysFk: "",
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 2,
+      },
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      uploadFileUrl: null,
+      fileList: [],
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      loading: false,
+      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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 2,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+
+
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+
+    getList() {
+      if (this.filterQuery.thirdSysFk == null) {
+        this.$message.warning("请先选择第三方系统！")
+        return;
+      }
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      this.loading = true;
+      getReceiveOrder(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      this.detailList = row.subErpOrders;
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            id: row.id,
+          };
+          delThrOrders(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {
+        });
+    }
+    ,
+    clearAll() {
+      this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delAll()
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.success(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {
+        });
+    }
+    ,
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+          this.selectSysParam();
+          this.getThirdSysDetail();
+          this.getBusType();
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    }
+    ,
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    }
+    ,
+    handleChange(response, files, fileList) {
+      console.log(response);
+      if (response.code != 20000) {
+        this.$message.error(response.message);
+      } else {
+        console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+        this.$message.success("文件上传成功,请稍后刷新查看！");
+      }
+    }
+    ,
+    selectSysParam() {
+      let query = {
+        key: "thirdIpUrl",
+        thirdSysFk: this.filterQuery.thirdSysFk
+      };
+      selectIp(query).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
+        }
+      });
+    },
+    thirdSysChange() {
+      this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+      this.getThirdSysDetail();
+    },
+    getThirdSysDetail() {
+      let query = {
+        thirdSysFk: this.filterQuery.thirdSysFk,
+        key: "orderQueryUrl",
+      };
+      filterDetailByKey(query)
+        .then((response) => {
+          this.thirdSysDetail = response.data;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+    downloadDatas() {
+      let query = {
+        billAction: this.filterQuery.billAction
+      };
+      downloadAll(query).then((response) => {
+        if (response.code == 20000) {
+          this.$message.success(response.data);
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
+    },
+
+    getlocalName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].localName;
+        }
+      }
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+      getOriginBusType(query)
+        .then((response) => {
+          this.originTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+  },
+  components: {},
+  mounted() {
+  },
+  created() {
+    this.getBasicThirdSys();
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+    this.getList();
+  },
+};
+</script>
+<style scoped>
+.itemTag {
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
+}
+
+.text {
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+}
+
+.query-form-item {
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
+}
+
+.el-row {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.el-col {
+  border-radius: 4px;
+  flex-wrap: wrap;
+}
+</style>
+
diff --git a/src/views/inout/receive/thrOrderNew.vue b/src/views/inout/receive/thrOrderNew.vue
new file mode 100644
index 00000000..1445d02f
--- /dev/null
+++ b/src/views/inout/receive/thrOrderNew.vue
@@ -0,0 +1,657 @@
+<template>
+  <div>
+    <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
+      <el-row type="flex" justify="end">
+        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -5px">
+          <el-button
+            type="primary"
+            @click.native="saveOrder('1')"
+            :loading="loading"
+          >草稿保存
+          </el-button
+          >
+          <el-button
+            type="primary"
+            @click.native="saveOrder('2')"
+            :loading="loading"
+          >提交单据
+          </el-button
+          >
+        </el-button-group>
+      </el-row>
+      <el-card style="margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="11">
+            <el-form-item prop="billNo" label="单据号:">
+              <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="billDate" label="单据日期:">
+              <el-date-picker
+                v-model="formData.billDate"
+                type="datetime"
+                placeholder="选择日期"
+                style="width: 100%"
+                :clearable="false"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="11">
+            <el-form-item prop="invCode" label="当前仓库:">
+              <el-select v-model="formData.invCode" @change="subStorageChange" placeholder="当前仓库信息"
+                         style="width: 100%;"
+                         clearable>
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item class="query-form-item" prop="targetInvCode" label="往来信息:">
+              <el-select v-model="formData.targetInvCode" placeholder="请选择仓库"
+                         clearable="true"
+                         style="width: 100%"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="11">
+            <el-form-item prop="billType" label="领用类型:">
+              <el-select v-model="formData.billType" placeholder="请选择领用类型" style="width: 100%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.originAction"
+                  :label="item.originName"
+                  :value="item.originAction">
+                  <span style="float: left">{{ item.originName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="remark" label="备注:">
+              <el-input v-model="formData.remark" auto-complete="off"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card>
+        <el-button-group style="display: flex">
+          <el-button
+            type="primary"
+            @click.native.stop="selectProductFunction()"
+            style="margin: 0px 60px 10px auto; height: 35px"
+            :loading="loading"
+          >产品录入
+          </el-button
+          >
+        </el-button-group>
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
+                  :row-class-name="tableRowClassName"
+                  border
+                  max-height="300" height="300" ref="multipleTable">
+          <el-table-column label="序号" type="index" width="50"></el-table-column>
+          <el-table-column width="150"
+                           label="产品通用名"
+                           prop="cpmctymc"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150"
+                           label="规格型号"
+                           prop="ggxh"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150" label="单据数量">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.count"
+                        placeholder="请输入数量" style="width: 80%"
+                        type='number'
+                        @change="tableCountChange(scope.row)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column width="150"
+                           label="注册/备案凭证号"
+                           prop="zczbhhzbapzbh"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150"
+                           label="生产厂家"
+                           prop="ylqxzcrbarmc"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" width="150">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                :disabled="scope.row.index === selectedIndex"
+                @click.stop="true"
+                @click.native="rowChange(scope.row)"
+              >编辑
+              </el-button
+              >
+              <el-button
+                type="text"
+                size="small"
+                @click.stop="true"
+                @click.native="deleteCodeArray(scope.$index, scope.row)"
+              >删除
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-form>
+
+
+    <el-dialog
+      title="库存产品录入"
+      :visible.sync="selectInvProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectInvProductVisible"
+      :append-to-body='true'
+    >
+      <dialogInvProduct
+        :closeDialog="closeDialogC2"
+        :invQueryData="formData"
+        :type="1"
+      ></dialogInvProduct>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  uploadStockOrderDetail,
+} from "@/api/inout/stockOrder";
+import {getBusChange} from "@/api/basic/busTypeChange";
+import {inserThrOrderWeb, updateReceive} from "@/api/thrsys/thrOrderReceive";
+import {getThrOrderDetails, delThrOrders, delOrderDetail} from "@/api/thrsys/thrOrder";
+import {filterSubByInv, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
+import dialogInvProduct from "../DialogSelectInvProduct";
+import {getOrderDetail} from "@/api/inout/receiveOrder";
+
+export default {
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+    closeConfirmFunction: {
+      type: Function,
+      required: true,
+    },
+    editType: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      code: "",
+      query: {
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+      },
+      formData: {
+        invCode: null,
+        targetInvCode: null,
+        billNo: null,
+        billDate: "",
+        billType: "",
+      },
+      formRules: {
+        billDate: [
+          {required: true, message: "请输入单据日期", trigger: "blur"}
+        ],
+        billType: [
+          {required: true, message: "请选择业务类型", trigger: "blur"}
+        ],
+        invCode: [
+          {required: true, message: "请选择当前仓库", trigger: "blur"}
+        ],
+        targetInvCode: [
+          {required: true, message: "请选择往来仓库", trigger: "blur"}
+        ],
+      },
+      codeArray: [],
+      invList: [],
+      fromStorageOptions: [],
+      fromOptions: [],
+      total: 0,
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+      },
+      orderEditor: true,
+      iCount: 0,
+      sOptions: [],
+      sValue: [],
+      sList: [],
+      sLoading: false,
+      busTypes: [],
+      currentRow: {},
+      selectedIndex: "",
+      selectInvProductVisible: false,
+      thisData: {},
+      storageList: [],
+      invQueryData: {},
+      type: 1,
+
+    };
+  },
+  components: {
+    dialogInvProduct
+  },
+  methods: {
+    //当前分库
+    finCurInv() {
+      this.invList = [];
+      let query = {
+        filter: 3
+      };
+      findInvByUser(query)
+        .then((response) => {
+          this.invList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    //往来分库
+    findFromInv() {
+      let cQuery = {
+        locInvCode: this.formData.invCode,
+      };
+      findByFrom(cQuery)
+        .then((response) => {
+          this.fromOptions = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    //领用类型
+    getBusType() {
+      let query = {
+        enable: false,
+        type: 1,
+      };
+      getBusChange(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+
+
+    saveOrder(status) {
+      this.code = "";
+      this.$refs.multipleTable.setCurrentRow();
+      this.currentRow = {};
+      this.selectedIndex = "";
+      this.iCount = 0;
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (this.codeArray.length < 1) {
+            this.$message.warning('未添加产品');
+            return;
+          }
+
+          for (let i = 0; i < this.codeArray.length; i++) {
+            if (!this.$isBlank(this.codeArray[i].productDate) && this.codeArray[i].productDate.length != 6) {
+              return this.$message.error('生产日期格式错误');
+            }
+            if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
+              return this.$message.error('失效日期格式错误');
+            }
+
+          }
+
+          if (status === '2') {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                return this.$message.error('单据数量不能为0');
+              }
+              if (this.$isBlank(this.codeArray[i].batchNo)) {
+                return this.$message.error('批次号不能为空');
+              }
+
+
+            }
+          }
+          if (status === '0') {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                return this.$message.error('单据数量不能为0');
+              }
+            }
+          }
+
+          if (status == "1") {
+            this.submitFunction(status);
+          } else {
+            let tip = "是否确定提交订单?";
+            this.$confirm(tip, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }).then(() => {
+              this.submitFunction(status);
+            }).catch(() => {
+              this.loading = false;
+            });
+          }
+
+
+        }
+      });
+    },
+
+
+    submitFunction(status) {
+      let tMessage = status === '501' ? '保存' : '提交';
+      this.loading = true;
+      let tQuery = this.formData;
+      tQuery.editStatus = status;
+      tQuery.subErpOrders = this.codeArray;
+      tQuery.thirdPartyDate = 2;
+      if (this.editType === "add") {
+        inserThrOrderWeb(tQuery)
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success(tMessage + "成功");
+              this.closeDialog(true);
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          })
+      } else if (this.editType === "update") {
+        updateReceive(tQuery)
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success(tMessage + "成功");
+              this.closeDialog(true);
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          })
+      }
+
+
+    },
+    selectProductFunction(event) {
+      if (this.$isBlank(event)) {
+        this.selectInvProductVisible = true;
+      }
+    },
+    closeDialogC2(rData) {
+      this.selectInvProductVisible = false;
+    },
+    rowChange(val) {
+      this.currentRow = val;
+      this.selectedIndex = val.index;
+      this.iCount = val.count;
+      this.focusNext('iCount');
+
+    },
+    tableCountChange(row) {
+      if (this.$isNotBlank(row)) {
+        // row.count = row.reCount;
+      }
+    },
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
+    },
+    focusNext(nextRef) {
+      this.$refs[nextRef].focus()
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    saveCodeArray(index, row) {
+      if (this.$isBlank(row.batchNo)) {
+        return this.$message.error('批次号不能为空');
+      }
+      this.$refs.multipleTable.setCurrentRow();
+      this.currentRow = {};
+      this.selectedIndex = "";
+      this.iCount = 0;
+
+      this.detailLoading = true;
+      // row.count = row.reCount;
+      let tQuery = row;
+      uploadStockOrderDetail(tQuery).then((response) => {
+        this.detailLoading = false;
+        if (response.code === 20000) {
+          this.$message.success("修改完成");
+          this.getStockOrderDetailList();
+          this.$refs.inputRef.focus();
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
+    deleteCodeArray(index, row) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
+        this.iCount = 0;
+
+        if (this.orderEditor) {
+          this.detailLoading = true;
+          if (this.$isNotBlank(row.id)) {
+            delOrderDetail({id: row.id})
+              .then(response => {
+                this.detailLoading = false;
+                if (response.code === 20000) {
+                  this.$message.success(response.data);
+                  // this.getStockOrderDetailList();
+                  this.codeArray.splice(index, 1);
+                } else {
+                  this.$message.error(response.message);
+                }
+              })
+              .catch(() => {
+                this.detailLoading = false;
+              })
+          } else {
+            this.$message.success('删除成功');
+            this.codeArray.splice(index, 1);
+          }
+        } else {
+          this.$message.success('删除成功');
+          this.codeArray.splice(index, 1);
+        }
+      }).catch(() => {
+
+      });
+    },
+    subStorageChange(item) {
+      this.getBusType();
+      this.findFromInv();
+    },
+    copyDetail(row) {
+      this.$confirm("是否复制该记录?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let rData = JSON.parse(JSON.stringify(row));
+        rData.id = null;
+        if (this.codeArray.length === 0) {
+          this.codeArray.push(rData);
+          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+          this.currentRow = this.codeArray[0];
+          this.selectedIndex = 0;
+        } else {
+          this.codeArray.unshift(rData);
+          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+          this.currentRow = this.codeArray[0];
+          this.selectedIndex = 0;
+        }
+        this.$message.success("复制成功");
+        this.iCount = this.currentRow.count;
+        this.focusNext('iCount');
+      }).catch(() => {
+      });
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    tableSelection() {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleAllSelection();
+    },
+    handleSizeChange(val) {
+      this.query.limit = val;
+      this.getStockOrderDetailList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getStockOrderDetailList();
+    },
+    getStockOrderDetailList() {
+      this.loading = true;
+      this.query.orderIdFk = this.formData.billNo;
+      getOrderDetail(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    intentBack() {
+      this.$router.go(-1);
+    },
+
+    selectOne(event) {
+      this.formData.corpName = event.name;
+      this.formData.corpId = event.erpId;
+      this.formData.unitIdFk = event.erpId;
+    },
+    getActionItem(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].thirdAction === action) {
+          return this.busTypes[i];
+        }
+      }
+    },
+    locInChange(item) {
+      if (this.formData.invWarehouseCode != null) {
+        this.formData.invWarehouseCode = "";
+      }
+      this.formData.locStorageCode = item;
+      this.$forceUpdate();
+      this.finCurInv();
+    },
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    if (this.$isNotBlank(this.idQuery.id)) {
+      this.query.limit = 100;
+      this.query.orderIdFk = this.idQuery.id;
+      this.formData = this.idQuery.formData;
+      this.orderEditor = true;
+      this.sValue = this.formData.corpName;
+      this.getStockOrderDetailList();
+    } else {
+      this.formData = {
+        invCode: null,
+        targetInvCode: null,
+        billNo: null,
+        billDate: "",
+        billType: "",
+      };
+      this.orderEditor = false;
+    }
+
+    this.getBusType();
+    this.finCurInv();
+  },
+};
+</script>
+<style>
+
+.ao-text {
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
+}
+
+</style>
+
+
+