From 1e57be77e186a493d20974210465cc1099d194c0 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 1 Jul 2022 18:09:13 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/UdiRlDetailDialog.vue         |  437 ++++
 src/views/thrsys/thrOrderNew.vue              |    1 +
 src/views/warehouse/AdditionalOrder.vue       |   18 +-
 src/views/warehouse/DialogSelectErpOrder.vue  |  704 +++---
 src/views/warehouse/IOCheckErrOrder.vue       |   18 +-
 src/views/warehouse/IOErrorOrder.vue          |   19 +-
 src/views/warehouse/IONewOrder.vue            |   24 +-
 src/views/warehouse/IOWaitOrder.vue           | 1966 +++++++++--------
 src/views/warehouse/stockHospOrderNew.vue     |   19 +-
 src/views/warehouse/stockOrder.vue            |    2 +-
 .../warehouse/stockOrderEditDistribution.vue  |    3 +-
 src/views/warehouse/stockOrderEditor.vue      |    5 +-
 src/views/warehouse/stockOrderInCode.vue      |    2 +-
 src/views/warehouse/stockOrderNew.vue         |    4 +-
 .../warehouse/stockOrderNewDistribution.vue   |  157 +-
 .../warehouse/stockOrderNewSelectProduct.vue  |   72 +-
 src/views/warehouse/stockOrderSearch.vue      |    2 +-
 src/views/warehouse/stockOrderWaitCheck.vue   |    2 +-
 18 files changed, 1901 insertions(+), 1554 deletions(-)
 create mode 100644 src/views/basic/UdiRlDetailDialog.vue

diff --git a/src/views/basic/UdiRlDetailDialog.vue b/src/views/basic/UdiRlDetailDialog.vue
new file mode 100644
index 0000000..d8ec7b8
--- /dev/null
+++ b/src/views/basic/UdiRlDetailDialog.vue
@@ -0,0 +1,437 @@
+<template>
+    <div>
+        <el-table :data="sysList" style="width: 100%" border>
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column
+                label="第三方系统名称"
+                prop="sysName"
+                show-overflow-tooltip
+            ></el-table-column>
+
+            <el-table-column
+                label="第三方产品名称"
+                prop="thirdName"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="第三方产品ID"
+                prop="thirdId"
+                show-overflow-tooltip
+            ></el-table-column>
+        </el-table>
+        <el-table
+            v-loading="loading"
+            :data="detailList"
+            style="width: 100%; margin-top: 20px"
+            border
+            @current-change="handleDetail"
+        >
+            <el-table-column
+                label="产品标识"
+                prop="nameCode"
+                show-overflow-tooltip
+            ></el-table-column>
+
+            <el-table-column
+                label="产品通用名"
+                prop="cpmctymc"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="包装级别"
+                prop="packLevel"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="包装层级"
+                prop="bzcj"
+                show-overflow-tooltip
+            ></el-table-column>
+        </el-table>
+
+        <el-form
+            :model="editQuery"
+            ref="editQuery"
+            label-width="100px"
+            style="margin-top: 20px"
+        >
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>产品名称:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            size="small"
+                            splaceholder="请输入内容"
+                            :disabled="true"
+                            v-model="editQuery.cpmctymc"
+                        ></el-input>
+                    </div>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>产品标识:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.nameCode"
+                        ></el-input>
+                    </div>
+                </el-col>
+
+
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>规格型号:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.ggxh"
+                        ></el-input>
+                    </div>
+                </el-col>
+
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>器械类别:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.qxlb"
+                        ></el-input>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>产品类别:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.cplb"
+                        ></el-input>
+                    </div>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>分类编码:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.flbm"
+                        ></el-input>
+                    </div>
+                </el-col>
+
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>商品条码:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.sptm"
+                        ></el-input>
+                    </div>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>医保编码:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.ybbm"
+                        ></el-input>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>医疗器械注册人:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="ylqxzcrbarmc"
+                            v-model="editQuery.ylqxzcrbarmc"
+                        ></el-input>
+                    </div>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>注册人英文名称:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.ylqxzcrbarywmc"
+                        ></el-input>
+                    </div>
+                </el-col>
+
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>统一社会信用号:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.tyshxydm"
+                        ></el-input>
+                    </div>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>注册证/备案号:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.zczbhhzbapzbh"
+                        ></el-input>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>上级产品编码:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="true"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.sjcpbm"
+                        ></el-input>
+                    </div>
+                </el-col>
+
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>包装级别:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            size="small"
+                            splaceholder="请输入内容"
+                            :disabled="true"
+                            v-model="editQuery.packLevel"
+                        ></el-input>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>计量单位/包装级别:&nbsp;</span>
+                        </div>
+
+                        <el-input
+                            style="width: 65%"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.bzcj"
+                            :disabled="true"
+
+                        ></el-input>
+                    </div>
+                </el-col>
+
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>包含下级包装数量:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            size="small"
+                            splaceholder="请输入内容"
+                            :disabled="true"
+                            v-model="editQuery.bhxjsl"
+                        ></el-input>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>包含下级产品编码:&nbsp;</span>
+                        </div>
+
+                        <el-input
+                            style="width: 65%"
+                            size="small"
+                            :disabled="true"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.bhxjcpbm"
+
+                        ></el-input>
+                    </div>
+                </el-col>
+
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>包含最小销售包装数量:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            size="small"
+                            :disabled="true"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.bhzxxsbzsl"
+                        ></el-input>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="12" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>最小包装单元内包含使用单元数量:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 65%"
+                            :disabled="!checked"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.zxxsbzbhsydysl"
+                        ></el-input>
+                    </div>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                    <el-form-item prop="name">
+                        <el-checkbox v-model="checked" class="text item itemTag"
+                                     disabled
+                        >以使用单元数量入库
+                        </el-checkbox>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+
+    </div>
+</template>
+
+<script>
+import {thirdSysDetail} from "@/api/basic/udiRelevance";
+import {filterByUuid} from "@/api/basic/udiInfo";
+
+export default {
+    name: "UdiRlDetail",
+    props: {
+        editQuery: {
+            type: Object,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            sysList: [],
+            checked:false,
+            detailList:[],
+            loading:false,
+        }
+    },
+    methods: {
+        getThirdSysDetail() {
+            let query = {
+                id: this.editQuery.id,
+            };
+
+            thirdSysDetail(query)
+                .then((response) => {
+                    this.loading = false;
+                    this.sysList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.sysList = [];
+                });
+        },
+        getDetailList(detailQuery) {
+            this.loading = true;
+            filterByUuid(detailQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.detailList = response.data || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                });
+        },
+    },
+
+    created() {
+        let ttquery = {
+            uuid: this.editQuery.uuid,
+            page: 1,
+            limit: 10,
+        };
+        this.getDetailList(ttquery);
+        this.getThirdSysDetail();
+    },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index aa7e47d..b3ee0a5 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -213,6 +213,7 @@
               <el-input size="small" v-model="scope.row.batchNo"
                         :disabled="scope.row.index !== selectedIndex"
                         ref='inputBatchNoRef'
+                        @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
                         placeholder="请输入批次号" style="width: 80%"></el-input>
             </template>
           </el-table-column>
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index ad6f2aa..99bb9ce 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -293,6 +293,7 @@ export default {
                 id: "",
                 mainAction: null,
                 action: null,
+                status: 5,
                 page: 1,
                 limit: 20,
             },
@@ -343,6 +344,7 @@ export default {
             },
             addType: "edit",
             deleteData: {
+                status: 5,
                 id: "",
             },
             erpCheckStatus: {
@@ -368,6 +370,7 @@ export default {
                 path: "",
             });
             this.filterQuery = {
+                status: 5,
                 page: 1,
                 limit: 20,
             };
@@ -447,11 +450,16 @@ export default {
             this.deleteData.id = data;
             deleteByOrderId(this.deleteData)
                 .then((response) => {
-                    this.getList();
-                    this.$message({
-                        type: "success",
-                        message: "删除成功！",
-                    });
+                    if (response.code == 20000) {
+                        this.getList();
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！",
+                        });
+                    } else if (response.code == 520) {
+                        this.$message.error("补录单据列表已不存在该扫码单据！");
+                        this.getList();
+                    }
                 })
                 .catch(() => {
                 });
diff --git a/src/views/warehouse/DialogSelectErpOrder.vue b/src/views/warehouse/DialogSelectErpOrder.vue
index 1940283..63dc3b3 100644
--- a/src/views/warehouse/DialogSelectErpOrder.vue
+++ b/src/views/warehouse/DialogSelectErpOrder.vue
@@ -1,148 +1,148 @@
 <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="单据号"
-            ></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="filterQuery.billAction" placeholder="请选择业务类型">
-              <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-form-item class="query-form-item">
+    <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="单据号"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.billAction" placeholder="请选择业务类型">
+                            <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-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>
-              <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="importErps"
-              >导入比对
-              </el-button
-              >
+                        <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>
+                            <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="importErps"
+                            >导入比对
+                            </el-button
+                            >
 
-              <!-- <el-button type="primary" icon="search" @click="combineErps"
-                >合并下载</el-button
-              > -->
-            </el-button-group>
-          </el-form-item>
-        </el-row>
-      </el-form>
-      <el-table
-          v-loading="loading"
-          :data="list"
-          highlight-current-row="true"
-          @selection-change="handleSelectionChange"
-          @row-click="getOrderDetail"
-          style="width: 100%"
-      >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
-            label="订单ID"
-            prop="billNo"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-            label="客户名称"
-            prop="corpName"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-            label="单据日期"
-            show-overflow-tooltip
-            prop="billdate"
-        ></el-table-column>
-        <el-table-column label="业务单据类型" prop="billType"></el-table-column>
+                            <!-- <el-button type="primary" icon="search" @click="combineErps"
+                              >合并下载</el-button
+                            > -->
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+            <el-table
+                v-loading="loading"
+                :data="list"
+                highlight-current-row="true"
+                @selection-change="handleSelectionChange"
+                @row-click="getOrderDetail"
+                style="width: 100%"
+            >
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column
+                    label="订单ID"
+                    prop="billNo"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="客户名称"
+                    prop="corpName"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="单据日期"
+                    show-overflow-tooltip
+                    prop="billdate"
+                ></el-table-column>
+                <el-table-column label="业务单据类型" prop="billType"></el-table-column>
 
