From 0bdc7d10c8c4b13a993f5f1474b7fb2fc8c88fc9 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 17 十月 2023 14:26:40 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn
---
src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 112 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 84 insertions(+), 28 deletions(-)
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index b0da187..8fdce8a 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -65,7 +65,7 @@
</div>
</el-form-item>
</el-col>
- <el-col v-if="isUnflod" :span="12">
+ <el-col v-if="isUnflod && !isDetail" :span="12">
<el-form-item label="瀹㈡埛鐘舵��" prop="client_status_id">
<div class="common-select">
<el-select
@@ -179,7 +179,7 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12" v-if="!isDetail">
<el-form-item label="閿�鍞嚎绱�" prop="sales_leads_name">
<div class="custom-name">
<!-- <el-input v-model="editConfig.infomation.sales_leads_id"></el-input> -->
@@ -345,6 +345,7 @@
import { getContactList } from "@/api/client/contacts"
import { mapActions } from "vuex"
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
+import { getSalesLeadsList } from "@/api/client/salesLead"
export default {
name: "AddFollowupRecordsDialog",
@@ -359,25 +360,34 @@
infomation: {}
}
}
+ },
+ isDetail: {
+ type: Boolean,
+ default: false
}
},
- components: { SelectClientDialog, SelectContactDialog, SelectChanceDialog, SelectLeadDialog },
+ components: {
+ SelectClientDialog,
+ SelectContactDialog,
+ SelectChanceDialog,
+ SelectLeadDialog
+ },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
},
clientList() {
return this.$store.state.getClientName.clientList
- },
- contactNamelist() {
- return this.$store.state.getClientName.contactNamelist
- },
+ }
+ // contactNamelist() {
+ // return this.$store.state.getClientName.contactNamelist
+ // },
// saleChancelist() {
// return this.$store.state.getClientName.saleChancelist
// },
- saleLeadlist() {
- return this.$store.state.getClientName.saleLeadlist
- }
+ // saleLeadlist() {
+ // return this.$store.state.getClientName.saleLeadlist
+ // }
},
data() {
return {
@@ -387,7 +397,7 @@
number: [{ required: true, message: "璇疯緭鍏ヨ窡杩涜褰曠紪鍙�", trigger: "blur" }],
member_id: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }],
record: [{ required: true, message: "璇疯緭鍏ヨ窡杩涜褰�", trigger: "blur" }],
- client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
+ client_name: [{ required: true, validator: this.checkClient, trigger: "change" }],
contact_name: [{ required: true, message: "璇烽�夋嫨鑱旂郴浜哄鍚�", trigger: "change" }],
topic: [{ required: true, message: "璇疯緭鍏ヤ富棰�", trigger: "blur" }],
// content: [{ required: true, message: "璇疯緭鍏ュ唴瀹�", trigger: "blur" }],
@@ -419,17 +429,20 @@
editSelectContactConfig: {
editVisible: false,
title: "",
- infomation: {}
+ infomation: {},
+ search_map: {}
},
editSelectChanceConfig: {
editVisible: false,
title: "",
- infomation: {}
+ infomation: {},
+ search_map: {}
},
editSelectLeadConfig: {
editVisible: false,
title: "",
- infomation: {}
+ infomation: {},
+ search_map: {}
},
clientId: this.editContactsConfig.infomation.client_id,
contactId: this.editContactsConfig.infomation.contact_id,
@@ -441,9 +454,9 @@
},
created() {
this.$store.dispatch("geClient")
- this.$store.dispatch("geContact")
- this.$store.dispatch("geChance")
- this.$store.dispatch("geLead")
+ // this.$store.dispatch("geContact")
+ // this.$store.dispatch("geChance")
+ // this.$store.dispatch("geLead")
this.getCommonData()
this.getContactInfoList()
this.formInfo()
@@ -459,7 +472,7 @@
}
},
methods: {
- ...mapActions(["getContactFilter"]),
+ ...mapActions(["getContactFilter", "getLeadFilter"]),
formInfo() {
this.objCode.type = "璺熻繘璁板綍缂栫爜"
this.objCode.codeStandID = ""
@@ -473,7 +486,7 @@
console.log(res)
this.clientStatusOptions = res.data.client_status
this.memberOptions = res.data.member
- this.dataProcess()
+ // this.dataProcess()
})
},
async getContactInfoList() {
@@ -501,6 +514,7 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
+ this.validateFormNumber()
if (valid) {
const params = this.saveParams()
if (this.editConfig.title === "鏂板缓") {
@@ -559,8 +573,8 @@
// 鑾峰彇閿�鍞満浼�
getChanceList(id) {
getSaleChanceList({
- page: 0,
- pageSize: 0,
+ page: 1,
+ pageSize: 15,
search_map: {
client_id: id
}
@@ -590,18 +604,44 @@
return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
}
},
+ // 鑱旂郴浜哄垪琛�
+ async getContactList(item) {
+ await getContactList({
+ search_map: {
+ client_id: item.id
+ },
+ page: 1,
+ pageSize: 15
+ }).then((res) => {
+ if (res.code === 200) {
+ this.contactNamelist = res.data.list
+ }
+ })
+ },
+ // 閿�鍞嚎绱�
+ async getSalesLeadsList(item) {
+ await getSalesLeadsList({
+ search_map: {
+ name: item.name
+ }
+ }).then((res) => {
+ if (res.code === 200) {
+ this.saleLeadlist = res.data.list
+ }
+ })
+ },
async handleSelectClient(value, item) {
if (value === "client") {
+ console.log(item, "item")
+ this.editSelectContactConfig.search_map.client_id = item.id
+ this.editSelectChanceConfig.search_map.client_id = item.id
+ this.editSelectLeadConfig.search_map.name = item.name
+ this.getContactList(item)
+ this.getSalesLeadsList(item)
this.clientId = item.id
this.editConfig.infomation.client_name = item.name
- await getContactList({
- clientId: this.clientId
- }).then((res) => {
- this.getContactFilter(res.data.list)
- })
this.isChance = false
this.getChanceList(item.id)
- // console.log("clientId",this.clientId,this.editConfig.infomation.client_name)
} else if (value === "contact") {
this.contactId = item.id
this.editConfig.infomation.contact_name = item.name
@@ -629,8 +669,16 @@
this.editConfig.infomation.contact_name = row.name
this.contactId = row.id
} else if (value === "client") {
- this.editConfig.infomation.client_name = row.name
+ // this.editConfig.infomation.client_name = row.name;
+ // this.clientId = row.id;
+ // this.isChance = false;
+ this.editSelectContactConfig.search_map.client_id = row.id
+ this.editSelectChanceConfig.search_map.client_id = row.id
+ this.editSelectLeadConfig.search_map.name = row.name
+ this.getContactList(row)
+ this.getSalesLeadsList(row)
this.clientId = row.id
+ this.editConfig.infomation.client_name = row.name
this.isChance = false
this.getChanceList(row.id)
} else if (value === "chance") {
@@ -673,6 +721,14 @@
this.unflodCollapseStr = "鏀惰捣"
this.isUnflod = true
}
+ },
+ // 瀹㈡埛鍚嶇О鍗曠嫭鏍￠獙
+ checkClient(rule, value, callback) {
+ if (this.editConfig.infomation.client_name && this.editConfig.infomation.client_name.length > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨瀹㈡埛鍚嶇О"))
+ }
}
}
}
--
Gitblit v1.8.0