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/serviceContract/index.vue | 357 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 282 insertions(+), 75 deletions(-)
diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index e433765..d56d3d6 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -1,33 +1,86 @@
<template>
<div class="service-contract">
- <SearchCommonView ref="searchCommonView" :query-class-options="queryClassOptions" :search-options="searchOptions" />
- <div class="btn-pager">
- <PublicFunctionBtnView :submit-approval="true" :operates-list="operatesList" />
- <PagerView class="page" />
+ <div v-if="isDetail" class="detail-top">
+ <DetailListCommonBtn :query-class-options="queryClassOptions" />
</div>
- <TableCommonView ref="tableListRef" :table-list="tableList">
- <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>
+ <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>
- </el-table-column>
- </template>
- </TableCommonView>
+ </CommonSearch>
+ </div>
+ </div>
+
+ <div class="body">
+ <div class="body-card">
+ <div class="list-view">
+ <TableCommonView
+ ref="tableListRef"
+ :table-list="tableList"
+ @selClientClick="selClientClick"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
+ >
+ <template slot="tableButton">
+ <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>
+ </template>
+ </el-table-column>
+ </template>
+ </TableCommonView>
+ </div>
+ <div class="btn-pager">
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ </div>
+ </div>
+ </div>
<!-- 鏂板缓/缂栬緫 -->
<AddServiceContractDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <!-- 鏈嶅姟鍚堝悓鏄庣粏 -->
+ <DetailServiceContract v-if="serviceContractDetail.visible" :service-contract-detail="serviceContractDetail" />
+ <!-- 瀹㈡埛璇︽儏 -->
+ <DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
</div>
</template>
<script>
import AddServiceContractDialog from "@/views/service/serviceContract/AddServiceContractDialog"
-import { getServiceContractList } from "@/api/serviceManage/serviceContract"
+import { getServiceContractList, getDelServiceContract } from "@/api/serviceManage/serviceContract"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import DetailServiceContract from "@/views/service/serviceContract/DetailServiceContract"
export default {
name: "ServiceContract",
- props: {},
+ props: {
+ isDetail: {
+ type: Boolean,
+ default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
+ }
+ },
+ mixins: [pageMixin],
components: {
- AddServiceContractDialog
+ AddServiceContractDialog,
+ DetailServiceContract,
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage")
},
computed: {
searchCommonHeight() {
@@ -60,50 +113,136 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ serviceContractDetail: {
+ visible: false,
+ infomation: {}
+ },
+ clientDeail: {
+ visible: false,
+ infomation: {}
+ },
+ searchSel: {
+ value: "number",
+ label: "鏈嶅姟鍚堝悓缂栧彿"
+ },
+ selValueList: [],
+ keyword: "",
+ keywordType: "",
+ tableColumn: [
+ { label: "鏈嶅姟鍚堝悓缂栧彿", prop: "number", isCommonClick: true, default: true }, // 鏈嶅姟鍚堝悓缂栧彿
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true }, // 瀹㈡埛鍚嶇О
+ { label: "绛剧害鏃ユ湡", prop: "signTime" }, // 绛剧害鏃ユ湡
+ { label: "鍚堝悓绫诲瀷", prop: "serviceContractType" }, // 鍚堝悓绫诲瀷
+ { label: "鍚堝悓鐘舵��", prop: "serviceContractStatus" }, // 鍚堝悓鐘舵��
+ { label: "璐熻矗浜�", prop: "member_name" }, // 璐熻矗浜�
+ { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true }, // 浜у搧鍚嶇О
+ { label: "鏈嶅姟寮�濮嬫棩", prop: "startTime" }, // 鏈嶅姟寮�濮嬫棩
+ { label: "鏈嶅姟鍒版湡鏃�", prop: "endTime" }, // 鏈嶅姟鍒版湡鏃�
+ { label: "浠风◣鍚堣", prop: "amountTotal" } // 浠风◣鍚堣
+ ],
+ showCol: [
+ "鏈嶅姟鍚堝悓缂栧彿",
+ "瀹㈡埛鍚嶇О",
+ "绛剧害鏃ユ湡",
+ "鍚堝悓绫诲瀷",
+ "鍚堝悓鐘舵��",
+ "璐熻矗浜�",
+ "浜у搧鍚嶇О",
+ "鏈嶅姟寮�濮嬫棩",
+ "鏈嶅姟鍒版湡鏃�",
+ "浠风◣鍚堣"
+ ]
}
},
created() {
this.setTable()
+ if (!this.isDetail) {
+ this.keyword = ""
+ this.keywordType = ""
+ } else {
+ this.keyword = this.addConfig.keyword
+ this.keywordType = this.addConfig.keywordType
+ }
this.getData()
},
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
tableInfomation: [],
- tableColumn: [
- { label: "鏈嶅姟鍚堝悓缂栧彿", prop: "serviceContractNumber", min: 100 }, // 鏈嶅姟鍚堝悓缂栧彿
- { label: "瀹㈡埛鍚嶇О", prop: "customName", min: 120 }, // 瀹㈡埛鍚嶇О
- { label: "绛剧害鏃ユ湡", prop: "signDate" }, // 绛剧害鏃ユ湡
- { label: "鍚堝悓绫诲瀷", prop: "contractType" }, // 鍚堝悓绫诲瀷
- { label: "鍚堝悓鐘舵��", prop: "contractStatus" }, // 鍚堝悓鐘舵��
- { label: "璐熻矗浜�", prop: "owner" }, // 璐熻矗浜�
- { label: "浜у搧鍚嶇О", prop: "productName" }, // 浜у搧鍚嶇О
- { label: "鏈嶅姟寮�濮嬫棩", prop: "startDate" }, // 鏈嶅姟寮�濮嬫棩
- { label: "鏈嶅姟鍒版湡鏃�", prop: "endDate" }, // 鏈嶅姟鍒版湡鏃�
- { label: "浠风◣鍚堣", prop: "priceTax" } // 浠风◣鍚堣
- ]
+ 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 getServiceContractList()
+ let params = {}
+ console.log(this.addConfig)
+ if (this.addConfig.id && this.addConfig.keywordType === "閿�鍞満浼�") {
+ params = {
+ saleChanceId: this.addConfig.id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else if (this.addConfig.id && this.addConfig.keywordType === "閿�鍞槑缁嗗崟") {
+ params = {
+ salesDetailsId: this.addConfig.id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else if (this.addConfig.id && this.addConfig.keywordType === "鎶ヤ环鍗�") {
+ params = {
+ quotationId: this.addConfig.id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else {
+ params = {
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize,
+ contactId: this.addConfig.client_id
+ }
+ }
+ await getServiceContractList(params)
.then((res) => {
console.log(res)
if (res.code === 200) {
if (res.data.list && res.data.list.length > 0) {
const list = res.data.list.map((item) => {
return {
- ...item
+ ...item,
+ client_name: item.client.name,
+ serviceContractStatus: item.serviceContractStatus.name,
+ serviceContractType: item.serviceContractType.name,
+ member_name: item.member.username
}
})
this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.data.count
} else {
this.tableList.tableInfomation = []
}
@@ -118,58 +257,91 @@
this.loading = false
})
},
+ // 鎼滅储
+ onFilterSearch(searchText) {
+ this.keyword = searchText ?? ""
+ this.keywordType = "鏈嶅姟鍚堝悓缂栧彿"
+ this.pagerOptions.currPage = 1
+ this.getData()
+ },
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
this.editConfig.infomation = {
- customName: "",
- serviceContractNumber: "AC6521",
- owner: "5",
- contactName: "",
- salesOpportunity: "",
- contractOrder: "",
- quotation: "",
- contractType: "",
- signDate: "",
- startDate: "",
- endDate: "",
- contractStatus: "",
- serviceNumber: "",
- termsTreaty: "",
- notes: "",
- approvalWorkflow: "",
- approvalSteps: "",
- approvalPerson: "",
- approvalOpinion: ""
+ ...this.addConfig,
+ currency: "浜烘皯甯�",
+ client_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.client_name,
+ contact_name: "",
+ sale_chance_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.sale_chance_name,
+ contract_number: "",
+ quotation_number: ""
}
},
// 缂栬緫
handleClick(row) {
console.log(row)
- this.editSalesLeadConfig.visible = true
- this.editSalesLeadConfig.title = "缂栬緫"
- this.editSalesLeadConfig.infomation = {
- customName: "",
- serviceContractNumber: "AC6521",
- owner: "5",
- contactName: "",
- salesOpportunity: "",
- contractOrder: "",
- quotation: "",
- contractType: "",
- signDate: "",
- startDate: "",
- endDate: "",
- contractStatus: "",
- serviceNumber: "",
- termsTreaty: "",
- notes: "",
- approvalWorkflow: "",
- approvalSteps: "",
- approvalPerson: "",
- approvalOpinion: ""
+ this.editConfig.visible = true
+ this.editConfig.title = "缂栬緫"
+ this.editConfig.infomation = {
+ ...row,
+ contract_number: row.salesDetails.number,
+ quotation_number: row.quotation.number,
+ currency: "浜烘皯甯�",
+ sale_chance_name: row.SaleChance.name,
+ contact_name: row.contact.name,
+ serviceContractTypeId: row.serviceContractTypeId === 0 ? null : row.serviceContractTypeId,
+ serviceContractStatusId: row.serviceContractStatusId === 0 ? null : row.serviceContractStatusId
}
+ },
+ // 鍒犻櫎
+ delClick(id) {
+ // if (this.selValueList && this.selValueList.length > 0) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelServiceContract({ ids: [id] }).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,
+ client_name: row.client.name,
+ client_level: row.client.client_level.name,
+ client_status: row.client.client_status.name,
+ contact_name: row.contact.name
+ }
+ },
+ // 鏈嶅姟鍚堝悓璇︽儏
+ selCommonClick(row) {
+ console.log(row)
+ this.serviceContractDetail.visible = true
+ this.serviceContractDetail.infomation = { ...row }
}
}
}
@@ -178,10 +350,45 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.service-contract {
- .btn-pager {
+ height: 100%;
+ overflow: hidden;
+ .filter {
+ height: 80px;
display: flex;
- .page {
- margin-left: auto;
+ 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