From 9fe356cfff4787b5ccba2d9957c08af189af7e3b Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 28 二月 2024 16:36:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 18 +++++++++++-------
src/components/makepager/mixin/codeMixin.js | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/components/makepager/mixin/codeMixin.js b/src/components/makepager/mixin/codeMixin.js
index 5d31dbc..ff2ead3 100644
--- a/src/components/makepager/mixin/codeMixin.js
+++ b/src/components/makepager/mixin/codeMixin.js
@@ -130,7 +130,7 @@
},
// 閰嶇疆缂栫爜瑙勮寖鐨勮烦杞�
numberClick() {
- window.open("http://www.fai365.com:9080/facilty", "_blank")
+ window.open("http://www.fai365.com:9080/transportation", "_blank")
}
}
}
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index 62460d3..92575c0 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -167,6 +167,7 @@
<el-col v-if="isUnflod" :span="12">
<el-form-item label="閿�鍞満浼�" prop="sale_chance_name">
<div class="custom-name">
+ <!-- :disabled="isChance" -->
<el-autocomplete
v-model="editConfig.infomation.sale_chance_name"
:fetch-suggestions="
@@ -177,17 +178,17 @@
value-key="name"
@select="handleSelectClient('chance', $event)"
style="width: 100%"
- placeholder="璇峰厛閫夋嫨瀹㈡埛鍚嶇О"
- :disabled="isChance"
+ placeholder="璇烽�夋嫨閿�鍞満浼�"
></el-autocomplete>
- <div v-if="!isChance" class="common-select-btn" @click="selClientClick('chance')">
+ <!-- v-if="!isChance" -->
+ <div class="common-select-btn" @click="selClientClick('chance')">
<i class="el-icon-circle-plus-outline"></i>
</div>
+ <!-- &&!isChance -->
<div
v-if="
editConfig.infomation.sale_chance_name &&
- editConfig.infomation.sale_chance_name.length > 0 &&
- !isChance
+ editConfig.infomation.sale_chance_name.length > 0
"
class="common-select-btn"
@click="clearupClient('chance')"
@@ -687,6 +688,7 @@
this.editSelectContactConfig.clientId = this.clientId || 0
this.editSelectContactConfig.editVisible = true
} else if (value === "chance") {
+ this.editSelectChanceConfig.clientId = this.clientId
this.editSelectChanceConfig.editVisible = true
} else {
this.editSelectLeadConfig.editVisible = true
@@ -703,15 +705,17 @@
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.getContactList(row)
+ this.getSalesLeadsList(row)
this.getChanceList(row.id)
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
this.saleChanceId = row.id
+ this.editConfig.infomation.client_name = row.client.name
+ this.clientId = row.client.id
} else {
this.editConfig.infomation.sales_leads_name = row.name
this.saleLeadId = row.id
--
Gitblit v1.8.0