From 9da0f2bcbe86206a37a369099c191e40bd0034be Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 21 Dec 2022 11:55:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?DI=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=BA=93=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                   | 4 ++--
 src/views/basic/basicProductEdit.vue | 2 +-
 src/views/thrsys/SysUdimsConfig.vue  | 1 -
 src/views/warehouse/IONewOrder.vue   | 5 -----
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/public/config.json b/public/config.json
index fc9ceba..ea701d5 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
-    "BASE_URL": "http://192.168.0.166:9996",
-    "SERVER_IP": "http://192.168.0.166:9996",
+    "BASE_URL": "http://192.168.0.166:9906",
+    "SERVER_IP": "http://192.168.0.166:9906",
     "hosp_name": "福建省XX市医院"
 }
 
diff --git a/src/views/basic/basicProductEdit.vue b/src/views/basic/basicProductEdit.vue
index b256fe0..d5f044f 100644
--- a/src/views/basic/basicProductEdit.vue
+++ b/src/views/basic/basicProductEdit.vue
@@ -987,7 +987,7 @@ export default {
             this.selectVersionVisible = true;
             this.uuid = this.editQuery.uuid;
             this.originUuid = this.editQuery.originUuid;
-            this.relId = this.editQuery.id;
+            this.relId = this.editQuery.rlId;
         },
 
         updateVersion() {
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
index 7e90eeb..519e0e4 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -26,7 +26,6 @@
                 </el-row>
 
             </el-descriptions-item>
-
         </el-descriptions>
         <el-descriptions class="margin-top" title="同步至UDI管理系统基础数据" :column="1" :size="100" style="margin-top: 40px"
                          border>
diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 3a6b863..81abc54 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -55,8 +55,6 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-
-
                         <el-form-item>
                             <el-button-group>
                                 <el-button
@@ -476,8 +474,6 @@ export default {
             this.idQuery.id = '';
             this.idQuery.actDate = '';
             this.idQuery.corpOrderId = '';
-
-
             this.idQuery.outChangeEnable = row.outChangeEnable;
             if (row.id !== null && row.id !== undefined && row.id !== '') {
                 this.idQuery.id = row.id;
@@ -492,7 +488,6 @@ export default {
             } else {
                 this.formName = "add";
             }
-
             if (store.getters.customerId == 110) {
                 this.addHosOrderVisible = true;
                 this.idQuery.action = row.action;

From 03cb78449c6c218a41e51fc5798c3a5cbec80726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 21 Dec 2022 13:20:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/DialogInvProduct.vue      |  4 +++
 src/views/purchase/purPlanEditDialog.vue      |  3 ---
 src/views/thrsys/thrOrderNew.vue              | 26 +++----------------
 src/views/warehouse/IONewOrder.vue            |  1 +
 src/views/warehouse/addHosOrder.vue           |  5 ++--
 .../warehouse/selectReceiveOrderDialog.vue    |  2 +-
 src/views/warehouse/stockHospOrderNew.vue     |  1 +
 .../warehouse/stockOrderNewSelectProduct.vue  |  3 ++-
 8 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue
index fc16deb..6c67f98 100644
--- a/src/views/inventory/DialogInvProduct.vue
+++ b/src/views/inventory/DialogInvProduct.vue
@@ -152,6 +152,7 @@ export default {
     },
     methods: {
         onReset() {
+
             this.$router.push({
                 path: "",
             });
@@ -165,6 +166,8 @@ export default {
                 supId: null,
                 page: 1,
                 limit: 10,
+                invStorageCode:this.invQueryData.locStorageCode,
+                invWarehouseCode:this.invQueryData.invWarehouseCode
             };
             this.getList();
         },
@@ -333,6 +336,7 @@ export default {
         };
     },
     created() {
+
         this.getBusType();
         let query = this.$route.query;
 
diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue
index ae61822..d0e319a 100644
--- a/src/views/purchase/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlanEditDialog.vue
@@ -356,9 +356,6 @@ export default {
                         if (this.formData.billDate == "" || this.formData.billDate == null) {
                             return this.$message.error("单据日期不能为空！");
                         }
-                        if(this.formData.billType=="" || this.formData.billType==null){
-                            return this.$message.error("采购类型不能为空！");
-                        }
 
                         if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){
                             return this.$message.error("采购分库不能为空！");
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 4590b9c..3054d23 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -499,7 +499,9 @@ export default {
                     this.subInvList = response.data || [];
                     if (this.subInvList != null && this.subInvList.length == 1) {
                         this.formData.invWarehouseCode = this.subInvList[0].code;
+                        this.formData.locStorageCode = this.subInvList[0].parentId;
                         this.getBusType();
+                        this.findSubStorageMethod();
                     }
                 })
                 .catch(() => {
@@ -514,30 +516,11 @@ export default {
             }
         },
 
-        //往来仓库
-        findStorageMethod() {
-            if (this.formData.locStorageCode == null)
-                return;
-            this.fromStorageOptions = [];
-            let cQuery = {
-                locInvCode: this.formData.locStorageCode,
-            };
-            filterAllByLoc(cQuery)
-                .then((response) => {
-                    let temp = response.data || [];
-                    for (let i = 0; i < temp.length; i++) {
-                        if (temp[i].code != this.formData.locStorageCode) {
-                            this.fromStorageOptions.push(temp[i]);
-                        }
-                    }
 
-                })
-                .catch(() => {
-                });
-        },
 
         //往来分库
         findSubStorageMethod() {
+            debugger
             let cQuery = {
                 code: this.formData.invWarehouseCode,
                 filter: 2,
@@ -918,7 +901,6 @@ export default {
             }
             this.formData.locStorageCode = item;
             this.$forceUpdate();
-            this.findStorageMethod();
             this.findSubInvs();
         },
 
@@ -960,7 +942,7 @@ export default {
 
         this.getBusType();
         this.findSubInvs();
-        this.findSubStorageMethod();
+
         // this.findSubInvByInv();
         this.codeArray = [];
         this.closeConfirmFunction(false);
diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 81abc54..26e9c1a 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -476,6 +476,7 @@ export default {
             this.idQuery.corpOrderId = '';
             this.idQuery.outChangeEnable = row.outChangeEnable;
             if (row.id !== null && row.id !== undefined && row.id !== '') {
+
                 this.idQuery.id = row.id;
                 this.idQuery.actDate = row.actDate;
                 this.idQuery.corpOrderId = row.corpOrderId;
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 292b45b..74f959a 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -1005,7 +1005,6 @@ export default {
             };
             filterSubByInv(cQuery)
                 .then((response) => {
-
                     this.fromSubStorageOptions = response.data || [];
                     if (val == 1) {
 
@@ -1182,7 +1181,7 @@ export default {
 
     },
     created() {
-
+        debugger
         this.formData.code = '';
         this.formData.actDate = new Date();
         this.codeArray = [];
@@ -1221,9 +1220,9 @@ export default {
             if (this.$isNotBlank(this.formData.locStorageCode)) {
                 this.findStorageMethod();
             }
+            this.findSubStorageMethod();
         }
         this.findSubInvByInv();
-        this.findSubStorageMethod();
         this.getBusType();
 
         //查询是否启用多级仓库，判断是否启用部门
diff --git a/src/views/warehouse/selectReceiveOrderDialog.vue b/src/views/warehouse/selectReceiveOrderDialog.vue
index 0d2459a..5755bfb 100644
--- a/src/views/warehouse/selectReceiveOrderDialog.vue
+++ b/src/views/warehouse/selectReceiveOrderDialog.vue
@@ -80,7 +80,7 @@
                     <el-table-column label="单据号" prop="billNo"></el-table-column>
                     <el-table-column label="往来单位" prop="corpName" width="300"
                                      show-overflow-tooltip="true"></el-table-column>
-                    <el-table-column label="单据类型" prop="billType"></el-table-column>
+                    <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
                     <el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>
                     <el-table-column label="单据日期" prop="billdate"></el-table-column>
                 </el-table>
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index fe3a0bc..10fd8ee 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -800,6 +800,7 @@ export default {
                     };
                     this.selectInvProductVisible = true;
                 } else {
+
                     this.selectProductVisible = true;
                 }
                 return;
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index d7aacaa..8876fd3 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -302,10 +302,11 @@ export default {
             this.getList();
         },
         getList() {
+            debugger
 
             this.loading = true;
             this.listQuery.customerId = store.getters.customerId;
-            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
+            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined && this.data.formData.noInvOut==false){
                 this.listQuery.companyName=this.data.formData.corpName
             }
             if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){

From f31dbef3d582a516097c128076bec412283d4c3c Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 21 Dec 2022 17:51:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=AA=E7=95=99=E4=B8=80=E4=B8=AA=E5=88=86?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E7=94=B3=E8=B4=AD=E8=AE=A1=E5=88=92=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3bug=E4=BF=AE=E6=94=B9=EF=BC=8C=20=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/pureApplyDetailDialog.vue  |   84 +-
 src/views/thrsys/ThrDiProductsCheck.vue       |    1 +
 src/views/thrsys/thrOrderNew.vue              |    1 -
 src/views/warehouse/IOCheckErrOrder.vue       | 2184 +++++++++--------
 src/views/warehouse/IONewOrder.vue            |   37 +-
 src/views/warehouse/IOSearchOrder.vue         | 1821 +++++++-------
 src/views/warehouse/IOWaitOrder.vue           |   36 +-
 src/views/warehouse/addHosOrder.vue           |    1 -
 src/views/warehouse/addOrder.vue              | 1846 +++++++-------
 src/views/warehouse/stockOrder.vue            |   35 +-
 src/views/warehouse/stockOrderDelSearch.vue   |   34 +-
 src/views/warehouse/stockOrderEditor.vue      |   37 +-
 src/views/warehouse/stockOrderNew.vue         |   37 +-
 .../warehouse/stockOrderNewSelectProduct.vue  |    2 -
 src/views/warehouse/stockOrderSearch.vue      |   34 +-
 src/views/warehouse/stockOrderWaitCheck.vue   |   35 +-
 16 files changed, 3133 insertions(+), 3092 deletions(-)

diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue
index 9ad842c..7f0e94f 100644
--- a/src/views/purchase/pureApplyDetailDialog.vue
+++ b/src/views/purchase/pureApplyDetailDialog.vue
@@ -61,18 +61,20 @@
                     </el-col>
 
                     <el-col :span="7">
-                            <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 100%"
-                                       :disabled="true"
-                                       clearable>
-                                <el-option
-                                    v-for="item in subInvList"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
-                                </el-option>
-                            </el-select>
+                        <el-select v-model="formData.invWarehouseCode" placeholder="当前仓库信息" style="width: 100%"
+                                   :disabled="true"
+                                   clearable>
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{
+                                        item.warehouseName
+                                    }}</span>
+                            </el-option>
+                        </el-select>
 
                     </el-col>
 
@@ -88,22 +90,8 @@
                                       disabled
                                       autosize></el-input>
                         </el-form-item>
-                        <el-form-item prop="targetInv">
-                            <el-select v-model="formData.targetSubInv" placeholder="当前分库信息" @change="setTargetInv" style="width: 100%"
-                                       clearable>
-                                <el-option
-                                    v-for="item in targetSubInvList"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
                     </el-col>
 
-
                 </el-row>
 
 
@@ -150,12 +138,34 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-
-
+                <el-row :gutter="20" v-if="formData.audtoPlan">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>采购科室：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="targetInv">
+                            <el-select v-model="formData.targetSubInv" placeholder="当前采购科室信息" @change="setTargetInv"
+                                       style="width: 100%"
+                                       clearable>
+                                <el-option
+                                    v-for="item in targetSubInvList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px">{{
+                                            item.warehouseName
+                                        }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
             </el-card>
 
             <el-card>
-
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
                           :row-class-name="tableRowClassName"
                           max-height="300" height="300" ref="multipleTable">
@@ -213,7 +223,6 @@
                 </el-table>
             </el-card>
         </el-form>
-
         <el-dialog
             title="产品录入"
             :visible.sync="selectProductVisible"
@@ -310,11 +319,8 @@ export default {
             thisData: {},
             storageList: [],
             subInvList: [],
-
-
             targetInvList: [],
             targetSubInvList: [],
-
             invQueryData: {},
 
         };
@@ -328,6 +334,12 @@ export default {
             let tip = "";
             if (status == "3") {
                 tip = "是否确定通过该申购请求？";
+                if (this.formData.audtoPlan) {
+                    if (this.$isBlank(this.formData.targetSubInv)) {
+                        this.$message.warning("请选择当前采购科室！");
+                        return;
+                    }
+                }
             } else {
                 tip = "是否确定拒绝该申购请求？";
             }
@@ -495,7 +507,7 @@ export default {
         findTargetSubInvs() {
             this.targetSubInvList = [];
             let query = {
-                pcode: this.formData.targetInv
+                filter:3
             };
             filterSubByInv(query)
                 .then((response) => {
@@ -560,7 +572,9 @@ export default {
         }
         this.getStorage();
         this.findSubInvs();
-        this.getTargetStorage();
+        // this.getTargetStorage();
+
+        this.findTargetSubInvs();
         this.codeArray = [];
         this.getBusType();
     },
diff --git a/src/views/thrsys/ThrDiProductsCheck.vue b/src/views/thrsys/ThrDiProductsCheck.vue
index 8159db5..ae55baa 100644
--- a/src/views/thrsys/ThrDiProductsCheck.vue
+++ b/src/views/thrsys/ThrDiProductsCheck.vue
@@ -187,6 +187,7 @@ export default {
         },
         checDialog(row) {
             this.checkVisible = true;
+            this.remark = "";
             this.curRow = row;
         },
         search() {
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 3054d23..144d194 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -520,7 +520,6 @@ export default {
 
         //往来分库
         findSubStorageMethod() {
-            debugger
             let cQuery = {
                 code: this.formData.invWarehouseCode,
                 filter: 2,
diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 9f6355c..9ca62de 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -1,450 +1,450 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <el-form
-                :inline="true"
-                :model="filterQuery"
-                class="query-form"
-                size="mini"
+  <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="出入库类型"
             >
-                <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-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="请选择扫码单据类型" clearable>
-                            <el-option
-                                v-for="item in busTypes"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.action">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-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"
-                                   @change="subInvChange">
-                            <el-option
-                                v-for="item in subInvList"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-select v-model="filterQuery.action" placeholder="请选择扫码单据类型" clearable>
+              <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-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"
+                       @change="subInvChange">
+              <el-option
+                  v-for="item in subInvList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
 
-                    <el-form-item class="query-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="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
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
             >
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="扫码单据类型" prop="billTypeName" width="120">
-                </el-table-column>
-                <el-table-column
-                    label="订单号"
-                    prop="id"
-                    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-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 label="序号" type="index"></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName" width="120">
+        </el-table-column>
+        <el-table-column
+            label="订单号"
+            prop="id"
+            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="invName" width="120">
-                </el-table-column>
-                <el-table-column label="当前分库" prop="subInvName" width="120">
-                </el-table-column>
-                <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
-                </el-table-column>
-                <el-table-column
-                    label="创建时间"
-                    prop="actDate"
-                    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="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="250">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="repeatCheckClick(scope.row)"
-                            v-if="scope.row.status != 4"
-                        >重新校验
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="repeatPrintCheckClick(scope.row)"
-                            v-if="scope.row.status === 4"
-                        >重新提交
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="handleErrorDetail(scope.$index)"
-                        >校验信息
-                        </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="deleteDialog(scope.row.id)"
-                        >删除
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            :disabled="scope.row.status == 4 && scope.row.contrastStatus == 2  "
-                            @click.native.stop="importOrder(scope.row)"
-                        >选择业务单据
-                        </el-button>
-
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="revokeErrOrder(scope.row)"
-                        >撤回
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
+        </el-table-column>
+        <el-table-column label="往来单位" prop="fromCorp" width="250">
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="当前分库" prop="subInvName" width="120">
+        </el-table-column>
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
+        </el-table-column>
+        <el-table-column
+            label="创建时间"
+            prop="actDate"
+            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="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="250">
+          <template slot-scope="scope">
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="repeatCheckClick(scope.row)"
+                v-if="scope.row.status != 4"
+            >重新校验
+            </el-button
+            >
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="repeatPrintCheckClick(scope.row)"
+                v-if="scope.row.status === 4"
+            >重新提交
+            </el-button
+            >
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="handleErrorDetail(scope.$index)"
+            >校验信息
+            </el-button
+            >
 
-            <el-dialog
-                title="导出PDF"
-                :visible.sync="successOrderExportPDFSettingVisible"
-                width="80%"
-                v-if="successOrderExportPDFSettingVisible"
-                @close='closeDialog'
+          </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="deleteDialog(scope.row.id)"
+            >删除
+            </el-button
             >
-                <successOrderExportPDFSetting
-                    :closeDialog="closeDialog"
-                    :idQuery="idQuery"
-                ></successOrderExportPDFSetting>
-            </el-dialog>
+            <el-button
+                type="text"
+                size="small"
+                :disabled="scope.row.status == 4 && scope.row.contrastStatus == 2  "
+                @click.native.stop="importOrder(scope.row)"
+            >选择业务单据
+            </el-button>
 
-            <el-pagination
-                :page-size="filterQuery.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-                :current-page="filterQuery.page"
-            ></el-pagination>
-        </el-card>
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="revokeErrOrder(scope.row)"
+            >撤回
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-        <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-dialog
+          title="导出PDF"
+          :visible.sync="successOrderExportPDFSettingVisible"
+          width="80%"
+          v-if="successOrderExportPDFSettingVisible"
+          @close='closeDialog'
+      >
+        <successOrderExportPDFSetting
+            :closeDialog="closeDialog"
+            :idQuery="idQuery"
+        ></successOrderExportPDFSetting>
+      </el-dialog>
 
-                <el-table-column
-                    label="产品通用名"
-                    prop="coName"
-                    width="150"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="包装规格"
-                    prop="packSpec"
-                    width="200"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="批次号"
-                    prop="batchNo"
-                    width="100"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="生产日期"
-                    prop="productDate"
-                    width="100"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="失效日期"
-                    prop="expireDate"
-                    width="100"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="单据数量"
-                    prop="erpCount"
-                    width="100"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="实际数量"
-                    prop="reCount"
-                    width="100"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
+      <el-pagination
+          :page-size="filterQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+          :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
 
-                <el-table-column label="扫码数量" prop="count"
-                                 width="100"></el-table-column>
-                <el-table-column
-                    label="供应商"
-                    prop="supName"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="生产企业"
-                    prop="productCompany"
-                    width="150"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
-                <el-table-column
-                    label="注册/备案凭证号"
-                    prop="authCode"
-                    width="150"
-                    :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="操作" fixed="right" width="180">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            :disabled="scope.row.bindRlFk != null "
-                            @click.native.stop="bindRl(scope.row)"
-                        >选择产品
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            :disabled=" scope.row.supId !='MUTI'"
-                            @click.native.stop="handleUnitClick(scope.row)"
-                        >选择供应商
-                        </el-button
-                        >
-                        <!--                         scope.row.supId !=null &&-->
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-card>
-        <el-dialog
-            title="选择往来单位"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            :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-button
-                        type="primary"
-                        icon="search"
-                        @click.native.stop="selectUnit()"
-                    >确定
-                    </el-button
-                    >
-                </el-form-item>
-            </el-form>
+        <el-table-column
+            label="产品通用名"
+            prop="coName"
+            width="150"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="包装规格"
+            prop="packSpec"
+            width="200"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="批次号"
+            prop="batchNo"
+            width="100"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="生产日期"
+            prop="productDate"
+            width="100"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="失效日期"
+            prop="expireDate"
+            width="100"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="单据数量"
+            prop="erpCount"
+            width="100"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="实际数量"
+            prop="reCount"
+            width="100"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
 
-            <el-table
-                v-loading="loading"
-                :data="unitlist"
-                style="width: 100%"
-                @current-change="handleDetail"
+        <el-table-column label="扫码数量" prop="count"
+                         width="100"></el-table-column>
+        <el-table-column
+            label="供应商"
+            prop="supName"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="生产企业"
+            prop="productCompany"
+            width="150"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+            label="注册/备案凭证号"
+            prop="authCode"
+            width="150"
+            :show-overflow-tooltip="true"
+        ></el-table-column>
+
+        <el-table-column label="操作" fixed="right" width="180">
+          <template slot-scope="scope">
+            <el-button
+                type="text"
+                size="small"
+                :disabled="scope.row.bindRlFk != null "
+                @click.native.stop="bindRl(scope.row)"
+            >选择产品
+            </el-button
             >
-                <el-table-column label="序号" type="index" width="60" fixed></el-table-column>
-                <el-table-column label="往来单位ID" prop="erpId"></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="选择业务单据"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            :visible.sync="addDialogVisible"
-            width="80%"
-            v-if="addDialogVisible"
-        >
-            <selectErpOrder
-                v-on:closeManuDialog="closeManuDialog"
-                :orderId="orderId"
-                :orderAction="billAction"
-                :curLocInv="curLocInv"
-            ></selectErpOrder>
-        </el-dialog>
+            <el-button
+                type="text"
+                size="small"
+                :disabled=" scope.row.supId !='MUTI'"
+                @click.native.stop="handleUnitClick(scope.row)"
+            >选择供应商
+            </el-button
+            >
+            <!--                         scope.row.supId !=null &&-->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog
+        title="选择往来单位"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :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-button
+              type="primary"
+              icon="search"
+              @click.native.stop="selectUnit()"
+          >确定
+          </el-button
+          >
+        </el-form-item>
+      </el-form>
 
-        <el-dialog
-            title="单号详情"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            :visible.sync="codeDetailVisible"
-            width="80%"
-            v-if="codeDetailVisible"
-        >
-            <codeDetail
-                :idQuery="idQuery"
-                v-on:closeDetailDialog="closeDetailDialog"
-            ></codeDetail>
-        </el-dialog>
+      <el-table
+          v-loading="loading"
+          :data="unitlist"
+          style="width: 100%"
+          @current-change="handleDetail"
+      >
+        <el-table-column label="序号" type="index" width="60" fixed></el-table-column>
+        <el-table-column label="往来单位ID" prop="erpId"></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="选择业务单据"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :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="单号详情"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :visible.sync="codeDetailVisible"
+        width="80%"
+        v-if="codeDetailVisible"
+    >
+      <codeDetail
+          :idQuery="idQuery"
+          v-on:closeDetailDialog="closeDetailDialog"
+      ></codeDetail>
+    </el-dialog>
 
-        <el-dialog
-            title="绑定产品ID"
-            :visible.sync="selectRlVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="80%"
-            v-if="selectRlVisible"
-        >
-            <selectRlDialog
-                :curRow="curRow"
-                :closeBindDialog="closeBindDialog"
-            ></selectRlDialog>
-        </el-dialog>
 
-        <el-dialog title="校验信息" :visible.sync="errDialogVisible" width="30%">
-            <span>{{ errorDetail }}</span>
-            <span slot="footer" class="dialog-footer">
+    <el-dialog
+        title="绑定产品ID"
+        :visible.sync="selectRlVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="80%"
+        v-if="selectRlVisible"
+    >
+      <selectRlDialog
+          :curRow="curRow"
+          :closeBindDialog="closeBindDialog"
+      ></selectRlDialog>
+    </el-dialog>
+
+    <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, revokeOredr, updateBind
+  orderList,
+  codeList,
+  findAllByOrderId,
+  updateUnit,
+  filterOrder,
+  deleteByOrderId,
+  updateExportStatus,
+  uploadOrder,
+  mergeOrder,
+  orderDetail, revokeOredr, updateBind
 } from "../../api/warehouse/order";
 
 import {updateBindSup} from "../../api/warehouse/order"
 
 import {
-    orderDetailPDFFromTemplateCode,
-    orderDetailPDFFromTemplateFile,
-    inspectionOrderDetailPDFFromTemplateCode,
-    inspectionOrderDetailPDFFromTemplateFile
+  orderDetailPDFFromTemplateCode,
+  orderDetailPDFFromTemplateFile,
+  inspectionOrderDetailPDFFromTemplateCode,
+  inspectionOrderDetailPDFFromTemplateFile
 } from "../../api/itextpdf/itextpdf";
 import {repeatCheck, repeatPrintCheck} from "../../api/erp/erpOrder";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
@@ -463,732 +463,734 @@ import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
 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: 20,
-            },
-            checkStatus: {
-                1: "校验异常",
-                0: "未校验",
-                2: "正常",
-            },
-            erpCheckStatus: {
-                // error: "校验异常",
-                // null: "未校验",
-                // success: "正常",
-                1: "校验异常",
-                0: "未校验",
-                2: "校验成功",
-            },
-            fromTypeMap: {
-                "1": "UDIMS平台",
-                "2": "网页新增",
-                "3": "pda即时校验",
-                "4": "pda未校验",
-                "5": "pc端扫码精灵",
-                "6": "缺量补录单据",
-                "7": "UDI供应商平台",
-                "8": "平衡补录单据",
-                "10": "手动补单"
-            },
-            busTypes: [],
-            enableDept: false,
-            //往来单位
-            unitquery: {key: "", page: 1, limit: 20},
-            unitlist: [],
-            list: [],
-            detailList: [],
-            unitUpdateQuery: {
-                id: "",
-                fromCorpId: "",
-                fromCorp: "",
-            },
-            billAction: null,
-            actDateRange: [],
-            filterQuery: {
-                id: "",
-                mainAction: null,
-                action: null,
-                page: 1,
-                limit: 10,
-                code: "",
-                exportStatus: null,
-                contrastStatus: 1,
-                status: null,
-                startTime: "",
-                endTime: "",
-                locStorageCode: this.$store.getters.locInvCode,
-                invWarehouseCode: this.$store.getters.locSubInvCode,
-            },
-            detailQuery: {
-                orderId: "",
-            },
-            deleteData: {
-                id: "",
-            },
-            idQuery: {
-                id: "",
-            },
-            curUnitRow: null,
-            storageList: [],
-            subInvList: [],
-            curIndex: "",
-            adListNoDataText: "无数据",
-            queryAdIdAsyncLoading: false,
-            codeDetailVisible: false,
-            selectRlVisible: false,
-            curRow: null,
-            successOrderExportPDFSettingVisible: false,
-            total: 0,
-            loading: false,
-            index: null,
-            formName: null,
-            orderId: "",
-            curLocInv: null,
-            formMap: {
-                add: "新增",
-                edit: "编辑",
-            },
-            exportQuery: {
-                orderId: "",
-                exportStatus: "",
-            },
+  data() {
+    return {
+      query: {
+        page: 1,
+        limit: 20,
+      },
+      checkStatus: {
+        1: "校验异常",
+        0: "未校验",
+        2: "正常",
+      },
+      erpCheckStatus: {
+        // error: "校验异常",
+        // null: "未校验",
+        // success: "正常",
+        1: "校验异常",
+        0: "未校验",
+        2: "校验成功",
+      },
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单"
+      },
+      busTypes: [],
+      enableDept: false,
+      //往来单位
+      unitquery: {key: "", page: 1, limit: 20},
+      unitlist: [],
+      list: [],
+      detailList: [],
+      unitUpdateQuery: {
+        id: "",
+        fromCorpId: "",
+        fromCorp: "",
+      },
+      billAction: null,
+      actDateRange: [],
+      filterQuery: {
+        id: "",
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        code: "",
+        exportStatus: null,
+        contrastStatus: 1,
+        status: null,
+        startTime: "",
+        endTime: "",
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+      },
+      detailQuery: {
+        orderId: "",
+      },
+      deleteData: {
+        id: "",
+      },
+      idQuery: {
+        id: "",
+      },
+      curUnitRow: null,
+      storageList: [],
+      subInvList: [],
+      curIndex: "",
+      adListNoDataText: "无数据",
+      queryAdIdAsyncLoading: false,
+      codeDetailVisible: false,
+      selectRlVisible: false,
+      curRow: null,
+      successOrderExportPDFSettingVisible: false,
+      total: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      orderId: "",
+      curLocInv: null,
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      exportQuery: {
+        orderId: "",
+        exportStatus: "",
+      },
 
-            uploadQuery: {
-                orderId: "",
+      uploadQuery: {
+        orderId: "",
+      },
+      errorDetail: null,
+      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]);
             },
-            errorDetail: null,
-            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]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-        };
+          },
+        ],
+      },
+    };
+  },
+  components: {
+    draggable,
+    codeDetail,
+    successOrderExportPDFSetting,
+    selectErpOrder,
+    selectRlDialog
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        code: "",
+        exportStatus: null,
+        contrastStatus: 1,
+        status: null,
+        startTime: "",
+        endTime: "",
+      };
+      this.actDateRange = [];
+      this.getList();
     },
-    components: {
-        draggable,
-        codeDetail,
-        successOrderExportPDFSetting,
-        selectErpOrder,
-        selectRlDialog
+    onSubmit() {
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    bindRl(val) {
+      this.curRow = val;
+      this.selectRlVisible = true;
     },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                id: "",
-                mainAction: null,
-                action: null,
-                page: 1,
-                limit: 10,
-                code: "",
-                exportStatus: null,
-                contrastStatus: 1,
-                status: null,
-                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.filterQuery.page = 1;
-            this.getList();
-        },
-        bindRl(val) {
-            this.curRow = val;
-            this.selectRlVisible = true;
-        },
 
-        closeBindDialog(id) {
-            this.selectRlVisible = false;
-            this.detailQuery = {
-                orderId: id,
-            };
-            this.refresgOrderDetail();
-        },
+    closeBindDialog(id) {
+      this.selectRlVisible = false;
+      this.detailQuery = {
+        orderId: id,
+      };
+      this.refresgOrderDetail();
+    },
 
-        handleSizeChange(val) {
-            this.filterQuery.limit = val;
-            this.getList();
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
-            this.getList();
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
 
-        handleErrorDetail(poistion) {
-            var mOrder = this.list[poistion];
-            this.errorDetail = mOrder.remark;
-            this.errDialogVisible = true;
-        },
+    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,
-            };
+    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(() => {
+      this.$confirm(
+          "所选择的订单将会合并到订单号为" + orderid + "的订单下",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+      )
+          .then(() => {
+            mergeOrder(tquery).then((response) => {
+              if (response.code === 20000) {
+                this.getList();
+                this.$message({
+                  type: "success",
+                  message: "合并成功",
                 });
-        },
-        //获取订单列表
-        getList() {
-            this.loading = true;
-            this.filterQuery.customerId = store.getters.customerId;
-            filterOrder(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                        this.detailList = [];
-                    } else {
-                        this.$message.error(response.message);
-                    }
+              } else {
+                this.$message.error(response.message);
+              }
+            });
+          })
+          .catch(() => {
+          });
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.filterQuery.customerId = store.getters.customerId;
+      filterOrder(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code == 20000) {
+              this.list = response.data.list || [];
+              this.total = response.data.total || 0;
+              this.detailList = [];
+            } else {
+              this.$message.error(response.message);
+            }
 
-                })
-                .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 = {
+          })
+          .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.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);
-                });
-        },
-        getStorageName(code) {
-            for (let i = 0; i < this.storageList.length; i++) {
-                if (this.storageList[i].code === code) {
-                    return this.storageList[i].name;
-                }
+              };
+              this.refresgOrderDetail();
+            } else {
+              this.$message.error(response.message);
             }
-        },
-        getSubStorageName(code) {
-            for (let i = 0; i < this.subInvList.length; i++) {
-                if (this.subInvList[i].code === code) {
-                    return this.subInvList[i].name;
-                }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.getList();
+            this.$message.error(response.message);
+          });
+    },
+    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;
+        }
+      }
+    },
+    repeatPrintCheckClick(row) {
+      let tQuery = {
+        orderId: row.id,
+      };
+      this.loading = true;
+      repeatPrintCheck(tQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success(response.data);
+              this.getList();
+              this.detailList = [];
+              // this.detailQuery = {
+              //     orderId: row.id,
+              // };
+              // this.refresgOrderDetail();
+            } else {
+              this.$message.error(response.message);
             }
-        },
-        repeatPrintCheckClick(row) {
-            let tQuery = {
-                orderId: row.id,
-            };
-            this.loading = true;
-            repeatPrintCheck(tQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success(response.data);
-                        this.getList();
-                        this.detailList = [];
-                        // this.detailQuery = {
-                        //     orderId: row.id,
-                        // };
-                        // this.refresgOrderDetail();
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.getList();
-                    this.$message.error(response.message);
-                });
-        },
-
-        revokeErrOrder(row) {
-            let tQuery = {id: row.id};
-            revokeOredr(tQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success(response.data);
-                        this.getList();
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.getList();
-                    this.$message.error(response.message);
-                });
-        },
-
-        refresgOrderDetail() {
-            orderDetail(this.detailQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.detailList = response.data || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.detailList = [];
-                });
-        },
+          })
+          .catch(() => {
+            this.loading = false;
+            this.getList();
+            this.$message.error(response.message);
+          });
+    },
 
