From 68eb60800a453078e55927dcde6ee9956963f68f Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期二, 17 十月 2023 11:16:15 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

---
 src/views/client/client/index.vue                      |    3 
 src/views/client/contacts/AddContactsDialog.vue        |   18 +++---
 src/views/client/salesLead/AddSalesLeadDialog.vue      |   14 ++--
 src/views/sales/salesDetails/AddSalesDetailsDialog.vue |   56 ++++++++++--------
 src/views/client/client/AddClientManageDialog.vue      |   26 ++++----
 src/views/client/followupRecords/mixin/codeMixin.js    |    1 
 src/views/sales/salesDetails/index.vue                 |    7 ++
 7 files changed, 69 insertions(+), 56 deletions(-)

diff --git a/src/views/client/client/AddClientManageDialog.vue b/src/views/client/client/AddClientManageDialog.vue
index 2da6bda..d61d99c 100644
--- a/src/views/client/client/AddClientManageDialog.vue
+++ b/src/views/client/client/AddClientManageDialog.vue
@@ -538,32 +538,32 @@
       dialogWidth: "50%",
       editConfig: this.editClientManageConfig,
       rules: {
-        number: [{ required: true, message: "璇疯緭鍏ュ鎴风紪鍙�", trigger: "blur" }],
+        number: [{ required: true, message: "璇疯緭鍏ュ鎴风紪鍙�", trigger: ["change",'blur' ]}],
         name: [
-          { required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: "blur" },
+          { required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: ["change",'blur' ] },
           {
             validator: this.checkNameClient,
-            trigger: "blur"
+            trigger: ["change",'blur' ]
           }
         ],
-        client_status_id: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鐘舵��", trigger: "change" }],
-        member_id: [{ required: false, message: "璇烽�夋嫨閿�鍞礋璐d汉", trigger: "change" }],
-        approvalOpinion: [{ required: true, message: "璇疯緭鍏ュ鎵规剰瑙�", trigger: "blur" }],
+        client_status_id: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鐘舵��", trigger: ["change",'blur' ] }],
+        member_id: [{ required: false, message: "璇烽�夋嫨閿�鍞礋璐d汉", trigger: ["change",'blur' ] }],
+        approvalOpinion: [{ required: true, message: "璇疯緭鍏ュ鎵规剰瑙�", trigger: ["change",'blur' ] }],
         contact_phone: [
-          { required: false, message: "", trigger: "blur" },
-          { len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: "blur" },
+          { required: false, message: "", trigger:["change",'blur' ] },
+          { len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: ["change",'blur' ] },
           {
             pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
             message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�",
-            trigger: "blur"
+            trigger: ["change",'blur' ]
           }
         ],
         contact_email: [
-          { required: false, message: "", trigger: "blur" },
+          { required: false, message: "", trigger: ["change",'blur' ] },
           {
             pattern: /^[a-zA-Z0-9_\\.]+@[a-zA-Z0-9-]+[\\.a-zA-Z]+$/,
             message: "璇疯緭鍏ユ纭殑閭鏍煎紡",
-            trigger: "blur"
+            trigger: ["change",'blur' ]
           }
         ]
       },
@@ -748,8 +748,8 @@
     async getCityList(val, value) {
       await getCityList({ province_id: val }).then((res) => {
         console.log(res)
-        if (res.data.code === 200) {
-          this.cityOptions = res.data.data.list
+        if (res.code === 200) {
+          this.cityOptions = res.data.list
           if (value === "sel") {
             this.editConfig.infomation.city_id = ""
           }
diff --git a/src/views/client/client/index.vue b/src/views/client/client/index.vue
index d341bbe..6dfdd2d 100644
--- a/src/views/client/client/index.vue
+++ b/src/views/client/client/index.vue
@@ -293,7 +293,8 @@
         registered_capital_id: 1,
         enterprise_nature_id: 1,
         enterprise_scale_id: 1,
-        industry_id: 1
+        industry_id: 1,
+        province_id:''
       }
       this.editConfig.visible = true
     },
diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index 42ca99a..e03be94 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/src/views/client/contacts/AddContactsDialog.vue
@@ -299,25 +299,25 @@
       dialogWidth: "50%",
       editConfig: this.editContactsConfig,
       rules: {
-        name: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-        number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-        client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "blur" }],
-        member_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+        name: [{ required: true, message: "璇疯緭鍏�", trigger:  ["change",'blur'] }],
+        number: [{ required: true, message: "璇疯緭鍏�", trigger: ["change",'blur'] }],
+        client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: ["change",'blur'] }],
+        member_id: [{ required: true, message: "璇烽�夋嫨", trigger: ["change",'blur'] }],
         phone: [
-          { required: false, message: "", trigger: "blur" },
-          { len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: "blur" },
+          { required: false, message: "", trigger: ["change",'blur'] },
+          { len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: ["change",'blur'] },
           {
             pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
             message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�",
-            trigger: "blur"
+            trigger: ["change",'blur']
           }
         ],
         email: [
-          { required: false, message: "", trigger: "blur" },
+          { required: false, message: "", trigger: ["change",'blur'] },
           {
             pattern: /^[a-zA-Z0-9_\\.]+@[a-zA-Z0-9-]+[\\.a-zA-Z]+$/,
             message: "璇疯緭鍏ユ纭殑閭鏍煎紡",
-            trigger: "blur"
+            trigger: ["change",'blur']
           }
         ]
       },
