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/followupRecords/AddFollowupRecordsDialog.vue | 467 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 326 insertions(+), 141 deletions(-)
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index 007f860..8fdce8a 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -5,13 +5,15 @@
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
+ append-to-body
+ custom-class="iframe-dialog"
>
<el-form
ref="form"
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="168px"
size="mini"
>
<!-- 淇℃伅 -->
@@ -20,6 +22,22 @@
<div v-if="isUnflod" class="basic-info-title">鍩烘湰淇℃伅</div>
<div class="basic-info-view">
<el-row>
+ <el-col :span="12" v-if="isUnflod">
+ <el-form-item label="璺熻繘璁板綍缂栧彿" prop="number">
+ <WordInput
+ v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+ :codenumer="codenumer"
+ :sum="sum"
+ :disabled="this.editConfig.title !== '鏂板缓' || isIdDisabled"
+ :inputValue="inputValue"
+ @codeList="codeList"
+ />
+ <span v-else-if="method == 0" style="color: #f56c6c"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ <span v-else>鑷姩鐢熸垚</span>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
@@ -32,22 +50,22 @@
"
value-key="name"
@select="handleSelectClient('client', $event)"
+ style="width: 100%"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick('client')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('client')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('client')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
</el-col>
- <el-col :span="12" v-if="isUnflod">
- <el-form-item label="璺熻繘璁板綍缂栧彿" prop="number">
- <el-input v-model="editConfig.infomation.number"></el-input>
- </el-form-item>
- </el-col>
- <el-col v-if="isUnflod" :span="12">
+ <el-col v-if="isUnflod && !isDetail" :span="12">
<el-form-item label="瀹㈡埛鐘舵��" prop="client_status_id">
<div class="common-select">
<el-select
@@ -55,11 +73,12 @@
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ style="width: 100%"
>
<el-option v-for="item in clientStatusOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -75,19 +94,29 @@
"
value-key="name"
@select="handleSelectClient('contact', $event)"
+ style="width: 100%"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick('contact')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('contact')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.contact_name && editConfig.infomation.contact_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('contact')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="isUnflod" label="璐熻矗浜�" prop="member_id">
- <el-select v-model="editConfig.infomation.member_id" placeholder="璇烽�夋嫨" size="mini">
+ <el-select
+ v-model="editConfig.infomation.member_id"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 100%"
+ >
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
</el-select>
@@ -98,23 +127,23 @@
<el-input v-model="editConfig.infomation.topic"></el-input>
</el-form-item>
</el-col>
- <el-col :span="isUnflod ? 24 : 12">
- <el-form-item label="璺熻繘璁板綍" prop="record">
- <el-input
- type="textarea"
- :autosize="{ minRows: 2, maxRows: 4 }"
- v-model="editConfig.infomation.record"
- ></el-input>
- </el-form-item>
- </el-col>
<el-col :span="12">
- <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber">
- <el-input
+ <el-form-item label="鑱旂郴鏂瑰紡" prop="contact_information_id">
+ <!-- <el-input
v-model="editConfig.infomation.phoneNumber"
maxlength="11"
show-word-limit
oninput="value=value.replace(/[^\d]/g,'')"
- ></el-input>
+ ></el-input> -->
+ <el-select
+ v-model="editConfig.infomation.contact_information_id"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 100%"
+ >
+ <el-option v-for="item in contactInfoOptions" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
</el-form-item>
</el-col>
<el-col v-if="isUnflod" :span="12">
@@ -129,17 +158,28 @@
"
value-key="name"
@select="handleSelectClient('chance', $event)"
+ style="width: 100%"
+ placeholder="璇峰厛閫夋嫨瀹㈡埛鍚嶇О"
+ :disabled="isChance"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick('chance')">
+ <div v-if="!isChance" class="common-select-btn" @click="selClientClick('chance')">
<i class="el-icon-circle-plus-outline"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('chance')">
- <i class="el-icon-edit-outline"></i>
+ <div
+ v-if="
+ editConfig.infomation.sale_chance_name &&
+ editConfig.infomation.sale_chance_name.length > 0 &&
+ !isChance
+ "
+ class="common-select-btn"
+ @click="clearupClient('chance')"
+ >
+ <i class="el-icon-remove-outline"></i>
</div>
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12" v-if="!isDetail">
<el-form-item label="閿�鍞嚎绱�" prop="sales_leads_name">
<div class="custom-name">
<!-- <el-input v-model="editConfig.infomation.sales_leads_id"></el-input> -->
@@ -152,26 +192,53 @@
"
value-key="name"
@select="handleSelectClient('lead', $event)"
+ style="width: 100%"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick('lead')">
<i class="el-icon-circle-plus-outline"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('lead')">
- <i class="el-icon-edit-outline"></i>
+ <div
+ v-if="editConfig.infomation.sales_leads_name && editConfig.infomation.sales_leads_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('lead')"
+ >
+ <i class="el-icon-remove-outline"></i>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鑱旂郴鏃ユ湡" prop="follow_time">
- <el-date-picker v-model="editConfig.infomation.follow_time" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.follow_time"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="pickerOptions"
+ style="width: 100%"
+ >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="涓嬫鍥炶鏃ユ湡" prop="next_follow_time">
- <el-date-picker v-model="editConfig.infomation.next_follow_time" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.next_follow_time"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%"
+ >
</el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="isUnflod ? 24 : 12">
+ <el-form-item label="璺熻繘璁板綍" prop="record">
+ <el-input
+ type="textarea"
+ :autosize="{ minRows: 2, maxRows: 4 }"
+ v-model="editConfig.infomation.record"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -269,13 +336,20 @@
<script>
import { getAllData } from "@/api/client/client"
-import { getAddFollowRecord, getUpdateFollowRecord } from "@/api/client/followupRecords"
+import { getAddFollowRecord, getUpdateFollowRecord, getContactInfoList } from "@/api/client/followupRecords"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import SelectLeadDialog from "@/views/other/commonDialog/SelectLeadDialog"
+import codeMixin from "./mixin/codeMixin"
+import { getContactList } from "@/api/client/contacts"
+import { mapActions } from "vuex"
+import { getSaleChanceList } from "@/api/sales/salesOpportunity"
+import { getSalesLeadsList } from "@/api/client/salesLead"
+
export default {
name: "AddFollowupRecordsDialog",
+ mixins: [codeMixin],
props: {
editContactsConfig: {
type: Object,
@@ -286,35 +360,47 @@
infomation: {}
}
}
+ },
+ isDetail: {
+ type: Boolean,
+ default: false
}
},
- components: { SelectClientDialog, SelectContactDialog, SelectChanceDialog, SelectLeadDialog },
+ components: {
+ SelectClientDialog,
+ SelectContactDialog,
+ SelectChanceDialog,
+ SelectLeadDialog
+ },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
},
clientList() {
return this.$store.state.getClientName.clientList
- },
- contactNamelist() {
- return this.$store.state.getClientName.contactNamelist
- },
- saleChancelist() {
- return this.$store.state.getClientName.saleChancelist
- },
- saleLeadlist() {
- return this.$store.state.getClientName.saleLeadlist
}
+ // contactNamelist() {
+ // return this.$store.state.getClientName.contactNamelist
+ // },
+ // saleChancelist() {
+ // return this.$store.state.getClientName.saleChancelist
+ // },
+ // saleLeadlist() {
+ // return this.$store.state.getClientName.saleLeadlist
+ // }
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editContactsConfig,
rules: {
number: [{ required: true, message: "璇疯緭鍏ヨ窡杩涜褰曠紪鍙�", trigger: "blur" }],
member_id: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }],
record: [{ required: true, message: "璇疯緭鍏ヨ窡杩涜褰�", trigger: "blur" }],
- content: [{ required: true, message: "璇疯緭鍏ュ唴瀹�", trigger: "blur" }],
+ client_name: [{ required: true, validator: this.checkClient, trigger: "change" }],
+ contact_name: [{ required: true, message: "璇烽�夋嫨鑱旂郴浜哄鍚�", trigger: "change" }],
+ topic: [{ required: true, message: "璇疯緭鍏ヤ富棰�", trigger: "blur" }],
+ // content: [{ required: true, message: "璇疯緭鍏ュ唴瀹�", trigger: "blur" }],
phoneNumber: [
{ required: false, message: "", trigger: "blur" },
{ len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: "blur" },
@@ -325,7 +411,13 @@
}
]
},
+ pickerOptions: {
+ disabledDate: (time) => {
+ return time.getTime() > Date.now()
+ }
+ },
clientStatusOptions: [], // 瀹㈡埛鐘舵��
+ contactInfoOptions: [], // 鑱旂郴鏂瑰紡
memberOptions: [],
unflodCollapseStr: "鏀惰捣",
isUnflod: true,
@@ -337,43 +429,72 @@
editSelectContactConfig: {
editVisible: false,
title: "",
- infomation: {}
+ infomation: {},
+ search_map: {}
},
editSelectChanceConfig: {
editVisible: false,
title: "",
- infomation: {}
+ infomation: {},
+ search_map: {}
},
editSelectLeadConfig: {
editVisible: false,
title: "",
- infomation: {}
+ infomation: {},
+ search_map: {}
},
clientId: this.editContactsConfig.infomation.client_id,
contactId: this.editContactsConfig.infomation.contact_id,
saleChanceId: this.editContactsConfig.infomation.sale_chance_id,
- saleLeadId: this.editContactsConfig.infomation.sales_leads_id
+ saleLeadId: this.editContactsConfig.infomation.sales_leads_id,
+ saleChancelist: [],
+ isChance: true
}
},
created() {
this.$store.dispatch("geClient")
- this.$store.dispatch("geContact")
- this.$store.dispatch("geChance")
- this.$store.dispatch("geLead")
+ // this.$store.dispatch("geContact")
+ // this.$store.dispatch("geChance")
+ // this.$store.dispatch("geLead")
this.getCommonData()
+ this.getContactInfoList()
+ this.formInfo()
+ },
+ watch: {
+ "editContactsConfig.visible"(val) {
+ if (val) {
+ this.formInfo()
+ }
+ },
+ "editContactsConfig.infomation.codeStandID"() {
+ this.formInfo()
+ }
},
methods: {
+ ...mapActions(["getContactFilter", "getLeadFilter"]),
+ formInfo() {
+ this.objCode.type = "璺熻繘璁板綍缂栫爜"
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
+ }
+ this.getRCodeStandardList()
+ },
getCommonData() {
- getAllData()
- .then((res) => {
- console.log(res)
- this.clientStatusOptions = res.data.client_status
- this.memberOptions = res.data.member
- this.dataProcess()
- })
- .catch((err) => {
- console.log(err)
- })
+ getAllData().then((res) => {
+ console.log(res)
+ this.clientStatusOptions = res.data.client_status
+ this.memberOptions = res.data.member
+ // this.dataProcess()
+ })
+ },
+ async getContactInfoList() {
+ await getContactInfoList().then((res) => {
+ if (res.code === 200) {
+ this.contactInfoOptions = res.data.list
+ }
+ })
},
dataProcess() {
this.saleChancelist.map((item) => {
@@ -393,38 +514,25 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
+ this.validateFormNumber()
if (valid) {
const params = this.saveParams()
if (this.editConfig.title === "鏂板缓") {
- getAddFollowRecord(params)
- .then((res) => {
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "娣诲姞鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getAddFollowRecord(params).then((res) => {
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
} else {
- getUpdateFollowRecord(params)
- .then((res) => {
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "缂栬緫鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getUpdateFollowRecord(params).then((res) => {
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
}
} else {
console.log("error submit")
@@ -436,10 +544,10 @@
let data = this.editConfig.infomation
let follow_record = {
follow_record: {
- client_id: parseInt(this.clientId),
- client_status_id: data.client_status_id || 0,
- contact_id: parseInt(this.contactId),
- contact_information_id: data.contact_information_id || 0,
+ client_id: this.clientId || 0,
+ client_status_id: data.client_status_id || null,
+ contact_id: this.contactId || 0,
+ contact_information_id: data.contact_information_id || null,
content: data.content || "",
follow_time: data.follow_time || "",
member_id: data.member_id || 0,
@@ -447,9 +555,11 @@
number: data.number || "",
purpose: data.purpose || "",
record: data.record || "",
- sale_chance_id: parseInt(this.saleChanceId), //data.sale_chance_id ||
- sales_leads_id: parseInt(this.saleLeadId), // data.sales_leads_id ||
- topic: data.topic || ""
+ sale_chance_id: this.saleChanceId || 0,
+ sales_leads_id: this.saleLeadId || 0,
+ topic: data.topic || "",
+ codeStandID: data.ID,
+ codeRule: this.codeRule
}
}
let params = {}
@@ -459,6 +569,20 @@
params = { ...follow_record, id: data.id || 0 }
}
return params
+ },
+ // 鑾峰彇閿�鍞満浼�
+ getChanceList(id) {
+ getSaleChanceList({
+ page: 1,
+ pageSize: 15,
+ search_map: {
+ client_id: id
+ }
+ }).then((res) => {
+ if (res.code == 200) {
+ this.saleChancelist = res.data.list
+ }
+ })
},
// 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
querySearchAsync(queryString, cb, value) {
@@ -480,15 +604,53 @@
return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
}
},
- handleSelectClient(value, item) {
+ // 鑱旂郴浜哄垪琛�
+ async getContactList(item) {
+ await getContactList({
+ search_map: {
+ client_id: item.id
+ },
+ page: 1,
+ pageSize: 15
+ }).then((res) => {
+ if (res.code === 200) {
+ this.contactNamelist = res.data.list
+ }
+ })
+ },
+ // 閿�鍞嚎绱�
+ async getSalesLeadsList(item) {
+ await getSalesLeadsList({
+ search_map: {
+ name: item.name
+ }
+ }).then((res) => {
+ if (res.code === 200) {
+ this.saleLeadlist = res.data.list
+ }
+ })
+ },
+ async handleSelectClient(value, item) {
if (value === "client") {
+ console.log(item, "item")
+ this.editSelectContactConfig.search_map.client_id = item.id
+ this.editSelectChanceConfig.search_map.client_id = item.id
+ this.editSelectLeadConfig.search_map.name = item.name
+ this.getContactList(item)
+ this.getSalesLeadsList(item)
this.clientId = item.id
+ this.editConfig.infomation.client_name = item.name
+ this.isChance = false
+ this.getChanceList(item.id)
} else if (value === "contact") {
this.contactId = item.id
+ this.editConfig.infomation.contact_name = item.name
} else if (value === "chance") {
this.saleChanceId = item.id
+ this.editConfig.infomation.sale_chance_name = item.name
} else {
this.saleLeadId = item.id
+ this.editConfig.infomation.sales_leads_name = item.name
}
},
selClientClick(value) {
@@ -507,8 +669,18 @@
this.editConfig.infomation.contact_name = row.name
this.contactId = row.id
} else if (value === "client") {
- this.editConfig.infomation.client_name = row.name
+ // this.editConfig.infomation.client_name = row.name;
+ // this.clientId = row.id;
+ // this.isChance = false;
+ this.editSelectContactConfig.search_map.client_id = row.id
+ this.editSelectChanceConfig.search_map.client_id = row.id
+ this.editSelectLeadConfig.search_map.name = row.name
+ this.getContactList(row)
+ this.getSalesLeadsList(row)
this.clientId = row.id
+ this.editConfig.infomation.client_name = row.name
+ this.isChance = false
+ this.getChanceList(row.id)
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
this.saleChanceId = row.id
@@ -522,6 +694,9 @@
if (value === "client") {
this.editConfig.infomation.client_name = ""
this.clientId = 0
+ this.isChance = true
+ this.editConfig.infomation.sale_chance_name = ""
+ this.saleChanceId = 0
} else if (value === "contact") {
this.editConfig.infomation.contact_name = ""
this.contactId = 0
@@ -546,6 +721,14 @@
this.unflodCollapseStr = "鏀惰捣"
this.isUnflod = true
}
+ },
+ // 瀹㈡埛鍚嶇О鍗曠嫭鏍￠獙
+ checkClient(rule, value, callback) {
+ if (this.editConfig.infomation.client_name && this.editConfig.infomation.client_name.length > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨瀹㈡埛鍚嶇О"))
+ }
}
}
}
@@ -553,54 +736,56 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.add-followup-records {
- .basic-info {
- .basic-info-title {
- background-color: #f4f8fe;
- padding-left: 10px;
- font-size: 15px;
- font-weight: bold;
- color: #666;
- height: 42px;
- line-height: 42px;
- }
- .basic-info-view {
- margin-top: 10px;
- padding-right: 40px;
- .custom-name,
- .common-select {
+::v-deep {
+ .iframe-dialog .el-dialog__body {
+ .basic-info {
+ .basic-info-title {
+ background-color: #f4f8fe;
+ padding-left: 10px;
+ font-size: 15px;
+ font-weight: bold;
+ color: #666;
+ height: 42px;
+ line-height: 42px;
+ }
+ .basic-info-view {
+ margin-top: 10px;
+ padding-right: 40px;
+ .custom-name,
+ .common-select {
+ display: flex;
+ .common-select-btn {
+ margin-left: 5px;
+ font-size: 18px;
+ cursor: pointer;
+ }
+ }
+ .common-select {
+ .common-select-sel {
+ width: 270px;
+ }
+ }
+ }
+ .annex-view {
display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
- cursor: pointer;
- }
- }
- .common-select {
- .common-select-sel {
- width: 270px;
+ color: #6166d3;
+ .setFormat {
+ margin-left: 10px;
}
}
}
- .annex-view {
+ .unflod-collapse {
display: flex;
+ height: 30px;
+ justify-content: center;
+ align-items: center;
color: #6166d3;
- .setFormat {
- margin-left: 10px;
- }
}
- }
- .unflod-collapse {
- display: flex;
- height: 30px;
- justify-content: center;
- align-items: center;
- color: #6166d3;
- }
- .dialog-footer {
- background-color: #f5f5f5;
- height: 55px;
- line-height: 55px;
+ .dialog-footer {
+ background-color: #f5f5f5;
+ height: 55px;
+ line-height: 55px;
+ }
}
}
</style>
--
Gitblit v1.8.0