-        <!-- <el-table-column label="下载状态" prop="isDownload"></el-table-column> -->
-      </el-table>
-      <el-pagination
-          :page-size="filterQuery.limit"
-          @current-change="handleCurrentChange"
-          layout="prev, pager, next"
-          :total="total"
-      ></el-pagination>
-    </el-card>
+                <!-- <el-table-column label="下载状态" prop="isDownload"></el-table-column> -->
+            </el-table>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+        </el-card>
 
-    <el-card class="el-card">
-      <el-table
-          v-loading="detailLoading"
-          :data="detailList"
-          style="width: 100%"
-      >
-        <el-table-column label="序号" type="index"></el-table-column>
+        <el-card class="el-card">
+            <el-table
+                v-loading="detailLoading"
+                :data="detailList"
+                style="width: 100%"
+            >
+                <el-table-column label="序号" type="index"></el-table-column>
 
-        <el-table-column
-            label="产品ID"
-            prop="productId"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
+                <el-table-column
+                    label="产品ID"
+                    prop="productId"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
 
-        <el-table-column
-            label="产品名称"
-            prop="productName"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-            label="批号"
-            prop="batchNo"
-            :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="reCount"></el-table-column>
-        <el-table-column label="实际数量" prop="count">
-        </el-table-column>
-      </el-table>
-    </el-card>
-  </div>
+                <el-table-column
+                    label="产品名称"
+                    prop="productName"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="批号"
+                    prop="batchNo"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="规格型号"
+                    prop="spec"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column label="单据数量" prop="count"></el-table-column>
+                <el-table-column label="实际数量" prop="reCount">
+                </el-table-column>
+            </el-table>
+        </el-card>
+    </div>
 </template>
 
 <script>
 import {
-  combineErpOrder,
-  selectErpOrder,
-  getCloudErp,
+    combineErpOrder,
+    selectErpOrder,
+    getCloudErp,
 } from "../../api/inout/erpOrder";
 
 import {stockListDetail} from "../../api/warehouse/stockOrder"
@@ -150,254 +150,254 @@ import {getBussinessType} from "../../api/basic/bussinessType";
 import {getLocalBusType, filterByBus} from "../../api/basic/busLocalType";
 
 export default {
-  name: "orderId",
-  props: {
-    orderId: {
-      type: Object,
-      required: true,
+    name: "orderId",
+    props: {
+        orderId: {
+            type: Object,
+            required: true,
+        },
+        orderAction: {
+            type: Object,
+            required: true,
+        },
+        curLocInv: {
+            type: Object,
+            required: true,
+        }
     },
-    orderAction: {
-      type: Object,
-      required: true,
-    },
-    curLocInv:{
-      type: Object,
-      required: true,
-    }
-  },
-  data() {
-    return {
-      filterQuery: {
-        billcode: "",
-        billFlag: null,
-        billAction: null,
-        startDate: null,
-        endDate: null,
-        status: 3,
-        page: 1,
-        limit: 5,
-        locStorageCode:null,
-      },
-      value: "",
-      total: 0,
-      list: [],
-      loading: false,
-      detailLoading: false,
-      detailList: [],
-      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]);
+    data() {
+        return {
+            filterQuery: {
+                billcode: "",
+                billFlag: null,
+                billAction: null,
+                startDate: null,
+                endDate: null,
+                status: 3,
+                page: 1,
+                limit: 5,
+                locStorageCode: null,
             },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
+            value: "",
+            total: 0,
+            list: [],
+            loading: false,
+            detailLoading: false,
+            detailList: [],
+            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]);
+                        },
+                    },
+                ],
             },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
+            multipleSelection: [],
+            postQuery: {
+                orderId: "",
+                purchaseinResponses: [],
             },
-          },
-        ],
-      },
-      multipleSelection: [],
-      postQuery: {
-        orderId: "",
-        purchaseinResponses: [],
-      },
-      idQuery: {
-        id: "",
-      },
-    };
-  },
-
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        billNo: "",
-        billFlag: null,
-        billAction: null,
-        startDate: null,
-        endDate: null,
-        page: 1,
-        limit: 5,
-        status: 3,
-        locStorageCode:null,
-      };
-      this.actDateRange = [];
-      this.getList();
+            idQuery: {
+                id: "",
+            },
+        };
     },
 
-    onSubmit() {
-      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.getList();
-    },
-    getList() {
-      this.loading = true;
-      this.filterQuery.locStorageCode = this.curLocInv;
-      stockListDetail(this.filterQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.list = response.data.list || [];
-              this.detailList = [];
-              this.total = response.data.total || 0;
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                billNo: "",
+                billFlag: null,
+                billAction: null,
+                startDate: null,
+                endDate: null,
+                page: 1,
+                limit: 5,
+                status: 3,
+                locStorageCode: null,
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+
+        onSubmit() {
+            if (this.actDateRange != null) {
+                this.filterQuery.startDate = this.actDateRange[0];
+                this.filterQuery.endDate = this.actDateRange[1];
             } else {
-              this.$message.error(response.message);
+                this.filterQuery.startDate = null;
+                this.filterQuery.endDate = null;
             }
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
-    },
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            this.filterQuery.locStorageCode = this.curLocInv;
+            stockListDetail(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.detailList = [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
 
-    //业务明细表
-    getOrderDetail(row) {
+        //业务明细表
+        getOrderDetail(row) {
 
-      this.detailList = row.subErpOrders;
-    },
+            this.detailList = row.subErpOrders;
+        },
 
-    importErps() {
-      var selectData = this.multipleSelection;
+        importErps() {
+            var selectData = this.multipleSelection;
+            this.postQuery.purchaseinResponses = [],
+                selectData.forEach((obj, index) => {
+                    this.postQuery.purchaseinResponses.push(obj);
+                });
 
-      selectData.forEach((obj, index) => {
-        this.postQuery.purchaseinResponses.push(obj);
-      });
+            if (this.postQuery.purchaseinResponses.length < 1) {
+                this.$message.warning("选择的订单需大于1");
+                return;
+            }
+            this.postQuery.orderId = this.orderId;
+            selectErpOrder(this.postQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.loading = false;
+                        this.$emit("closeManuDialog", true);
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.$emit("closeManuDialog", false);
+                });
+        },
+        combineErps() {
+            var selectData = this.multipleSelection;
 
-      if (this.postQuery.purchaseinResponses.length < 1) {
-        this.$message.warning("选择的订单需大于1");
-        return;
-      }
-      this.postQuery.orderId = this.orderId;
-      selectErpOrder(this.postQuery)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.loading = false;
-              this.$emit("closeManuDialog", true);
-            } else {
-              this.$message.error(response.message);
+            selectData.forEach((obj, index) => {
+                this.postQuery.docids.push(obj.docid);
+            });
+
+            if (this.postQuery.docids.length < 1) {
+                this.$message.warning("选择的订单需大于1");
+                return;
             }
-          })
-          .catch(() => {
-            this.loading = false;
-            this.$emit("closeManuDialog", false);
-          });
-    },
-    combineErps() {
-      var selectData = this.multipleSelection;
 
-      selectData.forEach((obj, index) => {
-        this.postQuery.docids.push(obj.docid);
-      });
+            combineErpOrder(this.postQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.loading = false;
+                        this.$emit("closeManuDialog", true);
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.$emit("closeManuDialog", false);
+                });
+        },
 
-      if (this.postQuery.docids.length < 1) {
-        this.$message.warning("选择的订单需大于1");
-        return;
-      }
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleSelectionChange(val) {
+            console.log(val);
+            this.multipleSelection = val;
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getLocalBusType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    // this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                    this.getCurBillAction();
+                })
+                .catch(() => {
+                });
 
-      combineErpOrder(this.postQuery)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.loading = false;
-              this.$emit("closeManuDialog", true);
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-            this.$emit("closeManuDialog", false);
-          });
-    },
 
-    handleSizeChange(val) {
-      this.filterQuery.limit = val;
-      this.getList();
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
+        },
+
+        getCurBillAction() {
+            let tQuery = {
+                action: this.orderAction
+            }
+            filterByBus(tQuery)
+                .then((response) => {
+                    this.filterQuery.billAction = response.data;
+                    this.getList();
+                })
+                .catch(() => {
+                });
+        }
     },
-    handleSelectionChange(val) {
-      console.log(val);
-      this.multipleSelection = val;
+    components: {},
+    mounted() {
     },
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getLocalBusType(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            // this.filterQuery.billAction = this.busTypes[0].action;
-            // this.getList();
-            this.getCurBillAction();
-          })
-          .catch(() => {
-          });
-
+    created() {
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
 
+        this.getBusType();
     },
-
-    getCurBillAction() {
-      let tQuery = {
-        action: this.orderAction
-      }
-      filterByBus(tQuery)
-          .then((response) => {
-            this.filterQuery.billAction = response.data;
-            this.getList();
-          })
-          .catch(() => {
-          });
-    }
-  },
-  components: {},
-  mounted() {
-  },
-  created() {
-    let end = new Date();
-    let start = new Date();
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
-
-    this.getBusType();
-  },
 };
 </script>
 
 <style scoped>
 
 .el-card {
-  margin-right: 20px;
-  /*transition: all .5s;*/
+    margin-right: 20px;
+    /*transition: all .5s;*/
 }
 
 </style>
diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 64cb0b7..95d5ac1 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -1001,12 +1001,18 @@ export default {
             this.deleteData.id = data;
             deleteByOrderId(this.deleteData)
                 .then((response) => {
-                    this.getList();
-                    this.refresgOrderDetail();
-                    this.$message({
-                        type: "success",
-                        message: "删除成功！",
-                    });
+
+                    if (response.code == 20000) {
+                        this.getList();
+                        this.refresgOrderDetail();
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！",
+                        });
+                    } else if (response.code == 520) {
+                        this.$message.error("校验异常单据列表已不存在该扫码单据！");
+                        this.getList();
+                    }
                 })
                 .catch(() => {
                 });
diff --git a/src/views/warehouse/IOErrorOrder.vue b/src/views/warehouse/IOErrorOrder.vue
index d1543d2..119d7fa 100644
--- a/src/views/warehouse/IOErrorOrder.vue
+++ b/src/views/warehouse/IOErrorOrder.vue
@@ -295,6 +295,7 @@ export default {
     data() {
         return {
             filterQuery: {
+                status: 3,
                 id: "",
                 mainAction: null,
                 action: null,
@@ -352,6 +353,7 @@ export default {
                 edit: "编辑",
             },
             deleteData: {
+                status: 3,
                 id: "",
             },
             dialogTableVisible: false,
@@ -473,11 +475,18 @@ export default {
             this.deleteData.id = data;
             deleteByOrderId(this.deleteData)
                 .then((response) => {
-                    this.getList();
-                    this.$message({
-                        type: "success",
-                        message: "删除成功！",
-                    });
+
+                    if (response.code == 20000) {
+                        this.getList();
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！",
+                        });
+                    } else if (response.code == 520) {
+                        this.$message.error("异常单据列表已不存在该扫码单据！");
+                        this.getList();
+                    }
+
                 })
                 .catch(() => {
                 });
diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 32e1bc9..10c2c60 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -372,6 +372,7 @@ export default {
             },
             deleteData: {
                 id: "",
+                status: 10,
             },
             dialogTableVisible: false,
             formLoading: false,
@@ -611,11 +612,19 @@ export default {
             this.deleteData.id = data;
             deleteByOrderId(this.deleteData)
                 .then((response) => {
-                    this.getList();
-                    this.$message({
-                        type: "success",
-                        message: "删除成功！",
-                    });
+
+                    if (response.code == 20000) {
+                        this.getList();
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！",
+                        });
+                    } else if (response.code == 520) {
+                        this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+                        this.getList();
+                    }
+
+
                 })
                 .catch(() => {
                 });
@@ -650,7 +659,8 @@ export default {
                                 this.list.splice(i, 1);
                                 break;
                             }
-                        };
+                        }
+                        ;
                         this.$message.success("提交成功");
                     } else {
                         this.$message.error(response.message);
@@ -677,7 +687,7 @@ export default {
         invChange() {
             this.subInvList = [];
 
-            if(this.$isNotBlank(this.filterQuery.invWarehouseCode)){
+            if (this.$isNotBlank(this.filterQuery.invWarehouseCode)) {
                 this.filterQuery.invWarehouseCode = "";
             }
 
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index aefa0da..29ee0f4 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.vue
@@ -1,429 +1,429 @@
 <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.id" placeholder="单号"></el-input>
-          </el-form-item>
-
-          <el-form-item class="query-form-item">
-            <el-select
-                v-model="filterQuery.mainAction"
-                placeholder="出入库类型"
+    <div>
+        <el-card class="el-card">
+            <el-form
+                :inline="true"
+                :model="filterQuery"
+                class="query-form"
+                size="mini"
             >
-              <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-form-item class="query-form-item">
-            <el-select v-model="filterQuery.action" placeholder="请选择扫码单据类型">
-              <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-form-item class="query-form-item">
-            <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
-                       @change="invChange"
-                       size="mini">
-              <el-option
-                  v-for="item in storageList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
-                       size="mini">
-              <el-option
-                  v-for="item in subInvList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="query-form-item">
+                <el-row>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.id" placeholder="单号"></el-input>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-select
+                            v-model="filterQuery.mainAction"
+                            placeholder="出入库类型"
+                        >
+                            <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-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.action" placeholder="请选择扫码单据类型">
+                            <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-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
+                                   @change="invChange"
+                                   size="mini">
+                            <el-option
+                                v-for="item in storageList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-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
+                            :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>
+                            <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="mergesOrders">合并单号</el-button>
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+            <el-table
+                v-loading="loading"
+                :data="list"
+                style="width: 100%"
+                @row-click="getOrderDetail"
+                highlight-current-row
+                @selection-change="handleSelectionChange"
             >
-            </el-date-picker>
-          </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="mergesOrders">合并单号</el-button>
-            </el-button-group>
-          </el-form-item>
-        </el-row>
-      </el-form>
-      <el-table
-          v-loading="loading"
-          :data="list"
-          style="width: 100%"
-          @row-click="getOrderDetail"
-          highlight-current-row
-          @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="action">
-          <template slot-scope="scope">
-            <span>{{ getActionName(scope.row.action) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            label="订单号"
-            prop="id"
-            show-overflow-tooltip="true"
-        ></el-table-column>
-        <!-- <el-table-column
-          label="来源订单号"
-          prop="corpOrderId"
-          :show-overflow-tooltip="true"
-        ></el-table-column> -->
-        <el-table-column label="来源" prop="fromType">
-          <template slot-scope="scope">
-            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="往来单位" prop="fromCorp" width="250">
-        </el-table-column>
-        <el-table-column label="当前仓库" prop="locStorageCode" width="120">
-          <template slot-scope="scope">
-            <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-          </template>
-        </el-table-column>
-          <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
-              <template slot-scope="scope">
-                  <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
-              </template>
-          </el-table-column>
-        <el-table-column
-            label="创建时间"
-            prop="actDate"
-            width="150"
-            show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <i class="el-icon-time"></i>
-            <span>{{ scope.row.actDate }}</span>
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="校验状态" prop="status" width="100">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-tag :type="(scope.row.status === 3) | statusFilterType">{{-->
-        <!--checkStatus[scope.row.contrastStatus]-->
-        <!--}}-->
-        <!--</el-tag>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <el-table-column label="校验状态" prop="contrastStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
-              {{ erpCheckStatus[scope.row.contrastStatus] }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="操作" width="150">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-button-->
-        <!--type="text"-->
-        <!--size="small"-->
-        <!--:disabled="scope.row.contrastStatus === null"-->
-        <!--@click.native.stop="repeatCheckClick(scope.row)"-->
-        <!--&gt;重新校验-->
-        <!--</el-button-->
-        <!--&gt;-->
-        <!--<el-button-->
-        <!--type="text"-->
-        <!--size="small"-->
-        <!--:disabled="scope.row.contrastStatus !== 0"-->
-        <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
-        <!--&gt;校验信息-->
-        <!--</el-button-->
-        <!--&gt;-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!-- <el-table-column label="上传状态" prop="exportStatus"></el-table-column> -->
-        <!--<el-table-column label="操作" width="250">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-button-->
-        <!--type="text"-->
-        <!--size="small"-->
-        <!--:disabled="scope.row.status === 4"-->
-        <!--@click.native.stop="repeatCheckClick(scope.row)"-->
-        <!--&gt;重新校验-->
-        <!--</el-button-->
-        <!--&gt;-->
-        <!--<el-button-->
-        <!--type="text"-->
-        <!--size="small"-->
-        <!--:disabled="scope.row.status === 4"-->
-        <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
-        <!--&gt;校验信息-->
-        <!--</el-button-->
-        <!--&gt;-->
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column label="扫码单据类型" prop="action">
+                    <template slot-scope="scope">
+                        <span>{{ getActionName(scope.row.action) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="订单号"
+                    prop="id"
+                    show-overflow-tooltip="true"
+                ></el-table-column>
+                <!-- <el-table-column
+                  label="来源订单号"
+                  prop="corpOrderId"
+                  :show-overflow-tooltip="true"
+                ></el-table-column> -->
+                <el-table-column label="来源" prop="fromType">
+                    <template slot-scope="scope">
+                        <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="往来单位" prop="fromCorp" width="250">
+                </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="创建时间"
+                    prop="actDate"
+                    width="150"
+                    show-overflow-tooltip="true"
+                >
+                    <template slot-scope="scope">
+                        <i class="el-icon-time"></i>
+                        <span>{{ scope.row.actDate }}</span>
+                    </template>
+                </el-table-column>
+                <!--<el-table-column label="校验状态" prop="status" width="100">-->
+                <!--<template slot-scope="scope">-->
+                <!--<el-tag :type="(scope.row.status === 3) | statusFilterType">{{-->
+                <!--checkStatus[scope.row.contrastStatus]-->
+                <!--}}-->
+                <!--</el-tag>-->
+                <!--</template>-->
+                <!--</el-table-column>-->
+                <el-table-column label="校验状态" prop="contrastStatus" width="120">
+                    <template slot-scope="scope">
+                        <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
+                            {{ erpCheckStatus[scope.row.contrastStatus] }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+                <!--<el-table-column label="操作" width="150">-->
+                <!--<template slot-scope="scope">-->
+                <!--<el-button-->
+                <!--type="text"-->
+                <!--size="small"-->
+                <!--:disabled="scope.row.contrastStatus === null"-->
+                <!--@click.native.stop="repeatCheckClick(scope.row)"-->
+                <!--&gt;重新校验-->
+                <!--</el-button-->
+                <!--&gt;-->
+                <!--<el-button-->
+                <!--type="text"-->
+                <!--size="small"-->
+                <!--:disabled="scope.row.contrastStatus !== 0"-->
+                <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
+                <!--&gt;校验信息-->
+                <!--</el-button-->
+                <!--&gt;-->
+                <!--</template>-->
+                <!--</el-table-column>-->
+                <!-- <el-table-column label="上传状态" prop="exportStatus"></el-table-column> -->
+                <!--<el-table-column label="操作" width="250">-->
+                <!--<template slot-scope="scope">-->
+                <!--<el-button-->
+                <!--type="text"-->
+                <!--size="small"-->
+                <!--:disabled="scope.row.status === 4"-->
+                <!--@click.native.stop="repeatCheckClick(scope.row)"-->
+                <!--&gt;重新校验-->
+                <!--</el-button-->
+                <!--&gt;-->
+                <!--<el-button-->
+                <!--type="text"-->
+                <!--size="small"-->
+                <!--:disabled="scope.row.status === 4"-->
+                <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
+                <!--&gt;校验信息-->
+                <!--</el-button-->
+                <!--&gt;-->
 
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <el-table-column label="操作" fixed="right" width="250">
-          <template slot-scope="scope">
-            <el-button
-                type="text"
-                size="small"
-                @click.native.stop="intentDetail(scope.row)"
-            >详情
-            </el-button
-            >
+                <!--</template>-->
+                <!--</el-table-column>-->
+                <el-table-column label="操作" fixed="right" width="250">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="intentDetail(scope.row)"
+                        >详情
+                        </el-button
+                        >
 
-            <!--                        <el-button-->
-            <!--                            type="text"-->
-            <!--                            size="small"-->
-            <!--                            @click.native.stop="successOrderExportPDF(scope.row)"-->
-            <!--                        >打印-->
-            <!--                        </el-button-->
-            <!--                        >-->
+                        <!--                        <el-button-->
+                        <!--                            type="text"-->
+                        <!--                            size="small"-->
+                        <!--                            @click.native.stop="successOrderExportPDF(scope.row)"-->
+                        <!--                        >打印-->
+                        <!--                        </el-button-->
+                        <!--                        >-->
 
-            <el-button
-                type="text"
-                size="small"
-                @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
-            <el-button
-                type="text"
-                size="small"
-                @click.native.stop="importOrder(scope.row)"
-            >选择业务单据
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="importOrder(scope.row)"
+                        >选择业务单据
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
 
-      <el-dialog
-          title="导出PDF"
-          :visible.sync="successOrderExportPDFSettingVisible"
-          width="80%"
-          v-if="successOrderExportPDFSettingVisible"
-          @close='closeDialog'
-      >
-        <successOrderExportPDFSetting
-            :closeDialog="closeDialog"
-            :idQuery="idQuery"
-        ></successOrderExportPDFSetting>
-      </el-dialog>
+            <el-dialog
+                title="导出PDF"
+                :visible.sync="successOrderExportPDFSettingVisible"
+                width="80%"
+                v-if="successOrderExportPDFSettingVisible"
+                @close='closeDialog'
+            >
+                <successOrderExportPDFSetting
+                    :closeDialog="closeDialog"
+                    :idQuery="idQuery"
+                ></successOrderExportPDFSetting>
+            </el-dialog>
 
-      <el-pagination
-          :page-size="filterQuery.limit"
-          @current-change="handleCurrentChange"
-          layout="prev, pager, next"
-          :total="total"
-      ></el-pagination>
-    </el-card>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+        </el-card>
 
-    <el-card class="el-card" v-if="true" id="printJS-form">
-      <el-table
-          v-loading="loading"
-          :row-class-name="tableRowClassName"
-          :data="detailList"
-          style="width: 100%"
-      >
-        <el-table-column label="序号" type="index"></el-table-column>
-        <!--                <el-table-column-->
-        <!--                    label="ERP订单号"-->
-        <!--                    prop="erpOrderId"-->
-        <!--                    :show-overflow-tooltip="true"-->
-        <!--                ></el-table-column>-->
+        <el-card class="el-card" v-if="true" id="printJS-form">
+            <el-table
+                v-loading="loading"
+                :row-class-name="tableRowClassName"
+                :data="detailList"
+                style="width: 100%"
+            >
+                <el-table-column label="序号" type="index"></el-table-column>
+                <!--                <el-table-column-->
+                <!--                    label="ERP订单号"-->
+                <!--                    prop="erpOrderId"-->
+                <!--                    :show-overflow-tooltip="true"-->
+                <!--                ></el-table-column>-->
 
-        <!--                <el-table-column-->
-        <!--                    label="产品名称"-->
-        <!--                    prop="goodsname"-->
-        <!--                    :show-overflow-tooltip="true"-->
-        <!--                ></el-table-column>-->
+                <!--                <el-table-column-->
+                <!--                    label="产品名称"-->
+                <!--                    prop="goodsname"-->
+                <!--                    :show-overflow-tooltip="true"-->
+                <!--                ></el-table-column>-->
 
-        <el-table-column
-            label="产品通用名"
-            prop="coName"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-            label="包装规格"
-            prop="packSpec"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-            label="批次号"
-            prop="batchNo"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-            label="生产日期"
-            prop="productDate"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-            label="失效日期"
-            prop="expireDate"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-            label="单据数量"
-            prop="erpCount"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-            label="实际数量"
-            prop="reCount"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
+                <el-table-column
+                    label="产品通用名"
+                    prop="coName"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="包装规格"
+                    prop="packSpec"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="批次号"
+                    prop="batchNo"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="生产日期"
+                    prop="productDate"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="失效日期"
+                    prop="expireDate"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="单据数量"
+                    prop="erpCount"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="实际数量"
+                    prop="reCount"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
 
-        <el-table-column label="扫码数量" prop="count"></el-table-column>
-        <el-table-column
-            label="供应商"
-            prop="supName"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-            label="生产企业"
-            prop="productCompany"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-            label="注册/备案凭证号"
-            prop="authCode"
-            :show-overflow-tooltip="true"
-        ></el-table-column>
-      </el-table>
-    </el-card>
-    <el-dialog
-        title="选择往来单位"
-        :visible.sync="dialogTableVisible"
-        width="70%"
-    >
-      <el-form :inline="true" :model="query" 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-column label="扫码数量" prop="count"></el-table-column>
+                <el-table-column
+                    label="供应商"
+                    prop="supName"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="生产企业"
+                    prop="productCompany"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="注册/备案凭证号"
+                    prop="authCode"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+            </el-table>
+        </el-card>
+        <el-dialog
+            title="选择往来单位"
+            :visible.sync="dialogTableVisible"
+            width="70%"
+        >
+            <el-form :inline="true" :model="query" 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="unitId"></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="addDialogVisible"
-        width="80%"
-        v-if="addDialogVisible"
-    >
-      <selectErpOrder
-          v-on:closeManuDialog="closeManuDialog"
-          :orderId="orderId"
-          :orderAction="billAction"
-          :curLocInv="curLocInv"
-      ></selectErpOrder>
-    </el-dialog>
+            <el-table
+                v-loading="loading"
+                :data="unitlist"
+                style="width: 100%"
+                @row-click="selectUnit"
+            >
+                <el-table-column label="往来单位ID" prop="unitId"></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="addDialogVisible"
+            width="80%"
+            v-if="addDialogVisible"
+        >
+            <selectErpOrder
+                v-on:closeManuDialog="closeManuDialog"
+                :orderId="orderId"
+                :orderAction="billAction"
+                :curLocInv="curLocInv"
+            ></selectErpOrder>
+        </el-dialog>
 
-    <el-dialog
-        title="单号详情"
-        :visible.sync="codeDetailVisible"
-        width="80%"
-        v-if="codeDetailVisible"
-    >
-      <codeDetail
-          :idQuery="idQuery"
-          v-on:closeDetailDialog="closeDetailDialog"
-      ></codeDetail>
-    </el-dialog>
+        <el-dialog
+            title="单号详情"
+            :visible.sync="codeDetailVisible"
+            width="80%"
+            v-if="codeDetailVisible"
+        >
+            <codeDetail
+                :idQuery="idQuery"
+                v-on:closeDetailDialog="closeDetailDialog"
+            ></codeDetail>
+        </el-dialog>
 
-    <el-dialog title="校验信息" :visible.sync="errDialogVisible" width="30%">
-      <span>{{ errorDetail }}</span>
-      <span slot="footer" class="dialog-footer">
+        <el-dialog title="校验信息" :visible.sync="errDialogVisible" width="30%">
+            <span>{{ errorDetail }}</span>
+            <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="errDialogVisible = false"
         >关 闭</el-button
         >
       </span>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import {
-  orderList,
-  codeList,
-  findAllByOrderId,
-  updateUnit,
-  filterOrder,
-  deleteByOrderId,
-  updateExportStatus,
-  uploadOrder,
-  mergeOrder,
-  orderDetail,
+    orderList,
+    codeList,
+    findAllByOrderId,
+    updateUnit,
+    filterOrder,
+    deleteByOrderId,
+    updateExportStatus,
+    uploadOrder,
+    mergeOrder,
+    orderDetail,
 } from "../../api/warehouse/order";
 import {
-  orderDetailPDFFromTemplateCode,
-  orderDetailPDFFromTemplateFile,
-  inspectionOrderDetailPDFFromTemplateCode,
-  inspectionOrderDetailPDFFromTemplateFile
+    orderDetailPDFFromTemplateCode,
+    orderDetailPDFFromTemplateFile,
+    inspectionOrderDetailPDFFromTemplateCode,
+    inspectionOrderDetailPDFFromTemplateFile
 } from "../../api/itextpdf/itextpdf";
 import {repeatCheck} from "../../api/erp/erpOrder";
 import {unitListBykey} from "../../api/warehouse/unit";
@@ -440,624 +440,630 @@ import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 const formJson = {
-  site_id: "",
-  site_name: "",
-  describe: "",
-  ads: [],
+    site_id: "",
+    site_name: "",
+    describe: "",
+    ads: [],
 };
 export default {
-  props: {
-    isSelect: {
-      type: Boolean,
-      default: false,
+    props: {
+        isSelect: {
+            type: Boolean,
+            default: false,
+        },
     },
-  },
-
-  data() {
-    return {
-      query: {
-        page: 1,
-        limit: 10,
-      },
-      checkStatus: {
-        1: "校验异常",
-        0: "未校验",
-        2: "正常",
-      },
-      erpCheckStatus: {
-        // error: "校验异常",
-        // null: "未校验",
-        // success: "正常",
-        1: "等待校验",
-        0: "等待校验",
-        2: "等待校验",
-      },
-      //往来单位
-      unitquery: {key: "", page: 1, limit: 20},
-      unitlist: [],
-      list: [],
-      billAction: null,
-      curLocInv: null,
-      detailList: [],
-      unitUpdateQuery: {
-        id: "",
-        fromCorpId: "",
-        fromCorp: "",
-      },
-      actDateRange: [],
-      filterQuery: {
-        id: "",
-        mainAction: null,
-        action: null,
-        page: 1,
-        limit: 10,
-        code: "",
-        exportStatus: null,
-        contrastStatus: 0,
-        status: 2,
-        startTime: "",
-        endTime: "",
-        locStorageCode: this.$store.getters.locInvCode,
-        invWarehouseCode: this.$store.getters.locSubInvCode,
-      },
-      detailQuery: {
-        orderId: "",
-      },
-      deleteData: {
-        id: "",
-      },
-      idQuery: {
-        id: "",
-      },
-      curIndex: "",
-      adListNoDataText: "无数据",
-      queryAdIdAsyncLoading: false,
-      codeDetailVisible: false,
-      successOrderExportPDFSettingVisible: false,
-      total: 0,
-      loading: false,
-      index: null,
-      formName: null,
-      orderId: "",
-      formMap: {
-        add: "新增",
-        edit: "编辑",
-      },
-      fromTypeMap: {
-        "1": "UDIMS平台",
-        "2": "网页新增",
-        "3": "pda即时校验",
-        "4": "pda未校验",
-        "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
-        "7": "UDI供应商平台",
-        "8": "平衡补录单据",
-      },
-      exportQuery: {
-        orderId: "",
-        exportStatus: "",
-      },
 
-      uploadQuery: {
-        orderId: "",
-      },
-      busTypes: [],
-      storageList: [],
-      subInvList: [],
-      multipleSelection: [],
-      dialogTableVisible: false,
-      formLoading: false,
-      formVisible: false,
-      formData: formJson,
-      deleteLoading: false,
-      addDialogVisible: false,
-      errDialogVisible: 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]);
+    data() {
+        return {
+            query: {
+                page: 1,
+                limit: 10,
             },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
+            checkStatus: {
+                1: "校验异常",
+                0: "未校验",
+                2: "正常",
             },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
+            erpCheckStatus: {
+                // error: "校验异常",
+                // null: "未校验",
+                // success: "正常",
+                1: "等待校验",
+                0: "等待校验",
+                2: "等待校验",
+            },
+            //往来单位
+            unitquery: {key: "", page: 1, limit: 20},
+            unitlist: [],
+            list: [],
+            billAction: null,
+            curLocInv: null,
+            detailList: [],
+            unitUpdateQuery: {
+                id: "",
+                fromCorpId: "",
+                fromCorp: "",
+            },
+            actDateRange: [],
+            filterQuery: {
+                id: "",
+                mainAction: null,
+                action: null,
+                page: 1,
+                limit: 10,
+                code: "",
+                exportStatus: null,
+                contrastStatus: 0,
+                status: 2,
+                startTime: "",
+                endTime: "",
+                locStorageCode: this.$store.getters.locInvCode,
+                invWarehouseCode: this.$store.getters.locSubInvCode,
+            },
+            detailQuery: {
+                orderId: "",
+            },
+            deleteData: {
+                id: "",
+                status: 2,
+            },
+            idQuery: {
+                id: "",
+            },
+            curIndex: "",
+            adListNoDataText: "无数据",
+            queryAdIdAsyncLoading: false,
+            codeDetailVisible: false,
+            successOrderExportPDFSettingVisible: false,
+            total: 0,
+            loading: false,
+            index: null,
+            formName: null,
+            orderId: "",
+            formMap: {
+                add: "新增",
+                edit: "编辑",
+            },
+            fromTypeMap: {
+                "1": "UDIMS平台",
+                "2": "网页新增",
+                "3": "pda即时校验",
+                "4": "pda未校验",
+                "5": "pc端扫码精灵",
+                "6": "缺量补录单据",
+                "7": "UDI供应商平台",
+                "8": "平衡补录单据",
+            },
+            exportQuery: {
+                orderId: "",
+                exportStatus: "",
             },
-          },
-        ],
-      },
-    };
-  },
-  components: {
-    draggable,
-    codeDetail,
-    successOrderExportPDFSetting,
-    selectErpOrder,
-  },
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        id: "",
-        mainAction: null,
-        action: null,
-        page: 1,
-        limit: 10,
-        code: "",
-        exportStatus: null,
-        contrastStatus: 0,
-        status: 2,
-        startTime: "",
-        endTime: "",
-      };
-      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.getList();
-    },
-    handleSizeChange(val) {
-      this.filterQuery.limit = val;
-      this.getList();
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
-    },
-    handleSelectionChange(val) {
-      console.log(val);
-      this.multipleSelection = val;
-    },
-    getStorageName(code) {
-      for (let i = 0; i < this.storageList.length; i++) {
-        if (this.storageList[i].code === code) {
-          return this.storageList[i].name;
-        }
-      }
-    },
-      getSubStorageName(code) {
-          for (let i = 0; i < this.subInvList.length; i++) {
-              if (this.subInvList[i].code === code) {
-                  return this.subInvList[i].name;
-              }
-          }
-      },
-    handleErrorDetail(poistion) {
-      var mOrder = this.list[poistion];
-      this.errorDetail = mOrder.remark;
-      this.errDialogVisible = true;
-    },
-
-    mergesOrders() {
-      let repeatData = this.multipleSelection;
-      if (repeatData.length <= 1) {
-        this.$message.warning("选择的订单需大于1");
-        return;
-      }
-      let orderid = repeatData[0].id;
-      let unit = repeatData[0].fromCorp;
-      let action = repeatData[0].action;
-      let orderList = [];
-      repeatData.forEach((obj, index) => {
-        if (unit !== obj.fromCorp) {
-          this.$message.warning("往来单位不一致！");
-          return;
-        }
-        if (action !== obj.action) {
-          this.$message.warning("业务类型不一致！");
-          return;
-        }
-        orderList.push(obj.id);
-      });
-      let tquery = {
-        orderList: orderList,
-      };
 
-      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(() => {
-          });
-    },
-    //获取订单列表
-    getList() {
-      this.loading = true;
-      this.filterQuery.customerId = store.getters.customerId;
-      filterOrder(this.filterQuery)
-          .then((response) => {
-            console.log(response)
-            this.loading = false;
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-            this.detailList = [];
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+            uploadQuery: {
+                orderId: "",
+            },
+            busTypes: [],
+            storageList: [],
+            subInvList: [],
+            multipleSelection: [],
+            dialogTableVisible: false,
+            formLoading: false,
+            formVisible: false,
+            formData: formJson,
+            deleteLoading: false,
+            addDialogVisible: false,
+            errDialogVisible: 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]);
+                        },
+                    },
+                ],
+            },
+        };
     },
-    //业务明细表
-    getOrderDetail(row) {
-      this.loading = true;
-      this.detailQuery = {
-        orderId: row.id,
-      };
-      this.refresgOrderDetail();
+    components: {
+        draggable,
+        codeDetail,
+        successOrderExportPDFSetting,
+        selectErpOrder,
     },
-    repeatCheckClick(row) {
-      let tQuery = {
-        orderId: row.id,
-      };
-      this.loading = true;
-      repeatCheck(tQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code === 20000) {
-              this.$message.success(response.data);
-              this.getList();
-              this.detailQuery = {
-                orderId: row.id,
-              };
-              this.refresgOrderDetail();
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                id: "",
+                mainAction: null,
+                action: null,
+                page: 1,
+                limit: 10,
+                code: "",
+                exportStatus: null,
+                contrastStatus: 0,
+                status: 2,
+                startTime: "",
+                endTime: "",
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+        onSubmit() {
+            if (this.actDateRange !== null) {
+                this.filterQuery.startTime = this.actDateRange[0];
+                this.filterQuery.endTime = this.actDateRange[1];
             } else {
-              this.$message.error(response.message);
+                this.filterQuery.startTime = null;
+                this.filterQuery.endTime = null;
             }
-          })
-          .catch(() => {
-            this.loading = false;
             this.getList();
-            this.$message.error(response.message);
-          });
-    },
-    refresgOrderDetail() {
-      orderDetail(this.detailQuery)
-          .then((response) => {
-            console.log(response)
-            this.loading = false;
-            this.detailList = response.data || [];
-          })
-          .catch(() => {
-            this.loading = false;
-            this.detailList = [];
-          });
-    },
-
-    handleUnitClick(row) {
-      this.curIndex = row.id;
-      // this.dialogTableVisible = true;
-    },
-    getUnitList() {
-      this.loading = true;
-      unitListBykey(this.unitquery)
-          .then((response) => {
-            this.loading = false;
-            this.unitlist = response.data.list || [];
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-    },
-    intentDetail(row) {
-      // this.$router.push({
-      //   path: "../inout/detail",
-      //   query: { id: row.id },
-      // });
-
-      this.codeDetailVisible = true;
-      this.idQuery.id = row.id;
-    },
-    successOrderExportPDFSetting(row) {
-      this.idQuery.id = '';
-      if (this.$isNotBlank(row.id)) {
-        this.idQuery.id = row.id;
-      }
-      this.successOrderExportPDFSettingVisible = true;
-    },
-    successOrderExportPDF(row) {
-      console.log(row)
-      let tQuery = {
-        orderId: row.id,
-        customerId: store.getters.customerId
-      }
-      this.loading = true;
-      inspectionOrderDetailPDFFromTemplateFile(tQuery).then((response) => {
-        if (response.code === 20000) {
-          orderDetailPDFFromTemplateFile(tQuery).then((response) => {
-            //将pdf文件转换为url。
-            const binaryData = [];
-            binaryData.push(response);
-            //获取blob链接。
-            let url = window.URL.createObjectURL(
-                new Blob(binaryData, {type: "application/pdf"})
-            );
-            this.loading = false;
-            window.open(url);//打开新标签页，预览pdf。
-          }).catch(() => {
-            this.loading = false;
-          });
-        } else {
-          this.loading = false;
-          this.$message.error(response.message);
-        }
-      }).catch(() => {
-        this.loading = false;
-      });
-    },
-    closeDialog() {
-      this.successOrderExportPDFSettingVisible = false;
-      this.getList();
-    },
-
-    selectUnit(row) {
-      console.log(row.id);
-      this.unitUpdateQuery.id = this.curIndex;
-      this.unitUpdateQuery.fromCorp = row.name;
-      this.unitUpdateQuery.fromCorpId = row.unitid;
-      updateUnit(this.unitUpdateQuery)
-          .then((response) => {
-            this.dialogTableVisible = false;
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
             this.getList();
-          })
-          .catch(() => {
-            this.dialogTableVisible = false;
-          });
-    },
-    deleteOrders(data) {
-      this.loading = true;
-      this.deleteData.id = data;
-      deleteByOrderId(this.deleteData)
-          .then((response) => {
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
             this.getList();
-            this.refresgOrderDetail();
-            this.$message({
-              type: "success",
-              message: "删除成功！",
-            });
-          })
-          .catch(() => {
-          });
-    },
-    tableRowClassName({row, rowIndex}) {
-      if (row.reCount === row.count) {
-        return "success-row";
-      } else {
-        return "warning-row";
-      }
-    },
+        },
+        handleSelectionChange(val) {
+            console.log(val);
+            this.multipleSelection = val;
+        },
+        getStorageName(code) {
+            for (let i = 0; i < this.storageList.length; i++) {
+                if (this.storageList[i].code === code) {
+                    return this.storageList[i].name;
+                }
+            }
+        },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
+        handleErrorDetail(poistion) {
+            var mOrder = this.list[poistion];
+            this.errorDetail = mOrder.remark;
+            this.errDialogVisible = true;
+        },
 
-    exportDialog(value) {
-      var mOrder = value;
-      if (mOrder.exportStatus === "已上传") {
-        this.$confirm("该订单已修改, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-            .then(() => {
-              this.uploadOrderDialog(mOrder);
-            })
-            .catch(() => {
-            });
-      } else if (mOrder.contrastStatus === 0) {
-        this.$confirm("该订单校验异常, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-            .then(() => {
-              this.uploadOrderDialog(mOrder);
-            })
-            .catch(() => {
-            });
-      } else if (mOrder.contrastStatus === null) {
-        this.$confirm("该订单未校验, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-            .then(() => {
-              this.uploadOrderDialog(mOrder);
-            })
-            .catch(() => {
+        mergesOrders() {
+            let repeatData = this.multipleSelection;
+            if (repeatData.length <= 1) {
+                this.$message.warning("选择的订单需大于1");
+                return;
+            }
+            let orderid = repeatData[0].id;
+            let unit = repeatData[0].fromCorp;
+            let action = repeatData[0].action;
+            let orderList = [];
+            repeatData.forEach((obj, index) => {
+                if (unit !== obj.fromCorp) {
+                    this.$message.warning("往来单位不一致！");
+                    return;
+                }
+                if (action !== obj.action) {
+                    this.$message.warning("业务类型不一致！");
+                    return;
+                }
+                orderList.push(obj.id);
             });
-      } else {
-        this.$confirm("是否确定修改ERP订单?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-            .then(() => {
-              this.uploadOrderDialog(mOrder);
-            })
-            .catch(() => {
+            let tquery = {
+                orderList: orderList,
+            };
+
+            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(() => {
+                });
+        },
+        //获取订单列表
+        getList() {
+            this.loading = true;
+            this.filterQuery.customerId = store.getters.customerId;
+            filterOrder(this.filterQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                    this.detailList = [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        //业务明细表
+        getOrderDetail(row) {
+            this.loading = true;
+            this.detailQuery = {
+                orderId: row.id,
+            };
+            this.refresgOrderDetail();
+        },
+        repeatCheckClick(row) {
+            let tQuery = {
+                orderId: row.id,
+            };
+            this.loading = true;
+            repeatCheck(tQuery)
+                .then((response) => {
+                    this.loading = false;
+                    if (response.code === 20000) {
+                        this.$message.success(response.data);
+                        this.getList();
+                        this.detailQuery = {
+                            orderId: row.id,
+                        };
+                        this.refresgOrderDetail();
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.getList();
+                    this.$message.error(response.message);
+                });
+        },
+        refresgOrderDetail() {
+            orderDetail(this.detailQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.loading = false;
+                    this.detailList = response.data || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                });
+        },
+
+        handleUnitClick(row) {
+            this.curIndex = row.id;
+            // this.dialogTableVisible = true;
+        },
+        getUnitList() {
+            this.loading = true;
+            unitListBykey(this.unitquery)
+                .then((response) => {
+                    this.loading = false;
+                    this.unitlist = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
+        intentDetail(row) {
+            // this.$router.push({
+            //   path: "../inout/detail",
+            //   query: { id: row.id },
+            // });
+
+            this.codeDetailVisible = true;
+            this.idQuery.id = row.id;
+        },
+        successOrderExportPDFSetting(row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+            }
+            this.successOrderExportPDFSettingVisible = true;
+        },
+        successOrderExportPDF(row) {
+            console.log(row)
+            let tQuery = {
+                orderId: row.id,
+                customerId: store.getters.customerId
+            }
+            this.loading = true;
+            inspectionOrderDetailPDFFromTemplateFile(tQuery).then((response) => {
+                if (response.code === 20000) {
+                    orderDetailPDFFromTemplateFile(tQuery).then((response) => {
+                        //将pdf文件转换为url。
+                        const binaryData = [];
+                        binaryData.push(response);
+                        //获取blob链接。
+                        let url = window.URL.createObjectURL(
+                            new Blob(binaryData, {type: "application/pdf"})
+                        );
+                        this.loading = false;
+                        window.open(url);//打开新标签页，预览pdf。
+                    }).catch(() => {
+                        this.loading = false;
+                    });
+                } else {
+                    this.loading = false;
+                    this.$message.error(response.message);
+                }
+            }).catch(() => {
+                this.loading = false;
             });
-      }
-    },
+        },
+        closeDialog() {
+            this.successOrderExportPDFSettingVisible = false;
+            this.getList();
+        },
 
+        selectUnit(row) {
+            console.log(row.id);
+            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;
+                });
+        },
+        deleteOrders(data) {
+            this.loading = true;
+            this.deleteData.id = data;
+            deleteByOrderId(this.deleteData)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.getList();
+                        this.refresgOrderDetail();
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！",
+                        });
+                    } else if (response.code == 520) {
+                        this.$message.error("等待校验单据列表已不存在该扫码单据！");
+                        this.getList();
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        tableRowClassName({row, rowIndex}) {
+            if (row.reCount === row.count) {
+                return "success-row";
+            } else {
+                return "warning-row";
+            }
+        },
 
-    uploadOrderDialog(value) {
-      console.log(value.id + "---" + value.orderid);
-      this.uploadQuery = {
-        orderId: value.id,
-      };
-      uploadOrder(this.uploadQuery)
-          .then((response) => {
-            if (response.code === 20000) {
-              this.$message.success(response.data);
-              this.getList();
+        exportDialog(value) {
+            var mOrder = value;
+            if (mOrder.exportStatus === "已上传") {
+                this.$confirm("该订单已修改, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.uploadOrderDialog(mOrder);
+                    })
+                    .catch(() => {
+                    });
+            } else if (mOrder.contrastStatus === 0) {
+                this.$confirm("该订单校验异常, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.uploadOrderDialog(mOrder);
+                    })
+                    .catch(() => {
+                    });
+            } else if (mOrder.contrastStatus === null) {
+                this.$confirm("该订单未校验, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.uploadOrderDialog(mOrder);
+                    })
+                    .catch(() => {
+                    });
             } else {
-              this.$message.error(response.message);
+                this.$confirm("是否确定修改ERP订单?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.uploadOrderDialog(mOrder);
+                    })
+                    .catch(() => {
+                    });
             }
-          })
-          .catch(() => {
-          });
-    },
+        },
 
-    deleteDialog(rowId) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-          .then(() => {
-            this.deleteOrders(rowId);
-          })
-          .catch(() => {
-          });
-    },
-    closeDetailDialog(val) {
-      this.codeDetailVisible = false;
-    },
-    closeManuDialog(val) {
-      this.addDialogVisible = false;
-      if (val) {
-        this.$message.success("选入成功");
-        this.refresgOrderDetail();
-        this.getList();
-      } else {
-        this.$message.error("选入失败");
-      }
-    },
-    cancelDialog() {
-      this.addDialogVisible = false;
-    },
-    importOrder(row) {
-      this.orderId = row.id;
-      this.billAction = row.action;
-      this.curLocInv = row.locStorageCode;
-      this.addDialogVisible = true;
-    },
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getLocalJoinByUser(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            this.filterQuery.billAction = this.busTypes[0].action;
-            // this.getList();
-          })
-          .catch(() => {
-          });
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
-        }
-      }
-    },
-    getStorage() {
-      this.storageList = [];
-      filterAllByUser()
-          .then((response) => {
-            this.storageList = response.data || [];
-            if (this.storageList.length > 0) {
-              this.invChange();
-              this.getList();
+
+        uploadOrderDialog(value) {
+            console.log(value.id + "---" + value.orderid);
+            this.uploadQuery = {
+                orderId: value.id,
+            };
+            uploadOrder(this.uploadQuery)
+                .then((response) => {
+                    if (response.code === 20000) {
+                        this.$message.success(response.data);
+                        this.getList();
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteOrders(rowId);
+                })
+                .catch(() => {
+                });
+        },
+        closeDetailDialog(val) {
+            this.codeDetailVisible = false;
+        },
+        closeManuDialog(val) {
+            this.addDialogVisible = false;
+            if (val) {
+                this.$message.success("选入成功");
+                this.refresgOrderDetail();
+                this.getList();
+            } else {
+                this.$message.error("选入失败");
+            }
+        },
+        cancelDialog() {
+            this.addDialogVisible = false;
+        },
+        importOrder(row) {
+            this.orderId = row.id;
+            this.billAction = row.action;
+            this.curLocInv = row.locStorageCode;
+            this.addDialogVisible = true;
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getLocalJoinByUser(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
             }
-          })
-          .catch(() => {
-          });
+        },
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.invChange();
+                        this.getList();
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        invChange() {
+            this.filterQuery.invWarehouseCode = "";
+            this.subInvList = [];
+            let query = {
+                pcode: this.filterQuery.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
     },
-    invChange() {
-        this.filterQuery.invWarehouseCode = "";
-      this.subInvList = [];
-      let query = {
-        pcode: this.filterQuery.locStorageCode
-      };
-      filterSubByInv(query)
-          .then((response) => {
-            this.subInvList = response.data || [];
-          })
-          .catch(() => {
-          });
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                false: "success",
+                true: "danger",
+            };
+            return statusMap[status];
+        },
     },
-  },
-  filters: {
-    statusFilterType(status) {
-      const statusMap = {
-        false: "success",
-        true: "danger",
-      };
-      return statusMap[status];
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
     },
-  },
-  mounted() {
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-  },
 
-  created() {
-    this.getStorage();
-    this.getBusType();
-    let query = this.$route.query;
-    this.query = Object.assign(this.query, query);
-    this.query.limit = parseInt(this.query.limit);
-    // 加载表格数据
-    let end = new Date();
-    let start = new Date();
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
-  },
+    created() {
+        this.getStorage();
+        this.getBusType();
+        let query = this.$route.query;
+        this.query = Object.assign(this.query, query);
+        this.query.limit = parseInt(this.query.limit);
+        // 加载表格数据
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
+    },
 };
 </script>
 
 
 <style>
 .el-table .warning-row {
-  background: #ffb5b5;
+    background: #ffb5b5;
 }
 
 .el-table .success-row {
-  background: #ffffff;
+    background: #ffffff;
 }
 </style>
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index 9f26b83..f9011ee 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -51,10 +51,11 @@
                             <!--                            <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
                             <el-date-picker
                                 v-model="formData.billdate"
