From d05d95424986dc6e8defefb24fab6dc62e37ee08 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期六, 21 十月 2023 16:23:05 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/client/contacts/index.vue | 228 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 151 insertions(+), 77 deletions(-)
diff --git a/src/views/client/contacts/index.vue b/src/views/client/contacts/index.vue
index 014eb51..3712433 100644
--- a/src/views/client/contacts/index.vue
+++ b/src/views/client/contacts/index.vue
@@ -2,37 +2,54 @@
<div class="contacts-view">
<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"
- />
- <div class="btn-pager">
- <PublicFunctionBtnView :operates-list="operatesList" :allocation="false" @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"
- @selContactsClick="selContactsClick"
- @selClientClick="selClientClick"
- @getSelectArray="getSelectArray"
- >
- <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="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>
+
+ <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="120" fixed="right">
+ <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="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>
+
<!-- 鏂板缓/缂栬緫鑱旂郴浜� -->
<AddContactsDialog v-if="editConfig.visible" :edit-contacts-config="editConfig" />
<!-- 鑱旂郴浜鸿鎯� -->
@@ -55,6 +72,12 @@
isDetail: {
type: Boolean,
default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
}
},
mixins: [pageMixin],
@@ -105,27 +128,41 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ search_map: {},
+ tableColumn: [
+ { label: "鑱旂郴浜哄鍚�", prop: "name", min: 100, isContactClick: true, default: true }, // 鑱旂郴浜哄鍚�
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 190, isClientClick: true }, // 瀹㈡埛鍚嶇О
+ // { label: "鑱旂郴浜虹紪鍙�", prop: "number", min: 100 }, // 鑱旂郴浜虹紪鍙�
+ { label: "鑱屽姟", prop: "position", min: 120 }, // 鑱屽姟
+ { label: "鎵嬫満", prop: "phone", min: 100 }, // 鎵嬫満鍙风爜
+ { label: "閿�鍞礋璐ｄ汉", prop: "member_name", min: 120 }, // 閿�鍞礋璐ｄ汉
+ { label: "棣栬鑱旂郴浜�", prop: "is_first", isFirst: true, min: 90 } // 棣栬鑱旂郴浜�
+ ],
+ showCol: ['鑱旂郴浜哄鍚�','瀹㈡埛鍚嶇О','鑱旂郴浜虹紪鍙�','鑱屽姟','鎵嬫満','閿�鍞礋璐ｄ汉','棣栬鑱旂郴浜�']
}
},
created() {
this.setTable()
- this.getData()
+ if (!this.isDetail) {
+ this.search_map = {}
+ } else {
+ this.search_map = {
+ [this.addConfig.id_name]: this.addConfig.client_id
+ }
+ }
+ this.getData(this.search_map)
},
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
tableInfomation: [],
- tableColumn: [
- { label: "鑱旂郴浜哄鍚�", prop: "name", min: 100, isContactClick: true }, // 鑱旂郴浜哄鍚�
- { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 190, isClientClick: true }, // 瀹㈡埛鍚嶇О
- { label: "鑱旂郴浜虹紪鍙�", prop: "number", min: 100 }, // 鑱旂郴浜虹紪鍙�
- { label: "鑱屽姟", prop: "position", min: 120 }, // 鑱屽姟
- { label: "鎵嬫満", prop: "phone", min: 100 }, // 鎵嬫満鍙风爜
- { label: "閿�鍞礋璐ｄ汉", prop: "member_id", min: 120 }, // 閿�鍞礋璐ｄ汉
- { label: "棣栬鑱旂郴浜�", prop: "is_first", min: 90 } // 棣栬鑱旂郴浜�
- ]
+ 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
@@ -133,11 +170,23 @@
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() {
this.loading = true
await getContactList({
- keyword: "",
+ search_map: this.search_map,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
@@ -149,7 +198,8 @@
return {
...item,
client_name: item.Client.name,
- is_first: item.is_first ? "鏄�" : "鍚�"
+ client_id: item.Client.id,
+ member_name: item.member.username
}
})
this.tableList.tableInfomation = list || []
@@ -168,11 +218,18 @@
this.loading = false
})
},
+ // 鎼滅储
+ onFilterSearch(searchText){
+ this.search_map.name = searchText ?? ''
+ this.pagerOptions.currPage = 1
+ this.getData()
+ },
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {}
+ console.log(this.addIdConfig)
+ this.editConfig.infomation = { ...this.addConfig }
},
// 缂栬緫
handleClick(row) {
@@ -182,32 +239,24 @@
this.editConfig.infomation = { ...row }
},
// 鍒犻櫎
- delClick() {
- // this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- // confirmButtonText: "纭畾",
- // cancelButtonText: "鍙栨秷",
- // type: "warning"
- // })
- // .then(function () {
- // return getDeleteContact({ id: id })
- // })
- // .then((response) => {
- // if (response.code === 200) {
- // this.$message.success("鍒犻櫎鎴愬姛")
- // this.getData()
- // } else {
- // this.$message.warning("鍒犻櫎澶辫触")
- // }
- // })
- // .catch(function () {})
- if (this.selValueList && this.selValueList.length > 0) {
+ delClick(id) {
+ if(!id){
+ if (this.selValueList && this.selValueList.length == 0) {
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
+ return true;
+ }
+ }
this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
})
.then(() => {
- getDeleteContact({ ids: this.selValueList }).then((response) => {
+ let params={ids: this.selValueList }
+ if(id){
+ params={ids: [id]}
+ }
+ getDeleteContact(params).then((response) => {
if (response.code === 200) {
this.$message.success("鍒犻櫎鎴愬姛")
this.getData()
@@ -217,9 +266,6 @@
})
})
.catch(() => {})
- } else {
- this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
- }
},
getSelectArray(val) {
console.log(val)
@@ -243,19 +289,21 @@
...row.Client,
client_name: row.Client.name,
client_level: row.Client.client_level.name,
- client_status: row.Client.client_status.name
+ client_status: row.Client.client_status.name,
+ contact_name: row.name
}
},
// 璺熻繘
followupClick(row) {
console.log(row)
- this.editFollowupConfig.visible = true
this.editFollowupConfig.title = "鏂板缓"
this.editFollowupConfig.infomation = {
...row,
client_name: row.Client.name,
- number: ""
+ number: "",
+ codeStandID:''
}
+ this.editFollowupConfig.visible = true
}
}
}
@@ -263,20 +311,46 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.contacts-view {
- .top {
- margin-bottom: 20px;
+.contacts-view{
+ 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