From 0aa43734cb40f00ae4921cdcc082639a91e68d3d Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 20 Dec 2022 14:30:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=BC=96=E8=BE=91=E9=A1=B5=E6=98=BE=E7=A4=BA=E5=88=86?=
 =?UTF-8?q?=E5=BA=93=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=202.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=8D=95=E6=8D=AE=E7=BC=96=E8=BE=91=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=E9=A1=B5=E9=9D=A2=E5=BC=B9=E7=AA=97=E4=BC=9A?=
 =?UTF-8?q?=E8=A2=AB=E8=AF=AF=E8=A7=A6=E5=85=B3=E9=97=AD=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/stockOrderDelete.vue | 14 +++++++++++---
 src/views/inventory/addCountOrder.vue   |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/business/stockOrderDelete.vue b/src/views/business/stockOrderDelete.vue
index 6fbe553..4ac9698 100644
--- a/src/views/business/stockOrderDelete.vue
+++ b/src/views/business/stockOrderDelete.vue
@@ -63,7 +63,6 @@
                 </el-table-column>
 
 
-
                 <el-table-column
                     label="创建时间"
                     prop="actDate"
@@ -163,6 +162,8 @@
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeReplace
                 :idQuery="idQuery"
@@ -170,7 +171,12 @@
             ></codeReplace>
         </el-dialog>
 
-        <el-dialog title="校验信息" :visible.sync="errDialogVisible" width="30%">
+        <el-dialog title="校验信息"
+                   :visible.sync="errDialogVisible"
+                   width="30%"
+                   :close-on-click-modal="false"
+                   :close-on-press-escape="false"
+        >
             <span>{{ errorDetail }}</span>
             <span slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="errDialogVisible = false">关 闭</el-button>
@@ -182,6 +188,8 @@
             :visible.sync="editOrderVisible"
             width="35%"
             v-if="editOrderVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
 
             <el-row style="width: 100%">
@@ -271,7 +279,7 @@ export default {
                 "6": "缺量补录单据",
                 "7": "UDI供应商平台",
                 "8": "平衡补录单据",
-                "10":"手动补单"
+                "10": "手动补单"
             },
             erpCheckStatus: {
                 // error: "校验异常",
diff --git a/src/views/inventory/addCountOrder.vue b/src/views/inventory/addCountOrder.vue
index dd3b5ee..f342d38 100644
--- a/src/views/inventory/addCountOrder.vue
+++ b/src/views/inventory/addCountOrder.vue
@@ -306,7 +306,7 @@
 </template>
 
 <script>
-import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {filterSubByInv, getInvWarehouseList} from "@/api/basic/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {getSpaceCodeList} from "@/api/inventory/invSpace";
@@ -445,7 +445,7 @@ export default {
         },
         getSubInvList() {
             let params = {pcode: this.formData.invStorageCode}
-            filterSubByInv(params).then((res) => {
+            getInvWarehouseList(params).then((res) => {
                 this.subInvList = res.data || [];
             });
         },