-                                type="date"
+                                type="datetime"
                                 placeholder="选择日期"
                                 style="width: 100%"
                                 :clearable="false"
+                                value-format="yyyy-MM-dd HH:mm:ss"
                             >
                             </el-date-picker>
                         </el-form-item>
@@ -69,7 +70,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="billType">
-                            <el-select v-model="formData.billType" placeholder="请选择业务类型"
+                            <el-select v-model="formData.billType" placeholder="请选择业务类型" :disabled="codeArray.length>0"
                                        @change="actionChange">
                                 <el-option
                                     v-for="item in busTypes"
@@ -94,7 +95,7 @@
                             <el-select
                                 v-model="formData.corpName"
                                 filterable
-                                remote
+                                remote :disabled="codeArray.length>0"
                                 clearable="true"
                                 reserve-keyword
                                 placeholder="请输入往来单位"
@@ -118,7 +119,7 @@
                                 v-model="formData.corpName"
                                 filterable
                                 remote
-                                clearable="true"
+                                clearable="true" :disabled="codeArray.length>0"
                                 reserve-keyword
                                 placeholder="请输入仓库信息"
                                 :remote-method="findStorageMethod"
@@ -142,7 +143,7 @@
                                 <el-option
                                     v-for="item in fromSubStorageOptions"
                                     :key="item.code"
