From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style
---
src/views/service/clientServiceOrder/index.vue | 157 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 98 insertions(+), 59 deletions(-)
diff --git a/src/views/service/clientServiceOrder/index.vue b/src/views/service/clientServiceOrder/index.vue
index de187ad..c8fd71a 100644
--- a/src/views/service/clientServiceOrder/index.vue
+++ b/src/views/service/clientServiceOrder/index.vue
@@ -6,16 +6,16 @@
<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"
+ :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>
+ <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
+ <!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button> -->
</template>
</CommonSearch>
</div>
@@ -26,16 +26,16 @@
<TableCommonView
ref="tableListRef"
:table-list="tableList"
- :select-box="!isDetail"
@selClientClick="selClientClick"
@selCommonClick="selCommonClick"
@getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
>
<template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="60">
+ <el-table-column label="鎿嶄綔" width="100">
<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> -->
+ <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
</template>
@@ -44,7 +44,6 @@
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
-
</div>
</div>
@@ -123,7 +122,18 @@
},
selValueList: [],
keyword: "",
- keywordType: ""
+ keywordType: "",
+ tableColumn: [
+ { label: "鏈嶅姟鍗曠紪鍙�", prop: "serviceNumber", min: 100, isCommonClick: true, default: true }, // 鏈嶅姟鍗曠紪鍙�
+ { label: "涓婚", prop: "subject" }, // 涓婚
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 130, isClientClick: true }, // 瀹㈡埛鍚嶇О
+ { label: "瀹為檯澶勭悊鏃堕棿", prop: "realTime" }, // 瀹為檯澶勭悊鏃堕棿
+ { label: "鏈嶅姟浜哄憳", prop: "serviceMan_name" }, // 鏈嶅姟浜哄憳
+ { label: "鏈嶅姟鏂瑰紡", prop: "serviceType_name" }, // 鏈嶅姟鏂瑰紡
+ // { label: "浜у搧绫诲埆", prop: "reportSourceId" }, // 浜у搧绫诲埆
+ { label: "鏁呴殰绫诲埆", prop: "faultType_name" } // 鏁呴殰绫诲埆
+ ],
+ showCol: ["鏈嶅姟鍗曠紪鍙�", "涓婚", "瀹㈡埛鍚嶇О", "瀹為檯澶勭悊鏃堕棿", "鏈嶅姟浜哄憳", "鏈嶅姟鏂瑰紡", "鏁呴殰绫诲埆"]
}
},
created() {
@@ -140,18 +150,13 @@
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
tableInfomation: [],
- tableColumn: [
- { label: "鏈嶅姟鍗曠紪鍙�", prop: "serviceNumber", min: 100, isCommonClick: true }, // 鏈嶅姟鍗曠紪鍙�
- { label: "涓婚", prop: "subject" }, // 涓婚
- { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 130, isClientClick: true }, // 瀹㈡埛鍚嶇О
- { label: "瀹為檯澶勭悊鏃堕棿", prop: "realTime" }, // 瀹為檯澶勭悊鏃堕棿
- { label: "鏈嶅姟浜哄憳", prop: "serviceMan_name" }, // 鏈嶅姟浜哄憳
- { label: "鏈嶅姟鏂瑰紡", prop: "serviceType_name" }, // 鏈嶅姟鏂瑰紡
- // { label: "浜у搧绫诲埆", prop: "reportSourceId" }, // 浜у搧绫诲埆
- { label: "鏁呴殰绫诲埆", prop: "faultType_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
@@ -159,17 +164,38 @@
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 getServiceOrderList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize,
- salesDetailsId: 0,
- serviceContractId: 0
- })
+ console.log(this.addConfig)
+ let params = {}
+ if (this.addConfig.keywordType === "鏈嶅姟鍚堝悓") {
+ params = {
+ serviceContractId: this.addConfig.serviceContractId,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else {
+ params = {
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ }
+ await getServiceOrderList(params)
.then((res) => {
console.log(res)
if (res.code === 200) {
@@ -205,9 +231,9 @@
console.log(tab, event)
},
// 鎼滅储
- onFilterSearch(searchText){
+ onFilterSearch(searchText) {
this.keyword = searchText ?? ""
- this.keywordType =searchText ? "鏈嶅姟鍗曠紪鍙�" : ''
+ this.keywordType = searchText ? "鏈嶅姟鍗曠紪鍙�" : ""
this.pagerOptions.currPage = 1
this.getData()
},
@@ -215,37 +241,50 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {}
+ this.editConfig.infomation = {
+ client_name: "",
+ serviceContract_Number: "",
+ number: "",
+ productName: "",
+ contact_name: "",
+ sale_chance_name: ""
+ }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row, contact_name: row.Contact.name, service_number: row.serviceContractId }
+ this.editConfig.infomation = {
+ ...row,
+ contact_name: row.Contact.name,
+ service_number: row.serviceContractId,
+ number: row.SalesDetails.number,
+ sale_chance_name: row.SaleChance.name
+ }
},
// 鍒犻櫎
- delClick() {
- if (this.selValueList && this.selValueList.length > 0) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- getDelServiceOrder({ 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(() => {
+ getDelServiceOrder({ 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)
@@ -288,15 +327,15 @@
}
}
-.sales-lead{
+.sales-lead {
height: 100%;
overflow: hidden;
- .filter{
+ .filter {
height: 80px;
display: flex;
align-items: center;
padding: 12px 20px 0 20px;
- &-card{
+ &-card {
height: 80px;
display: flex;
align-items: center;
@@ -307,7 +346,7 @@
background-color: #fff;
}
}
- .body{
+ .body {
box-sizing: border-box;
padding: 10px 20px;
border-radius: 12px;
--
Gitblit v1.8.0