From d4f4c52402b91cb8e17c1845da71c5e39662fde0 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期三, 03 一月 2024 15:28:06 +0800 Subject: [PATCH] 销售报价单列表页增加统计内容及接口联调、添加报价单天天客户名称及对应限制功能 --- src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 212 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 185 insertions(+), 27 deletions(-) diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue index 83da7e4..35cbbe7 100644 --- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue +++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue @@ -31,7 +31,20 @@ <!-- </el-col>--> <el-col :span="12"> <el-form-item label="閿�鍞満浼氱紪鍙�" prop="number"> - <WordInput + <el-input + v-if=" + editConfig.title == '缂栬緫' || + (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" + >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span + > + <!-- <WordInput v-if="codenumer && (explain != '' || isIdDisabled) && method == 0" :codenumer="codenumer" :sum="sum" @@ -42,7 +55,7 @@ <span v-else-if="method == 0" style="color: #f56c6c" >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span > - <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span> + <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span> --> </el-form-item> </el-col> <el-col :span="12"> @@ -299,6 +312,30 @@ </el-col> </el-row> </div> + + <!-- 浜у搧绠$悊 --> + <div class="basic-info-title" style="display: flex"> + 浜у搧绠$悊 + <div style="margin-left: 400px"> + 甯佺 + <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%"> + <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + </div> + </div> + <div class="product-view"> + <CommonFormTableView + :show-summary="showSummary" + :product-table-list="productTableList" + @inputContent="inputContent" + @addProductClick="addProductClick" + @emptyProductClick="emptyProductClick" + @recalculateProductClick="recalculateProductClick" + @clearupProduct="clearupProduct" + /> + </div> + <!-- 鍟嗘満涓冭绱� --> <div class="basic-info-title">鍟嗘満涓冭绱�(5W2P)</div> <div class="basic-info-view"> @@ -576,9 +613,9 @@ import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog" import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog" import { getCityList } from "@/api/common/address" -import WordInput from "@/components/wordInput.vue" -import codeMixin from "@/views/client/followupRecords/mixin/codeMixin" +import codeMixin from "@/components/makepager/mixin/codeMixin" import { getContactList } from "@/api/client/contacts" +import CommonFormTableView from "@/components/makepager/CommonFormTableView.vue" export default { name: "AddSalesOpportunityDialog", mixins: [codeMixin], @@ -594,7 +631,7 @@ } } }, - components: { WordInput, SelectClientDialog, SelectContactDialog }, + components: { CommonFormTableView, SelectClientDialog, SelectContactDialog }, computed: { searchCommonHeight() { return this.$refs.searchCommonView.offsetHeight @@ -609,10 +646,10 @@ dialogWidth: "50%", editConfig: this.editCommonConfig, rules: { - number: [{ required: true, message: "璇疯緭鍏ラ攢鍞満浼氱紪鍙�", trigger: "blur" }], + number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }], name: [{ required: true, message: "璇疯緭鍏ユ満浼氬悕绉�", trigger: "blur" }], - member_id: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐d汉", trigger: "change" }], + member_id: [{ required: true, validator: this.validateMemberId, trigger: "change" }], sale_stage_id: [{ required: true, message: "璇烽�夋嫨閿�鍞樁娈�", trigger: "change" }], currency: [{ required: true, message: "璇烽�夋嫨甯佺", trigger: "change" }], expected_time: [{ required: true, message: "璇烽�夋嫨棰勮鎴愪氦鏃ユ湡", trigger: "change" }], @@ -646,7 +683,16 @@ contactId: this.editCommonConfig.infomation.contact_id, objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞満浼氱紪鐮�", codeStandID: "" }, isContact: true, - contactNamelist: [] + contactNamelist: [], + tableData: [], + productTableList: {}, + showSummary: { + show: true, + total: true, + sumProp: ["Amount", "total"], + mergeNumber: 2 + }, + productId: 1 } }, created() { @@ -654,9 +700,10 @@ if (this.editConfig.title !== "鏂板缓" && this.editConfig.infomation.province_id !== 0) { this.getCityList(this.editConfig.infomation.province_id, "edit") } + this.setTableForm() this.getCommonData() this.formInfo() - if (this.editConfig.title === '缂栬緫'){ + if (this.editConfig.title === "缂栬緫") { this.isContact = false this.getContactList(this.editConfig.infomation.contact_id) } @@ -666,9 +713,6 @@ if (val) { this.formInfo() } - }, - "editConfig.infomation.codeStandID"() { - this.formInfo() } }, methods: { @@ -688,6 +732,14 @@ getAllData() .then((res) => { this.memberOptions = res.data.member + if (this.editConfig.title === "鏂板缓") { + let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1") + this.memberOptions.map((item) => { + if (item.username == username) { + this.$set(this.editConfig.infomation, "member_id", item.id) + } + }) + } this.businessSourceOptions = res.data.sales_source this.businessTypeOptions = res.data.sale_type this.oldCustomerMarketOptions = res.data.regular_customers @@ -713,7 +765,12 @@ saveClick(formName) { this.$refs[formName].validate((valid) => { if (valid) { - console.log(this.editConfig.infomation) + const hasProduct = this.tableData.every((ele) => !!ele.name) + if (!hasProduct) { + this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖") + return + } + const params = this.saveParams() console.log(params) if (this.editConfig.title === "鏂板缓") { @@ -721,9 +778,14 @@ console.log(res) this.editConfig.visible = false if (res.code === 200) { - this.$message.success("娣诲姞鎴愬姛") - this.$parent.getData() - // } + this.$message.success("娣诲姞鎴愬姛锛�") + if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation?.sourceTitle === "鎺ㄨ繘") { + this.$parent.handleClose() + } else { + this.$parent.getData() + } + } else { + this.$message.error(res.msg ? res.msg : "娣诲姞澶辫触锛�") } }) } else { @@ -731,8 +793,10 @@ console.log(res) this.editConfig.visible = false if (res.code === 200) { - this.$message.success("缂栬緫鎴愬姛") - this.$parent.getData() + this.$message.success("缂栬緫鎴愬姛锛�") + this.$parent?.getData() + } else { + this.$message.error(res.msg ? res.msg : "缂栬緫澶辫触锛�") } }) } @@ -777,22 +841,22 @@ status_id: data.status_id || 0, threats: data.threats || "", whether_established: data.whether_established || "", - remark: data.remark || "", detail_address: data.detail_address || "", codeStandID: data.ID, - codeRule: this.codeRule + products: this.tableData } return params }, // 鑾峰彇鑱旂郴浜哄垪琛� getContactList(id) { getContactList({ - clientId: id, page: 0, pageSize: 0, - search_map: {} + search_map: { + client_id: id + } }).then((res) => { if (res.code == 200) { this.contactNamelist = res.data.list @@ -818,28 +882,36 @@ handleSelectClient(value, item) { if (value === "client") { this.clientId = item.id + this.editConfig.infomation.client_name = item.name + this.editConfig.infomation.contact_name = "" + this.contactId = 0 this.isContact = false this.getContactList(item.id) } else if (value === "contact") { + this.editConfig.infomation.contact_name = item.name this.contactId = item.id } + this.refresh() }, selClientClick(value) { if (value === "client") { this.editSelectClientConfig.editVisible = true } else if (value === "contact") { this.editSelectContactConfig.editVisible = true + this.editSelectContactConfig.clientId = this.clientId } }, selClient(row, value) { if (value === "contact") { this.editConfig.infomation.contact_name = row.name this.contactId = row.id - this.isContact = false - this.getContactList(row.id) } else if (value === "client") { this.editConfig.infomation.client_name = row.name this.clientId = row.id + this.editConfig.infomation.contact_name = "" + this.contactId = 0 + this.isContact = false + this.getContactList(row.id) } this.refresh() }, @@ -877,14 +949,100 @@ }, async getCityList(val, value) { await getCityList({ province_id: val }).then((res) => { - console.log(res) - if (res.data.code === 200) { - this.cityOptions = res.data.data.list + if (res.code === 200) { + this.cityOptions = res.data.list if (value === "sel") { this.editConfig.infomation.city_id = "" } } }) + }, + setTableForm() { + if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) { + this.tableData = [ + { + productId: this.productId, + id: 0, + amount: 0, + desc: "", + name: "", + number: "", + price: 0, + total: 0 + } + ] + } else { + this.tableData = this.editConfig.infomation.products + this.tableData.map((item, index) => { + item.productId = index + 1 + }) + } + this.productTableList = { + tableData: this.tableData, + tableColumn: [ + { label: "#", prop: "productId", width: 40 }, + { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true }, + { label: "浜у搧缂栧彿", prop: "number" }, + { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true }, + { label: "閿�鍞崟浠�", prop: "price", inputFloat: true }, + { label: "浠风◣鍚堣", prop: "total", inputFloat: true } + ] + } + }, + // 浜у搧鍒楄〃杈撳叆 + inputContent(val, prop, row) { + this.productId = row.productId + this.tableData.map((item) => { + if (item.productId === row.productId) { + item[prop] = val + } + }) + }, + // 浜у搧鏂板 + addProductClick() { + this.productId++ + this.tableData.push({ + productId: this.productId, + id: 0, + amount: 0, + desc: "", + name: "", + number: "", + price: 0, + total: 0 + }) + this.showSummary.show = true + }, + // 浜у搧娓呯┖ + emptyProductClick() { + this.productId = 1 + this.tableData = [ + { + productId: this.productId, + id: 0, + amount: 0, + desc: "", + name: "", + number: "", + price: 0, + total: 0 + } + ] + this.productTableList.tableData = this.tableData + }, + // 浜у搧閲嶇畻 + recalculateProductClick() {}, + clearupProduct(data) { + this.tableData = data + this.productTableList.tableData = this.tableData + }, + // 閿�鍞礋璐d汉鑷畾涔夋牎楠岃鍒� + validateMemberId(rule, value, callback) { + if (this.editConfig.infomation?.member_id > 0) { + callback() + } else { + callback(new Error("璇烽�夋嫨閿�鍞礋璐d汉")) + } } } } -- Gitblit v1.8.0