-                                    :label="item.name"
+                                    :label="item.name" :disabled="codeArray.length>0"
                                     :value="item.code">
                                     <span style="float: left">{{ item.name }}</span>
                                     <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
@@ -153,7 +154,7 @@
                         </el-form-item>
                         <el-form-item class="query-form-item" prop="fromCorp"
                                       v-if="curAction.corpType ==2 && curAction.genUnit">
-                            <el-input v-model="formData.corpName" auto-complete="off"
+                            <el-input v-model="formData.corpName" auto-complete="off" :disabled="codeArray.length>0"
                                       clearable
                                       placeholder="请输入病人住院号"
                             ></el-input>
@@ -171,6 +172,7 @@
                     <el-col :span="7">
                         <el-form-item prop="locStorageCode">
                             <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
+                                       :disabled="codeArray.length>0"
                                        clearable>
                                 <el-option
                                     v-for="item in storageList"
@@ -193,6 +195,7 @@
                     <el-col :span="7">
                         <el-form-item prop="invWarehouseCode">
                             <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
+                                       :disabled="codeArray.length>0"
                                        clearable>
                                 <el-option
                                     v-for="item in subInvList"
@@ -217,7 +220,8 @@
                     <el-col :span="7">
                         <el-form-item prop="type" style="margin-right: 20px;"
                                       v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
