From ed5b2584cd8aba929d43aae7f449f235f263e9fb Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 08 一月 2024 16:27:40 +0800
Subject: [PATCH] Merge branch 'zzq' of ssh://192.168.5.5:29418/web/crm-web into dev
---
src/views/client/client/index.vue | 4 ++--
src/views/client/followupRecords/index.vue | 5 +++--
src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 4 ++++
src/views/service/clientServiceOrder/index.vue | 1 -
src/views/client/client/AddClientManageDialog.vue | 2 +-
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/client/client/AddClientManageDialog.vue b/src/views/client/client/AddClientManageDialog.vue
index 85e35e6..600fb67 100644
--- a/src/views/client/client/AddClientManageDialog.vue
+++ b/src/views/client/client/AddClientManageDialog.vue
@@ -81,7 +81,7 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12" v-if="editConfig.infomation.activeName==='second'">
<el-form-item label="閿�鍞礋璐ｄ汉" prop="member_id">
<el-select
v-model="editConfig.infomation.member_id"
diff --git a/src/views/client/client/index.vue b/src/views/client/client/index.vue
index 7b7d9d3..7bbf5bf 100644
--- a/src/views/client/client/index.vue
+++ b/src/views/client/client/index.vue
@@ -300,10 +300,10 @@
},
// 缂栬緫
handleClick(row) {
- console.log(row)
this.editConfig.title = "缂栬緫"
this.editConfig.infomation = {
- ...row
+ ...row,
+ activeName:this.activeName,
}
this.editConfig.visible = true
},
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index ecb4399..62460d3 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -463,6 +463,10 @@
}
},
created() {
+ this.getChanceList(this.editConfig.infomation.client_id)
+ if(this.editContactsConfig.title==="缂栬緫"){
+ this.isChance=false
+ }
this.$store.dispatch("geClient")
this.getCommonData()
this.getContactInfoList()
diff --git a/src/views/client/followupRecords/index.vue b/src/views/client/followupRecords/index.vue
index 9a5954e..5edba03 100644
--- a/src/views/client/followupRecords/index.vue
+++ b/src/views/client/followupRecords/index.vue
@@ -174,7 +174,8 @@
content = this.addConfig.id
}
this.search_map = {
- [this.addConfig.id_name]: content
+ // [this.addConfig.id_name]: content
+ contact_id: content
}
}
this.getData(this.search_map)
@@ -266,7 +267,7 @@
let config=JSON.parse(JSON.stringify(row));
config.client_status_id=config.client_status_id?config.client_status_id:null
config.contact_information_id=config.contact_information_id?config.contact_information_id:null
- this.editConfig.infomation = { ...config, sale_chance_name: "", sales_leads_name: "" }
+ this.editConfig.infomation = { ...config, sale_chance_name:row.sale_chance.name, sales_leads_name: "" }
this.editConfig.visible = true
},
// 鍒犻櫎
diff --git a/src/views/service/clientServiceOrder/index.vue b/src/views/service/clientServiceOrder/index.vue
index c8fd71a..017ebf6 100644
--- a/src/views/service/clientServiceOrder/index.vue
+++ b/src/views/service/clientServiceOrder/index.vue
@@ -252,7 +252,6 @@
},
// 缂栬緫
handleClick(row) {
- console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
this.editConfig.infomation = {
--
Gitblit v1.8.0