-        handleUnitClick(row) {
-            this.curIndex = row.id;
-            this.curRow = row;
-            this.dialogTableVisible = true;
-        },
-        getUnitList() {
-            this.loading = true;
-            getBasicUnitMaintains(this.unitquery)
-                .then((response) => {
-                    this.loading = false;
-                    this.unitlist = response.data.page.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
-        },
-        intentDetail(row) {
-            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) {
-            let tQuery = {
-                orderId: row.id,
-                customerId: store.getters.customerId
+    revokeErrOrder(row) {
+      let tQuery = {id: row.id};
+      revokeOredr(tQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success(response.data);
+              this.getList();
+            } else {
+              this.$message.error(response.message);
             }
-            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;
+          })
+          .catch(() => {
+            this.loading = false;
             this.getList();
-        },
+            this.$message.error(response.message);
+          });
+    },
 
-        selectUnit() {
-            let query = {
-                id: this.curRow.id,
-                supId: this.curRow.erpId,
-            };
-            updateBindSup(query).then((response) => {
-                if (response.code == 20000) {
-                    this.$message.success("绑定成功");
-                    this.getList();
-                    this.detailList = [];
-                } else {
-                    this.$message.error("绑定失败");
-                }
-            }).catch(() => {
+    refresgOrderDetail() {
+      orderDetail(this.detailQuery)
+          .then((response) => {
+            this.loading = false;
+            this.detailList = response.data || [];
+          })
+          .catch(() => {
+            this.loading = false;
+            this.detailList = [];
+          });
+    },
 
-            });
+    handleUnitClick(row) {
+      this.curIndex = row.id;
+      this.curRow = row;
+      this.dialogTableVisible = true;
+    },
+    getUnitList() {
+      this.loading = true;
+      getBasicUnitMaintains(this.unitquery)
+          .then((response) => {
+            this.loading = false;
+            this.unitlist = response.data.page.list || [];
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+    },
+    intentDetail(row) {
+      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) {
+      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() {
+      let query = {
+        id: this.curRow.id,
+        supId: this.curRow.erpId,
+      };
+      updateBindSup(query).then((response) => {
+        if (response.code == 20000) {
+          this.$message.success("绑定成功");
+          this.getList();
+          this.detailList = [];
+        } else {
+          this.$message.error("绑定失败");
+        }
+      }).catch(() => {
 
+      });
 
-            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.erpCount === row.count) {
-                return "success-row";
-            } else {
-                return "warning-row";
-            }
-        },
+      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) => {
 
-        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.$confirm("是否确定修改ERP订单?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                })
-                    .then(() => {
-                        this.uploadOrderDialog(mOrder);
-                    })
-                    .catch(() => {
-                    });
-            }
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].name;
-                }
+            if (response.code == 20000) {
+              this.getList();
+              this.refresgOrderDetail();
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else if (response.code == 520) {
+              this.$message.error("校验异常单据列表已不存在该扫码单据！");
+              this.getList();
             }
-        },
-        getStorage() {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                    if (this.storageList.length > 0) {
-                        this.getSubInvList();
-                        this.getList();
-                    }
-                })
-                .catch(() => {
-                });
-        },
-        getBusType() {
-            let query = {
-                code: this.filterQuery.invWarehouseCode,
-                enabled: true,
-            };
-            getLocalJoinByUser(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
-                })
-                .catch(() => {
-                });
-        },
-
-        uploadOrderDialog(value) {
-            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(() => {
-                });
-        },
+          })
+          .catch(() => {
+          });
+    },
+    tableRowClassName({row, rowIndex}) {
+      if (row.erpCount === row.count) {
+        return "success-row";
+      } else {
+        return "warning-row";
+      }
+    },
 
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+    exportDialog(value) {
+      var mOrder = value;
+      if (mOrder.exportStatus === "已上传") {
+        this.$confirm("该订单已修改, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+            .then(() => {
+              this.uploadOrderDialog(mOrder);
             })
-                .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("选入失败");
+            .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.$confirm("是否确定修改ERP订单?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+            .then(() => {
+              this.uploadOrderDialog(mOrder);
+            })
+            .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.getSubInvList();
+              this.getList();
             }
