From da3dbb56388ae49097e50ded584ed2abb7f5022d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 14:16:25 +0800
Subject: [PATCH] bug修复（5243）
---
src/views/client/client/index.vue | 329 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 215 insertions(+), 114 deletions(-)
diff --git a/src/views/client/client/index.vue b/src/views/client/client/index.vue
index 4830133..6dfdd2d 100644
--- a/src/views/client/client/index.vue
+++ b/src/views/client/client/index.vue
@@ -5,7 +5,7 @@
<el-tab-pane label="鍏捣瀹㈡埛" name="first"></el-tab-pane>
<el-tab-pane label="鎴戠殑瀹㈡埛" name="second"></el-tab-pane>
</el-tabs>
- <div class="sel-gonghai">
+ <!-- <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>
@@ -13,46 +13,60 @@
<div class="query-class-btn">
<i class="el-icon-setting"></i>
</div>
- </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>
- <TableCommonView
- ref="tableListRef"
- v-loading="loading"
- :table-list="tableList"
- @selClientClick="selClientClick"
- @selContactsClick="selContactsClick"
- @getSelectArray="getSelectArray"
- >
- <template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="150">
- <template slot-scope="scope">
- <el-button type="text" size="small" disabled>鍙樻洿鍏捣</el-button>
- <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> -->
+
+ <div 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"
+ v-loading="loading"
+ :table-list="tableList"
+ @selClientClick="selClientClick"
+ @selContactsClick="selContactsClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
+ >
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="180">
+ <template slot-scope="scope">
+ <el-button v-if="activeName === 'first'" type="text" size="small" @click="allocationBtnClick(scope.row)"
+ >鍒嗛厤</el-button
+ >
+ <el-button v-else type="text" size="small" @click="changeHighSeasClick(scope.row)">鍙樻洿鍏捣</el-button>
+ <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>
+
<!-- 鏂板缓/缂栬緫瀹㈡埛绠＄悊 -->
<AddClientManageDialog v-if="editConfig.visible" :edit-client-manage-config="editConfig" />
<!-- 瀹㈡埛璇︽儏 -->
@@ -61,6 +75,8 @@
<DetailContacts v-if="contactsDeail.visible" :contacts-detail="contactsDeail" />
<!-- 鏂板缓/缂栬緫璺熻繘璁板綍 -->
<AddFollowupRecordsDialog v-if="editFollowupConfig.visible" :edit-contacts-config="editFollowupConfig" />
+ <!-- 鍒嗛厤 -->
+ <AllocationDialog v-if="allocationConfig.visible" :edit-common-config="allocationConfig" />
</div>
</template>
@@ -69,6 +85,8 @@
import { getClientList, getDeleteClient } from "@/api/client/client"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import AddFollowupRecordsDialog from "@/views/client/followupRecords/AddFollowupRecordsDialog"
+import AllocationDialog from "@/views/client/client/AllocationDialog"
+import { getAssign } from "@/api/common/other"
export default {
name: "CustomManage",
@@ -78,7 +96,8 @@
AddClientManageDialog,
DetailContacts: () => import("@/views/client/contacts/DetailContacts"),
DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
- AddFollowupRecordsDialog
+ AddFollowupRecordsDialog,
+ AllocationDialog
},
computed: {},
data() {
@@ -126,34 +145,60 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ allocationConfig: {
+ visible: false,
+ infomation: {}
+ },
+ not_admin: 2,
+ tableColumn:[
+ { label: "瀹㈡埛鍚嶇О", prop: "name", min: 100, isClientClick: true, default: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" }, // 瀹㈡埛鐘舵��
+ { label: "鑱旂郴浜哄鍚�", prop: "contact_name", isContactClick: true }, // 鑱旂郴浜哄鍚�
+ { label: "鑱旂郴浜烘墜鏈哄彿鐮�", prop: "contact_phone" } // 鎵嬫満鍙风爜
+ ],
+ showCol:['瀹㈡埛鍚嶇О','閿�鍞礋璐ｄ汉','閲嶈绾у埆','涓嬫鍥炶鏃ユ湡','璇︾粏鍦板潃','瀹㈡埛鐘舵��','鑱旂郴浜哄鍚�','鑱旂郴浜烘墜鏈哄彿鐮�']
}
},
created() {
this.setTable()
+ this.search_map = {
+ not_admin: this.not_admin
+ }
this.getData()
},
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
tableInfomation: [],
- tableColumn: [
- { 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" }, // 瀹㈡埛鐘舵��
- { label: "鑱旂郴浜哄鍚�", prop: "contact_name", isContactClick: true }, // 鑱旂郴浜哄鍚�
- { label: "鑱旂郴浜烘墜鏈哄彿鐮�", prop: "contact_phone" } // 鎵嬫満鍙风爜
- ]
+ 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
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() {
@@ -171,12 +216,18 @@
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
}
}
}
@@ -187,7 +238,10 @@
client_level: item.client_level.name,
client_status: item.client_status.name,
contact_id: contact_id,
- member_name: item.member.username
+ member_name: item.member.username,
+ contact_wechat: contact_wechat,
+ contact_email: contact_email,
+ position: position
}
})
this.tableList.tableInfomation = list || []
@@ -206,56 +260,72 @@
this.loading = false
})
},
- tabsClick(tab, event) {
- console.log(tab, event)
- },
- // 鎼滅储
- searchClick(val, content) {
- console.log(val, content)
- this.search_map = {
- [val.value]: content
+ tabsClick(tab) {
+ console.log(tab.name)
+ if (tab.name === "first") {
+ this.not_admin = 2
+ } else {
+ this.not_admin = 1
}
+ this.search_map = {
+ not_admin: this.not_admin
+ }
+ this.pagerOptions.currPage = 1
this.getData()
},
- resetClick() {
- this.search_map = {}
+ // 鎼滅储
+ onFilterSearch(searchText){
+ this.search_map = {
+ not_admin: this.not_admin,
+ name: searchText
+ }
+ this.pagerOptions.currPage = 1
this.getData()
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { city_id: 0 }
+ this.editConfig.infomation = {
+ city_id: 0,
+ client_type_id: 1,
+ client_origin_id: 1,
+ client_level_id: 1,
+ registered_capital_id: 1,
+ enterprise_nature_id: 1,
+ enterprise_scale_id: 1,
+ industry_id: 1,
+ province_id:''
+ }
+ this.editConfig.visible = true
},
// 缂栬緫
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 }
- }
- })
- }
this.editConfig.infomation = {
- ...row,
- contact_wechat: contactObj.length > 0 ? contactObj.wechat : "",
- contact_email: contactObj.length > 0 ? contactObj.email : ""
+ ...row
}
+ this.editConfig.visible = true
},
// 鍒犻櫎
- delClick() {
- 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(() => {
- getDeleteClient({ ids: this.selValueList }).then((response) => {
+ let params={ids: this.selValueList }
+ if(id){
+ params={ids: [id]}
+ }
+ getDeleteClient(params).then((response) => {
if (response.code === 200) {
this.$message.success("鍒犻櫎鎴愬姛")
this.getData()
@@ -265,9 +335,6 @@
})
})
.catch(() => {})
- } else {
- this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
- }
},
getSelectArray(val) {
console.log(val)
@@ -303,14 +370,35 @@
// 璺熻繘
followupClick(row) {
console.log(row)
- this.editFollowupConfig.visible = true
this.editFollowupConfig.title = "鏂板缓"
this.editFollowupConfig.infomation = {
...row,
client_name: row.name,
number: "",
+ codeStandID:'',
next_follow_time: row.next_visit_time
}
+ this.editFollowupConfig.visible = true
+ },
+ // 鍒嗛厤
+ allocationBtnClick(row) {
+ console.log(row)
+ this.allocationConfig.visible = true
+ this.allocationConfig.infomation = { member_id: row.member_id, id: row.id }
+ },
+ // 鍙樻洿鍏捣
+ async changeHighSeasClick(row) {
+ await getAssign({
+ ids: [row.id],
+ member_id: 1,
+ type: "client"
+ }).then((res) => {
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("鍙樻洿鎴愬姛")
+ this.getData()
+ }
+ })
}
}
}
@@ -318,37 +406,6 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.custom-manage {
- .tab-view {
- position: relative;
- .sel-gonghai {
- display: flex;
- position: absolute;
- top: 5px;
- left: 660px;
- height: 35px;
- line-height: 35px;
- .query-class-sel {
- width: 165px;
- margin-left: 10px;
- }
- .query-class-btn {
- font-size: 16px;
- margin-left: 10px;
- color: #bebebe;
- }
- }
- }
- .top {
- margin-bottom: 20px;
- .btn-pager {
- display: flex;
- .page {
- margin-left: auto;
- }
- }
- }
-}
::v-deep {
.el-tabs--top .el-tabs__item.is-top:nth-child(2) {
padding-left: 25px;
@@ -358,4 +415,48 @@
height: 45px;
}
}
+
+.custom-manage{
+ height: 100%;
+ overflow: hidden;
+ .filter{
+ height: 80px;
+ display: flex;
+ align-items: center;
+ padding: 0 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% - 139px);
+ .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;
+ }
+ }
+ }
+}
</style>
--
Gitblit v1.8.0