diff --git a/src/views/client/followupRecords/mixin/codeMixin.js b/src/views/client/followupRecords/mixin/codeMixin.js
index a370e3b..5a9b97f 100644
--- a/src/views/client/followupRecords/mixin/codeMixin.js
+++ b/src/views/client/followupRecords/mixin/codeMixin.js
@@ -82,7 +82,6 @@
       }
     },
     codeList(val) {
-      console.log(val, "===val  codelist")
       this.inputValue = val
       this.codenumberList = val.toString()
       this.editConfig.infomation.number = this.codenumberList.length > 0 ? this.codenumberList.replace(/,/g, "") : ""
diff --git a/src/views/client/salesLead/AddSalesLeadDialog.vue b/src/views/client/salesLead/AddSalesLeadDialog.vue
index 883f9cc..6466f19 100644
--- a/src/views/client/salesLead/AddSalesLeadDialog.vue
+++ b/src/views/client/salesLead/AddSalesLeadDialog.vue
@@ -270,17 +270,17 @@
       dialogWidth: "50%",
       editConfig: this.editSalesLeadConfig,
       rules: {
-        name: [{ required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: "blur" }],
-        number: [{ required: true, message: "璇疯緭鍏ラ攢鍞嚎绱㈢紪鍙�", trigger: "blur" }],
-        businessStatus: [{ required: true, message: "璇疯緭鍏ュ晢鏈虹姸鎬�", trigger: "blur" }],
-        sales_sources_id: [{ required: true, message: "璇烽�夋嫨鍟嗘満鏉ユ簮", trigger: "change" }],
+        name: [{ required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: ["change",'blur' ]}],
+        number: [{ required: true, message: "璇疯緭鍏ラ攢鍞嚎绱㈢紪鍙�", trigger: ["change",'blur' ] }],
+        businessStatus: [{ required: true, message: "璇疯緭鍏ュ晢鏈虹姸鎬�", trigger: ["change",'blur' ] }],
+        sales_sources_id: [{ required: true, message: "璇烽�夋嫨鍟嗘満鏉ユ簮", trigger: ["change",'blur' ] }],
         contact_phone: [
-          { required: true, message: "璇疯緭鍏ユ墜鏈哄彿鐮�", trigger: "blur" },
-          { len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: "blur" },
+          { required: true, message: "璇疯緭鍏ユ墜鏈哄彿鐮�", trigger: ["change",'blur' ] },
+          { len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: ["change",'blur' ] },
           {
             pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
             message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�",
-            trigger: "blur"
+            trigger: ["change",'blur' ]
           }
         ]
       },
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 6e9ec9f..ee35820 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -489,7 +489,7 @@
         editVisible: false,
         title: "",
         infomation: {},
-        search_map:{},
+        search_map: {}
       },
       editSelCommonConfig: {
         editVisible: false,
@@ -548,7 +548,7 @@
       getAllData()
         .then((res) => {
           this.memberOptions = res.data.member
-          this.dataProcess()
+          // this.dataProcess()
         })
         .catch((err) => {
           console.log(err)
@@ -673,31 +673,37 @@
         }
       }
     },
-    async handleSelectClient(value, item) {
+    // 閿�鍞満浼氬垪琛�
+    async getSaleChanceList(item) {
+      await getSaleChanceList({
+        page: 1,
+        pageSize: 15,
+        search_map: {
+          client_id: item.id
+        }
+      }).then((res) => {
+        console.log(res)
+        this.saleChancelist = res.data.list
+      })
+    },
+    // 閿�鍞瓙鍗曞垪琛�
+    async getSubOrderList(item) {
+      await getSubOrderList({
+        page: 1,
+        pageSize: 15,
+        search_map: {
+          client_id: item.id
+        }
+      }).then((res) => {
+        this.subOrderList = res.data.list
+      })
+    },
+    handleSelectClient(value, item) {
       if (value === "client") {
         this.clientId = item.id
         this.editConfig.infomation.client_name = item.name
-        this.editSelectChanceConfig.search_map.client_id=item.id
-        // 闇�瑕佷慨鏀�
-        await getSaleChanceList({
-          page: 1,
-          pageSize: 15,
-          search_map: {
-            client_id: item.id
-          }
-        }).then((res) => {
-          console.log(res)
-          this.saleChancelist = res.data.list
-        })
-        await getSubOrderList({
-          page: 1,
-          pageSize: 15,
-          search_map: {
-            client_id: item.id
-          }
-        }).then((res) => {
-          this.subOrderList = res.data.list
-        })
+        this.getSaleChanceList(item)
+        this.getSubOrderList(item)
       } else if (value === "chance") {
         this.saleChanceId = item.id
         this.editConfig.infomation.client_name = item.name
@@ -723,6 +729,8 @@
       if (value === "client") {
         this.editConfig.infomation.client_name = row.name
         this.clientId = row.id
+        this.getSaleChanceList(row)
+        this.getSubOrderList(row)
       } else if (value === "chance") {
         this.editConfig.infomation.sale_chance_name = row.name
         this.saleChanceId = row.id
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 1183936..914a8bd 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -290,7 +290,12 @@
     addBtnClick() {
       this.editConfig.visible = true
       this.editConfig.title = "鏂板缓"
-      this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
+      console.log(this.addConfig)
+      this.editConfig.infomation = {
+        ...this.addConfig,
+        currency: "浜烘皯甯�",
+        client_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.client_name
+      }
     },
     // 缂栬緫
     handleClick(row) {

--
Gitblit v1.8.0