From 51ff0291f447450421835c2cd1f2660913da58bd Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 14 Nov 2022 18:02:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=A1=B5=E7=A0=81=E6=9C=AA?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98=202.=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/InvGoodsPlacement.vue |  1 +
 src/views/inventory/addCountOrder.vue     | 11 +++++++++++
 src/views/inventory/invCountOrderNew.vue  |  1 +
 3 files changed, 13 insertions(+)

diff --git a/src/views/inventory/InvGoodsPlacement.vue b/src/views/inventory/InvGoodsPlacement.vue
index 40e6ab9..fa546f3 100644
--- a/src/views/inventory/InvGoodsPlacement.vue
+++ b/src/views/inventory/InvGoodsPlacement.vue
@@ -79,6 +79,7 @@
 
         <el-pagination
             :page-size="filterQuery.limit"
+            :current-page="filterQuery.page"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
             :total="total"
diff --git a/src/views/inventory/addCountOrder.vue b/src/views/inventory/addCountOrder.vue
index 4c7a7a3..d7a94b9 100644
--- a/src/views/inventory/addCountOrder.vue
+++ b/src/views/inventory/addCountOrder.vue
@@ -575,6 +575,17 @@ export default {
             this.getCountOrderCodesNum();
         },
         addCode() {
+            if (this.countType != 1) {
+                if (isBlank(this.formData.invStorageCode) || isBlank(this.formData.invWarehouseCode)) {
+                    this.$message.error("请先选择盘点仓库和分库信息")
+                    return;
+                }
+            } else if (this.countType === 1) {
+                if (isBlank(this.formData.invStorageCode) || isBlank(this.formData.invWarehouseCode) || isBlank(this.formData.invSpaceCode)) {
+                    this.$message.error("请先选择盘点仓库和分库信息");
+                    return;
+                }
+            }
             this.formData.code.trim();
             let params = {
                 orderIdFk: this.formData.orderId,
diff --git a/src/views/inventory/invCountOrderNew.vue b/src/views/inventory/invCountOrderNew.vue
index 0099d5e..6f0d4d7 100644
--- a/src/views/inventory/invCountOrderNew.vue
+++ b/src/views/inventory/invCountOrderNew.vue
@@ -119,6 +119,7 @@
 
         <el-pagination
             :page-size="filterQuery.limit"
+            :current-page="filterQuery.page"
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
             :total="total"