-        },
-        handleDetail(row) {
-            this.curUnitRow = row;
-        },
-        cancelDialog() {
-            this.addDialogVisible = false;
-        },
-        importOrder(row) {
-            this.orderId = row.id;
-            this.billAction = row.action;
-            this.curLocInv = row.locStorageCode;
-            this.addDialogVisible = true;
-        },
-        invChange() {
-            this.subInvList = [];
-            this.filterQuery.invWarehouseCode = "";
-            let query = {
-                pcode: this.filterQuery.locStorageCode
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
+          })
+          .catch(() => {
+          });
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invWarehouseCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.filterQuery.billAction = this.busTypes[0].action;
+            // this.getList();
+          })
+          .catch(() => {
+          });
+    },
 
-        getSubInvList() {
-            let query = {
-                pcode: this.filterQuery.locStorageCode
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
+    uploadOrderDialog(value) {
+      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(() => {
+          });
+    },
 
-        subInvChange() {
-            this.getBusType();
-        }
+    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("选入失败");
+      }
+    },
+    handleDetail(row) {
+      this.curUnitRow = row;
     },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                false: "success",
-                true: "danger",
-            };
-            return statusMap[status];
-        },
+    cancelDialog() {
+      this.addDialogVisible = false;
     },
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
+    importOrder(row) {
+      this.orderId = row.id;
+      this.billAction = row.action;
+      this.curLocInv = row.locStorageCode;
+      this.addDialogVisible = true;
+    },
+    invChange() {
+      this.subInvList = [];
+      this.filterQuery.invWarehouseCode = "";
+      let query = {
+        pcode: this.filterQuery.locStorageCode
+      };
+      filterSubByInv(query)
+          .then((response) => {
+            this.subInvList = response.data || [];
+          })
+          .catch(() => {
+          });
     },
 
-    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];
-        selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
-            if (res.code === 20000) {
-                if (res.data.paramValue === "0") {
-                    this.enableDept = true;
-                }
-            }
-        })
+    getSubInvList() {
+      let query = {
+        // pcode: this.filterQuery.locStorageCode
+        filter: 3
+      };
+      filterSubByInv(query)
+          .then((response) => {
+            this.subInvList = response.data || [];
+            this.getList();
+          })
+          .catch(() => {
+          });
     },
+
+    subInvChange() {
+      this.getBusType();
+    }
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "danger",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+
+  created() {
+    this.getSubInvList();
+    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];
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+  },
 };
 </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/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 26e9c1a..68b9ba0 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -28,21 +28,22 @@
 
                     </el-col>
                     <el-col>
+                        <!--                        <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.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"
+                            <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择请选择当前仓库当前分库"
+                                       clearable="true"
                                        size="mini"
                                        @change="subInvChange"
                             >
@@ -714,11 +715,15 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.filterQuery.locStorageCode
+                // pcode: this.filterQuery.locStorageCode
+
+                filter: 3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
+
                 })
                 .catch(() => {
                 });
@@ -745,7 +750,7 @@ export default {
         };
     },
     created() {
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let query = this.$route.query;
         this.filterQuery = Object.assign(this.filterQuery, query);
diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue
index cc1bce0..f909055 100644
--- a/src/views/warehouse/IOSearchOrder.vue
+++ b/src/views/warehouse/IOSearchOrder.vue
@@ -1,347 +1,346 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <el-form
-                :inline="true"
-                :model="filterQuery"
-                class="query-form"
-                size="mini"
+  <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="出入库类型"
+                clearable
             >
-                <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="出入库类型"
-                            clearable
-                        >
-                            <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="请选择扫码单据类型" clearable>
-                            <el-option
-                                v-for="item in busTypes"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.action">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-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"
-                                   @change="subInvChange">
-                            <el-option
-                                v-for="item in subInvList"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
+              <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="请选择扫码单据类型" clearable>
+              <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!--                        <el-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"
+                       @change="subInvChange">
+              <el-option
+                  v-for="item in subInvList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="query-form-item">
             <span style="color: #000; margin-left: 10px; margin-right: 6px;font-size: small"
             >创建日期:</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="exportOrders">导出单据</el-button>-->
-                        </el-button-group>
-                    </el-form-item>
-                </el-row>
-            </el-form>
-            <el-table
-                v-loading="loading"
-                :data="list"
-                ref="multipleTable"
-                style="width: 100%"
-                @row-click="getOrderDetail"
-                highlight-current-row
+            <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-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="扫码单据类型" prop="billTypeName">
-                </el-table-column>
-                <el-table-column
-                    label="订单号"
-                    prop="id"
-                    show-overflow-tooltip="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="invName" width="120">
-                </el-table-column>
-                <el-table-column label="当前分库" prop="subInvName" width="120">
-                </el-table-column>
-                <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
-                </el-table-column>
-                <el-table-column
-                    label="创建时间"
-                    prop="actDate"
-                    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="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="操作" fixed="right" width="120">
-                    <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="deleteDialog(scope.row.id)"
-                        >删除
-                        </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-pagination
-                :page-size="filterQuery.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-                :current-page="filterQuery.page"
-            ></el-pagination>
-        </el-card>
-
-        <el-card class="el-card" 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="产品通用名"
-                    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-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="exportOrders">导出单据</el-button>-->
+            </el-button-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-table
+          v-loading="loading"
+          :data="list"
+          ref="multipleTable"
+          style="width: 100%"
+          @row-click="getOrderDetail"
+          highlight-current-row
+      >
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName">
+        </el-table-column>
+        <el-table-column
+            label="订单号"
+            prop="id"
+            show-overflow-tooltip="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="invName" width="120">
+        </el-table-column>
+        <el-table-column label="当前分库" prop="subInvName" width="120">
+        </el-table-column>
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
+        </el-table-column>
+        <el-table-column
+            label="创建时间"
+            prop="actDate"
+            width="150"
+            show-overflow-tooltip="true"
         >
-            <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"
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.actDate }}</span>
+          </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="操作" fixed="right" width="120">
+          <template slot-scope="scope">
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="intentDetail(scope.row)"
+            >详情
+            </el-button
             >
