From 46ed69e3b72658140a40127f4bae16bef9a02d56 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期一, 21 八月 2023 11:23:34 +0800 Subject: [PATCH] bug修复 --- src/views/sales/salesOpportunity/index.vue | 69 ++++++++++++++++++++++++++-------- 1 files changed, 53 insertions(+), 16 deletions(-) diff --git a/src/views/sales/salesOpportunity/index.vue b/src/views/sales/salesOpportunity/index.vue index 277db73..640b3d3 100644 --- a/src/views/sales/salesOpportunity/index.vue +++ b/src/views/sales/salesOpportunity/index.vue @@ -14,7 +14,6 @@ /> <div class="btn-pager"> <PublicFunctionBtnView - :duplicate-check="true" :statistics="true" :custom-funnel="true" :operates-list="operatesList" @@ -32,10 +31,10 @@ @getSelectArray="getSelectArray" > <template slot="tableButton"> - <el-table-column label="鎿嶄綔" width="120"> + <el-table-column label="鎿嶄綔" width="100"> <template slot-scope="scope"> <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button> - <el-button type="text" size="small">璺熻繘</el-button> + <el-button @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button> <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button> --> </template> </el-table-column> @@ -49,6 +48,8 @@ <DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" /> <!-- 鑱旂郴浜鸿鎯� --> <DetailContacts v-if="contactsDeail.visible" :contacts-detail="contactsDeail" /> + <!-- 鏂板缓/缂栬緫璺熻繘璁板綍 --> + <AddFollowupRecordsDialog v-if="editFollowupConfig.visible" :edit-contacts-config="editFollowupConfig" /> </div> </template> @@ -57,6 +58,7 @@ import { getSaleChanceList, getDelSaleChance } from "@/api/sales/salesOpportunity" import pageMixin from "@/components/makepager/pager/mixin/pageMixin" import DetailOpportunity from "@/views/sales/salesOpportunity/DetailOpportunity" +import AddFollowupRecordsDialog from "@/views/client/followupRecords/AddFollowupRecordsDialog" export default { name: "SalesOpportunity", @@ -64,6 +66,12 @@ isDetail: { type: Boolean, default: false + }, + addConfig: { + type: Object, + default: () => { + return {} + } } }, mixins: [pageMixin], @@ -71,13 +79,10 @@ AddSalesOpportunityDialog, DetailOpportunity, DetailContacts: () => import("@/views/client/contacts/DetailContacts"), - DetailClientManage: () => import("@/views/client/client/DetailClientManage") + DetailClientManage: () => import("@/views/client/client/DetailClientManage"), + AddFollowupRecordsDialog }, - computed: { - searchCommonHeight() { - return this.$refs.searchCommonView.offsetHeight - } - }, + computed: {}, data() { return { tableList: {}, @@ -125,12 +130,24 @@ infomation: {} }, search_map: {}, - selValueList: [] + selValueList: [], + editFollowupConfig: { + visible: false, + title: "鏂板缓", + infomation: {} + } } }, created() { this.setTable() - this.getData() + if (!this.isDetail) { + this.search_map = {} + } else { + this.search_map = { + [this.addConfig.id_name]: this.addConfig.client_name + } + } + this.getData(this.search_map) }, methods: { setTable() { @@ -142,8 +159,8 @@ { label: "閿�鍞満浼氱紪鍙�", prop: "number" }, // 閿�鍞満浼氱紪鍙� { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 100, isContactClick: true }, // 鑱旂郴浜哄鍚� { label: "閿�鍞樁娈�", prop: "sale_stage_name" }, // 閿�鍞樁娈� - { label: "鍙兘鎬�(%)", prop: "possibilities" }, // 鍙兘鎬� - { label: "棰勮鎴愪氦鏃ユ湡", prop: "expected_time", isTime: true, min: 130 }, // 棰勮鎴愪氦鏃ユ湡 + { label: "鍙兘鎬�(%)", prop: "possibility_name" }, // 鍙兘鎬� + { label: "棰勮鎴愪氦鏃ユ湡", prop: "expected_time", min: 130 }, // 棰勮鎴愪氦鏃ユ湡 { label: "棰勮鍚堝悓閲戦", prop: "projected_amount" }, // 棰勮鍚堝悓閲戦 { label: "棰勭畻缁濆鍊�", prop: "capital_budget" }, // 棰勭畻缁濆鍊� { label: "閿�鍞礋璐d汉", prop: "member_name" } // 閿�鍞礋璐d汉 @@ -173,7 +190,9 @@ ...item, client_name: item.client.name, contact_name: item.contact.name, - sale_stage_name: item.sale_stage.name + sale_stage_name: item.sale_stage.name, + member_name: item.member.username, + possibility_name: item.possibility.name } }) this.tableList.tableInfomation = list || [] @@ -208,7 +227,7 @@ addBtnClick() { this.editConfig.visible = true this.editConfig.title = "鏂板缓" - this.editConfig.infomation = { city_id: 0 } + this.editConfig.infomation = { city_id: 0, ...this.addConfig } }, // 缂栬緫 handleClick(row) { @@ -264,13 +283,31 @@ selContactsClick(row) { console.log(row) this.contactsDeail.visible = true - this.contactsDeail.infomation = { ...row.contact } + this.contactsDeail.infomation = { + ...row.contact, + sale_chance_name: row.name, + sale_chance_id: row.id, + Client: { name: row.client.name, client_status_id: row.client.client_status_id }, + client_name: row.name + } }, // 鏈轰細鍚嶇О璇︽儏 selCommonClick(row) { console.log(row) this.opportunityDeail.visible = true this.opportunityDeail.infomation = { ...row } + }, + // 璺熻繘 + followupClick(row) { + console.log(row) + this.editFollowupConfig.visible = true + this.editFollowupConfig.title = "鏂板缓" + this.editFollowupConfig.infomation = { + ...row, + number: "", + sale_chance_name: row.name, + sale_chance_id: row.id + } } } } -- Gitblit v1.8.0