From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style

---
 src/views/other/commonDialog/SelectCommonDialog.vue |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 3df5f0c..4e6e01e 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -68,6 +68,7 @@
           editVisible: false,
           title: "",
           clientId: 0,
+          client_name: "",
           tableInfomation: []
         }
       }
@@ -98,6 +99,8 @@
     this.search_map = {
       client_id: this.editConfig.clientId
     }
+    this.keyword = this.editConfig.client_name
+    this.keywordType = "瀹㈡埛鍚嶇О"
     this.setTable()
     this.getData()
   },
@@ -349,8 +352,9 @@
     // 閿�鍞槑缁嗗崟
     async getSalesDetailsList() {
       await getSalesDetailsList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
+        // keyword: this.keyword,
+        // keywordType: this.keywordType,
+        clientId:this.editCommonConfig.clientId,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
@@ -430,8 +434,9 @@
     },
     async getSalesReturnList() {
       await getSalesReturnList({
-        keyword: this.keyword,
-        keywordType: this.keywordType,
+        // keyword: this.keyword,
+        // keywordType: this.keywordType,
+        clientId:this.editCommonConfig.clientId,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {

--
Gitblit v1.8.0