From 0f8844dcb400fcdee4ea7831336a6aff382a8cc2 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期六, 23 九月 2023 14:59:16 +0800
Subject: [PATCH] fix: 修复搜索供应商列表结果为空时产品列表不为空的bug, 修复产品列表翻页后搜索供应商时产品列表页码未重置的bug, 修复供应商列表/产品列表/采购订单/质检单/退货单翻页后再搜索页码未重置的bug

---
 src/views/other/commonDialog/SelectCommonDialog.vue |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 34cde2a..cfe8f7b 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { getProductList } from "@/api/common/other"
+import { getProductListFromGrpc,getProductList } from "@/api/productManage/product"
 export default {
   name: "EditSelCommonDialog",
   props: {
@@ -52,6 +52,10 @@
           tableInfomation: []
         }
       }
+    },
+    sign:{
+      type:String,
+      default:''
     }
   },
   components: {},
@@ -105,16 +109,16 @@
     },
     // 浜у搧鍚嶇О
     async getProductList() {
-      await getProductList({
-        productName: this.keywordType === "浜у搧鍚嶇О" ? this.keyword : "",
-        productNumber: this.keywordType === "浜у搧缂栧彿" ? this.keyword : "",
+      
+      let fn = this.sign == "purchase" ? getProductList : getProductListFromGrpc;
+      await  fn({
         page: 1,
-        pageSize: 5
+        pageSize: 100
       }).then((res) => {
         console.log(res.data)
         if (res.data.code === 200) {
-          if (res.data.data.data && res.data.data.data.length > 0) {
-            const list = res.data.data.data.map((item) => {
+          if (res.data.data.list && res.data.data.list.length > 0) {
+            const list = res.data.data.list.map((item) => {
               return {
                 ...item
               }

--
Gitblit v1.8.0