From 22b4ff2a9e7eca77b2cdcc393ef552cc627054c4 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期三, 11 十月 2023 15:27:24 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/client/followupRecords/index.vue | 253 ++++++++++++++++++++++++++++++++------------------
1 files changed, 161 insertions(+), 92 deletions(-)
diff --git a/src/views/client/followupRecords/index.vue b/src/views/client/followupRecords/index.vue
index 060adca..592b2bb 100644
--- a/src/views/client/followupRecords/index.vue
+++ b/src/views/client/followupRecords/index.vue
@@ -2,40 +2,53 @@
<div class="followup-records">
<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"
- :search-sel="searchSel"
- @searchClick="searchClick"
- @resetClick="resetClick"
- />
- <div class="btn-pager">
- <PublicFunctionBtnView :statistics="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"
+ :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"
- v-loading="loading"
- :table-list="tableList"
- :select-box="!isDetail"
- @selContactsClick="selContactsClick"
- @selClientClick="selClientClick"
- @getSelectArray="getSelectArray"
- >
- <template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="60" fixed="right">
- <template slot-scope="scope">
- <el-button @click="handleClick(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"
+ v-loading="loading"
+ :table-list="tableList"
+ @selContactsClick="selContactsClick"
+ @selClientClick="selClientClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
+ >
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="90" fixed="right">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(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>
<!-- 鏂板缓/缂栬緫璺熻繘璁板綍 -->
<AddFollowupRecordsDialog v-if="editConfig.visible" :edit-contacts-config="editConfig" />
<!-- 鑱旂郴浜鸿鎯� -->
@@ -57,16 +70,16 @@
type: Boolean,
default: false
},
- followRecord: {
- type: Array,
- default: () => []
- },
addConfig: {
type: Object,
default: () => {
- return {
- sales_leads_name: ""
- }
+ return {}
+ }
+ },
+ addIdConfig: {
+ type: Object,
+ default: () => {
+ return {}
}
}
},
@@ -123,7 +136,30 @@
value: "topic",
label: ""
},
- search_map: {}
+ search_map: {},
+ tableColumn: [
+ { label: "涓婚", prop: "topic", min: 120, default: true }, // 涓婚
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 190, isClientClick: true }, // 瀹㈡埛鍚嶇О
+ { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 100, isContactClick: true }, // 鑱旂郴浜哄鍚�
+ { label: "瀹㈡埛鐘舵��", prop: "client_status", min: 100 }, // 瀹㈡埛鐘舵��
+ { label: "鑱旂郴鏂瑰紡", prop: "contact_information_name", min: 100 }, // 鑱旂郴鏂瑰紡
+ { label: "鑱旂郴鏃ユ湡", prop: "follow_time", min: 130 }, // 鑱旂郴浜烘棩鏈�
+ { label: "涓嬫鍥炶鏃ユ湡", prop: "next_follow_time", min: 130 }, // 涓嬫鍥炶鏃ユ湡
+ { label: "璐熻矗浜�", prop: "member_name", min: 110 }, // 璐熻矗浜�
+ { label: "璺熻繘璁板綍", prop: "record", min: 130 } // 璺熻繘璁板綍
+ ],
+ showCol: [
+ "涓婚",
+ "瀹㈡埛鍚嶇О",
+ "鑱旂郴浜哄鍚�",
+ "鑱旂郴浜哄鍚�",
+ "瀹㈡埛鐘舵��",
+ "鑱旂郴鏂瑰紡",
+ "鑱旂郴鏃ユ湡",
+ "涓嬫鍥炶鏃ユ湡",
+ "璐熻矗浜�",
+ "璺熻繘璁板綍"
+ ]
}
},
created() {
@@ -131,8 +167,14 @@
if (!this.isDetail) {
this.search_map = {}
} else {
+ let content = ""
+ if (this.addConfig.keywordType === "閿�鍞満浼�") {
+ content = this.addConfig.id
+ } else {
+ content = this.addConfig.common_name
+ }
this.search_map = {
- [this.addConfig.id_name]: this.addConfig.id
+ [this.addConfig.id_name]: content
}
}
this.getData(this.search_map)
@@ -140,25 +182,31 @@
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
tableInfomation: [],
- tableColumn: [
- { label: "涓婚", prop: "topic", min: 120 }, // 涓婚
- { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 190, isClientClick: true }, // 瀹㈡埛鍚嶇О
- { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 100, isContactClick: true }, // 鑱旂郴浜哄鍚�
- { label: "瀹㈡埛鐘舵��", prop: "client_status_id", min: 100 }, // 瀹㈡埛鐘舵��
- { label: "鑱旂郴鏂瑰紡", prop: "phone", min: 100 }, // 鑱旂郴鏂瑰紡
- { label: "鑱旂郴浜烘棩鏈�", prop: "follow_time", isTime: true, min: 130 }, // 鑱旂郴浜烘棩鏈�
- { label: "涓嬫鍥炶鏃ユ湡", prop: "next_follow_time", isTime: true, min: 130 }, // 涓嬫鍥炶鏃ユ湡
- { label: "璐熻矗浜�", prop: "member_name", min: 110 }, // 璐熻矗浜�
- { label: "璺熻繘璁板綍", prop: "record", 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() {
@@ -177,9 +225,10 @@
...item,
client_name: item.client.name,
contact_name: item.contact.name,
- client_status_id: item.client.client_status_id,
+ client_status: item.client_status.name,
phone: item.contact.phone,
- member_name: item.member.username
+ member_name: item.member.username,
+ contact_information_name: item.contact_information.name
}
})
this.tableList.tableInfomation = list || []
@@ -199,52 +248,46 @@
})
},
// 鎼滅储
- 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()
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
this.editConfig.infomation = { ...this.addConfig }
+ this.editConfig.visible = true
},
// 缂栬緫
handleClick(row) {
console.log(row)
- this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
this.editConfig.infomation = { ...row, sale_chance_name: "", sales_leads_name: "" }
+ this.editConfig.visible = true
},
// 鍒犻櫎
- delClick() {
- if (this.selValueList && this.selValueList.length > 0) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- getDeleteFollowRecord({ ids: this.selValueList }).then((response) => {
- if (response.code === 200) {
- this.$message.success("鍒犻櫎鎴愬姛")
- this.getData()
- } else {
- this.$message.warning("鍒犻櫎澶辫触")
- }
- })
+ delClick(id) {
+ // if (this.selValueList && this.selValueList.length > 0) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDeleteFollowRecord({ ids: [id] }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
})
- .catch(() => {})
- } else {
- this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
- }
+ })
+ .catch(() => {})
+ // } else {
+ // this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
+ // }
},
getSelectArray(val) {
console.log(val)
@@ -283,19 +326,45 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.followup-records {
- .top {
- margin-bottom: 20px;
+ 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