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 | 248 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 198 insertions(+), 50 deletions(-) diff --git a/src/views/sales/salesOpportunity/index.vue b/src/views/sales/salesOpportunity/index.vue index 8747610..640b3d3 100644 --- a/src/views/sales/salesOpportunity/index.vue +++ b/src/views/sales/salesOpportunity/index.vue @@ -1,46 +1,88 @@ <template> <div class="sales-opportunity"> - <SearchCommonView ref="searchCommonView" :query-class-options="queryClassOptions" :search-options="searchOptions" /> - <div class="btn-pager"> - <PublicFunctionBtnView - :duplicate-check="true" - :statistics="true" - :custom-funnel="true" - :operates-list="operatesList" - /> - <PagerView class="page" /> + <div v-if="isDetail" class="detail-top"> + <DetailListCommonBtn :query-class-options="queryClassOptions" /> + <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" /> </div> - <TableCommonView ref="tableListRef" :table-list="tableList"> + <div v-else class="top"> + <SearchCommonView + ref="searchCommonView" + :query-class-options="queryClassOptions" + :search-options="searchOptions" + @searchClick="searchClick" + @resetClick="resetClick" + /> + <div class="btn-pager"> + <PublicFunctionBtnView + :statistics="true" + :custom-funnel="true" + :operates-list="operatesList" + @batchDelete="delClick" + /> + <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" /> + </div> + </div> + <TableCommonView + ref="tableListRef" + :table-list="tableList" + @selClientClick="selClientClick" + @selContactsClick="selContactsClick" + @selCommonClick="selCommonClick" + @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="delClick(scope.row.id)" 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> </template> </TableCommonView> <!-- 鏂板缓/缂栬緫 --> <AddSalesOpportunityDialog v-if="editConfig.visible" :edit-common-config="editConfig" /> + <!-- 鏈轰細璇︽儏 --> + <DetailOpportunity v-if="opportunityDeail.visible" :opportunity-detail="opportunityDeail" /> + <!-- 瀹㈡埛璇︽儏 --> + <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> <script> import AddSalesOpportunityDialog from "@/views/sales/salesOpportunity/AddSalesOpportunityDialog" 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", - props: {}, - components: { - AddSalesOpportunityDialog - }, - computed: { - searchCommonHeight() { - return this.$refs.searchCommonView.offsetHeight + props: { + isDetail: { + type: Boolean, + default: false + }, + addConfig: { + type: Object, + default: () => { + return {} + } } }, + mixins: [pageMixin], + components: { + AddSalesOpportunityDialog, + DetailOpportunity, + DetailContacts: () => import("@/views/client/contacts/DetailContacts"), + DetailClientManage: () => import("@/views/client/client/DetailClientManage"), + AddFollowupRecordsDialog + }, + computed: {}, data() { return { tableList: {}, @@ -74,40 +116,71 @@ visible: false, title: "鏂板缓", infomation: {} + }, + opportunityDeail: { + visible: false, + infomation: {} + }, + contactsDeail: { + visible: false, + infomation: {} + }, + clientDeail: { + visible: false, + infomation: {} + }, + search_map: {}, + 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() { this.tableList = { tableInfomation: [], tableColumn: [ - { label: "鏈轰細鍚嶇О", prop: "name", min: 120 }, // 鏈轰細鍚嶇О - { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 90 }, // 瀹㈡埛鍚嶇О + { label: "鏈轰細鍚嶇О", prop: "name", min: 120, isCommonClick: true }, // 鏈轰細鍚嶇О + { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 90, isClientClick: true }, // 瀹㈡埛鍚嶇О { label: "閿�鍞満浼氱紪鍙�", prop: "number" }, // 閿�鍞満浼氱紪鍙� - { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 100 }, // 鑱旂郴浜哄鍚� - { label: "閿�鍞樁娈�", prop: "sale_stage_id" }, // 閿�鍞樁娈� - { label: "鍙兘鎬�(%)", prop: "possibilities_id" }, // 鍙兘鎬� - { label: "棰勮鎴愪氦鏃ユ湡", prop: "expected_time", isTime: true, min: 130 }, // 棰勮鎴愪氦鏃ユ湡 + { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 100, isContactClick: true }, // 鑱旂郴浜哄鍚� + { label: "閿�鍞樁娈�", prop: "sale_stage_name" }, // 閿�鍞樁娈� + { label: "鍙兘鎬�(%)", prop: "possibility_name" }, // 鍙兘鎬� + { label: "棰勮鎴愪氦鏃ユ湡", prop: "expected_time", min: 130 }, // 棰勮鎴愪氦鏃ユ湡 { label: "棰勮鍚堝悓閲戦", prop: "projected_amount" }, // 棰勮鍚堝悓閲戦 { label: "棰勭畻缁濆鍊�", prop: "capital_budget" }, // 棰勭畻缁濆鍊� - { label: "閿�鍞礋璐d汉", prop: "member_id" } // 閿�鍞礋璐d汉 + { label: "閿�鍞礋璐d汉", prop: "member_name" } // 閿�鍞礋璐d汉 ] } this.searchOptions = [] for (let i = 0; i < this.tableList.tableColumn.length; i++) { const label = this.tableList.tableColumn[i].label - this.searchOptions.push({ value: (i + 1).toString(), label: label }) + const value = this.tableList.tableColumn[i].prop + this.searchOptions.push({ value: value, label: label }) } }, // 璇锋眰鏁版嵁 async getData() { this.loading = true - await getSaleChanceList() + await getSaleChanceList({ + search_map: this.search_map, + page: this.pagerOptions.currPage, + pageSize: this.pagerOptions.pageSize + }) .then((res) => { console.log(res) if (res.code === 200) { @@ -116,10 +189,14 @@ return { ...item, client_name: item.client.name, - contact_name: item.contact.name + contact_name: item.contact.name, + sale_stage_name: item.sale_stage.name, + member_name: item.member.username, + possibility_name: item.possibility.name } }) this.tableList.tableInfomation = list || [] + this.pagerOptions.totalCount = res.data.count } else { this.tableList.tableInfomation = [] } @@ -134,11 +211,23 @@ this.loading = false }) }, + // 鎼滅储 + searchClick(val, content) { + console.log(val, content) + this.search_map = { + [val.value]: content + } + this.getData() + }, + resetClick() { + this.search_map = {} + this.getData() + }, // 鏂板缓 addBtnClick() { this.editConfig.visible = true this.editConfig.title = "鏂板缓" - this.editConfig.infomation = {} + this.editConfig.infomation = { city_id: 0, ...this.addConfig } }, // 缂栬緫 handleClick(row) { @@ -148,27 +237,77 @@ this.editConfig.infomation = { ...row } }, // 鍒犻櫎 - delClick(id) { - this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", { - confirmButtonText: "纭畾", - cancelButtonText: "鍙栨秷", - type: "warning" - }) - .then(function () { - return getDelSaleChance({ id: id }) + delClick() { + if (this.selValueList && this.selValueList.length > 0) { + this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning" }) - .then((response) => { - if (response.code === 200) { - this.$message.success("鍒犻櫎鎴愬姛") - this.getData() - } else { - this.$message.warning("鍒犻櫎澶辫触") - } - }) - .catch(function () {}) + .then(() => { + console.log("dddd") + getDelSaleChance({ ids: this.selValueList }).then((response) => { + if (response.code === 200) { + this.$message.success("鍒犻櫎鎴愬姛") + this.getData() + } else { + this.$message.warning("鍒犻櫎澶辫触") + } + }) + }) + .catch(() => {}) + } else { + this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�") + } }, getSelectArray(val) { console.log(val) + this.selValueList = [] + const list = val.map((item) => { + return item.id + }) + this.selValueList = list + }, + // 瀹㈡埛鍚嶇О璇︽儏 + selClientClick(row) { + console.log(row) + this.clientDeail.visible = true + this.clientDeail.infomation = { + ...row.client, + client_name: row.client.name, + client_level: row.client.client_level.name, + client_status: row.client.client_status.name + } + }, + // 鑱旂郴浜鸿鎯� + selContactsClick(row) { + console.log(row) + this.contactsDeail.visible = true + 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 + } } } } @@ -177,7 +316,16 @@ <!-- Add "scoped" attribute to limit CSS to this component only --> <style lang="scss" scoped> .sales-opportunity { - .btn-pager { + .top { + margin-bottom: 20px; + .btn-pager { + display: flex; + .page { + margin-left: auto; + } + } + } + .detail-top { display: flex; .page { margin-left: auto; -- Gitblit v1.8.0