-                <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"
-            ></selectErpOrder>
-        </el-dialog>
-
-        <el-dialog
-            title="单号详情"
-            :visible.sync="codeDetailVisible"
-            width="80%"
-            v-if="codeDetailVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-        >
-            <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-button
+                type="text"
+                size="small"
+                @click.native.stop="deleteDialog(scope.row.id)"
+            >删除
+            </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-pagination
+          :page-size="filterQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+          :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
+
+    <el-card class="el-card" 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="产品通用名"
+            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
+          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"
+      ></selectErpOrder>
+    </el-dialog>
+
+    <el-dialog
+        title="单号详情"
+        :visible.sync="codeDetailVisible"
+        width="80%"
+        v-if="codeDetailVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+    >
+      <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-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, exportJson
+  orderList,
+  codeList,
+  findAllByOrderId,
+  updateUnit,
+  filterOrder,
+  deleteByOrderId,
+  updateExportStatus,
+  uploadOrder,
+  mergeOrder,
+  orderDetail, exportJson
 } from "../../api/warehouse/order";
 import {
-    orderDetailPDFFromTemplateCode,
-    orderDetailPDFFromTemplateFile,
-    inspectionOrderDetailPDFFromTemplateCode,
-    inspectionOrderDetailPDFFromTemplateFile, stockOrderPDFFromTemplateFile
+  orderDetailPDFFromTemplateCode,
+  orderDetailPDFFromTemplateFile,
+  inspectionOrderDetailPDFFromTemplateCode,
+  inspectionOrderDetailPDFFromTemplateFile, stockOrderPDFFromTemplateFile
 } from "../../api/itextpdf/itextpdf";
 import {repeatCheck} from "../../api/erp/erpOrder";
 import {unitListBykey} from "../../api/warehouse/unit";
@@ -360,608 +359,610 @@ import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
 const formJson = {
-    site_id: "",
-    site_name: "",
-    describe: "",
-    ads: [],
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
 };
 export default {
-    props: {
-        isSelect: {
-            type: Boolean,
-            default: false,
-        },
-    },
-
-    data() {
-        return {
-            query: {
-                page: 1,
-                limit: 20,
-            },
-            checkStatus: {
-                1: "校验异常",
-                0: "未校验",
-                2: "正常",
-            },
-            erpCheckStatus: {
-                // error: "校验异常",
-                // null: "未校验",
-                // success: "正常",
-                1: "已完成",
-                0: "已完成",
-                2: "已完成",
-            },
-            fromTypeMap: {
-                "1": "UDIMS平台",
-                "2": "网页新增",
-                "3": "pda即时校验",
-                "4": "pda未校验",
-                "5": "pc端扫码精灵",
-                "6": "缺量补录单据",
-                "7": "UDI供应商平台",
-                "8": "平衡补录单据",
-                "10": "手动补单"
-            },
-            //往来单位
-            unitquery: {key: "", page: 1, limit: 20},
-            unitlist: [],
-            list: [],
-            detailList: [],
-            storageList: [],
-            subInvList: [],
-            unitUpdateQuery: {
-                id: "",
-                fromCorpId: "",
-                fromCorp: "",
-            },
-            actDateRange: [],
-            filterQuery: {
-                id: "",
-                mainAction: null,
-                action: null,
-                page: 1,
-                limit: 10,
-                code: "",
-                exportStatus: null,
-                unionCtrStatus: 1,
-                status: null,
-                startTime: "",
-                endTime: "",
-                locStorageCode: this.$store.getters.locInvCode,
-                invWarehouseCode: this.$store.getters.locSubInvCode,
-            },
-            detailQuery: {
-                orderId: "",
-                page: 1,
-                limit: 20
-            },
-            detailTotal: 0,
-            deleteData: {
-                id: "",
-            },
-            idQuery: {
-                id: "",
-            },
-            curIndex: "",
-            adListNoDataText: "无数据",
-            queryAdIdAsyncLoading: false,
-            codeDetailVisible: false,
-            successOrderExportPDFSettingVisible: false,
-            total: 0,
-            loading: false,
-            index: null,
-            formName: null,
-            orderId: "",
-            formMap: {
-                add: "新增",
-                edit: "编辑",
-            },
-            exportQuery: {
-                orderId: "",
-                exportStatus: "",
+  props: {
+    isSelect: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  data() {
+    return {
+      query: {
+        page: 1,
+        limit: 20,
+      },
+      checkStatus: {
+        1: "校验异常",
+        0: "未校验",
+        2: "正常",
+      },
+      erpCheckStatus: {
+        // error: "校验异常",
+        // null: "未校验",
+        // success: "正常",
+        1: "已完成",
+        0: "已完成",
+        2: "已完成",
+      },
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单"
+      },
+      //往来单位
+      unitquery: {key: "", page: 1, limit: 20},
+      unitlist: [],
+      list: [],
+      detailList: [],
+      storageList: [],
+      subInvList: [],
+      unitUpdateQuery: {
+        id: "",
+        fromCorpId: "",
+        fromCorp: "",
+      },
+      actDateRange: [],
+      filterQuery: {
+        id: "",
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        code: "",
+        exportStatus: null,
+        unionCtrStatus: 1,
+        status: null,
+        startTime: "",
+        endTime: "",
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+      },
+      detailQuery: {
+        orderId: "",
+        page: 1,
+        limit: 20
+      },
+      detailTotal: 0,
+      deleteData: {
+        id: "",
+      },
+      idQuery: {
+        id: "",
+      },
+      curIndex: "",
+      adListNoDataText: "无数据",
+      queryAdIdAsyncLoading: false,
+      codeDetailVisible: false,
+      successOrderExportPDFSettingVisible: false,
+      total: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      orderId: "",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      exportQuery: {
+        orderId: "",
+        exportStatus: "",
+      },
+      enableDept: false,
+      uploadQuery: {
+        orderId: "",
+      },
+      busTypes: [],
+      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]);
             },
-            enableDept: false,
-            uploadQuery: {
-                orderId: "",
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            busTypes: [],
-            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]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-        };
-    },
-    components: {
-        draggable,
-        codeDetail,
-        successOrderExportPDFSetting,
-        selectErpOrder,
-    },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                id: "",
-                mainAction: null,
-                action: null,
-                page: 1,
-                limit: 10,
-                code: "",
-                unionCtrStatus: 1,
-                exportStatus: null,
-                status: null,
-                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;
+          },
+        ],
+      },
+    };
+  },
+  components: {
+    draggable,
+    codeDetail,
+    successOrderExportPDFSetting,
+    selectErpOrder,
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        code: "",
+        unionCtrStatus: 1,
+        exportStatus: null,
+        status: null,
+        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) {
+      this.multipleSelection = val;
+    },
+    getStorage() {
+      this.storageList = [];
+      filterAllByUser()
+          .then((response) => {
+            this.storageList = response.data || [];
+            if (this.storageList.length > 0) {
+              this.getSubInvList();
+              this.getList();
             }
-            this.getList();
-        },
-        handleSizeChange(val) {
-            this.filterQuery.limit = val;
-            this.getList();
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
-            this.getList();
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        getStorage() {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                    if (this.storageList.length > 0) {
-                        this.getSubInvList();
-                        this.getList();
-                    }
-                })
-                .catch(() => {
+          })
+          .catch(() => {
+          });
+    },
+    getStorageName(code) {
+      for (let i = 0; i < this.storageList.length; i++) {
+        if (this.storageList[i].code === code) {
+          return this.storageList[i].name;
+        }
+      }
+    },
+    getSubStorageName(code) {
+      for (let i = 0; i < this.subInvList.length; i++) {
+        if (this.subInvList[i].code === code) {
+          return this.subInvList[i].name;
+        }
+      }
+    },
+    handleErrorDetail(poistion) {
+      var mOrder = this.list[poistion];
+      this.errorDetail = mOrder.remark;
+      this.errDialogVisible = true;
+    },
+
+    mergesOrders() {
+      var repeatData = this.multipleSelection;
+      if (repeatData.length <= 1) {
+        this.$message.warning("选择的订单需大于1");
+        return;
+      }
+      var orderid = repeatData[0].id;
+      var unit = repeatData[0].fromCorp;
+      var action = repeatData[0].action;
+      var 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);
+      });
+      var 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: "合并成功",
                 });
-        },
-        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() {
-            var repeatData = this.multipleSelection;
-            if (repeatData.length <= 1) {
-                this.$message.warning("选择的订单需大于1");
-                return;
-            }
-            var orderid = repeatData[0].id;
-            var unit = repeatData[0].fromCorp;
-            var action = repeatData[0].action;
-            var 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.$message.error(response.message);
+              }
             });
-            var 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(() => {
-                });
-        },
+          })
+          .catch(() => {
+          });
+    },
 
-        exportOrders() {
-            var repeatData = this.multipleSelection;
-            if (repeatData.length < 1) {
-                this.$message.warning("选择的订单需大于1");
-                return;
-            }
-            var orderList = [];
-            repeatData.forEach((obj, index) => {
-                orderList.push(obj.id);
-            });
-            var tquery = {
-                ids: orderList,
-            };
-
-            exportJson(tquery).then((response) => {
-                const binaryData = [];
-                binaryData.push(response);
-                let url = window.URL.createObjectURL(
-                    new Blob(binaryData, {type: "application/json"})
-                );
-                // window.open(url);
-                this.loading = false;
-                const eleLink = document.createElement('a');
-                var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
-                // var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm")
-                eleLink.download = "Order_" + timestamp + ".LowerIn";
-                eleLink.style.display = 'none';
-                eleLink.href = url;
-                document.body.appendChild(eleLink)
-                eleLink.click()
-                document.body.removeChild(eleLink)
-            }).catch(() => {
-                this.loading = false;
-            });
+    exportOrders() {
+      var repeatData = this.multipleSelection;
+      if (repeatData.length < 1) {
+        this.$message.warning("选择的订单需大于1");
+        return;
+      }
+      var orderList = [];
+      repeatData.forEach((obj, index) => {
+        orderList.push(obj.id);
+      });
+      var tquery = {
+        ids: orderList,
+      };
+
+      exportJson(tquery).then((response) => {
+        const binaryData = [];
+        binaryData.push(response);
+        let url = window.URL.createObjectURL(
+            new Blob(binaryData, {type: "application/json"})
+        );
+        // window.open(url);
+        this.loading = false;
+        const eleLink = document.createElement('a');
+        var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
+        // var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm")
+        eleLink.download = "Order_" + timestamp + ".LowerIn";
+        eleLink.style.display = 'none';
+        eleLink.href = url;
+        document.body.appendChild(eleLink)
+        eleLink.click()
+        document.body.removeChild(eleLink)
+      }).catch(() => {
+        this.loading = false;
+      });
 
-        },
-        //获取订单列表
-        getList() {
-            this.loading = true;
-            this.filterQuery.customerId = store.getters.customerId;
-            filterOrder(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) {
-            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) => {
-                    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.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) {
-            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) {
-            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) => {
-                    this.getList();
-                    this.refresgOrderDetail();
-                    this.$message({
-                        type: "success",
-                        message: "删除成功！",
-                    });
-                })
-                .catch(() => {
-                });
-        },
-        tableRowClassName({row, rowIndex}) {
-            if (row.reCount === row.count) {
-                return "success-row";
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.filterQuery.customerId = store.getters.customerId;
+      filterOrder(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 {
-                return "warning-row";
+              this.$message.error(response.message);
             }
-        },
-
-
-        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();
+
+          })
+          .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("选入失败");
-            }
-        },
-        cancelDialog() {
-            this.addDialogVisible = false;
-        },
-        importOrder(row) {
-            this.orderId = row.id;
-            this.addDialogVisible = true;
-        },
-        getBusType() {
-            let query = {
-                code: this.filterQuery.invWarehouseCode,
-                enabled: true,
-            };
-            getLocalJoinByUser(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
-                })
-                .catch(() => {
-                });
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].name;
-                }
+              this.$message.error(response.message);
             }
-        },
-        invChange() {
-            this.filterQuery.invWarehouseCode = "";
-            this.subInvList = [];
-            let query = {
-                pcode: this.filterQuery.locStorageCode
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
-
-
-        getSubInvList() {
-            let query = {
-                pcode: this.filterQuery.locStorageCode
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
+          })
+          .catch(() => {
+            this.loading = false;
+            this.getList();
+            this.$message.error(response.message);
+          });
+    },
+    refresgOrderDetail() {
+      orderDetail(this.detailQuery)
+          .then((response) => {
+            this.loading = false;
+            this.detailList = response.data || [];
+          })
+          .catch(() => {
+            this.loading = false;
+            this.detailList = [];
+          });
+    },
 
-        subInvChange() {
-            this.getBusType();
+    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.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) {
+      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);
         }
-    }
-    ,
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                false: "success",
-                true: "danger",
-            };
-            return statusMap[status];
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+    closeDialog() {
+      this.successOrderExportPDFSettingVisible = false;
+      this.getList();
+    },
+
+    selectUnit(row) {
+      this.unitUpdateQuery.id = this.curIndex;
+      this.unitUpdateQuery.fromCorp = row.name;
+      this.unitUpdateQuery.fromCorpId = row.unitid;
+      updateUnit(this.unitUpdateQuery)
+          .then((response) => {
+            this.dialogTableVisible = false;
+            this.getList();
+          })
+          .catch(() => {
+            this.dialogTableVisible = false;
+          });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.id = data;
+      deleteByOrderId(this.deleteData)
+          .then((response) => {
+            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";
+      }
+    },
+
+
+    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.addDialogVisible = true;
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invWarehouseCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.filterQuery.billAction = this.busTypes[0].action;
+            // this.getList();
+          })
+          .catch(() => {
+          });
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
         }
