From 46ed69e3b72658140a40127f4bae16bef9a02d56 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 21 八月 2023 11:23:34 +0800
Subject: [PATCH] bug修复
---
src/views/client/client/index.vue | 298 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 185 insertions(+), 113 deletions(-)
diff --git a/src/views/client/client/index.vue b/src/views/client/client/index.vue
index dc643b4..f4be8f2 100644
--- a/src/views/client/client/index.vue
+++ b/src/views/client/client/index.vue
@@ -2,64 +2,85 @@
<div class="custom-manage">
<div class="tab-view">
<el-tabs v-model="activeName" @tab-click="tabsClick">
- <el-tab-pane label="鍏ㄩ儴(鍚墍鏈夊叕娴�)" name="first"></el-tab-pane>
- <el-tab-pane label="鍏ㄩ儴(鍚叕娴�)" name="second"></el-tab-pane>
- <el-tab-pane label="鍏ㄩ儴(涓嶅惈鍏捣)" name="third"></el-tab-pane>
- <el-tab-pane label="鍏捣宸插垎閰�" name="fourth"></el-tab-pane>
- <el-tab-pane label="鍏湭鍒嗛厤" name="aaa"></el-tab-pane>
+ <el-tab-pane label="鍏捣瀹㈡埛" name="first"></el-tab-pane>
+ <el-tab-pane label="鎴戠殑瀹㈡埛" name="second"></el-tab-pane>
</el-tabs>
- <div class="sel-gonghai">
- <el-select v-model="gonghaiValue" placeholder="璇烽�夋嫨" class="query-class-sel" size="mini">
+ <!-- <div class="sel-gonghai">
+ <el-select v-model="gonghaiValue" placeholder="璇烽�夋嫨" class="query-class-sel" size="mini" disabled>
<el-option v-for="item in gonghaiOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<div class="query-class-btn">
<i class="el-icon-setting"></i>
</div>
+ </div> -->
+ </div>
+ <div class="top">
+ <SearchCommonView
+ ref="searchCommonView"
+ :query-class-options="queryClassOptions"
+ :search-options="searchOptions"
+ @searchClick="searchClick"
+ @resetClick="resetClick"
+ />
+ <div class="btn-pager">
+ <PublicFunctionBtnView
+ :list-button="true"
+ :map-button="true"
+ :statistics="true"
+ :operates-list="operatesList"
+ @batchDelete="delClick"
+ />
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
- <SearchCommonView ref="searchCommonView" :query-class-options="queryClassOptions" :search-options="searchOptions" />
- <div class="btn-pager">
- <PublicFunctionBtnView
- :duplicate-check="true"
- :list-button="true"
- :map-button="true"
- :statistics="true"
- :operates-list="operatesList"
- />
- <PagerView class="page" />
- </div>
- <TableCommonView ref="tableListRef" v-loading="loading" :table-list="tableList">
+ <TableCommonView
+ ref="tableListRef"
+ v-loading="loading"
+ :table-list="tableList"
+ @selClientClick="selClientClick"
+ @selContactsClick="selContactsClick"
+ @getSelectArray="getSelectArray"
+ >
<template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="150" fixed="right">
+ <el-table-column label="鎿嶄綔" width="150">
<template slot-scope="scope">
- <el-button type="text" size="small">鍙樻洿鍏捣</el-button>
+ <el-button type="text" size="small" disabled>鍙樻洿鍏捣</el-button>
<el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button 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>
<!-- 鏂板缓/缂栬緫瀹㈡埛绠＄悊 -->
<AddClientManageDialog v-if="editConfig.visible" :edit-client-manage-config="editConfig" />
+ <!-- 瀹㈡埛璇︽儏 -->
+ <DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
+ <!-- 鑱旂郴浜鸿鎯� -->
+ <DetailContacts v-if="contactsDeail.visible" :contacts-detail="contactsDeail" />
+ <!-- 鏂板缓/缂栬緫璺熻繘璁板綍 -->
+ <AddFollowupRecordsDialog v-if="editFollowupConfig.visible" :edit-contacts-config="editFollowupConfig" />
</div>
</template>
<script>
-import AddClientManageDialog from "@/views/client/client/AddClientManageDialog.vue"
-import { getClientList } from "@/api/client/client"
+import AddClientManageDialog from "@/views/client/client/AddClientManageDialog"
+import { getClientList, getDeleteClient } from "@/api/client/client"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import AddFollowupRecordsDialog from "@/views/client/followupRecords/AddFollowupRecordsDialog"
export default {
name: "CustomManage",
props: {},
+ mixins: [pageMixin],
components: {
- AddClientManageDialog
+ AddClientManageDialog,
+ DetailContacts: () => import("@/views/client/contacts/DetailContacts"),
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
+ AddFollowupRecordsDialog
},
- computed: {
- searchCommonHeight() {
- return this.$refs.searchCommonView.offsetHeight
- }
- },
+ computed: {},
data() {
return {
tableList: {},
@@ -90,6 +111,21 @@
visible: false,
title: "鏂板缓",
infomation: {}
+ },
+ contactsDeail: {
+ visible: false,
+ infomation: {}
+ },
+ clientDeail: {
+ visible: false,
+ infomation: {}
+ },
+ search_map: {},
+ selValueList: [],
+ editFollowupConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {}
}
}
},
@@ -102,26 +138,31 @@
this.tableList = {
tableInfomation: [],
tableColumn: [
- { label: "瀹㈡埛鍚嶇О", prop: "name", min: 100 }, // 瀹㈡埛鍚嶇О
- { label: "閿�鍞礋璐ｄ汉", prop: "member_id" }, // 閿�鍞礋璐ｄ汉
- { label: "閲嶈绾у埆", prop: "client_level_id" }, // 閲嶈绾у埆
- { label: "涓嬫鍥炶鏃ユ湡", prop: "next_visit_time", isTime: true, min: 90 }, // 涓嬫鍥炶鏃ユ湡
+ { label: "瀹㈡埛鍚嶇О", prop: "name", min: 100, isClientClick: true }, // 瀹㈡埛鍚嶇О
+ { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }, // 閿�鍞礋璐ｄ汉
+ { label: "閲嶈绾у埆", prop: "client_level" }, // 閲嶈绾у埆
+ { label: "涓嬫鍥炶鏃ユ湡", prop: "next_visit_time", min: 90 }, // 涓嬫鍥炶鏃ユ湡
{ label: "璇︾粏鍦板潃", prop: "detail_address", min: 200 }, // 璇︾粏鍦板潃
- { label: "瀹㈡埛鐘舵��", prop: "client_status_id" }, // 瀹㈡埛鐘舵��
- { label: "鑱旂郴浜哄鍚�", prop: "contact_name" }, // 鑱旂郴浜哄鍚�
- { label: "鎵嬫満鍙风爜", prop: "contact_phone" } // 鎵嬫満鍙风爜
+ { label: "瀹㈡埛鐘舵��", prop: "client_status" }, // 瀹㈡埛鐘舵��
+ { label: "鑱旂郴浜哄鍚�", prop: "contact_name", isContactClick: true }, // 鑱旂郴浜哄鍚�
+ { label: "鑱旂郴浜烘墜鏈哄彿鐮�", prop: "contact_phone" } // 鎵嬫満鍙风爜
]
}
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 })
}
},
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- await getClientList()
+ await getClientList({
+ search_map: this.search_map,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
.then((res) => {
console.log(res)
if (res.code === 200) {
@@ -129,22 +170,38 @@
const list = res.data.list.map((item) => {
let contact_name = ""
let contact_phone = ""
+ let contact_id = 0
+ let contact_wechat = ""
+ let contact_email = ""
+ let position = ""
if (item.contacts.length !== 0) {
for (let i = 0; i < item.contacts.length; i++) {
if (item.contacts[i].is_first) {
contact_name = item.contacts[i].name
contact_phone = item.contacts[i].phone
+ contact_id = item.contacts[i].id
+ contact_wechat = item.contacts[i].wechat
+ contact_email = item.contacts[i].email
+ position = item.contacts[i].position
}
}
}
-
+ console.log(contact_wechat, contact_email)
return {
...item,
contact_name: contact_name,
- contact_phone: contact_phone
+ contact_phone: contact_phone,
+ client_level: item.client_level.name,
+ client_status: item.client_status.name,
+ contact_id: contact_id,
+ member_name: item.member.username,
+ contact_wechat: contact_wechat,
+ contact_email: contact_email,
+ position: position
}
})
this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.data.count
} else {
this.tableList.tableInfomation = []
}
@@ -162,85 +219,97 @@
tabsClick(tab, event) {
console.log(tab, event)
},
+ // 鎼滅储
+ searchClick(val, content) {
+ console.log(val, content)
+ this.search_map = {
+ [val.value]: content
+ }
+ this.getData()
+ },
+ resetClick() {
+ this.search_map = {}
+ this.getData()
+ },
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {
- name: "",
- number: "",
- client_status_id: "",
- member_id: "",
- client_type_id: "",
- clientSource: "",
- client_level_id: "",
- service_member_id: "",
- next_visit_time: "",
- latest_service_time: "",
- contact_name: "",
- contact_phone: "",
- contact_duties: "",
- contact_wechat: "",
- contact_email: "",
- industry_id: "",
- representative: "",
- registration_time: "",
- registered_capital_id: "",
- enterprise_nature_id: "",
- enterprise_scale_id: "",
- business_scope: "",
- country: "",
- province: "",
- city: "",
- region: "",
- detail_address: "",
- remark: ""
- }
+ this.editConfig.infomation = { city_id: 0 }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- let contactObj = {}
- if (row.contacts.length > 0) {
- row.contacts.forEach((ele) => {
- if (ele.is_first) {
- contactObj = { ...ele }
- }
- })
- }
- console.log(contactObj)
this.editConfig.infomation = {
- id: row.id,
- name: row.name,
- number: row.number,
- client_status_id: row.client_status_id,
- member_id: row.member_id,
- client_type_id: row.client_type_id,
- clientSource: row.clientSource,
- client_level_id: row.client_level_id,
- service_member_id: row.service_member_id,
- next_visit_time: row.next_visit_time,
- latest_service_time: row.latest_service_time,
- contact_name: row.contact_name,
- contact_phone: row.contact_phone,
- contact_duties: "",
- contact_wechat: contactObj.length > 0 ? contactObj.wechat : "",
- contact_email: contactObj.length > 0 ? contactObj.email : "",
- industry_id: row.industry_id,
- representative: row.representative,
- registration_time: row.registration_time,
- registered_capital_id: row.registered_capital_id,
- enterprise_nature_id: row.enterprise_nature_id,
- enterprise_scale_id: row.enterprise_scale_id,
- business_scope: row.business_scope,
- country: row.country,
- province: row.province,
- city: row.city,
- region: row.region,
- detail_address: row.detail_address,
- remark: row.remark
+ ...row
+ }
+ },
+ // 鍒犻櫎
+ delClick() {
+ if (this.selValueList && this.selValueList.length > 0) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDeleteClient({ 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 }
+ },
+ // 鑱旂郴浜鸿鎯�
+ selContactsClick(row) {
+ this.contactsDeail.visible = true
+ let contact = {}
+ if (row.contacts.length !== 0) {
+ for (let i = 0; i < row.contacts.length; i++) {
+ if (row.contacts[i].is_first) {
+ contact = row.contacts[i]
+ }
+ }
+ }
+ this.contactsDeail.infomation = {
+ ...contact,
+ Client: { name: row.name, client_status_id: row.client_status_id },
+ client_name: row.name
+ }
+ },
+ // 璺熻繘
+ followupClick(row) {
+ console.log(row)
+ this.editFollowupConfig.visible = true
+ this.editFollowupConfig.title = "鏂板缓"
+ this.editFollowupConfig.infomation = {
+ ...row,
+ client_name: row.name,
+ number: "",
+ next_follow_time: row.next_visit_time
}
}
}
@@ -270,10 +339,13 @@
}
}
}
- .btn-pager {
- display: flex;
- .page {
- margin-left: auto;
+ .top {
+ margin-bottom: 20px;
+ .btn-pager {
+ display: flex;
+ .page {
+ margin-left: auto;
+ }
}
}
}
--
Gitblit v1.8.0