From f417dc0a44d225d4ed19bcb5207250eb1b669455 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期五, 25 八月 2023 12:45:09 +0800 Subject: [PATCH] bug修复 --- src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 377 ++++++++++++++++++++++++++++++++++------------------- 1 files changed, 244 insertions(+), 133 deletions(-) diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue index d0564e5..fb7f1bf 100644 --- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue +++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue @@ -5,6 +5,8 @@ :visible.sync="editConfig.visible" :width="dialogWidth" :before-close="handleClose" + append-to-body + custom-class="iframe-dialog" > <el-form ref="form" @@ -25,14 +27,22 @@ <div class="custom-name"> <el-autocomplete v-model="editConfig.infomation.client_name" - :fetch-suggestions="querySearchAsync" + :fetch-suggestions=" + (queryString, callback) => { + querySearchAsync(queryString, callback, 'client') + } + " value-key="name" @select="handleSelectClient('client', $event)" ></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')"> + <div + v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0" + class="common-select-btn" + @click="clearupClient('client')" + > <i class="el-icon-edit-outline" title="娓呴櫎"></i> </div> </div> @@ -55,23 +65,31 @@ <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> <el-col :span="12"> - <el-form-item label="鑱旂郴浜哄鍚�" prop="contact_id"> + <el-form-item label="鑱旂郴浜哄鍚�" prop="contact_name"> <div class="custom-name"> <el-autocomplete v-model="editConfig.infomation.contact_name" - :fetch-suggestions="queryContactAsync" + :fetch-suggestions=" + (queryString, callback) => { + querySearchAsync(queryString, callback, 'contact') + } + " value-key="name" @select="handleSelectClient('contact', $event)" ></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')"> + <div + v-if="editConfig.infomation.contact_name && editConfig.infomation.contact_name.length > 0" + class="common-select-btn" + @click="clearupClient('contact')" + > <i class="el-icon-edit-outline" title="娓呴櫎"></i> </div> </div> @@ -100,48 +118,92 @@ </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"> + <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"> - <el-form-item label="閿�鍞満浼�" prop="sale_chance_id"> + <el-form-item label="閿�鍞満浼�" prop="sale_chance_name"> <div class="custom-name"> - <el-input v-model="editConfig.infomation.sale_chance_id"></el-input> - <!-- <el-autocomplete - v-model="editConfig.infomation.sale_chance_id" - :fetch-suggestions="queryChanceAsync" + <el-autocomplete + v-model="editConfig.infomation.sale_chance_name" + :fetch-suggestions=" + (queryString, callback) => { + querySearchAsync(queryString, callback, 'chance') + } + " value-key="name" @select="handleSelectClient('chance', $event)" - ></el-autocomplete> --> - <div class="common-select-btn"><i class="el-icon-circle-plus-outline"></i></div> - <div class="common-select-btn"><i class="el-icon-edit-outline"></i></div> + ></el-autocomplete> + <div class="common-select-btn" @click="selClientClick('chance')"> + <i class="el-icon-circle-plus-outline"></i> + </div> + <div + v-if="editConfig.infomation.sale_chance_name && editConfig.infomation.sale_chance_name.length > 0" + class="common-select-btn" + @click="clearupClient('chance')" + > + <i class="el-icon-edit-outline"></i> + </div> </div> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="閿�鍞嚎绱�" prop="sales_leads_id"> + <el-form-item label="閿�鍞嚎绱�" prop="sales_leads_name"> <div class="custom-name"> - <el-input v-model="editConfig.infomation.sales_leads_id"></el-input> - <div class="common-select-btn"><i class="el-icon-circle-plus-outline"></i></div> - <div class="common-select-btn"><i class="el-icon-edit-outline"></i></div> + <!-- <el-input v-model="editConfig.infomation.sales_leads_id"></el-input> --> + <el-autocomplete + v-model="editConfig.infomation.sales_leads_name" + :fetch-suggestions=" + (queryString, callback) => { + querySearchAsync(queryString, callback, 'lead') + } + " + value-key="name" + @select="handleSelectClient('lead', $event)" + ></el-autocomplete> + <div class="common-select-btn" @click="selClientClick('lead')"> + <i class="el-icon-circle-plus-outline"></i> + </div> + <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-edit-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" + > </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="閫夋嫨鏃ユ湡" + > </el-date-picker> </el-form-item> </el-col> @@ -222,15 +284,29 @@ :edit-common-config="editSelectContactConfig" @selClient="selClient" /> + <!-- 閫夋嫨閿�鍞満浼� --> + <SelectChanceDialog + v-if="editSelectChanceConfig.editVisible" + :edit-common-config="editSelectChanceConfig" + @selClient="selClient" + /> + <!-- 閫夋嫨閿�鍞嚎绱� --> + <SelectLeadDialog + v-if="editSelectLeadConfig.editVisible" + :edit-common-config="editSelectLeadConfig" + @selClient="selClient" + /> </el-dialog> </div> </template> <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" export default { name: "AddFollowupRecordsDialog", props: { @@ -245,7 +321,7 @@ } } }, - components: { SelectClientDialog, SelectContactDialog }, + components: { SelectClientDialog, SelectContactDialog, SelectChanceDialog, SelectLeadDialog }, computed: { searchCommonHeight() { return this.$refs.searchCommonView.offsetHeight @@ -258,6 +334,9 @@ }, saleChancelist() { return this.$store.state.getClientName.saleChancelist + }, + saleLeadlist() { + return this.$store.state.getClientName.saleLeadlist } }, data() { @@ -268,7 +347,7 @@ 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" }], + // content: [{ required: true, message: "璇疯緭鍏ュ唴瀹�", trigger: "blur" }], phoneNumber: [ { required: false, message: "", trigger: "blur" }, { len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: "blur" }, @@ -279,7 +358,13 @@ } ] }, + pickerOptions: { + disabledDate: (time) => { + return time.getTime() > Date.now() + } + }, clientStatusOptions: [], // 瀹㈡埛鐘舵�� + contactInfoOptions: [], // 鑱旂郴鏂瑰紡 memberOptions: [], unflodCollapseStr: "鏀惰捣", isUnflod: true, @@ -293,28 +378,57 @@ title: "", infomation: {} }, + editSelectChanceConfig: { + editVisible: false, + title: "", + infomation: {} + }, + editSelectLeadConfig: { + editVisible: false, + title: "", + infomation: {} + }, clientId: this.editContactsConfig.infomation.client_id, - contactId: this.editContactsConfig.infomation.contact_id - // saleChanceId: this.editContactsConfig.infomation.sale_chance_id + contactId: this.editContactsConfig.infomation.contact_id, + saleChanceId: this.editContactsConfig.infomation.sale_chance_id, + saleLeadId: this.editContactsConfig.infomation.sales_leads_id } }, created() { this.$store.dispatch("geClient") this.$store.dispatch("geContact") this.$store.dispatch("geChance") + this.$store.dispatch("geLead") this.getCommonData() + this.getContactInfoList() }, methods: { getCommonData() { - getAllData() - .then((res) => { - console.log(res) - this.clientStatusOptions = res.data.client_status - this.memberOptions = res.data.member - }) - .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) => { + if (this.saleChanceId === item.id) { + this.editConfig.infomation.sale_chance_name = item.name + } + }) + this.saleLeadlist.map((item) => { + if (this.saleLeadId === item.id) { + this.editConfig.infomation.sales_leads_name = item.name + } + }) }, handleClose() { this.editConfig.visible = false @@ -323,41 +437,23 @@ saveClick(formName) { this.$refs[formName].validate((valid) => { if (valid) { - console.log(this.editConfig.infomation) const params = this.saveParams() - console.log(params) if (this.editConfig.title === "鏂板缓") { - getAddFollowRecord(params) - .then((res) => { - console.log(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) => { - console.log(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") @@ -369,9 +465,9 @@ let data = this.editConfig.infomation let follow_record = { follow_record: { - client_id: parseInt(this.clientId), + client_id: this.clientId || 0, client_status_id: data.client_status_id || 0, - contact_id: parseInt(this.contactId), + contact_id: this.contactId || 0, contact_information_id: data.contact_information_id || 0, content: data.content || "", follow_time: data.follow_time || "", @@ -380,8 +476,8 @@ number: data.number || "", purpose: data.purpose || "", record: data.record || "", - sale_chance_id: parseInt(data.sale_chance_id), //data.sale_chance_id || - sales_leads_id: 0, // data.sales_leads_id || + sale_chance_id: this.saleChanceId || 0, + sales_leads_id: this.saleLeadId || 0, topic: data.topic || "" } } @@ -394,20 +490,17 @@ return params }, // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶 - querySearchAsync(queryString, cb) { - var restaurants = this.clientList - var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants - cb(results) - }, - // 閫夋嫨鑱旂郴浜哄鍚� - queryContactAsync(queryString, cb) { - var restaurants = this.contactNamelist - var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants - cb(results) - }, - // 閿�鍞満浼� - queryChanceAsync(queryString, cb) { - var restaurants = this.saleChancelist + querySearchAsync(queryString, cb, value) { + var restaurants = [] + if (value === "client") { + restaurants = this.clientList + } else if (value === "contact") { + restaurants = this.contactNamelist + } else if (value === "chance") { + restaurants = this.saleChancelist + } else { + restaurants = this.saleLeadlist + } var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants cb(results) }, @@ -417,13 +510,14 @@ } }, handleSelectClient(value, item) { - console.log(value) if (value === "client") { this.clientId = item.id } else if (value === "contact") { this.contactId = item.id - } else { + } else if (value === "chance") { this.saleChanceId = item.id + } else { + this.saleLeadId = item.id } }, selClientClick(value) { @@ -431,16 +525,25 @@ this.editSelectClientConfig.editVisible = true } else if (value === "contact") { this.editSelectContactConfig.editVisible = true + } else if (value === "chance") { + this.editSelectChanceConfig.editVisible = true + } else { + this.editSelectLeadConfig.editVisible = true } }, selClient(row, value) { - console.log(value) if (value === "contact") { this.editConfig.infomation.contact_name = row.name this.contactId = row.id - } else { + } else if (value === "client") { this.editConfig.infomation.client_name = row.name this.clientId = row.id + } else if (value === "chance") { + this.editConfig.infomation.sale_chance_name = row.name + this.saleChanceId = row.id + } else { + this.editConfig.infomation.sales_leads_name = row.name + this.saleLeadId = row.id } }, // 娓呴櫎宸查�夋嫨鐢ㄦ埛 @@ -448,9 +551,15 @@ if (value === "client") { this.editConfig.infomation.client_name = "" this.clientId = 0 - } else { + } else if (value === "contact") { this.editConfig.infomation.contact_name = "" this.contactId = 0 + } else if (value === "chance") { + this.editConfig.infomation.sale_chance_name = "" + this.saleChanceId = 0 + } else { + this.editConfig.infomation.sales_leads_name = "" + this.saleLeadId = 0 } }, // 娣诲姞闄勪欢 @@ -473,54 +582,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