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/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue index 83da7e4..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) } @@ -712,6 +712,7 @@ // 淇濆瓨 saveClick(formName) { this.$refs[formName].validate((valid) => { + this.validateFormNumber() if (valid) { console.log(this.editConfig.infomation) const params = this.saveParams() @@ -777,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 || "", @@ -789,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 @@ -818,28 +819,36 @@ handleSelectClient(value, item) { if (value === "client") { this.clientId = item.id + this.editConfig.infomation.client_name = item.name + this.editConfig.infomation.contact_name = "" + this.contactId = 0 this.isContact = false this.getContactList(item.id) } else if (value === "contact") { + this.editConfig.infomation.contact_name = item.name this.contactId = item.id } + this.refresh() }, selClientClick(value) { if (value === "client") { this.editSelectClientConfig.editVisible = true } else if (value === "contact") { this.editSelectContactConfig.editVisible = true + this.editSelectContactConfig.clientId = this.clientId } }, selClient(row, value) { if (value === "contact") { this.editConfig.infomation.contact_name = row.name this.contactId = row.id - this.isContact = false - this.getContactList(row.id) } else if (value === "client") { this.editConfig.infomation.client_name = row.name this.clientId = row.id + this.editConfig.infomation.contact_name = "" + this.contactId = 0 + this.isContact = false + this.getContactList(row.id) } this.refresh() }, @@ -877,9 +886,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 = "" } -- Gitblit v1.8.0