From da3dbb56388ae49097e50ded584ed2abb7f5022d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 14:16:25 +0800
Subject: [PATCH] bug修复（5243）
---
src/views/sales/salesOpportunity/index.vue | 250 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 178 insertions(+), 72 deletions(-)
diff --git a/src/views/sales/salesOpportunity/index.vue b/src/views/sales/salesOpportunity/index.vue
index 69511cd..ef65de7 100644
--- a/src/views/sales/salesOpportunity/index.vue
+++ b/src/views/sales/salesOpportunity/index.vue
@@ -2,45 +2,54 @@
<div class="sales-opportunity">
<div v-if="isDetail" class="detail-top">
<DetailListCommonBtn :query-class-options="queryClassOptions" />
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
- <div v-else class="top">
- <SearchCommonView
- ref="searchCommonView"
- :query-class-options="queryClassOptions"
- :search-options="searchOptions"
- @searchClick="searchClick"
- @resetClick="resetClick"
- />
- <div class="btn-pager">
- <PublicFunctionBtnView
- :duplicate-check="true"
- :statistics="true"
- :custom-funnel="true"
- :operates-list="operatesList"
- @batchDelete="delClick"
- />
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+
+ <div class="filter" v-else>
+ <div class="filter-card">
+ <CommonSearch
+ :show-add="false"
+ :show-download="false"
+ :amount-view="false"
+ placeholder="璇疯緭鍏ユ満浼氬悕绉�"
+ @searchClick="onFilterSearch"
+ >
+ <template slot="leftButton">
+ <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
+<!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button>-->
+ </template>
+ </CommonSearch>
</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">
- <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> -->
- </template>
- </el-table-column>
- </template>
- </TableCommonView>
+
+ <div class="body">
+ <div class="body-card">
+ <div class="list-view">
+ <TableCommonView
+ ref="tableListRef"
+ :table-list="tableList"
+ :select-box="false"
+ @selClientClick="selClientClick"
+ @selContactsClick="selContactsClick"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
+ >
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="120">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
+ <el-button @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button>
+ <el-button @click="deleteItem(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </template>
+ </TableCommonView>
+ </div>
+ <div class="btn-pager">
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ </div>
+ </div>
+ </div>
<!-- 鏂板缓/缂栬緫 -->
<AddSalesOpportunityDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
<!-- 鏈轰細璇︽儏 -->
@@ -49,6 +58,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 +68,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",
@@ -77,7 +89,8 @@
AddSalesOpportunityDialog,
DetailOpportunity,
DetailContacts: () => import("@/views/client/contacts/DetailContacts"),
- DetailClientManage: () => import("@/views/client/client/DetailClientManage")
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
+ AddFollowupRecordsDialog
},
computed: {},
data() {
@@ -127,7 +140,25 @@
infomation: {}
},
search_map: {},
- selValueList: []
+ selValueList: [],
+ editFollowupConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {}
+ },
+ tableColumn: [
+ { label: "鏈轰細鍚嶇О", prop: "name", min: 120, isCommonClick: true ,default:true}, // 鏈轰細鍚嶇О
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 90, isClientClick: true }, // 瀹㈡埛鍚嶇О
+ { label: "閿�鍞満浼氱紪鍙�", prop: "number" }, // 閿�鍞満浼氱紪鍙�
+ { 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: "budget" }, // 棰勭畻缁濆鍊�
+ { label: "閿�鍞礋璐ｄ汉", prop: "member_name" } // 閿�鍞礋璐ｄ汉
+ ],
+ showCol:["鏈轰細鍚嶇О", "瀹㈡埛鍚嶇О", "閿�鍞満浼氱紪鍙�", "鑱旂郴浜哄鍚�", "閿�鍞樁娈�", "鍙兘鎬�(%)", "棰勮鎴愪氦鏃ユ湡", "棰勮鍚堝悓閲戦", "棰勭畻缁濆鍊�", "閿�鍞礋璐ｄ汉"]
}
},
created() {
@@ -135,33 +166,40 @@
if (!this.isDetail) {
this.search_map = {}
} else {
- this.search_map = { ...this.addConfig }
+ this.search_map = {
+ [this.addConfig.id_name]: this.addConfig.client_name
+ }
}
this.getData(this.search_map)
},
methods: {
setTable() {
this.tableList = {
+ selectIndex:true,
tableInfomation: [],
- tableColumn: [
- { label: "鏈轰細鍚嶇О", prop: "name", min: 120, isCommonClick: true }, // 鏈轰細鍚嶇О
- { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 90, isClientClick: true }, // 瀹㈡埛鍚嶇О
- { 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: "projected_amount" }, // 棰勮鍚堝悓閲戦
- { label: "棰勭畻缁濆鍊�", prop: "capital_budget" }, // 棰勭畻缁濆鍊�
- { label: "閿�鍞礋璐ｄ汉", prop: "member_name" } // 閿�鍞礋璐ｄ汉
- ]
+ allcol: [],
+ showcol: this.showCol,
+ tableColumn:this.setColumnVisible(this.showCol)
}
+ this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
this.searchOptions = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
const label = this.tableList.tableColumn[i].label
const value = this.tableList.tableColumn[i].prop
this.searchOptions.push({ value: value, label: label })
}
+ },
+ setColumnVisible(showCol){
+ return this.tableColumn.map(ele=>{
+ return {
+ ...ele,
+ isShowColumn:showCol.includes(ele.label)
+ }
+ })
+ },
+ selTableCol(val) {
+ this.showcol = val;
+ this.tableList.tableColumn = this.setColumnVisible(val);
},
// 璇锋眰鏁版嵁
async getData() {
@@ -180,7 +218,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 || []
@@ -200,15 +240,9 @@
})
},
// 鎼滅储
- searchClick(val, content) {
- console.log(val, content)
- this.search_map = {
- [val.value]: content
- }
- this.getData()
- },
- resetClick() {
- this.search_map = {}
+ onFilterSearch(searchText){
+ this.search_map.name = searchText ?? ''
+ this.pagerOptions.currPage = 1
this.getData()
},
// 鏂板缓
@@ -224,7 +258,7 @@
this.editConfig.title = "缂栬緫"
this.editConfig.infomation = { ...row }
},
- // 鍒犻櫎
+ // 鎵归噺鍒犻櫎
delClick() {
if (this.selValueList && this.selValueList.length > 0) {
this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
@@ -247,6 +281,33 @@
} else {
this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
}
+ },
+ /**
+ * 鍗曚釜鍒犻櫎
+ * @param id 閿�鍞満浼歩d
+ */
+ deleteItem(id) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelSaleChance({ids: [id]}).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
+ })
+ .catch((err) => {
+ if (err!== 'cancel'){
+ console.error(err)
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
},
getSelectArray(val) {
console.log(val)
@@ -271,13 +332,32 @@
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.title = "鏂板缓"
+ this.editFollowupConfig.infomation = {
+ ...row,
+ number: "",
+ sale_chance_name: row.name,
+ sale_chance_id: row.id
+ }
+ this.editFollowupConfig.infomation.codeStandID=''
+ this.editFollowupConfig.visible = true
}
}
}
@@ -285,20 +365,46 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.sales-opportunity {
- .top {
- margin-bottom: 20px;
+.sales-opportunity{
+ height: 100%;
+ overflow: hidden;
+ .filter{
+ height: 80px;
+ display: flex;
+ align-items: center;
+ padding: 12px 20px 0 20px;
+ &-card{
+ height: 80px;
+ display: flex;
+ align-items: center;
+ box-sizing: border-box;
+ padding: 10px 20px;
+ flex: 1;
+ border-radius: 12px;
+ background-color: #fff;
+ }
+ }
+ .body{
+ box-sizing: border-box;
+ padding: 10px 20px;
+ border-radius: 12px;
+ height: calc(100% - 92px);
+ .body-card {
+ background-color: #fff;
+ border-radius: 12px;
+ height: 100%;
+ overflow: hidden;
+ }
+ .list-view {
+ height: calc(100% - 60px);
+ overflow: hidden;
+ }
.btn-pager {
display: flex;
+ margin-top: 10px;
.page {
margin-left: auto;
}
- }
- }
- .detail-top {
- display: flex;
- .page {
- margin-left: auto;
}
}
}
--
Gitblit v1.8.0