From bad9393dc3c437248697963f44eaa3ef39800a77 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期五, 10 十一月 2023 10:09:08 +0800 Subject: [PATCH] 销售线索详情跟进记录、推进到下一阶段隐藏和5458 --- src/views/client/salesLead/DetailSalesLead.vue | 8 src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 53 +++-- src/views/client/salesLead/AdvanceDialog.vue | 18 + src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 438 ++++++++++++++++++++---------------------------- src/components/makepager/CommonFormTableView.vue | 2 5 files changed, 227 insertions(+), 292 deletions(-) diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue index b8e1f51..66158ed 100644 --- a/src/components/makepager/CommonFormTableView.vue +++ b/src/components/makepager/CommonFormTableView.vue @@ -259,7 +259,7 @@ productName: "", productNumber: "", page: 1, - pageSize: 5 + pageSize: 100 }).then((res) => { console.log(res, "浜у搧鍚嶇О") if (res.code === 200) { diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue index 5758864..2b93c08 100644 --- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue +++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue @@ -27,16 +27,14 @@ <el-input v-if=" editConfig.title == '缂栬緫' || - (editConfig.title == '鏂板缓' && - codenumer && - (explain != '' || isIdDisabled)) + (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled)) " :disabled="editConfig.title == '缂栬緫'" v-model="editConfig.infomation.number" placeholder="璇疯緭鍏ョ紪鐮�" > </el-input> - <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c" + <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c" >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span > <!-- <WordInput @@ -60,24 +58,18 @@ v-model="editConfig.infomation.client_name" :fetch-suggestions=" (queryString, callback) => { - querySearchAsync(queryString, callback, 'client'); + querySearchAsync(queryString, callback, 'client') } " value-key="name" @select="handleSelectClient('client', $event)" style="width: 100%" ></el-autocomplete> - <div - class="common-select-btn" - @click="selClientClick('client')" - > + <div class="common-select-btn" @click="selClientClick('client')"> <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i> </div> <div - v-if=" - editConfig.infomation.client_name && - editConfig.infomation.client_name.length > 0 - " + v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0" class="common-select-btn" @click="clearupClient('client')" > @@ -96,12 +88,7 @@ size="mini" style="width: 100%" > - <el-option - v-for="item in clientStatusOptions" - :key="item.id" - :label="item.name" - :value="item.id" - > + <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> --> @@ -115,24 +102,18 @@ v-model="editConfig.infomation.contact_name" :fetch-suggestions=" (queryString, callback) => { - querySearchAsync(queryString, callback, 'contact'); + querySearchAsync(queryString, callback, 'contact') } " value-key="name" @select="handleSelectClient('contact', $event)" style="width: 100%" ></el-autocomplete> - <div - class="common-select-btn" - @click="selClientClick('contact')" - > + <div class="common-select-btn" @click="selClientClick('contact')"> <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i> </div> <div - v-if=" - editConfig.infomation.contact_name && - editConfig.infomation.contact_name.length > 0 - " + v-if="editConfig.infomation.contact_name && editConfig.infomation.contact_name.length > 0" class="common-select-btn" @click="clearupClient('contact')" > @@ -149,12 +130,7 @@ size="mini" style="width: 100%" > - <el-option - v-for="item in memberOptions" - :key="item.id" - :label="item.username" - :value="item.id" - > + <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> </el-option> </el-select> </el-form-item> @@ -178,12 +154,7 @@ size="mini" style="width: 100%" > - <el-option - v-for="item in contactInfoOptions" - :key="item.id" - :label="item.name" - :value="item.id" - > + <el-option v-for="item in contactInfoOptions" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> </el-form-item> @@ -195,7 +166,7 @@ v-model="editConfig.infomation.sale_chance_name" :fetch-suggestions=" (queryString, callback) => { - querySearchAsync(queryString, callback, 'chance'); + querySearchAsync(queryString, callback, 'chance') } " value-key="name" @@ -204,11 +175,7 @@ placeholder="璇峰厛閫夋嫨瀹㈡埛鍚嶇О" :disabled="isChance" ></el-autocomplete> - <div - v-if="!isChance" - 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 @@ -233,24 +200,18 @@ v-model="editConfig.infomation.sales_leads_name" :fetch-suggestions=" (queryString, callback) => { - querySearchAsync(queryString, callback, 'lead'); + querySearchAsync(queryString, callback, 'lead') } " value-key="name" @select="handleSelectClient('lead', $event)" style="width: 100%" ></el-autocomplete> - <div - class="common-select-btn" - @click="selClientClick('lead')" - > + <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 - " + v-if="editConfig.infomation.sales_leads_name && editConfig.infomation.sales_leads_name.length > 0" class="common-select-btn" @click="clearupClient('lead')" > @@ -348,23 +309,15 @@ </div> --> </div> <!-- 灞曞紑鏀惰捣 --> - <div - v-if="editConfig.title === '鏂板缓'" - class="unflod-collapse" - @click="unflodCollapseClick" - > + <div v-if="editConfig.title === '鏂板缓'" class="unflod-collapse" @click="unflodCollapseClick"> <div>{{ unflodCollapseStr }}</div> <div v-if="isUnflod"><i class="el-icon-arrow-up"></i></div> <div v-else><i class="el-icon-arrow-down"></i></div> </div> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" size="small" @click="saveClick('form')" - >淇� 瀛�</el-button - > - <el-button size="small" @click="editConfig.visible = false" - >鍙� 娑�</el-button - > + <el-button type="primary" size="small" @click="saveClick('form')">淇� 瀛�</el-button> + <el-button size="small" @click="editConfig.visible = false">鍙� 娑�</el-button> </div> <!-- 閫夋嫨瀹㈡埛 --> <SelectClientDialog @@ -395,21 +348,17 @@ </template> <script> -import { getAllData } from "@/api/client/client"; -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 "@/components/makepager/mixin/codeMixin"; -import { getContactList } from "@/api/client/contacts"; -import { mapActions } from "vuex"; -import { getSaleChanceList } from "@/api/sales/salesOpportunity"; -import { getSalesLeadsList } from "@/api/client/salesLead"; +import { getAllData } from "@/api/client/client" +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 "@/components/makepager/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", @@ -421,28 +370,28 @@ return { visible: false, title: "鏂板缓", - infomation: {}, - }; - }, + infomation: {} + } + } }, isDetail: { type: Boolean, - default: false, - }, + default: false + } }, components: { SelectClientDialog, SelectContactDialog, SelectChanceDialog, - SelectLeadDialog, + SelectLeadDialog }, computed: { searchCommonHeight() { - return this.$refs.searchCommonView.offsetHeight; + return this.$refs.searchCommonView.offsetHeight }, clientList() { - return this.$store.state.getClientName.clientList; - }, + return this.$store.state.getClientName.clientList + } // contactNamelist() { // return this.$store.state.getClientName.contactNamelist // }, @@ -458,38 +407,27 @@ dialogWidth: "50%", editConfig: this.editContactsConfig, rules: { - number: [ - { required: true, validator: this.validateCheckCode, trigger: ["blur",'change'] }, - ], - member_id: [ - { required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }, - ], - record: [ - { required: true, message: "璇疯緭鍏ヨ窡杩涜褰�", trigger: "blur" }, - ], - client_name: [ - { required: true, validator: this.checkClient, trigger: "change" }, - ], - contact_name: [ - { required: true, message: "璇烽�夋嫨鑱旂郴浜哄鍚�", trigger: "change" }, - ], + number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }], + member_id: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }], + record: [{ 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" }, { - pattern: - /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/, + pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�", - trigger: "blur", - }, - ], + trigger: "blur" + } + ] }, pickerOptions: { disabledDate: (time) => { - return time.getTime() > Date.now(); - }, + return time.getTime() > Date.now() + } }, clientStatusOptions: [], // 瀹㈡埛鐘舵�� contactInfoOptions: [], // 鑱旂郴鏂瑰紡 @@ -499,120 +437,120 @@ editSelectClientConfig: { editVisible: false, title: "", - infomation: {}, + infomation: {} }, editSelectContactConfig: { editVisible: false, title: "", infomation: {}, - search_map: {}, + search_map: {} }, editSelectChanceConfig: { editVisible: false, title: "", infomation: {}, - search_map: {}, + search_map: {} }, editSelectLeadConfig: { editVisible: false, title: "", infomation: {}, - search_map: {}, + 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, saleChancelist: [], - isChance: true, - }; + isChance: true + } }, created() { - this.$store.dispatch("geClient"); + this.$store.dispatch("geClient") // this.$store.dispatch("geContact") // this.$store.dispatch("geChance") // this.$store.dispatch("geLead") - this.getCommonData(); - this.getContactInfoList(); - this.formInfo(); + this.getCommonData() + this.getContactInfoList() + this.formInfo() }, watch: { "editContactsConfig.visible"(val) { if (val) { - this.formInfo(); + this.formInfo() } - }, + } }, methods: { ...mapActions(["getContactFilter", "getLeadFilter"]), formInfo() { - this.objCode.type = "璺熻繘璁板綍缂栫爜"; - this.objCode.codeStandID = ""; + this.objCode.type = "璺熻繘璁板綍缂栫爜" + this.objCode.codeStandID = "" if (this.editConfig.infomation.codeStandID) { - this.objCode.codeStandID = this.editConfig.infomation.codeStandID; + this.objCode.codeStandID = this.editConfig.infomation.codeStandID } - this.getRCodeStandardList(); + this.getRCodeStandardList() }, getCommonData() { getAllData().then((res) => { - console.log(res); - this.clientStatusOptions = res.data.client_status; - this.memberOptions = res.data.member; + 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; + this.contactInfoOptions = res.data.list } - }); + }) }, dataProcess() { this.saleChancelist.map((item) => { if (this.saleChanceId === item.id) { - this.editConfig.infomation.sale_chance_name = item.name; + 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; + this.editConfig.infomation.sales_leads_name = item.name } - }); + }) }, handleClose() { - this.editConfig.visible = false; + this.editConfig.visible = false }, // 淇濆瓨 saveClick(formName) { this.$refs[formName].validate((valid) => { if (valid) { - const params = this.saveParams(); + const params = this.saveParams() if (this.editConfig.title === "鏂板缓") { getAddFollowRecord(params).then((res) => { - this.editConfig.visible = false; + this.editConfig.visible = false if (res.code === 200) { - this.$message.success("娣诲姞鎴愬姛"); - this.$parent.getData(); + this.$message.success("娣诲姞鎴愬姛") + this.$parent.getData() } - }); + }) } else { getUpdateFollowRecord(params).then((res) => { - this.editConfig.visible = false; + this.editConfig.visible = false if (res.code === 200) { - this.$message.success("缂栬緫鎴愬姛"); - this.$parent.getData(); + this.$message.success("缂栬緫鎴愬姛") + this.$parent.getData() } - }); + }) } } else { - console.log("error submit"); - return false; + console.log("error submit") + return false } - }); + }) }, saveParams() { - let data = this.editConfig.infomation; + let data = this.editConfig.infomation let follow_record = { follow_record: { client_id: this.clientId || 0, @@ -629,16 +567,16 @@ sale_chance_id: this.saleChanceId || 0, sales_leads_id: this.saleLeadId || 0, topic: data.topic || "", - codeStandID: data.ID, - }, - }; - let params = {}; - if (this.editConfig.title === "鏂板缓") { - params = { ...follow_record }; - } else { - params = { ...follow_record, id: data.id || 0 }; + codeStandID: data.ID + } } - return params; + let params = {} + if (this.editConfig.title === "鏂板缓") { + params = { ...follow_record } + } else { + params = { ...follow_record, id: data.id || 0 } + } + return params }, // 鑾峰彇閿�鍞満浼� getChanceList(id) { @@ -646,145 +584,142 @@ page: 1, pageSize: 15, search_map: { - client_id: id, - }, + client_id: id + } }).then((res) => { if (res.code == 200) { - this.saleChancelist = res.data.list; + this.saleChancelist = res.data.list } - }); + }) }, // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶 querySearchAsync(queryString, cb, value) { - var restaurants = []; + var restaurants = [] if (value === "client") { - restaurants = this.clientList; + restaurants = this.clientList } else if (value === "contact") { - restaurants = this.contactNamelist; + restaurants = this.contactNamelist } else if (value === "chance") { - restaurants = this.saleChancelist; + restaurants = this.saleChancelist } else { - restaurants = this.saleLeadlist; + restaurants = this.saleLeadlist } - var results = queryString - ? restaurants.filter(this.createStateFilter(queryString)) - : restaurants; - cb(results); + var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants + cb(results) }, createStateFilter(queryString) { return (state) => { - return ( - state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0 - ); - }; + return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0 + } }, // 鑱旂郴浜哄垪琛� async getContactList(item) { await getContactList({ search_map: { - client_id: item.id, + client_id: item.id }, page: 1, - pageSize: 15, + pageSize: 15 }).then((res) => { if (res.code === 200) { - this.contactNamelist = res.data.list; + console.log(res, "鑱旂郴浜�") + this.contactNamelist = res.data.list } - }); + }) }, // 閿�鍞嚎绱� async getSalesLeadsList(item) { await getSalesLeadsList({ search_map: { - name: item.name, - }, + name: item.name + } }).then((res) => { if (res.code === 200) { - this.saleLeadlist = res.data.list; + this.saleLeadlist = res.data.list } - }); + }) }, async handleSelectClient(value, item) { if (value === "client") { - this.editConfig.infomation.contact_name = ""; - this.editConfig.infomation.sales_leads_name = ""; - this.editConfig.infomation.sale_chance_name = ""; - 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); + this.editConfig.infomation.contact_name = "" + this.editConfig.infomation.sales_leads_name = "" + this.editConfig.infomation.sale_chance_name = "" + 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; + 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; + 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; + this.saleLeadId = item.id + this.editConfig.infomation.sales_leads_name = item.name } }, selClientClick(value) { if (value === "client") { - this.editSelectClientConfig.editVisible = true; + this.editSelectClientConfig.editVisible = true } else if (value === "contact") { - this.editSelectContactConfig.editVisible = true; + this.editSelectContactConfig.editVisible = true } else if (value === "chance") { - this.editSelectChanceConfig.editVisible = true; + this.editSelectChanceConfig.editVisible = true } else { - this.editSelectLeadConfig.editVisible = true; + this.editSelectLeadConfig.editVisible = true } }, selClient(row, value) { if (value === "contact") { - this.editConfig.infomation.contact_name = row.name; - this.contactId = row.id; + this.editConfig.infomation.contact_name = row.name + this.contactId = row.id } else if (value === "client") { - this.editConfig.infomation.contact_name = ""; - this.editConfig.infomation.sales_leads_name = ""; - this.editConfig.infomation.sale_chance_name = ""; - 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); + this.editConfig.infomation.contact_name = "" + this.editConfig.infomation.sales_leads_name = "" + this.editConfig.infomation.sale_chance_name = "" + 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; + 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; + this.editConfig.infomation.sales_leads_name = row.name + this.saleLeadId = row.id } }, // 娓呴櫎宸查�夋嫨鐢ㄦ埛 clearupClient(value) { if (value === "client") { - this.editConfig.infomation.contact_name = ""; - this.editConfig.infomation.sales_leads_name = ""; - this.editConfig.infomation.sale_chance_name = ""; - this.editConfig.infomation.client_name = ""; - this.clientId = 0; - this.isChance = true; - this.editConfig.infomation.sale_chance_name = ""; - this.saleChanceId = 0; + this.editConfig.infomation.contact_name = "" + this.editConfig.infomation.sales_leads_name = "" + this.editConfig.infomation.sale_chance_name = "" + 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; + this.editConfig.infomation.contact_name = "" + this.contactId = 0 } else if (value === "chance") { - this.editConfig.infomation.sale_chance_name = ""; - this.saleChanceId = 0; + this.editConfig.infomation.sale_chance_name = "" + this.saleChanceId = 0 } else { - this.editConfig.infomation.sales_leads_name = ""; - this.saleLeadId = 0; + this.editConfig.infomation.sales_leads_name = "" + this.saleLeadId = 0 } }, // 娣诲姞闄勪欢 @@ -794,26 +729,23 @@ // 灞曞紑鏀惰捣 unflodCollapseClick() { if (this.unflodCollapseStr === "鏀惰捣") { - this.unflodCollapseStr = "灞曞紑鏇村鏍忕洰"; - this.isUnflod = false; + this.unflodCollapseStr = "灞曞紑鏇村鏍忕洰" + this.isUnflod = false } else { - this.unflodCollapseStr = "鏀惰捣"; - this.isUnflod = true; + this.unflodCollapseStr = "鏀惰捣" + this.isUnflod = true } }, // 瀹㈡埛鍚嶇О鍗曠嫭鏍¢獙 checkClient(rule, value, callback) { - if ( - this.editConfig.infomation.client_name && - this.editConfig.infomation.client_name.length > 0 - ) { - callback(); + if (this.editConfig.infomation.client_name && this.editConfig.infomation.client_name.length > 0) { + callback() } else { - callback(new Error("璇烽�夋嫨瀹㈡埛鍚嶇О")); + callback(new Error("璇烽�夋嫨瀹㈡埛鍚嶇О")) } - }, - }, -}; + } + } +} </script> <!-- Add "scoped" attribute to limit CSS to this component only --> diff --git a/src/views/client/salesLead/AdvanceDialog.vue b/src/views/client/salesLead/AdvanceDialog.vue index 60ee2a2..9fef5a7 100644 --- a/src/views/client/salesLead/AdvanceDialog.vue +++ b/src/views/client/salesLead/AdvanceDialog.vue @@ -10,14 +10,14 @@ > <div class="content"> <el-radio-group v-model="radio"> - <div class="one"> + <!-- <div class="one"> <el-radio :label="1"> <span>鎺ㄨ繘鍒颁笅涓�闃舵</span> <el-select v-model="value1" size="mini" disabled> <el-option v-for="(item, index) in options" :key="index" :label="item" :value="item"></el-option> </el-select> </el-radio> - </div> + </div> --> <div class="two"> <el-radio :label="2"> <span>鎺ㄨ繘鍒版寚瀹氶樁娈�</span> @@ -41,7 +41,7 @@ v-if="editConfig.visible" :edit-client-manage-config="editConfig" @salesOpportunityClick="salesOpportunityClick" - @reshData='reshData' + @reshData="reshData" /> <!-- 鏂板缓/缂栬緫閿�鍞満浼� --> <AddSalesOpportunityDialog v-if="editOpportunityConfig.visible" :edit-common-config="editOpportunityConfig" /> @@ -71,7 +71,7 @@ data() { return { dialogWidth: "25%", - radio: 1, + radio: 2, commonConfig: this.advanceConfig, value1: "", value: "", @@ -122,6 +122,8 @@ }, saveClick() { console.log(this.value) + // this.commonConfig.visible = false + // if (this.value === "璺熻繘涓�") { // val === '鏂板缓' || this.pushSalesSources(1) @@ -144,7 +146,7 @@ sales_leads_id: this.commonConfig.infomation.id } this.editConfig.isResh = true - this.editConfig.infomation.codeStandID='' + this.editConfig.infomation.codeStandID = "" this.editConfig.visible = true }) .catch(() => {}) @@ -162,7 +164,7 @@ ...this.commonConfig.infomation, sales_leads_id: this.commonConfig.infomation.id } - this.editConfig.infomation.codeStandID='' + this.editConfig.infomation.codeStandID = "" this.editConfig.visible = true }) .catch(() => {}) @@ -181,7 +183,7 @@ this.reshData() }) }, - reshData(){ + reshData() { this.$parent.getData() }, // 閿�鍞満浼� @@ -189,7 +191,7 @@ console.log(item) this.editOpportunityConfig.visible = true this.editOpportunityConfig.title = "鏂板缓" - this.editOpportunityConfig.infomation = { client_name: item.name } + this.editOpportunityConfig.infomation = { client_name: item.name, sourceTitle: "鎺ㄨ繘" } } } } diff --git a/src/views/client/salesLead/DetailSalesLead.vue b/src/views/client/salesLead/DetailSalesLead.vue index ac32fcb..e4d9d6b 100644 --- a/src/views/client/salesLead/DetailSalesLead.vue +++ b/src/views/client/salesLead/DetailSalesLead.vue @@ -11,11 +11,11 @@ <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"> - <!-- <template slot="label"> + <!-- <el-tab-pane label="璺熻繘璁板綍" name="second"> --> + <!-- <template slot="label"> <div>璺熻繘璁板綍<el-badge type="primary" :value="2"> </el-badge></div> </template> --> - </el-tab-pane> + <!-- </el-tab-pane> --> </el-tabs> </div> <div v-if="activeName === 'first'" class="detail"> @@ -219,7 +219,7 @@ leftValue: "", rightStr: "", rightValue: "" - }, + } // { // leftStr: "鍏抽棴鍘熷洜", // leftValue: "", diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue index db9ee6d..cd7970b 100644 --- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue +++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue @@ -34,16 +34,14 @@ <el-input v-if=" editConfig.title == '缂栬緫' || - (editConfig.title == '鏂板缓' && - codenumer && - (explain != '' || isIdDisabled)) + (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled)) " :disabled="editConfig.title == '缂栬緫'" v-model="editConfig.infomation.number" placeholder="璇疯緭鍏ョ紪鐮�" > </el-input> - <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c" + <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c" >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span > <!-- <WordInput @@ -328,13 +326,13 @@ </div> <div class="product-view"> <CommonFormTableView - :show-summary="showSummary" - :product-table-list="productTableList" - @inputContent="inputContent" - @addProductClick="addProductClick" - @emptyProductClick="emptyProductClick" - @recalculateProductClick="recalculateProductClick" - @clearupProduct="clearupProduct" + :show-summary="showSummary" + :product-table-list="productTableList" + @inputContent="inputContent" + @addProductClick="addProductClick" + @emptyProductClick="emptyProductClick" + @recalculateProductClick="recalculateProductClick" + @clearupProduct="clearupProduct" /> </div> @@ -617,7 +615,7 @@ import { getCityList } from "@/api/common/address" import codeMixin from "@/components/makepager/mixin/codeMixin" import { getContactList } from "@/api/client/contacts" -import CommonFormTableView from "@/components/makepager/CommonFormTableView.vue"; +import CommonFormTableView from "@/components/makepager/CommonFormTableView.vue" export default { name: "AddSalesOpportunityDialog", mixins: [codeMixin], @@ -633,7 +631,7 @@ } } }, - components: {CommonFormTableView, SelectClientDialog, SelectContactDialog }, + components: { CommonFormTableView, SelectClientDialog, SelectContactDialog }, computed: { searchCommonHeight() { return this.$refs.searchCommonView.offsetHeight @@ -648,7 +646,7 @@ dialogWidth: "50%", editConfig: this.editCommonConfig, rules: { - number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur",'change'] }], + number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }], name: [{ required: true, message: "璇疯緭鍏ユ満浼氬悕绉�", trigger: "blur" }], member_id: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐d汉", trigger: "change" }], @@ -694,7 +692,7 @@ sumProp: ["Amount", "total"], mergeNumber: 2 }, - productId:1, + productId: 1 } }, created() { @@ -715,7 +713,7 @@ if (val) { this.formInfo() } - }, + } }, methods: { formInfo() { @@ -759,8 +757,8 @@ saveClick(formName) { this.$refs[formName].validate((valid) => { if (valid) { - const hasProduct = this.tableData.every(ele=>!!ele.name) - if (!hasProduct){ + const hasProduct = this.tableData.every((ele) => !!ele.name) + if (!hasProduct) { this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖") return } @@ -773,10 +771,13 @@ this.editConfig.visible = false if (res.code === 200) { this.$message.success("娣诲姞鎴愬姛锛�") - this.$parent.getData() - // } - }else{ - this.$message.error(res.msg?res.msg:"娣诲姞澶辫触锛�") + if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation?.sourceTitle === "鎺ㄨ繘") { + this.$parent.handleClose() + } else { + this.$parent.getData() + } + } else { + this.$message.error(res.msg ? res.msg : "娣诲姞澶辫触锛�") } }) } else { @@ -785,9 +786,9 @@ this.editConfig.visible = false if (res.code === 200) { this.$message.success("缂栬緫鎴愬姛锛�") - this.$parent.getData() - }else{ - this.$message.error(res.msg?res.msg:"缂栬緫澶辫触锛�") + this.$parent?.getData() + } else { + this.$message.error(res.msg ? res.msg : "缂栬緫澶辫触锛�") } }) } @@ -836,7 +837,7 @@ detail_address: data.detail_address || "", codeStandID: data.ID, - products: this.tableData, + products: this.tableData } return params }, -- Gitblit v1.8.0