From adb807eae45f28d5ab24583e484a3d61556639b7 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 21 Dec 2022 17:31:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3404?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/stockOrderUpdate.vue   |  2 +-
 src/views/inventory/InvGoodsPlacement.vue |  6 +-----
 src/views/inventory/InvStatistics.vue     |  6 ------
 src/views/inventory/addInvMAOrder.vue     | 10 +++++++++-
 src/views/inventory/invMAOrderNew.vue     |  2 +-
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/views/business/stockOrderUpdate.vue b/src/views/business/stockOrderUpdate.vue
index 23139b5..cc4a1c0 100644
--- a/src/views/business/stockOrderUpdate.vue
+++ b/src/views/business/stockOrderUpdate.vue
@@ -348,7 +348,7 @@ export default {
         },
     },
     created() {
-        this.getByStockOrder();
+        // this.getByStockOrder();
     }
 }
 </script>
diff --git a/src/views/inventory/InvGoodsPlacement.vue b/src/views/inventory/InvGoodsPlacement.vue
index f4654db..8338924 100644
--- a/src/views/inventory/InvGoodsPlacement.vue
+++ b/src/views/inventory/InvGoodsPlacement.vue
@@ -512,7 +512,7 @@ export default {
                     this.loading = false;
                     this.$message.error(res.message);
                 } else if (res.code === 7) {
-                    this.$confirm(res.data, '提示', {
+                    this.$confirm(res.message, '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
                         type: 'warning'
@@ -520,10 +520,6 @@ export default {
                         this.codeArray.push(this.formData.code);
                     }).catch(() => {
                         this.loading = false;
-                        this.$message({
-                            type: 'info',
-                            message: '已取消'
-                        });
                     });
                 }
             });
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 3fc9eba..f0062ec 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -170,12 +170,6 @@ export default {
                 zczbhhzbapzbh: null,
                 ylqxzcrbarmc: null,
             },
-            detailQuery: {
-                code: null,
-                productIdFk: null,
-                page: 1,
-                limit: 20,
-            },
             list: [],
             codeDetailVisible: false,
             total: 0,
diff --git a/src/views/inventory/addInvMAOrder.vue b/src/views/inventory/addInvMAOrder.vue
index 8e2eb9c..c9bb798 100644
--- a/src/views/inventory/addInvMAOrder.vue
+++ b/src/views/inventory/addInvMAOrder.vue
@@ -232,7 +232,7 @@
                     <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="queryInvProducts"
+                            <el-button type="primary" icon="search" @click="queryInvProductsList"
                             >查询
                             </el-button
                             >
@@ -414,6 +414,10 @@ export default {
                 this.$message.warning("请先选择养护仓库！");
                 return;
             }
+            if (isBlank(this.formData.code)) {
+                this.$message.error("请输入或扫描条码！")
+                return;
+            }
             if (isBlank(this.formData.orderId)) {
                 this.saveOrder(this.formData.code);
                 return;
@@ -494,6 +498,10 @@ export default {
             this.filterQuery.page = val;
             this.queryInvProducts();
         },
+        queryInvProductsList() {
+            this.filterQuery.page = 1;
+            this.queryInvProducts();
+        },
         queryInvProducts() {
             this.filterQuery.invWarehouseCode = this.formData.invWarehouseCode;
             this.filterQuery.invSpaceCode = this.formData.invSpaceCode;
diff --git a/src/views/inventory/invMAOrderNew.vue b/src/views/inventory/invMAOrderNew.vue
index 96c9466..e6dde81 100644
--- a/src/views/inventory/invMAOrderNew.vue
+++ b/src/views/inventory/invMAOrderNew.vue
@@ -176,6 +176,7 @@ export default {
             this.getList();
         },
         onSubmit() {
+            this.filterQuery.page = 1;
             this.getList();
         },
         handleSizeChange(val) {
@@ -263,7 +264,6 @@ export default {
                     }
                 })
             }).catch((error) => {
-                this.$message.error(error.message);
             });
         },
     },