-                            <el-checkbox v-model="formData.noInvOut">允许无库存出库</el-checkbox>
+                            <el-checkbox v-model="formData.noInvOut" :disabled="codeArray.length>0">允许无库存出库
+                            </el-checkbox>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -259,6 +263,7 @@
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.batchNo"
                                       :disabled="scope.row.index !== selectedIndex"
+                                      @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
                                       ref='inputBatchNoRef'
                                       placeholder="请输入批次号" style="width: 80%"></el-input>
                         </template>
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index 1a6e635..023e7db 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -262,7 +262,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="count">
-                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input>
+                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index 7867068..ff2f64f 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/stockOrderEditDistribution.vue
@@ -231,6 +231,7 @@
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.batchNo"
                                       :disabled="scope.row.index !== selectedIndex"
+                                      @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
                                       ref='inputBatchNoRef'
                                       placeholder="请输入批次号" style="width: 80%"></el-input>
                         </template>
@@ -561,7 +562,7 @@ export default {
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
                             }
-                            if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount <1) {
+                            if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount < 1) {
                                 return this.$message.error('配货数量不能小于0');
                             }
                             if (this.detailCountMax) {
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index 878a91f..9c6f09c 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -369,7 +369,8 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="count">
-                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input>
+                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"
+                                      type="number"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
@@ -452,7 +453,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="price">
-                            <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false"></el-input>
+                            <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false"  type="number"></el-input>
                         </el-form-item>
                     </el-col>
                     <!--                    <el-col :span="3">-->
diff --git a/src/views/warehouse/stockOrderInCode.vue b/src/views/warehouse/stockOrderInCode.vue
index b5c5ccd..612d4f6 100644
--- a/src/views/warehouse/stockOrderInCode.vue
+++ b/src/views/warehouse/stockOrderInCode.vue
@@ -184,7 +184,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="count">
-                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input>
+                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index e8d4917..b638faa 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@@ -362,7 +362,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="count">
-                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="false"></el-input>
+                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="false" type="number"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
@@ -435,7 +435,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="batchNo">
-                            <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false"></el-input>
+                            <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false" type="number"></el-input>
                         </el-form-item>
                     </el-col>
 
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index 931b05a..0c0525a 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -52,10 +52,11 @@
                             <!--                            <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
                             <el-date-picker
                                 v-model="formData.billdate"
-                                type="date"
+                                type="datetime"
                                 placeholder="选择日期"
                                 style="width: 100%"
                                 :clearable="false"
+                                value-format="yyyy-MM-dd HH:mm:ss"
                             >
                             </el-date-picker>
                         </el-form-item>
@@ -71,11 +72,9 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="billType">
-                            <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
-                            <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
-                            <!--</el-select>-->
-                            <!--                             @change="getStorage"-->
-                            <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage" clearable>
+                            <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage"
+                                       :disabled="codeArray.length>0"
+                                       clearable>
                                 <el-option
                                     v-for="item in busTypes"
                                     :key="item.localName"
@@ -110,6 +109,7 @@
                     <el-col :span="7">
                         <el-form-item prop="locStorageCode">
                             <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
+                                       :disabled="codeArray.length>0"
                                        @change="invChange">
                                 <el-option
                                     v-for="item in storageList"
@@ -132,6 +132,7 @@
                     <el-col :span="7">
                         <el-form-item prop="invWarehouseCode">
                             <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
+                                       :disabled="codeArray.length>0"
                                        clearable>
                                 <el-option
                                     v-for="item in subInvList"
@@ -161,54 +162,9 @@
                     >
                 </el-button-group>
 
-                <!--                <el-row :gutter="20">-->
-                <!--                    <el-col :span="3">-->
-                <!--                        <div class="ao-text">-->
-                <!--                            <span>扫码录入：</span>-->
-                <!--                        </div>-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="10">-->
-                <!--                        <el-form-item prop="code">-->
-
-                <!--                            &lt;!&ndash;                            @keyup.native.enter="focusNext('iCount')"   @focus="getInputFocus($event)"-->
-                <!--                               @keypress.enter.native="selectProductFunction($event)"-->
-                <!--                            &ndash;&gt;-->
-                <!--                            <el-input-->
-
-                <!--                                @keyup.enter.native="selectProductFunction($event)"-->
-                <!--                                v-model="code"-->
-                <!--                                auto-complete="off"-->
-                <!--                                ref='inputRef'-->
-                <!--                                @focus="getInputFocus($event)"-->
-                <!--                            ></el-input>-->
-                <!--                        </el-form-item>-->
-                <!--                    </el-col>-->
-                <!--                    &lt;!&ndash;                    <el-col :span="3">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        <div class="ao-text">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            <span>数量：</span>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        </div>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    </el-col>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    <el-col :span="4">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        <el-form-item prop="iCount">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            &lt;!&ndash;                            @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @focus="getInputFocus($event)"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @input="iCountChange"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        </el-form-item>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    </el-col>&ndash;&gt;-->
-                <!--                </el-row>-->
-
-                <!--                highlight-current-row-->
-                <!--                @current-change="rowChange"-->
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
                           :row-class-name="tableRowClassName"
                           max-height="300" height="300" ref="multipleTable">
-                    <!--                    <el-table-column-->
-                    <!--                        type="selection"-->
-                    <!--                        width="55">-->
-                    <!--                    </el-table-column>-->
                     <el-table-column label="序号" type="index" width="50"></el-table-column>
                     <el-table-column width="150"
                                      label="产品通用名"
@@ -220,30 +176,11 @@
                                      prop="spec"
                                      show-overflow-tooltip
                     ></el-table-column>
-                    <!--                    <el-table-column-->
-                    <!--                        label="批次号"-->
-                    <!--                        prop="batchNo"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="生产日期"-->
-                    <!--                        prop="productDate"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="失效日期"-->
-                    <!--                        prop="expireDate"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="数量"-->
-                    <!--                        prop="count"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
                     <el-table-column width="150" label="批次号">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.batchNo"
                                       :disabled="scope.row.index !== selectedIndex"
+                                      @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
                                       ref='inputBatchNoRef'
                                       placeholder="请输入批次号" style="width: 80%"></el-input>
                         </template>
@@ -254,41 +191,15 @@
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       type="number"
                                       :disabled="false"></el-input>
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="scope.row.productDate"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                placeholder="请选择生产日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
-
-
-                            <!--                            <el-input size="small" v-model="scope.row.productDate"-->
-                            <!--                                      :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                      placeholder="请输入生产日期" style="width: 80%"></el-input>-->
                         </template>
                     </el-table-column>
                     <el-table-column width="180" label="失效日期(yyMMdd)">
                         <template slot-scope="scope">
-                            <!--                            <el-input size="small" v-model="scope.row.expireDate"-->
-                            <!--                                      :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                      placeholder="请输入失效日期" style="width: 80%"></el-input>-->
 
                             <el-input v-model="scope.row.expireDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       type="number"
                                       :disabled="false"></el-input>
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="scope.row.expireDate"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                placeholder="请输入失效日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                         </template>
                     </el-table-column>
                     <el-table-column width="150" label="单据数量">
@@ -301,16 +212,6 @@
                                       oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </template>
                     </el-table-column>
-                    <!--                    <el-table-column width="150" label="实际数量">-->
-                    <!--                        <template slot-scope="scope">-->
-                    <!--                            <el-input size="small" v-model="scope.row.reCount"-->
-                    <!--                                      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="价格">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.price"
@@ -321,11 +222,6 @@
                         </template>
                     </el-table-column>
 
-                    <!--<el-table-column width="150"-->
-                    <!--label="单据数量"-->
-                    <!--prop="count"-->
-                    <!--show-overflow-tooltip-->
-                    <!--&gt;</el-table-column>-->
                     <el-table-column width="150"
                                      label="注册/备案凭证号"
                                      prop="zczbhhzbapzbh"
@@ -338,8 +234,6 @@
                     ></el-table-column>
                     <el-table-column label="操作" fixed="right" width="150">
                         <template slot-scope="scope">
-
-                            <!--                            v-if="orderEditor && scope.row.index !== selectedIndex"-->
                             <el-button
                                 type="text"
                                 size="small"
@@ -349,16 +243,6 @@
                             >编辑
                             </el-button
                             >
-                            <!--                            <el-button-->
-                            <!--                                type="text"-->
-                            <!--                                size="small"-->
-                            <!--                                v-if="orderEditor && scope.row.index === selectedIndex"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                @click.stop="true"-->
-                            <!--                                @click.native="saveCodeArray(scope.$index, scope.row)"-->
-                            <!--                            >保存-->
-                            <!--                            </el-button-->
-                            <!--                            >-->
                             <el-button
                                 type="text"
                                 size="small"
@@ -378,15 +262,6 @@
                         </template>
                     </el-table-column>
                 </el-table>
-
-                <!--                <div class="block" v-if="orderEditor">-->
-                <!--                    <el-pagination-->
-                <!--                        @current-change="handleCurrentChange"-->
-                <!--                        layout="prev, pager, next"-->
-                <!--                        :page-size="query.limit"-->
-                <!--                        :total="total">-->
-                <!--                    </el-pagination>-->
-                <!--                </div>-->
             </el-card>
         </el-form>
 
@@ -791,17 +666,6 @@ export default {
 
             this.focusNext('iCount');
 
-            // let sc = this.selectedIndex + 'reCount';
-            // const _this = this;
-            // this.$nextTick(() => {
-            //     setTimeout(function() {
-            //         console.log(sc);
-            //         console.log(_this.$refs[sc]);
-            //         console.log(_this.$refs[sc].focus());
-            //         _this.$refs[sc].focus();
-            //     }, 1)
-            //     // this.$refs['inputBatchNoRef'][0].focus()
-            // })
         },
         iCountChange() {
             // console.log(this.iCount)
@@ -1159,7 +1023,6 @@ export default {
                 billdate: "",
                 corpName: store.getters.companyName,
                 customerId: store.getters.customerId,
-                // billType: "deliveryNote",
                 billType: "",
                 type: "2",
                 locStorageCode: store.getters.locInvCode,
@@ -1169,8 +1032,10 @@ export default {
             this.iCount = 0;
             this.orderEditor = false;
             this.formData.billdate = new Date();
-            this.findSubInvs();
+
+
         }
+        this.findSubInvs();
     },
 };
 </script>
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index abdcabb..2b48e48 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -95,6 +95,17 @@
                         prop="qxlb"
                         show-overflow-tooltip
                     ></el-table-column>
+                    <el-table-column label="操作" fixed="right" width="160">
+                        <template slot-scope="scope">
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click.native.stop="handleDetailClick(scope.row)"
+                            >详情
+                            </el-button
+                            >
+                        </template>
+                    </el-table-column>
                 </el-table>
                 <el-pagination
                     :page-size="listQuery.limit"
@@ -104,7 +115,17 @@
                 ></el-pagination>
             </div>
         </el-card>
-
+        <el-dialog
+            title="耗材字典详情"
+            :visible.sync="udiRlDetailVisible"
+            width="85%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            append-to-body
+            v-if="udiRlDetailVisible"
+        >
+            <udiRlDetailDialog :editQuery="currentRow" ></udiRlDetailDialog>
+        </el-dialog>
     </div>
 </template>
 
@@ -114,7 +135,7 @@ import {
     stockOrderDetailFilterProduct
 } from "../../api/warehouse/stockOrder";
 import store from "../../store";
-
+import udiRlDetailDialog from "./../basic/UdiRlDetailDialog";
 export default {
     name: "closeDialog",
     props: {
@@ -146,6 +167,7 @@ export default {
             total: 1,
             currentRow: null,
             loading: false,
+            udiRlDetailVisible:false,
             multipleUdiSelection: [],
             thirdSys: [],
             thirdSysFk: null,
@@ -195,12 +217,15 @@ export default {
                 unionCode: null,
                 udiCode: null,
                 ylqxzcrbarmc: "",
-                cpmctymc: "", thrPiId: null,
+                cpmctymc: "",
+                thrPiId: null,
                 nameCode: "",
                 ggxh: null,
                 page: 1,
                 limit: 20,
                 addType: 1,
+                billType: this.data.formData.billType,
+                corpId: this.data.formData.corpId,
             };
             this.getList();
         },
@@ -219,6 +244,11 @@ export default {
             console.log(val);
             this.currentRow = val;
         },
+        handleDetailClick(row) {
+            this.currentRow = row;
+            this.udiRlDetailVisible = true;
+
+        },
         handleErpPageChange(val) {
             this.listQuery.page = val;
             this.getList();
@@ -253,10 +283,7 @@ export default {
         intentBack() {
             this.closeDialog();
         },
-        combine() {//012693548470801311200226172302271020022632100025
-            // if (this.$isBlank(this.currentRow.id)) {
-            //     return;
-            // }
+        combine() {
             let selection = this.$refs.multipleTable.selection;
             if (selection.length < 1) {
                 this.$message.error('未选择产品');
@@ -287,43 +314,13 @@ export default {
                 this.loading = false;
             });
 
-            // let tQuery = {
-            //     id: this.currentRow.id
-            // };
-            // if (this.orderEditor) {
-            //     tQuery.orderId = this.orderId;
-            //     console.log(tQuery)
-            //     addStockOrderDetailFromCodeById(tQuery).then((response) => {
-            //         this.loading = false;
-            //         if (response.code === 20000) {
-            //             this.closeDialog(response);
-            //         } else {
-            //             this.$message.error(response.message);
-            //         }
-            //     }).catch(() => {
-            //         this.loading = false;
-            //     });
-            // } else {
-            //     getStockOrderDetailInstrumentById(tQuery).then((response) => {
-            //         this.loading = false;
-            //         if (response.code === 20000) {
-            //             this.closeDialog(response.data);
-            //         } else {
-            //             this.$message.error(response.message);
-            //         }
-            //     }).catch(() => {
-            //         this.loading = false;
-            //     });
-            // }
         },
         handleSelectionUdiChange(val) {
-            console.log("----" + val);
             this.multipleUdiSelection = val;
         },
     },
     created() {
         if (this.$isNotBlank(this.data)) {
-            console.log(this.data.stockOrderLists);
             this.listQuery.nameCode = this.data.udi;
             if (this.data.billType != null) {
                 this.listQuery.billType = this.data.billType;
@@ -335,6 +332,7 @@ export default {
             this.getList();
         }
     },
+    components: {udiRlDetailDialog},
 };
 </script>
 
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 17efb92..7609f3b 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -347,7 +347,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="count">
-                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input>
+                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
diff --git a/src/views/warehouse/stockOrderWaitCheck.vue b/src/views/warehouse/stockOrderWaitCheck.vue
index 9f7af60..e6444fc 100644
--- a/src/views/warehouse/stockOrderWaitCheck.vue
+++ b/src/views/warehouse/stockOrderWaitCheck.vue
@@ -235,7 +235,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="count">
-                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input>
+                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">