From 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:58 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/client/salesLead/index.vue | 171 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 115 insertions(+), 56 deletions(-)
diff --git a/src/views/client/salesLead/index.vue b/src/views/client/salesLead/index.vue
index 78a2656..014a51c 100644
--- a/src/views/client/salesLead/index.vue
+++ b/src/views/client/salesLead/index.vue
@@ -1,38 +1,53 @@
<template>
<div class="sales-lead">
- <div class="top">
- <SearchCommonView
- ref="searchCommonView"
- :search-options="searchOptions"
- @searchClick="searchClick"
- @resetClick="resetClick"
- />
- <div class="btn-pager">
- <PublicFunctionBtnView
- :operates-list="operatesList"
- @batchDelete="delClick"
- @allocationBtnClick="allocationBtnClick"
- />
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ <div class="filter">
+ <div class="filter-card">
+ <CommonSearch
+ :show-add="false"
+ :show-download="false"
+ :amount-view="false"
+ :show-action-btn="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"
- @selSalesLeadClick="selSalesLeadClick"
- @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 @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button>
- <el-button @click="advanceClick(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>
+
+ <div class="body">
+ <div class="body-card">
+ <div class="list-view">
+ <TableCommonView
+ ref="tableListRef"
+ :table-list="tableList"
+ @selSalesLeadClick="selSalesLeadClick"
+ @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="advanceClick(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>
+ </div>
+ <div class="btn-pager">
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ </div>
+ </div>
+ </div>
+
<!-- 鏂板缓/缂栬緫閿�鍞嚎绱� -->
<AddSalesLeadDialog v-if="editSalesLeadConfig.visible" :edit-sales-lead-config="editSalesLeadConfig" />
<!-- 瀵煎叆鏂囦欢 -->
@@ -120,7 +135,18 @@
// 鍒嗛厤
visible: false,
infomation: {}
- }
+ },
+ tableColumn:[
+ { label: "瀹㈡埛鍚嶇О", prop: "name", min: 190, isSalesLeadClick: true ,default:true}, // 瀹㈡埛鍚嶇О
+ { label: "閿�鍞嚎绱㈢紪鍙�", prop: "number", min: 130 }, // 閿�鍞嚎绱㈢紪鍙�
+ { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 130 }, // 鑱旂郴浜哄鍚�
+ { label: "鎵嬫満鍙风爜", prop: "contact_phone", min: 130 }, // 鎵嬫満鍙风爜
+ { label: "鍟嗘満鏉ユ簮", prop: "sales_resources", min: 130 }, // 鍟嗘満鏉ユ簮
+ { label: "鐪佷唤", prop: "province", min: 130 }, // 鐪佷唤
+ { label: "鍩庡競", prop: "city", min: 130 }, // 鍩庡競
+ { label: "璐熻矗浜�", prop: "member_name", min: 130 } // 璐熻矗浜�
+ ],
+ showCol:["瀹㈡埛鍚嶇О","閿�鍞嚎绱㈢紪鍙�","鑱旂郴浜哄鍚�","鎵嬫満鍙风爜","鍟嗘満鏉ユ簮","鐪佷唤","鍩庡競","璐熻矗浜�"]
}
},
created() {
@@ -131,23 +157,29 @@
setTable() {
this.tableList = {
tableInfomation: [],
- tableColumn: [
- { label: "瀹㈡埛鍚嶇О", prop: "name", min: 190, isSalesLeadClick: true }, // 瀹㈡埛鍚嶇О
- { label: "閿�鍞嚎绱㈢紪鍙�", prop: "number", min: 130 }, // 閿�鍞嚎绱㈢紪鍙�
- { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 130 }, // 鑱旂郴浜哄鍚�
- { label: "鎵嬫満鍙风爜", prop: "contact_phone", min: 130 }, // 鎵嬫満鍙风爜
- { label: "鍟嗘満鏉ユ簮", prop: "sales_sources_id", min: 130 }, // 鍟嗘満鏉ユ簮
- { label: "鐪佷唤", prop: "province", min: 130 }, // 鐪佷唤
- { label: "鍩庡競", prop: "city", min: 130 }, // 鍩庡競
- { label: "璐熻矗浜�", prop: "member_id", min: 130 } // 璐熻矗浜�
- ]
+ 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() {
@@ -161,7 +193,9 @@
return {
...item,
province: item.Province.name,
- city: item.City.name
+ city: item.City.name,
+ sales_resources: item.sales_sources.name,
+ member_name: item.member.username
}
})
this.tableList.tableInfomation = list || []
@@ -171,16 +205,9 @@
console.log(err)
})
},
- // 鎼滅储
- 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()
},
// 鏂板缓
@@ -265,11 +292,43 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.sales-lead {
- .top {
- margin-bottom: 20px;
+.sales-lead{
+ 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;
}
--
Gitblit v1.8.0