-        ,
-    }
-    ,
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
-    }
-    ,
+      }
+    },
+    invChange() {
+      this.filterQuery.invWarehouseCode = "";
+      this.subInvList = [];
+      let query = {
+        pcode: this.filterQuery.locStorageCode
+      };
+      filterSubByInv(query)
+          .then((response) => {
+            this.subInvList = response.data || [];
+          })
+          .catch(() => {
+          });
+    },
 
-    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];
-        selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
-            if (res.code === 20000) {
-                if (res.data.paramValue === "0") {
-                    this.enableDept = true;
-                }
-            }
-        })
+
+    getSubInvList() {
+      let query = {
+        // pcode: this.filterQuery.locStorageCode
+        filter: 3
+      };
+      filterSubByInv(query)
+          .then((response) => {
+            this.subInvList = response.data || [];
+            this.getList();
+          })
+          .catch(() => {
+          });
+    },
+
+    subInvChange() {
+      this.getBusType();
+    }
+  }
+  ,
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "danger",
+      };
+      return statusMap[status];
     }
     ,
+  }
+  ,
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  }
+  ,
+
+  created() {
+    this.getSubInvList();
+    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];
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+  }
+  ,
 }
 ;
 </script>
@@ -969,10 +970,10 @@ export default {
 
 <style>
 .el-table .warning-row {
-    background: #ffb5b5;
+  background: #ffb5b5;
 }
 
 .el-table .success-row {
-    background: #ffffff;
+  background: #ffffff;
 }
 </style>
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index 58bec5c..c0043ca 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.vue
@@ -33,21 +33,21 @@
                             </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.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"
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    size="mini"
                                    @change="subInvChange">
                             <el-option
@@ -560,7 +560,7 @@ export default {
                 this.filterQuery.endTime = null;
             }
 
-           
+
             this.getList();
         },
         handleSizeChange(val) {
@@ -978,11 +978,13 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.filterQuery.locStorageCode
+                // pcode: this.filterQuery.locStorageCode
+                filter: 3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
@@ -1009,7 +1011,7 @@ export default {
     },
 
     created() {
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let query = this.$route.query;
         this.query = Object.assign(this.query, query);
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 74f959a..9ff868d 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -1181,7 +1181,6 @@ export default {
 
     },
     created() {
-        debugger
         this.formData.code = '';
         this.formData.actDate = new Date();
         this.codeArray = [];
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 48aa454..b8c425b 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -1,308 +1,308 @@
 <template>
-  <div>
-
-    <el-form :model="formData" :rules="formRules" ref="dataForm">
-      <el-button-group style="display: flex;margin: -50px 0 10px 80%; height: 35px">
-        <el-button
-            type="primary"
-            @click.native="saveOrder()"
-        >草稿保存
-        </el-button
+    <div>
+
+        <el-form :model="formData" :rules="formRules" ref="dataForm">
+            <el-button-group style="display: flex;margin: -50px 0 10px 80%; height: 35px">
+                <el-button
+                    type="primary"
+                    @click.native="saveOrder()"
+                >草稿保存
+                </el-button
+                >
+                <el-button
+                    v-if="visiblV === 0"
+                    type="primary"
+                    @click.native="submit('0')"
+                >提交
+                </el-button
+                >
+
+            </el-button-group>
+            <el-card>
+                <el-row :gutter="20">
+                    <el-col :span="2">
+                        <div class="ao-text">
+                            <span>入库单号：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item prop="corpOrderId">
+                            <el-input v-model="formData.corpOrderId" auto-complete="off"
+                                      :disabled="corpOrderIdDisabled"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="2">
+                        <div class="ao-text">
+                            <span>单据时间：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item prop="actDate">
+                            <el-date-picker
+                                v-model="formData.actDate"
+                                type="datetime"
+                                placeholder="单据时间"
+                                :disabled="true"
+                                style="width: 100%; "
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="2">
+                        <div class="ao-text">
+                            <span>往来单位：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item prop="fromCorp">
+                            <el-input v-model="formData.fromCorp" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="2">
+                        <div class="ao-text">
+                            <span>单据类型：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="query-form-item">
+                            <el-select v-model="formData.billType" placeholder="请选择单据类型" @change="actionChange"
+                                       :disabled="corpOrderIdDisabled"
+                                       clearable>
+                                <el-option
+                                    v-for="item in busTypes"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.action">
+                                    <span style="float: left">{{ item.name }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+
+
+                    <el-col :span="2">
+                        <div class="ao-text">
+                            <span>当前仓库：</span>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item prop="locStorageCode">
+                            <el-select v-model="formData.invWarehouseCode" placeholder="当前仓库信息" clearable
+                                       @change="getBusType"
+                                       :disabled="corpOrderIdDisabled">
+                                <el-option
+
+                                    v-for="item in subInvList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px">{{
+                                            item.warehouseName
+                                        }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+
+                </el-row>
+                <!--        <el-row :gutter="20">-->
+                <!--          <el-col :span="12" class="el-col">-->
+                <!--            <div class="text item">-->
+                <!--              <el-checkbox v-model="formData.codeFillCheck"-->
+                <!--              >采集UDI码时进行三期校验-->
+                <!--              </el-checkbox>-->
+                <!--            </div>-->
+
+                <!--          </el-col>-->
+                <!--        </el-row>-->
+            </el-card>
+            <el-card>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <el-link
+                                target="_blank">{{ scanText }}
+                            </el-link>
+                        </div>
+                    </el-col>
+                    <el-col :span="16">
+                        <el-form-item prop="code">
+                            <el-input
+                                id="inputer"
+                                @focus="getInputFocus($event)"
+                                @keypress.enter.native="enterKey($event)"
+                                ref='inputRef'
+                                style="ime-mode:disabled"
+                                type="tel"
+                                v-model="formData.code"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="2">
+                        <el-button
+                            type="primary"
+                            size="small"
+                            @click.native.stop="addCode()"
+                            style="height: 31px; margin-left: 20px"
+                        >添加
+                        </el-button
+                        >
+                    </el-col>
+
+
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="14" style="margin-left: 40px">
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="text item" style="margin-left: 30px"> 条码数量：{{ total }}
+                        </div>
+                    </el-col>
+
+                </el-row>
+                <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
+                          :row-style="rowStyle"
+                          ref="multipleTable">
+                    <el-table-column label="序号" type="index" width="45"></el-table-column>
+                    <el-table-column
+                        label="条码"
+                        prop="code"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="扫码数量"
+                        prop="count"
+                        width="80"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="实际数量"
+                        prop="reCount"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="生产日期"
+                        prop="produceDate"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="失效日期"
+                        prop="expireDate"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="批次号"
+                        prop="batchNo"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="序列号"
+                        prop="serialNo"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column label="操作" fixed="right" width="250">
+                        <template slot-scope="scope">
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click.native.stop="deleteCode(scope.$index, scope.row)"
+                            >减一
+                            </el-button
+                            >
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click.native.stop="bindRl(scope.row)"
+                            >选择产品
+                            </el-button
+                            >
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click.native.stop="editCode(scope.row)"
+                            >编辑
+                            </el-button
+                            >
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+                <div class="block">
+                    <el-pagination
+                        @current-change="handleCurrentChange"
+                        layout="prev, pager, next,total"
+                        :page-size="query.limit"
+                        :total="total">
+                    </el-pagination>
+                </div>
+            </el-card>
+        </el-form>
+        <el-dialog
+            title="绑定产品ID"
+            :visible.sync="selectRlVisible"
+            width="80%"
+            v-if="selectRlVisible"
+            append-to-body
         >
-        <el-button
-            v-if="visiblV === 0"
-            type="primary"
-            @click.native="submit('0')"
-        >提交
-        </el-button
+            <selectRlDialog
+                :curRow="curRow"
+                :curAction="curAction"
+                v-on:selectBindRl="selectBindRl"
+                v-on:closeBindDialog="closeBindDialog"
+            ></selectRlDialog>
+        </el-dialog>
+        <el-dialog
+            :title="editTitle"
+            :visible.sync="editCodeVisible"
+            append-to-body width="70%"
+            v-if="editCodeVisible"
+            @close="getCodeList"
         >
-
-      </el-button-group>
-      <el-card>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <div class="ao-text">
-              <span>入库单号：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="corpOrderId">
-              <el-input v-model="formData.corpOrderId" auto-complete="off"
-                        :disabled="corpOrderIdDisabled"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="2">
-            <div class="ao-text">
-              <span>单据时间：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="actDate">
-              <el-date-picker
-                  v-model="formData.actDate"
-                  type="datetime"
-                  placeholder="单据时间"
-                  :disabled="true"
-                  style="width: 100%; "
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="2">
-            <div class="ao-text">
-              <span>往来单位：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="fromCorp">
-              <el-input v-model="formData.fromCorp" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="2">
-            <div class="ao-text">
-              <span>单据类型：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item">
-              <el-select v-model="formData.billType" placeholder="请选择单据类型" @change="actionChange"
-                         :disabled="corpOrderIdDisabled"
-                         clearable>
-                <el-option
-
-                    v-for="item in busTypes"
-                    :key="item.name"
-                    :label="item.name"
-                    :value="item.action">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-
-          
-
-          <el-col :span="2">
-            <div class="ao-text">
-              <span>当前分库：</span>
-            </div>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item prop="locStorageCode">
-              <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" clearable
-                          @change="getBusType"
-                         :disabled="corpOrderIdDisabled">
-                <el-option
-
-                    v-for="item in subInvList"
-                    :key="item.name"
-                    :label="item.name"
-                    :value="item.code">
-                  <span style="float: left">{{ item.name }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-
-        </el-row>
-<!--        <el-row :gutter="20">-->
-          <!--          <el-col :span="12" class="el-col">-->
-          <!--            <div class="text item">-->
-          <!--              <el-checkbox v-model="formData.codeFillCheck"-->
-          <!--              >采集UDI码时进行三期校验-->
-          <!--              </el-checkbox>-->
-          <!--            </div>-->
-
-          <!--          </el-col>-->
-          <!--        </el-row>-->
-      </el-card>
-      <el-card>
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <el-link
-                  target="_blank">{{ scanText }}
-              </el-link>
-            </div>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item prop="code">
-              <el-input
-                  id="inputer"
-                  @focus="getInputFocus($event)"
-                  @keypress.enter.native="enterKey($event)"
-                  ref='inputRef'
-                  style="ime-mode:disabled"
-                  type="tel"
-                  v-model="formData.code"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="2">
-            <el-button
-                type="primary"
-                size="small"
-                @click.native.stop="addCode()"
-                style="height: 31px; margin-left: 20px"
-            >添加
-            </el-button
-            >
-          </el-col>
-
-
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="14" style="margin-left: 40px">
-          </el-col>
-          <el-col :span="3">
-            <div class="text item" style="margin-left: 30px"> 条码数量：{{ total }}
-            </div>
-          </el-col>
-
-        </el-row>
-        <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
-                  :row-style="rowStyle"
-                  ref="multipleTable">
-          <el-table-column label="序号" type="index" width="45"></el-table-column>
-          <el-table-column
-              label="条码"
-              prop="code"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="扫码数量"
-              prop="count"
-              width="80"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="实际数量"
-              prop="reCount"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="生产日期"
-              prop="produceDate"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="失效日期"
-              prop="expireDate"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="批次号"
-              prop="batchNo"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="序列号"
-              prop="serialNo"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column label="操作" fixed="right" width="250">
-            <template slot-scope="scope">
-              <el-button
-                  type="text"
-                  size="small"
-                  @click.native.stop="deleteCode(scope.$index, scope.row)"
-              >减一
-              </el-button
-              >
-              <el-button
-                  type="text"
-                  size="small"
-                  @click.native.stop="bindRl(scope.row)"
-              >选择产品
-              </el-button
-              >
-              <el-button
-                  type="text"
-                  size="small"
-                  @click.native.stop="editCode(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div class="block">
-          <el-pagination
-              @current-change="handleCurrentChange"
-              layout="prev, pager, next,total"
-              :page-size="query.limit"
-              :total="total">
-          </el-pagination>
-        </div>
-      </el-card>
-    </el-form>
-    <el-dialog
-        title="绑定产品ID"
-        :visible.sync="selectRlVisible"
-        width="80%"
-        v-if="selectRlVisible"
-        append-to-body
-    >
-      <selectRlDialog
-          :curRow="curRow"
-          :curAction="curAction"
-          v-on:selectBindRl="selectBindRl"
-          v-on:closeBindDialog="closeBindDialog"
-      ></selectRlDialog>
-    </el-dialog>
-    <el-dialog
-        :title="editTitle"
-        :visible.sync="editCodeVisible"
-        append-to-body width="70%"
-        v-if="editCodeVisible"
-        @close="getCodeList"
-    >
-      <editCodeDialog
-          editTye="2"
-          :closeCodeDialog="closeCodeDialog"
-          :codeDetail="codeDetail">
-
-      </editCodeDialog>
-    </el-dialog>
-
-    <el-dialog
-        :title="editTitle"
-        :visible.sync="editOriginCodeVisible"
-        append-to-body width="70%"
-        v-if="editOriginCodeVisible">
-      <editCodeDialog
-          :closeCodeDialog="closeCodeDialog"
-          :repeatAddCode="repeatAddCode"
-          :codeDetail="formData"
-          editTye="1">
-      </editCodeDialog>
-    </el-dialog>
-  </div>
+            <editCodeDialog
+                editTye="2"
+                :closeCodeDialog="closeCodeDialog"
+                :codeDetail="codeDetail">
+
+            </editCodeDialog>
+        </el-dialog>
+
+        <el-dialog
+            :title="editTitle"
+            :visible.sync="editOriginCodeVisible"
+            append-to-body width="70%"
+            v-if="editOriginCodeVisible">
+            <editCodeDialog
+                :closeCodeDialog="closeCodeDialog"
+                :repeatAddCode="repeatAddCode"
+                :codeDetail="formData"
+                editTye="1">
+            </editCodeDialog>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import {
-  orderGetUdi,
-  orderList,
-  codeList,
-  orderListError,
-  saveOrderWeb,
-  mergeOrder,
-  postOrdersWeb,
-  errorCodeList,
-  addOrderWeb,
-  deleteCodesTempById,
-  submitOrderWeb,
-  updateCodeBindSup,
-  expireTimeCheck, enterCodeWeb
+    orderGetUdi,
+    orderList,
+    codeList,
+    orderListError,
+    saveOrderWeb,
+    mergeOrder,
+    postOrdersWeb,
+    errorCodeList,
+    addOrderWeb,
+    deleteCodesTempById,
+    submitOrderWeb,
+    updateCodeBindSup,
+    expireTimeCheck, enterCodeWeb
 } from "../../api/warehouse/order";
 import draggable from "vuedraggable";
 import {saveAs} from "file-saver";
@@ -310,7 +310,7 @@ import {getBussinessType} from "../../api/basic/bussinessType";
 import {parseTime} from "../../filtres/index";
 import store from "../../store";
 import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
-import {getLocalBusType, getLocalJoinBusType,getLocalJoinByUser} from "../../api/basic/busLocalType";
+import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
 import DialogSelectUnit from "./DialogSelectUnit";
 import selectRlDialog from "./DialogSelectRl";
 import editCodeDialog from "./editCode";
@@ -318,671 +318,675 @@ import A from "../../plugin/KeyScaner"
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
-  name: "idQuery",
-  props: {
-    closeDialog: {
-      type: Function,
-      required: true,
+    name: "idQuery",
+    props: {
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+        idQuery: {
+            type: Object,
+            required: true,
+        },
+        addType: {
+            type: Object,
+            required: true,
+        },
     },
-    idQuery: {
-      type: Object,
-      required: true,
+    data() {
+        return {
+            codeQuery: {
+                code: "",
+            },
+            query: {
+                code: "",
+                corpOrderId: "",
+                page: 1,
+                limit: 10,
+            },
+            formData: {
+                corpOrderId: "",
+                code: "",
+                actor: "",
+                fromCorpId: "",
+                fromCorp: "医院",
+                fromType: null,
+                locStorageCode: null,
+                invWarehouseCode: null,
+                actDate: new Date(),
+                billType: null,
+                preCheck: false,
+                outChangeEnable: false,
+                batchNo: null,
+                produceDate: null,
+                expireDate: null,
+                serialNo: null,
+                count: null,
+                codeFillCheck: null,
+                vailInv: null,
+                subInvCode: null,
+                fromSubInvCode: null,
+                invName: null,
+                subInvName: null
+            },
+            formRules: {
+                temp: [
+                    {required: true, message: "请输入条码", trigger: "blur"}
+                ],
+            },
+            isScan: true,
+            scanText: "扫码录入：",
+            visiblV: 0,
+            corpOrderIdDisabled: false,
+            codeArray: [],
+            total: 0,
+            loading: false,
+            index: null,
+            formLoading: false,
+            formVisible: false,
+            deleteLoading: false,
+            orderNo: null,
+            curRow: null,
+            busTypes: [],
+            storageList: [],
+            subInvList: [],
+            editOriginCodeVisible: false,
+            curId: null,
+            selectRlVisible: false,
+            dialogTableVisible: false,
+            sitcomScan: false,
+            codeDetail: null,
+            originCode: "",
+            checkSuccess: false,
+            editTitle: "编辑条码",
+            editCodeVisible: false,
+        };
     },
-    addType: {
-      type: Object,
-      required: true,
+    components: {
+        draggable, DialogSelectUnit, selectRlDialog, editCodeDialog
     },
-  },
-  data() {
-    return {
-      codeQuery: {
-        code: "",
-      },
-      query: {
-        code: "",
-        corpOrderId: "",
-        page: 1,
-        limit: 10,
-      },
-      formData: {
-        corpOrderId: "",
-        code: "",
-        actor: "",
-        fromCorpId: "",
-        fromCorp: "医院",
-        fromType: null,
-        locStorageCode: null,
-        invWarehouseCode: null,
-        actDate: new Date(),
-        billType: null,
-        preCheck: false,
-        outChangeEnable: false,
-        batchNo: null,
-        produceDate: null,
-        expireDate: null,
-        serialNo: null,
-        count: null,
-        codeFillCheck: null,
-        vailInv: null,
-        subInvCode: null,
-        fromSubInvCode: null,
-        invName: null,
-        subInvName: null
-      },
-      formRules: {
-        temp: [
-          {required: true, message: "请输入条码", trigger: "blur"}
-        ],
-      },
-      isScan: true,
-      scanText: "扫码录入：",
-      visiblV: 0,
-      corpOrderIdDisabled: false,
-      codeArray: [],
-      total: 0,
-      loading: false,
-      index: null,
-      formLoading: false,
-      formVisible: false,
-      deleteLoading: false,
-      orderNo: null,
-      curRow: null,
-      busTypes: [],
-      storageList: [],
-      subInvList: [],
-      editOriginCodeVisible: false,
-      curId: null,
-      selectRlVisible: false,
-      dialogTableVisible: false,
-      sitcomScan: false,
-      codeDetail: null,
-      originCode: "",
-      checkSuccess: false,
-      editTitle: "编辑条码",
-      editCodeVisible: false,
-    };
-  },
-  components: {
-    draggable, DialogSelectUnit, selectRlDialog, editCodeDialog
-  },
-  methods: {
-    submit(formName) {
-      if (this.total < 1) {
-        this.$message.error('未添加条码');
-        return;
-      }
-
-      let tQuery = {
-        orderId: this.idQuery.id,
-        action: this.formData.billType,
-        locStorageCode: this.formData.locStorageCode,
-        preCheck: this.formData.preCheck,
-        fromCorp: this.formData.fromCorp
-      }
-
-      submitOrderWeb(tQuery)
-          .then((response) => {
-            if (response.code === 20000) {
-              this.$message.success("提交成功");
-              this.closeDialog();
-            } else {
-              this.$message.error(response.message);
+    methods: {
+        submit(formName) {
+            if (this.total < 1) {
+                this.$message.error('未添加条码');
+                return;
             }
-            this.loading = false;
-          });
 
-    },
-    scanChange() {
-      this.isScan = !this.isScan;
-      if (this.isScan) {
-        this.scanText = "扫码录入：";
-
-      } else {
-        this.scanText = "手动录入：";
-      }
-    },
-    saveOrder() {
-      if (this.formData.billType == null || this.formData.billType == '') {
-        this.$message.error('未选择扫码单据类型');
-        return
-      }
-      
-      if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
-        this.$message.error('当前分库不能为空');
-        return;
-      }
-      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
-      tQuery.orderId = this.idQuery.id;
-      tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
-      tQuery.action = tQuery.billType;
-      saveOrderWeb(tQuery).then((response) => {
-        if (response.code === 20000) {
-          this.closeDialog();
-        } else {
-          this.$message.error(response.message);
-        }
-        this.loading = false;
-      });
-    },
+            let tQuery = {
+                orderId: this.idQuery.id,
+                action: this.formData.billType,
+                locStorageCode: this.formData.locStorageCode,
+                preCheck: this.formData.preCheck,
+                fromCorp: this.formData.fromCorp
+            }
 
-    closeCodeDialog() {
-      this.editCodeVisible = false;
-      this.editOriginCodeVisible = false;
-      this.getCodeList();
-    },
-    editCode(row) {
-      this.codeDetail = row;
-      this.editTitle = "编辑条码";
-      this.editCodeVisible = true;
-    },
+            submitOrderWeb(tQuery)
+                .then((response) => {
+                    if (response.code === 20000) {
+                        this.$message.success("提交成功");
+                        this.closeDialog();
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                    this.loading = false;
+                });
 
-    // 刷新表单
-    resetForm() {
-      if (this.$refs["dataForm"]) {
-        // 清空验证信息表单
-        this.$refs["dataForm"].clearValidate();
-        // 刷新表单
-        this.$refs["dataForm"].resetFields();
-        this.getList();
-      }
-    },
+        },
+        scanChange() {
+            this.isScan = !this.isScan;
+            if (this.isScan) {
+                this.scanText = "扫码录入：";
 
-    enterKey(event) {
-      this.checkSuccess = true;
-      let tQuery = {
-        originCode: this.originCode,
-        code: this.formData.code.trim(),
-      }
-      enterCodeWeb(tQuery).then((response) => {
-        if (response.code === 20000) {
-          this.$refs.inputRef.focus();
-          this.$refs.inputRef.select();
-          this.formData.code = response.data;
-          this.addCode();
-        } else {
-          if (response.code == 502) {
-            this.checkSuccess = false;
-            this.formData.code = response.data;
-            this.originCode = this.formData.code;
-          } else if (response.code == 501) {
-            this.checkSuccess = false;
-            // this.formData.code = response.data;
-            // this.originCode = this.formData.code;
-            this.$message.error(response.message);
-          } else if (response.code == 503) {
-            this.checkSuccess = false;
-            this.formData.code = response.data;
-            this.$confirm(response.message, "提示", {
-              type: "warning",
-            })
-                .then(() => {
-                  this.formData.code = response.data;
-                  this.addCode();
-                })
-                .catch(() => {
-                  this.formData.code = this.originCode;
-                });
+            } else {
+                this.scanText = "手动录入：";
+            }
+        },
+        saveOrder() {
+            if (this.formData.billType == null || this.formData.billType == '') {
+                this.$message.error('未选择扫码单据类型');
+                return
+            }
 
-          } else if (response.code == 508) {
-            this.originCode = "";
-            this.formData.code = "01" + response.data.nameCode;
-            this.originCode = this.formData.code;
-            // this.$confirm("当前商品条码对应产品信息：\n" +
-            //     "DI标识:" + response.data.nameCode + "\n" +
-            //     "产品名称：" + response.data.cpmctymc + "\n" +
-            //     "规格型号：" + response.data.cpmctymc + "\n" +
-            //     "医疗器械注册人：" + response.data.ylqxzcrbarmc + "\n" + "是否继续添加？", "提示", {
-            //     confirmButtonText: "确定",
-            //     cancelButtonText: "取消",
-            //     type: "warning",
-            // })
-            //     .then(() => {
-            //         this.originCode = "01" + response.data.nameCode;
-            //         this.formData.code = this.originCode;
-            //     })
-            //     .catch(() => {
-            //         this.originCode = "";
-            //         this.formData.code = "";
-            //     });
-          } else {
-            this.$alert(response.message, '提示', {
-              confirmButtonText: '确定',
-              type: 'warning',
-              closeOnClickModal: true,
-              callback: action => {
-                this.$refs.inputRef.focus();
-                this.$refs.inputRef.select();
-              }
+            if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
+                this.$message.error('当前仓库不能为空');
+                return;
+            }
+            let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
+            tQuery.orderId = this.idQuery.id;
+            tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
+            tQuery.action = tQuery.billType;
+            saveOrderWeb(tQuery).then((response) => {
+                if (response.code === 20000) {
+                    this.closeDialog();
+                } else {
+                    this.$message.error(response.message);
+                }
+                this.loading = false;
             });
-          }
-        }
-        this.loading = false;
-      });
-    },
-    addCode(event) {
-      console.log(this.formData)
-      console.log(this.storageList)
-      if (event == null) {
-      } else event.target.select();
-      this.sictomText = "";
-      this.originCode = "";
-      this.formData.corpOrderId = this.formData.corpOrderId.trim();
-      this.formData.batchNo = "";
-      this.formData.produceDate = "";
-      this.formData.expireDate = "";
-      this.formData.serialNo = "";
-      this.actionEnable = true;
-      this.$refs.inputRef.select();
-      if (this.$isBlank(this.formData.billType)) {
-        this.$message.warning("请选择单据类型！");
-        return;
-      }
-     
-      if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
-        this.$message.error('当前分库不能为空');
-        return;
-      }
-      this.formData.corpOrderId = this.formData.corpOrderId.trim();
-      if (this.$isBlank(this.formData.corpOrderId)) {
-        let date = new Date();
-        this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
-      }
-      this.formData.code = this.formData.code.trim();
-      if (this.$isBlank(this.formData.code)) return;
-      this.loading = true;
-
-      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
-      tQuery.orderId = this.idQuery.id;
-      tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
-      tQuery.action = tQuery.billType
-      this.addCodeSubmit(tQuery);
-      this.$refs.inputRef.select();
-    },
+        },
 
-    addCodeSubmit(tQuery) {
-      addOrderWeb(tQuery).then((response) => {
-        if (response.code === 20000) {
-          this.idQuery.id = response.data.orderId;
-          if (response.data.errMsg != null) {
-            this.$alert(response.data.errMsg, '提示', {
-              confirmButtonText: '确定',
-              type: 'warning',
-              closeOnClickModal: true,
-              callback: action => {
-              }
-            });
-          }
-          this.corpOrderIdDisabled = true;
-          this.getCodeList();
-        } else {
-          this.corpOrderIdDisabled = true;
-          if (response.code == 502) {
-            this.curRow = response.data;
-            this.idQuery.id = this.curRow.orderId;
-            this.getCodeList();
-            this.selectRlTitle = response.message;
-            this.bindRl(response.data);
-          } else if (response.code == 503) {
-            this.curRow = response.data;
-            this.idQuery.id = this.curRow.orderId;
+        closeCodeDialog() {
+            this.editCodeVisible = false;
+            this.editOriginCodeVisible = false;
             this.getCodeList();
-            this.selectUnitTitle = response.message;
-            this.handleUnitClick(response.data);
-          } else if (response.code == 504) {
-
-            this.$confirm(response.message, "提示", {
-              confirmButtonText: "确定",
-              cancelButtonText: "忽略",
-              type: "error",
-            }).then(() => {
-              tQuery.ignoreExpire = true;
-              this.addCodeSubmit(tQuery)
-            }).catch(() => {
+        },
+        editCode(row) {
+            this.codeDetail = row;
+            this.editTitle = "编辑条码";
+            this.editCodeVisible = true;
+        },
 
-            });
+        // 刷新表单
+        resetForm() {
+            if (this.$refs["dataForm"]) {
+                // 清空验证信息表单
+                this.$refs["dataForm"].clearValidate();
+                // 刷新表单
+                this.$refs["dataForm"].resetFields();
+                this.getList();
+            }
+        },
 
-          } else if (response.code == 505) {
+        enterKey(event) {
+            this.checkSuccess = true;
+            let tQuery = {
+                originCode: this.originCode,
+                code: this.formData.code.trim(),
+            }
+            enterCodeWeb(tQuery).then((response) => {
+                if (response.code === 20000) {
+                    this.$refs.inputRef.focus();
+                    this.$refs.inputRef.select();
+                    this.formData.code = response.data;
+                    this.addCode();
+                } else {
+                    if (response.code == 502) {
+                        this.checkSuccess = false;
+                        this.formData.code = response.data;
+                        this.originCode = this.formData.code;
+                    } else if (response.code == 501) {
+                        this.checkSuccess = false;
+                        // this.formData.code = response.data;
+                        // this.originCode = this.formData.code;
+                        this.$message.error(response.message);
+                    } else if (response.code == 503) {
+                        this.checkSuccess = false;
+                        this.formData.code = response.data;
+                        this.$confirm(response.message, "提示", {
+                            type: "warning",
+                        })
+                            .then(() => {
+                                this.formData.code = response.data;
+                                this.addCode();
+                            })
+                            .catch(() => {
+                                this.formData.code = this.originCode;
+                            });
+
+                    } else if (response.code == 508) {
+                        this.originCode = "";
+                        this.formData.code = "01" + response.data.nameCode;
+                        this.originCode = this.formData.code;
+                        // this.$confirm("当前商品条码对应产品信息：\n" +
+                        //     "DI标识:" + response.data.nameCode + "\n" +
+                        //     "产品名称：" + response.data.cpmctymc + "\n" +
+                        //     "规格型号：" + response.data.cpmctymc + "\n" +
+                        //     "医疗器械注册人：" + response.data.ylqxzcrbarmc + "\n" + "是否继续添加？", "提示", {
+                        //     confirmButtonText: "确定",
+                        //     cancelButtonText: "取消",
+                        //     type: "warning",
+                        // })
+                        //     .then(() => {
+                        //         this.originCode = "01" + response.data.nameCode;
+                        //         this.formData.code = this.originCode;
+                        //     })
+                        //     .catch(() => {
+                        //         this.originCode = "";
+                        //         this.formData.code = "";
+                        //     });
+                    } else {
+                        this.$alert(response.message, '提示', {
+                            confirmButtonText: '确定',
+                            type: 'warning',
+                            closeOnClickModal: true,
+                            callback: action => {
+                                this.$refs.inputRef.focus();
+                                this.$refs.inputRef.select();
+                            }
+                        });
+                    }
+                }
+                this.loading = false;
+            });
+        },
+        addCode(event) {
+            console.log(this.formData)
+            console.log(this.storageList)
+            if (event == null) {
+            } else event.target.select();
+            this.sictomText = "";
+            this.originCode = "";
+            this.formData.corpOrderId = this.formData.corpOrderId.trim();
+            this.formData.batchNo = "";
+            this.formData.produceDate = "";
+            this.formData.expireDate = "";
+            this.formData.serialNo = "";
+            this.actionEnable = true;
+            this.$refs.inputRef.select();
+            if (this.$isBlank(this.formData.billType)) {
+                this.$message.warning("请选择单据类型！");
+                return;
+            }
 
-            this.$confirm(response.message, "提示", {
-              confirmButtonText: "确定",
-              cancelButtonText: "忽略",
-              type: "warning",
+            if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
+                this.$message.error('当前仓库不能为空');
+                return;
+            }
+            this.formData.corpOrderId = this.formData.corpOrderId.trim();
+            if (this.$isBlank(this.formData.corpOrderId)) {
+                let date = new Date();
+                this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
+            }
+            this.formData.code = this.formData.code.trim();
+            if (this.$isBlank(this.formData.code)) return;
+            this.loading = true;
+
+            let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
+            tQuery.orderId = this.idQuery.id;
+            tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
+            tQuery.action = tQuery.billType
+            this.addCodeSubmit(tQuery);
+            this.$refs.inputRef.select();
+        },
+
+        addCodeSubmit(tQuery) {
+            addOrderWeb(tQuery).then((response) => {
+                if (response.code === 20000) {
+                    this.idQuery.id = response.data.orderId;
+                    if (response.data.errMsg != null) {
+                        this.$alert(response.data.errMsg, '提示', {
+                            confirmButtonText: '确定',
+                            type: 'warning',
+                            closeOnClickModal: true,
+                            callback: action => {
+                            }
+                        });
+                    }
+                    this.corpOrderIdDisabled = true;
+                    this.getCodeList();
+                } else {
+                    this.corpOrderIdDisabled = true;
+                    if (response.code == 502) {
+                        this.curRow = response.data;
+                        this.idQuery.id = this.curRow.orderId;
+                        this.getCodeList();
+                        this.selectRlTitle = response.message;
+                        this.bindRl(response.data);
+                    } else if (response.code == 503) {
+                        this.curRow = response.data;
+                        this.idQuery.id = this.curRow.orderId;
+                        this.getCodeList();
+                        this.selectUnitTitle = response.message;
+                        this.handleUnitClick(response.data);
+                    } else if (response.code == 504) {
+
+                        this.$confirm(response.message, "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "忽略",
+                            type: "error",
+                        }).then(() => {
+                            tQuery.ignoreExpire = true;
+                            this.addCodeSubmit(tQuery)
+                        }).catch(() => {
+
+                        });
+
+                    } else if (response.code == 505) {
+
+                        this.$confirm(response.message, "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "忽略",
+                            type: "warning",
+                        }).then(() => {
+                            tQuery.ignoreRecentExpire = true;
+                            this.addCodeSubmit(tQuery)
+                        }).catch(() => {
+
+                        });
+
+                    } else if (response.code == 507) {
+                        this.editTitle = response.message;
+                        this.editOriginCodeVisible = true;
+                        this.formData.produceDate = response.data.produceDate;
+                        this.formData.expireDate = response.data.expireDate;
+                        this.formData.batchNo = response.data.batchNo;
+                        this.formData.serialNo = response.data.serialNo;
+
+                        this.$message({
+                            type: 'error',
+                            message: "提交失败！" + this.editTitle,
+                            customClass: 'messageIndex'
+                        });
+
+                    } else {
+                        this.$alert(response.message, '提示', {
+                            confirmButtonText: '确定',
+                            type: 'warning',
+                            closeOnClickModal: true,
+                            callback: action => {
+                                this.$refs.inputRef.focus();
+                                this.$refs.inputRef.select();
+                            }
+                        });
+                    }
+                }
+                this.loading = false;
+            });
+        },
+
+        repeatAddCode(editCode) {
+            let tQuery = editCode;
+            tQuery.orderId = this.idQuery.id;
+            tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
+            tQuery.action = this.formData.action;
+            this.closeCodeDialog();
+            this.addCodeSubmit(tQuery);
+
+        },
+        deleteCode(index, row) {
+            this.$confirm("是否确定移除一个条码?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
             }).then(() => {
-              tQuery.ignoreRecentExpire = true;
-              this.addCodeSubmit(tQuery)
+                this.loading = true;
+                let tQuery = {
+                    id: row.id
+                }
+                deleteCodesTempById(tQuery)
+                    .then((response) => {
+                        if (response.code === 20000) {
+                            this.getCodeList();
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                        this.loading = false;
+                    });
             }).catch(() => {
-
-            });
-
-          } else if (response.code == 507) {
-            this.editTitle = response.message;
-            this.editOriginCodeVisible = true;
-            this.formData.produceDate = response.data.produceDate;
-            this.formData.expireDate = response.data.expireDate;
-            this.formData.batchNo = response.data.batchNo;
-            this.formData.serialNo = response.data.serialNo;
-
-            this.$message({
-              type: 'error',
-              message: "提交失败！" + this.editTitle,
-              customClass: 'messageIndex'
             });
+        },
+        getInputFocus(event) {
+            event.currentTarget.select();
+        },
+        tableSelection() {
+            this.$refs.multipleTable.clearSelection();
+            this.$refs.multipleTable.toggleAllSelection();
+        },
+        handleSizeChange(val) {
+            this.query.limit = val;
+            this.getCodeList();
+        },
+        handleCurrentChange(val) {
+            this.query.page = val;
+            this.getCodeList();
+        },
+        getCodeList() {
+            this.loading = true;
+            this.query.orderId = this.idQuery.id;
+            errorCodeList(this.query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.codeArray = response.data.list || [];
+                    this.total = response.data.total || 0;
+                    for (let i = 0; i < this.codeArray.length; i++) {
+                        this.codeArray[i].fromType = this.formData.fromType;
+                        this.codeArray[i].billType = this.formData.billType;
+                    }
+                    this.tableSelection();
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        getBusType() {
+            let query = {
+                code: this.formData.invWarehouseCode,
+                enabled: true,
+            };
+            getLocalJoinByUser(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    debugger
+                    if (this.formData.action != null) {
+                        this.curAction = this.getActionItem(this.formData.action);
+                        if (this.curAction != null) {
+                            this.formData.vailInv = this.curAction.vailInv;
+                            this.formData.codeFillCheck = this.curAction.codeFillCheck;
+                        } else {
+                            this.curAction = {corpType: 0, genUnit: false, changeEnable: false,};
+                            this.formData.action = null;
+                        }
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        findSubInvByInv(invCode) {
+            this.subInvList = [];
+            let query = {
+                filter: 3
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                    if (this.subInvList != null && this.subInvList.length == 1) {
+                        this.formData.invWarehouseCode = this.subInvList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        locCHange() {
+            this.subInvList = [];
+            this.formData.invWarehouseCode = "";
+            this.findSubInvByInv(this.formData.locStorageCode);
+        },
+
+        intentBack() {
+            this.$router.go(-1);
+        },
+        getStorage(event) {
+            let query = {
+                spUse: true,
+            };
+            this.storageList = [];
+            filterAll(query)
+                .then((response) => {
+                    this.storageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].advanceType;
+                }
+            }
+        },
+        getActionItem(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i];
+                }
+            }
+        },
+        actionChange(item) {
+            this.curAction = this.getActionItem(item);
+            this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
+            // this.formData.locStorageCode = this.curAction.storageCode;
+            // this.formData.fromCorp = null;
+        },
+        //绑定数据
+        bindRl(val) {
+            this.curRow = val;
+            this.selectRlVisible = true;
+        },
+
+
+        selectBindRl(row) {
+            let query = {
+                id: this.curRow.id,
+                relId: row.id,
+            };
+            updateCodeBindSup(query).then((response) => {
+                if (response.code == 20000) {
+                    this.$message.success("绑定成功");
+                    this.idQuery.id = this.curRow.orderId;
+                    this.getCodeList();
+                } else {
+
+                    if (response.code == 503) {
+                        this.curRow = response.data;
+                        this.idQuery.id = this.curRow.orderId;
+                        this.getCodeList();
+                        this.selectUnitTitle = response.message;
+                        this.handleUnitClick(response.data);
+                    } else
+                        this.$message.error(response.message);
+                }
+            }).catch(() => {
 
-          } else {
-            this.$alert(response.message, '提示', {
-              confirmButtonText: '确定',
-              type: 'warning',
-              closeOnClickModal: true,
-              callback: action => {
-                this.$refs.inputRef.focus();
-                this.$refs.inputRef.select();
-              }
             });
-          }
-        }
-        this.loading = false;
-      });
-    },
+        },
+        closeBindDialog(val) {
+            this.selectRlVisible = false;
+            this.dialogTableVisible = false;
+        },
+        rowStyle({row, rowIndex}) {
+            let rowBackground = {};
+            if (row.supId == null || row.relId == null) {
+                //rowBackground.background="#f6f5ee";
+                rowBackground.color = '#f60303';
+            }
 
-    repeatAddCode(editCode) {
-      let tQuery = editCode;
-      tQuery.orderId = this.idQuery.id;
-      tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
-      tQuery.action = this.formData.action;
-      this.closeCodeDialog();
-      this.addCodeSubmit(tQuery);
+            return rowBackground;
+        },
 
     },
-    deleteCode(index, row) {
-      this.$confirm("是否确定移除一个条码?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.loading = true;
-        let tQuery = {
-          id: row.id
-        }
-        deleteCodesTempById(tQuery)
-            .then((response) => {
-              if (response.code === 20000) {
-                this.getCodeList();
-              } else {
-                this.$message.error(response.message);
-              }
-              this.loading = false;
-            });
-      }).catch(() => {
-      });
-    },
-    getInputFocus(event) {
-      event.currentTarget.select();
-    },
-    tableSelection() {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleAllSelection();
-    },
-    handleSizeChange(val) {
-      this.query.limit = val;
-      this.getCodeList();
-    },
-    handleCurrentChange(val) {
-      this.query.page = val;
-      this.getCodeList();
-    },
-    getCodeList() {
-      this.loading = true;
-      this.query.orderId = this.idQuery.id;
-      errorCodeList(this.query) //查找该单号下的所有条码
-          .then((response) => {
-            this.codeArray = response.data.list || [];
-            this.total = response.data.total || 0;
-            for (let i = 0; i < this.codeArray.length; i++) {
-              this.codeArray[i].fromType = this.formData.fromType;
-              this.codeArray[i].billType = this.formData.billType;
+    filters: {},
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+        var that = this;
+        var inputer = document.getElementById("inputer");
+        window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
+        sc.onInput = function (text) {
+            if (text.includes("delete")) {
+                that.formData.code = "";
+                that.sictomText = "";
+                that.originCode = "";
+                return;
             }
-            this.tableSelection();
-            this.loading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
-    },
-    getBusType() {
-      this.formData.billType=null;
-      let query = {
-        enabled: true,
-        invWarehouseCode: this.formData.invWarehouseCode
-      };
-      getLocalJoinByUser(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            this.curAction = this.busTypes[0];
-            if (this.curAction != null) {
-              this.formData.vailInv = this.curAction.vailInv;
-              this.formData.codeFillCheck = this.curAction.codeFillCheck;
-            }
-           
-          })
-          .catch(() => {
-          });
-    },
-
-    findSubInvByInv(invCode) {
-      this.subInvList = [];
-      let query = {
-        filter:3
-      };
-      filterSubByInv(query)
-          .then((response) => {
-            this.subInvList = response.data || [];
-            if (this.subInvList != null && this.subInvList.length == 1) {
-              this.formData.invWarehouseCode = this.subInvList[0].code;
+            if (that.sitcomScan) {
+                let tempTxt = text;
+                let str = tempTxt.replace(/[\r]/g, "");
+                that.sictomText = that.sictomText + str;
+                that.formData.code = that.sictomText;
+            } else {
+                that.formData.code = text;
             }
-          })
-          .catch(() => {
-          });
-    },
+        };
+        inputer.focus();
 
-    locCHange() {
-      this.subInvList = [];
-      this.formData.invWarehouseCode = "";
-      this.findSubInvByInv(this.formData.locStorageCode);
-    },
 
-    intentBack() {
-      this.$router.go(-1);
-    },
-    getStorage(event) {
-      let query = {
-        spUse: true,
-      };
-      this.storageList = [];
-      filterAll(query)
-          .then((response) => {
-            this.storageList = response.data || [];
-          })
-          .catch(() => {
-          });
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].advanceType;
-        }
-      }
-    },
-    getActionItem(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i];
-        }
-      }
     },
-    actionChange(item) {
-      this.curAction = this.getActionItem(item);
-      this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
-      // this.formData.locStorageCode = this.curAction.storageCode;
-      // this.formData.fromCorp = null;
-    },
-    //绑定数据
-    bindRl(val) {
-      this.curRow = val;
-      this.selectRlVisible = true;
-    },
-
-
-    selectBindRl(row) {
-      let query = {
-        id: this.curRow.id,
-        relId: row.id,
-      };
-      updateCodeBindSup(query).then((response) => {
-        if (response.code == 20000) {
-          this.$message.success("绑定成功");
-          this.idQuery.id = this.curRow.orderId;
-          this.getCodeList();
+    created() {
+        this.formData.code = '';
+        this.formData.actDate = new Date();
+        this.codeArray = [];
+        this.formData.fromCorp = store.getters.companyName;// store.getters.customerId === 110 ? '医院' : store.getters.companyName;
+        this.formData.fromCorpId = store.getters.customerId;
+        this.formData.customerId = store.getters.customerId;
+        this.getStorage();
+        if (this.$isNotBlank(this.idQuery.id)) {
+            this.formData.actDate = new Date(this.idQuery.actDate);
+            this.formData.corpOrderId = this.idQuery.corpOrderId;
+            this.formData.billType = this.idQuery.billType;
+            this.findSubInvByInv(this.idQuery.locStorageCode);
+            this.formData.locStorageCode = this.idQuery.locStorageCode;
+            this.formData.invWarehouseCode = this.idQuery.invWarehouseCode;
+            this.corpOrderIdDisabled = true;
+            this.formData.preCheck = this.idQuery.preCheck;
+            this.formData.invName = this.idQuery.invName;
+            this.formData.subInvName = this.idQuery.subInvName;
+            if (this.addType == "edit") {
+                this.visiblV = 1;
+            }
+            this.getCodeList();
         } else {
+            this.formData.locStorageCode = this.$store.getters.locInvCode;
+            this.findSubInvByInv(this.$store.getters.locInvCode);
+            this.formData.invWarehouseCode = this.$store.getters.locSubInvCode;
+            this.corpOrderIdDisabled = false;
+            if (JSON.stringify(this.$route.query) === '{}') {
+                // this.formData.corpOrderId = new Date().getTime() + (Math.ceil(Math.random() * 10 + 10) + '');
+                let date = new Date();
+                this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
+            } else {
+                // 将参数拷贝进查询对象
+                let query = this.$route.query;
+                this.orderNo = query.id;
 
-          if (response.code == 503) {
-            this.curRow = response.data;
-            this.idQuery.id = this.curRow.orderId;
-            this.getCodeList();
-            this.selectUnitTitle = response.message;
-            this.handleUnitClick(response.data);
-          } else
-            this.$message.error(response.message);
-        }
-      }).catch(() => {
+                this.query = Object.assign(this.query, query);
+                this.query.limit = parseInt(this.query.limit);
+                this.query.corpOrderId = query.id;
 
-      });
-    },
-    closeBindDialog(val) {
-      this.selectRlVisible = false;
-      this.dialogTableVisible = false;
-    },
-    rowStyle({row, rowIndex}) {
-      let rowBackground = {};
-      if (row.supId == null || row.relId == null) {
-        //rowBackground.background="#f6f5ee";
-        rowBackground.color = '#f60303';
-      }
-
-      return rowBackground;
+                // 加载表格数据
+                // this.getCodeList();
+            }
+        }
+        if (this.formData.invWarehouseCode != null) {
+            this.getBusType();
+        }
     },
-
-  },
-  filters: {},
-  mounted() {
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-    var that = this;
-    var inputer = document.getElementById("inputer");
-    window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
-    sc.onInput = function (text) {
-      if (text.includes("delete")) {
-        that.formData.code = "";
-        that.sictomText = "";
-        that.originCode = "";
-        return;
-      }
-      if (that.sitcomScan) {
-        let tempTxt = text;
-        let str = tempTxt.replace(/[\r]/g, "");
-        that.sictomText = that.sictomText + str;
-        that.formData.code = that.sictomText;
-      } else {
-        that.formData.code = text;
-      }
-    };
-    inputer.focus();
-
-
-  },
-  created() {
-    this.formData.code = '';
-    this.formData.actDate = new Date();
-    this.codeArray = [];
-    this.formData.fromCorp = store.getters.companyName;// store.getters.customerId === 110 ? '医院' : store.getters.companyName;
-    this.formData.fromCorpId = store.getters.customerId;
-    this.formData.customerId = store.getters.customerId;
-    this.getStorage();
-    if (this.$isNotBlank(this.idQuery.id)) {
-      this.formData.actDate = new Date(this.idQuery.actDate);
-      this.formData.corpOrderId = this.idQuery.corpOrderId;
-      this.formData.billType = this.idQuery.billType;
-      this.findSubInvByInv(this.idQuery.locStorageCode);
-      this.formData.locStorageCode = this.idQuery.locStorageCode;
-      this.formData.invWarehouseCode = this.idQuery.invWarehouseCode;
-      this.corpOrderIdDisabled = true;
-      this.formData.preCheck = this.idQuery.preCheck;
-      this.formData.invName = this.idQuery.invName;
-      this.formData.subInvName = this.idQuery.subInvName;
-      if (this.addType == "edit") {
-        this.visiblV = 1;
-      }
-      this.getCodeList();
-    } else {
-      this.formData.locStorageCode = this.$store.getters.locInvCode;
-      this.findSubInvByInv(this.$store.getters.locInvCode);
-      this.formData.invWarehouseCode = this.$store.getters.locSubInvCode;
-      this.corpOrderIdDisabled = false;
-      if(this.formData.invWarehouseCode!=null){
-        this.getBusType();
-       }
-      if (JSON.stringify(this.$route.query) === '{}') {
-        // this.formData.corpOrderId = new Date().getTime() + (Math.ceil(Math.random() * 10 + 10) + '');
-        let date = new Date();
-        this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
-      } else {
-        // 将参数拷贝进查询对象
-        let query = this.$route.query;
-        this.orderNo = query.id;
-
-        this.query = Object.assign(this.query, query);
-        this.query.limit = parseInt(this.query.limit);
-        this.query.corpOrderId = query.id;
-
-        // 加载表格数据
-        // this.getCodeList();
-      }
-    }
-  },
 };
 </script>
 <style scoped>
 .ao-text {
-  width: 100%;
-  font-size: 13px;
-  font-family: "Microsoft YaHei";
-  float: right;
-  text-align: right;
-  margin-top: 10px;
+    width: 100%;
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+    float: right;
+    text-align: right;
+    margin-top: 10px;
 }
 
 #inputer {
-  width: 100%;
-  min-height: 30px;
-  background-color: white;
-  border: #d0d0d0;
-  border-style: solid;
-  border-width: 0.1px;
-  color: #4a4a4a;
+    width: 100%;
+    min-height: 30px;
+    background-color: white;
+    border: #d0d0d0;
+    border-style: solid;
+    border-width: 0.1px;
+    color: #4a4a4a;
 
 }
 
 #inputer:focus {
-  width: 100%;
-  min-height: 30px;
-  background-color: white;
-  border: #0080FF;
-  border-style: solid;
-  border-width: 0.1px;
-  color: #4a4a4a;
+    width: 100%;
+    min-height: 30px;
+    background-color: white;
+    border: #0080FF;
+    border-style: solid;
+    border-width: 0.1px;
+    color: #4a4a4a;
 
 }
 
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index 67e8447..1c84eaf 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -27,21 +27,21 @@
                     <el-form-item class="query-form-item" v-if="isSp ==110">
                         <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
                     </el-form-item>
+                    <!--                    <el-form-item class="query-form-item">-->
+                    <!--                        <el-select v-model="query.locStorageCode"-->
+                    <!--                                   @change="invChange"-->
+                    <!--                                   placeholder="请选择当前仓库" clearable="true" 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="query.locStorageCode"
-                                   @change="invChange"
-                                   placeholder="请选择当前仓库" clearable="true" 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="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    size="mini"
                                    @change="subInvChange"
                         >
@@ -825,11 +825,14 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                // pcode: this.query.locStorageCode
+                filter: 3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
+
                 })
                 .catch(() => {
                 });
@@ -897,7 +900,7 @@ export default {
     },
     created() {
         // 加载表格数据
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let end = new Date();
         let start = new Date();
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 3eb2ec6..38d514d 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -26,21 +26,21 @@
                     <el-form-item class="query-form-item" v-if="isSp ==110">
                         <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
                     </el-form-item>
+<!--                    <el-form-item class="query-form-item">-->
+<!--                        <el-select v-model="query.locStorageCode"-->
+<!--                                   @change="invChange"-->
+<!--                                   placeholder="请选择当前仓库" clearable="true" 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="query.locStorageCode"
-                                   @change="invChange"
-                                   placeholder="请选择当前仓库" clearable="true" 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="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    size="mini"
                                    @change="subInvChange"
                         >
@@ -875,11 +875,13 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                // pcode: this.query.locStorageCode
+                filter:3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
@@ -975,7 +977,7 @@ export default {
         }
     },
     created() {
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let end = new Date();
         let start = new Date();
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index d5faf39..c1a88aa 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -26,21 +26,21 @@
                     <el-form-item class="query-form-item" v-if="isSp ==110">
                         <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
                     </el-form-item>
+<!--                    <el-form-item class="query-form-item">-->
+<!--                        <el-select v-model="query.locStorageCode"-->
+<!--                                   @change="invChange"-->
+<!--                                   placeholder="请选择当前仓库" clearable="true" 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="query.locStorageCode"
-                                   @change="invChange"
-                                   placeholder="请选择当前仓库" clearable="true" 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="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    size="mini" @change="subInvChange">
                             <el-option
                                 v-for="item in subInvList"
@@ -975,11 +975,14 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                // pcode: this.query.locStorageCode
+
+                filter:3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
@@ -1021,7 +1024,9 @@ export default {
         }
     },
     created() {
-        this.getStorage();
+        // this.getStorage();
+
+        this.getSubInvList();
         this.getSysParm();
         this.getBusType();
         this.getList();
diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index e53060f..638a5d5 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@@ -26,23 +26,23 @@
                     <el-form-item class="query-form-item" v-if="isSp ==110">
                         <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
                     </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="query.locStorageCode"
-                                   placeholder="请选择当前仓库" clearable="true" size="mini"
-                                   @change="invChange">
-                            <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="query.locStorageCode"-->
+                    <!--                                   placeholder="请选择当前仓库" clearable="true" size="mini"-->
+                    <!--                                   @change="invChange">-->
+                    <!--                            <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="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库库" clearable="true"
                                    size="mini"
                                    @change="subInvChange">
                             <el-option
@@ -973,17 +973,17 @@ export default {
         },
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                // pcode: this.query.locStorageCode
+                filter: 3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
         },
-
-
         subInvChange() {
             this.getBusType();
         }
@@ -1019,7 +1019,8 @@ export default {
     },
     created() {
         this.getBusType();
-        this.getStorage();
+        // this.getStorage();
+        this.getSubInvList();
         let end = new Date();
         let start = new Date();
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index 8876fd3..b350ce9 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -302,8 +302,6 @@ export default {
             this.getList();
         },
         getList() {
-            debugger
-
             this.loading = true;
             this.listQuery.customerId = store.getters.customerId;
             if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined && this.data.formData.noInvOut==false){
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index af89e5b..dd1e63c 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -27,21 +27,21 @@
                     <el-form-item class="query-form-item" v-if="isSp ==110">
                         <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
                     </el-form-item>
+<!--                    <el-form-item class="query-form-item">-->
+                    <!--                        <el-select v-model="query.locStorageCode"-->
+                    <!--                                   @change="invChange"-->
+                    <!--                                   placeholder="请选择当前仓库" clearable="true" 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="query.locStorageCode"
-                                   @change="invChange"
-                                   placeholder="请选择当前仓库" clearable="true" 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="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    size="mini"
                                    @change="subInvChange">
                             <el-option
@@ -1026,11 +1026,13 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                // pcode: this.query.locStorageCode
+                filter: 3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
                 })
                 .catch(() => {
                 });
@@ -1160,7 +1162,7 @@ export default {
         if (store.getters.customerId == 110) {
             this.isReceAble = true;
         }
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let end = new Date();
         let start = new Date();
diff --git a/src/views/warehouse/stockOrderWaitCheck.vue b/src/views/warehouse/stockOrderWaitCheck.vue
index 7c99517..3bed2e7 100644
--- a/src/views/warehouse/stockOrderWaitCheck.vue
+++ b/src/views/warehouse/stockOrderWaitCheck.vue
@@ -27,21 +27,21 @@
                     <el-form-item class="query-form-item" v-if="isSp ==110">
                         <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
                     </el-form-item>
+                    <!--                    <el-form-item class="query-form-item">-->
+                    <!--                        <el-select v-model="query.locStorageCode"-->
+                    <!--                                   @change="invChange"-->
+                    <!--                                   placeholder="请选择当前仓库" clearable="true" 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="query.locStorageCode"
-                                   @change="invChange"
-                                   placeholder="请选择当前仓库" clearable="true" 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="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    size="mini"
                                    @change="subInvChange">
                             <el-option
@@ -813,11 +813,14 @@ export default {
         },
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                // pcode: this.query.locStorageCode
+                filter: 3
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
+
                 })
                 .catch(() => {
                 });
@@ -883,7 +886,7 @@ export default {
     },
     created() {
         // 加载表格数据
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let end = new Date();
         let start = new Date();