From eea34d6b7399dba7e7f81016a079d293d80a9eb9 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 12 Jul 2022 15:12:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AF=BC=E8=87=B4=E7=9A=84=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=95=B0=E6=8D=AE=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/inventory/DialogInvProduct.vue           |  7 +++----
 src/views/warehouse/stockOrderNewSelectProduct.vue | 10 ++++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue
index 67fc741..bdebe4a 100644
--- a/src/views/inventory/DialogInvProduct.vue
+++ b/src/views/inventory/DialogInvProduct.vue
@@ -109,7 +109,7 @@ export default {
                 relIdFk: null,
                 batchNo: null,
                 page: 1,
-                limit: 20,
+                limit: 10,
                 customerId: null,
                 supId: null,
                 unitFk: null,
@@ -154,12 +154,13 @@ export default {
                 unitFk: null,
                 supId: null,
                 page: 1,
-                limit: 20,
+                limit: 10,
             };
             this.getList();
         },
         onSubmit() {
             this.loading = true;
+            this.filterQuery.page = 1;
             this.getList();
         },
         handleSizeChange(val) {
@@ -183,7 +184,6 @@ export default {
             this.filterQuery.customerId = store.getters.customerId;
             filterProducts(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.showSup = response.data.showSup;
                     this.loading = false;
                     this.list = response.data.list || [];
@@ -231,7 +231,6 @@ export default {
                 });
         },
         findMethod(query) {
-            console.log(query);
             this.fromOptions = [];
             let cQuery = {
                 key: query,
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index 2b48e48..b079843 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -38,7 +38,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="getList">查询</el-button>
+                                <el-button type="primary" icon="search" @click="search">查询</el-button>
                                 <el-button type="primary" icon="search" @click="combine">确定</el-button>
                             </el-button-group>
                         </el-form-item>
@@ -112,6 +112,7 @@
                     @current-change="handleErpPageChange"
                     layout="prev, pager, next"
                     :total="pageTotal"
+                    :current-page="listQuery.page"
                 ></el-pagination>
             </div>
         </el-card>
@@ -241,7 +242,6 @@ export default {
             this.getList();
         },
         handleChange(val) {
-            console.log(val);
             this.currentRow = val;
         },
         handleDetailClick(row) {
@@ -258,12 +258,15 @@ export default {
             this.getList();
             event.target.select();
         },
+        search() {
+            this.listQuery.page = 1;
+            this.getList();
+        },
         getList() {
             this.loading = true;
             this.listQuery.customerId = store.getters.customerId;
             stockOrderDetailFilterProduct(this.listQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     if (response.code === 20000) {
                         this.dataList = response.data.list || [];
@@ -292,7 +295,6 @@ export default {
             let ids = [];
 
             selection.forEach((obj, index) => {
-                console.log("obj:===" + obj + "==" + obj.relIdFk)
                 let data = {
                     relId: obj.rlId,
                 }