From 26c39cd359bc0d2edc88408ff51ef70554e32a90 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 29 二月 2024 09:48:17 +0800
Subject: [PATCH] 跟进记录明细报价单没点击弹框下拉数据为空的问题选择机会或者报价单赋值客户名称
---
src/views/sales/quotation/AddQuotationDialog.vue | 256 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 179 insertions(+), 77 deletions(-)
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index f51a995..8bd4326 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -165,8 +165,44 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞満浼�" prop="sale_chance_name"
- :rules="[{ required: autoCodeHeadersObj.Xsjh=='yes'?true:false, validator: this.checkChance, trigger: 'change' }]">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
+ <div class="custom-name">
+ <el-autocomplete
+ style="width: 100%"
+ v-model="editConfig.infomation.client_name"
+ :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
+ 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">
+ <el-form-item
+ label="閿�鍞満浼�"
+ prop="sale_chance_name"
+ :rules="[
+ {
+ required: autoCodeHeadersObj.Xsjh == 'yes' ? true : false,
+ validator: this.checkChance,
+ trigger: 'change'
+ }
+ ]"
+ >
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.sale_chance_name"
@@ -250,7 +286,7 @@
<CommonFormTableView
:show-summary="showSummary"
pageName="quotation"
- :addTypeIdMultiple="false"
+ :addTypeIdMultiple="true"
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
@@ -336,6 +372,7 @@
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import codeMixin from "@/components/makepager/mixin/codeMixin"
+import { getSaleChanceList } from "@/api/sales/salesOpportunity"
export default {
name: "QuotationDialog",
mixins: [codeMixin],
@@ -361,10 +398,10 @@
},
contactNamelist() {
return this.$store.state.getClientName.contactNamelist
- },
- saleChancelist() {
- return this.$store.state.getClientName.saleChancelist
}
+ // saleChancelist() {
+ // return this.$store.state.getClientName.saleChancelist
+ // }
},
data() {
return {
@@ -376,7 +413,8 @@
quotationName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
quotation_status_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
// sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
- member_id: [{ required: true, validator: this.validateMemberId, trigger: "change" }]
+ member_id: [{ required: true, validator: this.validateMemberId, trigger: "change" }],
+ client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }]
},
memberOptions: [],
quotationStatusOptions: [], // 鎶ヤ环鍗曠姸鎬�
@@ -410,24 +448,32 @@
tableData: [],
productId: 1,
isNoProduct: true,
- objCode: { name: "", page: 0, pageSize: 0, type: "鎶ヤ环缂栫爜", codeStandID: "" }
+ objCode: { name: "", page: 0, pageSize: 0, type: "鎶ヤ环缂栫爜", codeStandID: "" },
+ clientOptions: [], // 瀹㈡埛
+ saleChancelist: []
}
+ },
+ mounted(){
+ this.getSaleChanceList()
},
created() {
this.$store.dispatch("geClient")
this.$store.dispatch("geContact")
- this.$store.dispatch("geChance")
+ // this.$store.dispatch("geChance")
this.setTableForm()
this.getCommonData()
this.formInfo()
- this.getUseSystemSet({modeType:'bjd'})
+ this.getUseSystemSet({ modeType: "bjd" })
+ if (this.editConfig.title === "缂栬緫") {
+ this.getSaleChanceList({ id: this.editConfig.infomation.client_id })
+ }
},
watch: {
"editConfig.visible"(val) {
if (val) {
this.formInfo()
}
- },
+ }
},
methods: {
formInfo() {
@@ -441,7 +487,7 @@
getAllData()
.then((res) => {
this.memberOptions = res.data.member
- this.quotationStatusOptions = res.data.quotationStatus?res.data.quotationStatus:[]
+ this.quotationStatusOptions = res.data.quotationStatus ? res.data.quotationStatus : []
if (this.editConfig.title === "鏂板缓") {
let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
this.memberOptions.map((item) => {
@@ -449,10 +495,13 @@
this.$set(this.editConfig.infomation, "member_id", item.id)
}
})
- this.$set(this.editConfig.infomation,'quotation_status_id',this.quotationStatusOptions.length>0?this.quotationStatusOptions[0].id:'')
+ this.$set(
+ this.editConfig.infomation,
+ "quotation_status_id",
+ this.quotationStatusOptions.length > 0 ? this.quotationStatusOptions[0].id : ""
+ )
}
-
- this.dataProcess()
+ // this.dataProcess()
})
.catch((err) => {
console.log(err)
@@ -469,50 +518,50 @@
saveClick(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
+ // for (let i = 0; i < this.tableData.length; i++) {
+ // if (this.tableData[i].name.length === 0) {
+ // this.isNoProduct = true
+ // break
+ // } else {
+ // this.isNoProduct = false
+ // }
+ // }
+ // if (this.isNoProduct) {
+ // this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
+ // } else {
for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].name.length === 0) {
- this.isNoProduct = true
- break
- } else {
- this.isNoProduct = false
- }
- }
- if (this.isNoProduct) {
- this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
- } else {
- for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].cost||Number(this.tableData[i].cost)==0) {
- let reg = /^\+?[1-9]\d*$/;
- if(!reg.test(this.tableData[i].cost)){
- this.$message.error("鎴愭湰鍗曚环闇�瑕佸～鍐欏ぇ浜�0鐨�2浣嶅皬鏁帮紒")
- return true;
- }
+ if (this.tableData[i].cost) {
+ let reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
+ if (!reg.test(this.tableData[i].cost)) {
+ this.$message.error("鎴愭湰鍗曚环闇�瑕佸～鍐欏ぇ浜�0鐨�2浣嶅皬鏁帮紒")
+ return true
}
}
- const params = this.saveParams()
- if (this.editConfig.title === "鏂板缓") {
- getAddQuotation(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
- } else {
- getUpdateQuotation(params).then((res) => {
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("缂栬緫鎴愬姛")
- this.$parent.getData()
- }
- })
- }
}
- } else {
- console.log("error submit")
- return false
+ const params = this.saveParams()
+ if (this.editConfig.title === "鏂板缓") {
+ getAddQuotation(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ } else {
+ getUpdateQuotation(params).then((res) => {
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ }
}
+ // } else {
+ // console.log("error submit")
+ // return false
+ // }
})
},
/**
@@ -527,6 +576,12 @@
},
saveParams() {
let data = this.editConfig.infomation
+ let products = []
+ this.tableData.map((item) => {
+ if (item.number.length > 0) {
+ products.push(item)
+ }
+ })
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
quotationName: data.quotationName || "",
@@ -537,7 +592,7 @@
quotation_status_id: data.quotation_status_id || 0,
sale_chance_id: this.saleChanceId || 0,
validity_date: data.validity_date || "",
- products: this.tableData,
+ products: products,
codeStandID: data.ID,
client_id: this.clientId || 0
}
@@ -565,11 +620,19 @@
}
},
handleSelectClient(value, item) {
- console.log(value)
+ console.log(item,'item')
if (value === "client") {
this.clientId = item.id
+ this.editConfig.infomation.client_name = item.name
+ this.getSaleChanceList(item)
} else if (value === "chance") {
this.saleChanceId = item.id
+ this.editConfig.infomation.sale_chance_name = item.name
+ this.editConfig.infomation.client_name = item.client.name
+ this.clientId = item.client.id
+ this.getSaleChanceList({id:this.clientId})
+ this.productTableList.tableData = item.products ? item.products : []
+ this.tableData = item.products ? item.products : []
} else {
this.contactId = item.id
}
@@ -580,6 +643,7 @@
} else if (value === "contact") {
this.editSelectContactConfig.editVisible = true
} else if (value === "chance") {
+ this.editSelectChanceConfig.clientId = this.clientId
this.editSelectChanceConfig.editVisible = true
}
},
@@ -590,10 +654,15 @@
this.contactId = row.id
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
+ this.editConfig.infomation.client_name = row.client.name
+ this.clientId = row.client.id
this.saleChanceId = row.id
+ this.productTableList.tableData = row.products ? row.products : []
+ this.tableData = row.products ? row.products : []
} else {
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
+ this.getSaleChanceList(row)
}
this.refresh()
},
@@ -602,14 +671,41 @@
if (value === "client") {
this.editConfig.infomation.client_name = ""
this.clientId = 0
+ this.getSaleChanceList()
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = ""
this.saleChanceId = 0
+ this.getSaleChanceList({id:this.clientId})
} else {
this.editConfig.infomation.contact_name = ""
this.contactId = 0
}
+
+ this.productTableList.tableData = []
+ this.tableData = []
this.refresh()
+ },
+ // 閿�鍞満浼氬垪琛�
+ async getSaleChanceList(item) {
+ let params={}
+ if(item){
+ params={
+ page: 0,
+ pageSize: 0,
+ }
+ params.search_map={
+ client_id: item.id
+ }
+ }else{
+ params={
+ page: 0,
+ pageSize: 0,
+ }
+ }
+ await getSaleChanceList(params).then((res) => {
+ console.log(res)
+ this.saleChancelist = res.data.list
+ })
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -626,9 +722,9 @@
name: "",
number: "",
price: 0,
- cost:'',
- profit:'',
- margin:'',
+ cost: "",
+ profit: "",
+ margin: "",
total: 0,
unit: ""
}
@@ -641,15 +737,16 @@
}
this.productTableList = {
tableData: this.tableData,
+ isReturn: true,
tableColumn: [
- { label: "#", prop: "productId", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true,min:110, },
+ // { label: "#", prop: "productId", width: 40 },
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true, min: 110 },
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鍗曚綅", prop: "unit" },
{ label: "閿�鍞崟浠�", prop: "price", inputFloat: true, isRequird: true },
- { label: "鎴愭湰鍗曚环", prop: "cost",input: true },
+ { label: "鎴愭湰鍗曚环", prop: "cost", input: true },
{ label: "姣涘埄", prop: "profit" },
- { label: "姣涘埄鐜�(%)", prop: "margin",min:90},
+ { label: "姣涘埄鐜�(%)", prop: "margin", min: 90 },
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
{ label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
@@ -657,9 +754,9 @@
},
// 浜у搧鍒楄〃杈撳叆
inputContent(val, prop, row) {
- this.productId = row.productId
+ // this.productId = row.productId
this.tableData.map((item) => {
- if (item.productId === row.productId) {
+ if (item.number === row.number) {
item[prop] = val
}
})
@@ -684,14 +781,19 @@
// this.showSummary.show = true
},
// 鏂板鏂瑰紡淇敼
- getSelectArray(val){
- if(val.length>0){
- val.map((item, index) => {
- item.productId = this.tableData.length + index+1
- })
+ getSelectArray(val, index) {
+ if (this.tableData.length == 1 && this.tableData[0].number.length == 0) {
+ this.tableData = []
}
- this.tableData=this.tableData.concat(val);
- this.productTableList.tableData=this.tableData
+ if (index < this.tableData.length) {
+ this.tableData.splice(index, 1)
+ val.map((item, ind) => {
+ this.tableData.splice(index + ind, 0, item)
+ })
+ } else {
+ this.tableData = this.tableData.concat(val)
+ }
+ this.productTableList.tableData = this.tableData
this.showSummary.show = true
},
// 浜у搧娓呯┖
@@ -706,9 +808,9 @@
name: "",
number: "",
price: 0,
- cost:'',
- profit:'',
- margin:'',
+ cost: "",
+ profit: "",
+ margin: "",
total: 0,
unit: ""
}
@@ -726,9 +828,9 @@
if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
callback()
} else {
- if(this.autoCodeHeadersObj.Xsjh=='yes'){
+ if (this.autoCodeHeadersObj.Xsjh == "yes") {
callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
- }else{
+ } else {
callback()
}
}
--
Gitblit v1.8.0