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/service/serviceFollowup/index.vue | 247 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 176 insertions(+), 71 deletions(-)
diff --git a/src/views/service/serviceFollowup/index.vue b/src/views/service/serviceFollowup/index.vue
index 3ad980c..59f60ca 100644
--- a/src/views/service/serviceFollowup/index.vue
+++ b/src/views/service/serviceFollowup/index.vue
@@ -2,37 +2,54 @@
<div class="sales-lead">
<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 :import-button="false" :operates-list="operatesList" />
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ <div v-else 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"
- :select-box="!isDetail"
- @selClientClick="selClientClick"
- @selCommonClick="selCommonClick"
- @selContactsClick="selContactsClick"
- @selServiceOrderClick="selServiceOrderClick"
- >
- <template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="90">
- <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"
+ :table-list="tableList"
+ :select-box="!isDetail"
+ @selClientClick="selClientClick"
+ @selCommonClick="selCommonClick"
+ @selContactsClick="selContactsClick"
+ @selServiceOrderClick="selServiceOrderClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
+ >
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="60">
+ <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>
<!-- 鏂板缓/缂栬緫 -->
<AddServiceFollowupDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
<!-- 鏈嶅姟鍥炶鍗曡鎯� -->
@@ -58,6 +75,12 @@
isDetail: {
type: Boolean,
default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
}
},
mixins: [pageMixin],
@@ -108,38 +131,69 @@
clientServiceDetail: {
visible: false,
infomation: {}
- }
+ },
+ searchSel: {
+ value: "number",
+ label: "鍥炶鍗曠紪鍙�"
+ },
+ selValueList: [],
+ keyword: "",
+ keywordType: "",
+ tableColumn: [
+ { label: "鍥炶鍗曠紪鍙�", prop: "number", min: 80, isCommonClick: true, default: true }, // 鍥炶鍗曠紪鍙�
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 130, isClientClick: true }, // 瀹㈡埛鍚嶇О
+ { label: "鑱旂郴浜哄鍚�", prop: "contact_name", isContactClick: true }, // 鑱旂郴浜哄鍚�
+ { label: "瀹㈡埛鏈嶅姟鍗�", prop: "client_service_order", isServiceOrder: true }, // 瀹㈡埛鏈嶅姟鍗�
+ { label: "鍥炶浜�", prop: "member_name" }, // 鍥炶浜�
+ { label: "婊℃剰搴�", prop: "satisfaction_name" } // 婊℃剰搴�
+ // { label: "淇敼鏃堕棿", prop: "modifyTime" } // 淇敼鏃堕棿
+ ],
+ showCol:["鍥炶鍗曠紪鍙�", "瀹㈡埛鍚嶇О", "鑱旂郴浜哄鍚�", "瀹㈡埛鏈嶅姟鍗�", "鍥炶浜�", "婊℃剰搴�"]
}
},
created() {
this.setTable()
+ if (this.isDetail) {
+ console.log(this.addConfig)
+ this.keyword = this.addConfig.keyword
+ this.keywordType = this.addConfig.keywordType
+ }
this.getData()
},
methods: {
setTable() {
this.tableList = {
tableInfomation: [],
- tableColumn: [
- { label: "鍥炶鍗曠紪鍙�", prop: "number", min: 80, isCommonClick: true }, // 鍥炶鍗曠紪鍙�
- { label: "瀹㈡埛鍚嶇О", prop: "clientId", min: 130, isClientClick: true }, // 瀹㈡埛鍚嶇О
- { label: "鑱旂郴浜哄鍚�", prop: "contactId", isContactClick: true }, // 鑱旂郴浜哄鍚�
- { label: "瀹㈡埛鏈嶅姟鍗�", prop: "serviceId", isServiceOrder: true }, // 瀹㈡埛鏈嶅姟鍗�
- { label: "鍥炶浜�", prop: "isVisit" }, // 鍥炶浜�
- { label: "婊℃剰搴�", prop: "satisfaction" } // 婊℃剰搴�
- // { label: "淇敼鏃堕棿", prop: "modifyTime" } // 淇敼鏃堕棿
- ]
+ 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
- this.searchOptions.push({ value: (i + 1).toString(), label: 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() {
this.loading = true
await getServiceFollowupList({
- keyword: "",
+ keyword: this.keyword,
+ keywordType: this.keywordType,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
@@ -149,7 +203,12 @@
if (res.data.list && res.data.list.length > 0) {
const list = res.data.list.map((item) => {
return {
- ...item
+ ...item,
+ client_service_order: item.ServiceOrder.serviceNumber,
+ client_name: item.client.name,
+ contact_name: item.contact.name,
+ member_name: item.Member.username,
+ satisfaction_name: item.satisfaction.name
}
})
this.tableList.tableInfomation = list || []
@@ -168,53 +227,73 @@
this.loading = false
})
},
+ // 鎼滅储
+ onFilterSearch(searchText){
+ this.keyword = searchText ?? ""
+ this.keywordType =searchText ? "鍥炶鍗曠紪鍙�" : ''
+ this.pagerOptions.currPage = 1
+ this.getData()
+ },
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {}
+ this.editConfig.infomation = { ...this.addConfig }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row }
+ this.editConfig.infomation = { ...row, service_number: row.ServiceOrder.serviceNumber }
},
// 鍒犻櫎
- delClick(id) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(function () {
- return getDelServiceFollowup({ 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(() => {
+ getDelServiceFollowup({ 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_name: row.name }
+ 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 }
+ this.contactsDeail.infomation = { ...row.contact, Client: row.client }
},
// 鏈嶅姟鍥炶鍗曡鎯�
selCommonClick(row) {
@@ -225,7 +304,7 @@
selServiceOrderClick(row) {
console.log(row)
this.clientServiceDetail.visible = true
- this.clientServiceDetail.infomation = { ...row }
+ this.clientServiceDetail.infomation = { ...row.ServiceOrder }
}
}
}
@@ -234,19 +313,45 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.sales-lead {
- .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