From 8c292eed724fa44557487811b82c8a6c343dab0d Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 17 十月 2023 14:51:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn

---
 src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue |   13 +++++++------
 src/views/other/commonDialog/SelectContactDialog.vue           |   15 +++++++++------
 src/views/client/followupRecords/index.vue                     |    2 +-
 src/views/sales/salesDetails/index.vue                         |    2 ++
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/views/client/followupRecords/index.vue b/src/views/client/followupRecords/index.vue
index ec8d7f6..4904afc 100644
--- a/src/views/client/followupRecords/index.vue
+++ b/src/views/client/followupRecords/index.vue
@@ -256,7 +256,7 @@
     // 鏂板缓
     addBtnClick() {
       this.editConfig.title = "鏂板缓"
-      this.editConfig.infomation = { ...this.addConfig }
+      this.editConfig.infomation = { ...this.addConfig ,contact_name:"",sales_leads_name:"",sale_chance_name:""}
       this.editConfig.visible = true
     },
     // 缂栬緫
diff --git a/src/views/other/commonDialog/SelectContactDialog.vue b/src/views/other/commonDialog/SelectContactDialog.vue
index 4c71a20..1b291da 100644
--- a/src/views/other/commonDialog/SelectContactDialog.vue
+++ b/src/views/other/commonDialog/SelectContactDialog.vue
@@ -54,8 +54,8 @@
         return {
           editVisible: false,
           title: "",
-          infomation: {},
-          search_map: {}
+          clientId: 0,
+          infomation: {}
         }
       }
     }
@@ -71,7 +71,7 @@
       tableList: [],
       searchSelOptions: [],
       loading: false,
-      // search_map: {},
+      search_map: {},
       tableColumn: [
         { label: "鑱旂郴浜哄鍚�", prop: "name", isContactClick: true, default: true }, // 鑱旂郴浜哄鍚�
         { label: "鑱旂郴浜虹紪鍙�", prop: "number" }, // 鑱旂郴浜虹紪鍙�
@@ -82,6 +82,9 @@
     }
   },
   created() {
+    this.search_map = {
+      client_id: this.editConfig.clientId
+    }
     this.setTable()
     this.getData()
   },
@@ -121,7 +124,7 @@
     async getData() {
       this.loading = true
       await getContactList({
-        search_map: this.editConfig.search_map,
+        search_map: this.search_map,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       })
@@ -158,13 +161,13 @@
     // 鎼滅储
     searchClick(val, content) {
       console.log(val, content)
-      this.editConfig.search_map = {
+      this.search_map = {
         [val.value]: content
       }
       this.getData()
     },
     resetClick() {
-      this.editConfig.search_map = {}
+      this.search_map = {}
       this.getData()
     }
   }
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 858ed5b..ba6058b 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -308,6 +308,8 @@
       this.editConfig.infomation = {
         ...this.addConfig,
         currency: "浜烘皯甯�",
+        sale_chance_name:"",
+        subbill_name:"",
         client_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.client_name
       }
     },
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index 7f09501..1f1ef32 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -656,7 +656,7 @@
     }
     this.getCommonData()
     this.formInfo()
-    if (this.editConfig.title === '缂栬緫'){
+    if (this.editConfig.title === "缂栬緫") {
       this.isContact = false
       this.getContactList(this.editConfig.infomation.contact_id)
     }
@@ -778,7 +778,6 @@
         status_id: data.status_id || 0,
         threats: data.threats || "",
         whether_established: data.whether_established || "",
-
         remark: data.remark || "",
         detail_address: data.detail_address || "",
 
@@ -790,10 +789,11 @@
     // 鑾峰彇鑱旂郴浜哄垪琛�
     getContactList(id) {
       getContactList({
-        clientId: id,
         page: 0,
         pageSize: 0,
-        search_map: {}
+        search_map: {
+          client_id: id
+        }
       }).then((res) => {
         if (res.code == 200) {
           this.contactNamelist = res.data.list
@@ -820,7 +820,7 @@
       if (value === "client") {
         this.clientId = item.id
         this.editConfig.infomation.client_name = item.name
-        this.editConfig.infomation.contact_name = ''
+        this.editConfig.infomation.contact_name = ""
         this.contactId = 0
         this.isContact = false
         this.getContactList(item.id)
@@ -835,6 +835,7 @@
         this.editSelectClientConfig.editVisible = true
       } else if (value === "contact") {
         this.editSelectContactConfig.editVisible = true
+        this.editSelectContactConfig.clientId = this.clientId
       }
     },
     selClient(row, value) {
@@ -844,7 +845,7 @@
       } else if (value === "client") {
         this.editConfig.infomation.client_name = row.name
         this.clientId = row.id
-        this.editConfig.infomation.contact_name = ''
+        this.editConfig.infomation.contact_name = ""
         this.contactId = 0
         this.isContact = false
         this.getContactList(row.id)

--
Gitblit v1.8.0