From 26c39cd359bc0d2edc88408ff51ef70554e32a90 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 29 二月 2024 09:48:17 +0800
Subject: [PATCH] 跟进记录明细报价单没点击弹框下拉数据为空的问题选择机会或者报价单赋值客户名称
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 255 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 168 insertions(+), 87 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 37d3683..de79216 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -115,6 +115,7 @@
@select="handleSelectClient('chance', $event)"
:disabled="isNameChanceEdit || isView"
></el-autocomplete>
+ <!-- &&editConfig.infomation.client_name -->
<div
v-if="!isNameChanceEdit && !isView"
class="common-select-btn"
@@ -181,6 +182,7 @@
}
]"
>
+ <!-- isAddQuatation || -->
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.quotation_number"
@@ -192,21 +194,18 @@
value-key="number"
@select="handleSelectClient('quotation', $event)"
style="width: 100%"
- placeholder="璇峰厛閫夋嫨閿�鍞満浼�"
- :disabled="isAddQuatation || isView"
+ placeholder="璇烽�夋嫨閿�鍞姤浠峰崟"
+ :disabled="isView"
></el-autocomplete>
- <div
- v-if="!isAddQuatation && !isView"
- class="common-select-btn"
- @click="selClientClick('quotation')"
- >
+ <!-- !isAddQuatation && editConfig.infomation.sale_chance_name &&-->
+ <div v-if="!isView" class="common-select-btn" @click="selClientClick('quotation')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
+ <!-- !isAddQuatation && -->
<div
v-if="
editConfig.infomation.quotation_number &&
editConfig.infomation.quotation_number.length > 0 &&
- !isAddQuatation &&
!isView
"
class="common-select-btn"
@@ -319,7 +318,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鐗╂祦鍏徃" prop="logisticCompany">
<el-input v-model="editConfig.infomation.logisticCompany" :disabled="isView"></el-input>
</el-form-item>
@@ -328,7 +327,7 @@
<el-form-item label="鐗╂祦鍗曞彿" prop="logisticNumber">
<el-input v-model="editConfig.infomation.logisticNumber" :disabled="isView"></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="鐗╂祦璐圭敤" prop="logisticCost">
<el-input-number
@@ -555,7 +554,7 @@
computed: {
clientList() {
return this.$store.state.getClientName.clientList
- }
+ },
// saleChancelist() {
// return this.$store.state.getClientName.saleChancelist
// },
@@ -565,7 +564,7 @@
},
data() {
return {
- dialogWidth: "50%",
+ dialogWidth: "60%",
editConfig: this.editCommonConfig,
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
@@ -639,8 +638,28 @@
}
}
},
+ mounted(){
+ this.getSaleChanceList()
+ this.getQuotation()
+ },
created() {
if (this.editConfig.title !== "鏂板缓") {
+ this.productTableList.tableData = [
+ {
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ cost: "",
+ profit: "",
+ margin: "",
+ total: 0,
+ unit: ""
+ }
+ ]
this.isAddQuatation = false
}
this.$store.dispatch("geClient")
@@ -702,61 +721,67 @@
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) {
- 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
- }
+ 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 === "鏂板缓") {
- getAddSalesDetails(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.tableData.map((item) => {
- this.amountTotal += parseFloat(item.total)
- })
- let config = {
- amountTotal: this.amountTotal,
- id: res.data.id
- }
- this.$emit("addCollectionPlanClick", config)
- }
- })
- } else {
- getUpdateSalesDetails(params).then((res) => {
- console.log(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 === "鏂板缓") {
+ getAddSalesDetails(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.tableData.map((item) => {
+ this.amountTotal += parseFloat(item.total)
+ })
+ let config = {
+ amountTotal: this.amountTotal,
+ id: res.data.id
+ }
+ this.$emit("addCollectionPlanClick", config)
+ }
+ })
+ } else {
+ getUpdateSalesDetails(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ }
}
+ // } else {
+ // console.log("error submit")
+ // return false
+ // }
})
},
saveParams() {
let data = this.editConfig.infomation
+ let products = []
+ this.tableData.map((item) => {
+ if (item.number.length > 0) {
+ products.push(item)
+ }
+ })
let commonParam = {
address: data.address || "",
addressee: data.addressee || "",
@@ -766,7 +791,7 @@
memberId: data.memberId || 0,
number: data.number || "",
phone: data.phone || "",
- products: this.tableData,
+ products: products,
remark: data.remark || "",
saleChanceId: this.saleChanceId || 0,
saleType: data.saleType || 0,
@@ -799,16 +824,20 @@
},
// 鑾峰彇鎶ヤ环鍗�
getQuotation(id, value) {
- getQuotationList({
- page: 0,
+ let params={
+ page: 0,
pageSize: 0,
- search_map: {
- sale_chance_id: id
- }
- }).then((res) => {
+ }
+ if(id){
+ params.search_map={
+ sale_chance_id: id
+ }
+ }
+ getQuotationList(params).then((res) => {
if (res.code == 200) {
console.log(res)
this.quotationList = res.data.list
+ this.count = res.data.count
if (value === "鍏ㄩ儴浜у搧") {
// this.quotationList.map((item) => {
// if (item.id === this.editConfig.infomation.quotationId) {
@@ -834,11 +863,11 @@
restaurants = this.clientList
console.log(restaurants, "瀹㈡埛鍗�")
} else if (value === "chance") {
- restaurants = this.saleChancelist
+ restaurants = this.saleChancelist
} else if (value === "subbill") {
restaurants = this.subOrderList
} else if (value === "quotation") {
- restaurants = this.quotationList
+ restaurants = this.quotationList
}
var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
@@ -854,13 +883,22 @@
},
// 閿�鍞満浼氬垪琛�
async getSaleChanceList(item) {
- await getSaleChanceList({
- page: 1,
- pageSize: 15,
- search_map: {
+ let params={}
+ if(item){
+ params={
+ page: 0,
+ pageSize: 0,
+ }
+ params.search_map={
client_id: item.id
}
- }).then((res) => {
+ }else{
+ params={
+ page: 0,
+ pageSize: 0,
+ }
+ }
+ await getSaleChanceList(params).then((res) => {
console.log(res)
this.saleChancelist = res.data.list
})
@@ -889,24 +927,37 @@
} else if (value === "chance") {
this.saleChanceId = item.id
this.editConfig.infomation.sale_chance_name = item.name
+ this.clientId = item.client.id
+ this.editConfig.infomation.client_name = item.client.name
this.isAddQuatation = false
+ this.getSaleChanceList({id:this.clientId})
this.getQuotation(item.id)
} else if (value === "subbill") {
console.log("涓嬫媺妗嗙偣鍑�", item)
this.subbillId = item.id
this.editConfig.infomation.subbill_name = item.number
} else if (value === "quotation") {
- // this.productTableList.tableData = item.products
- // this.tableData = item.products
+ this.productTableList.tableData = item.products
+ this.tableData = item.products
this.editConfig.infomation.quotation_number = item.number
this.quotationId = item.id
+ //鍙嶅悜 瀹㈡埛鍚嶇О
+ this.editConfig.infomation.client_name = item.client.name
+ this.clientId = item.client.id
+ this.getSaleChanceList({id:this.clientId})
+ //鍙嶅悜 閿�鍞満浼�
+ this.editConfig.infomation.sale_chance_name = item.sale_chance.name
+ this.saleChanceId = item.sale_chance.id
+ this.getQuotation(this.saleChanceId)
}
},
selClientClick(value) {
if (value === "client") {
this.editSelectClientConfig.editVisible = true
} else if (value === "chance") {
- this.editSelectChanceConfig.clientId = this.clientId
+ if (this.clientId) {
+ this.editSelectChanceConfig.clientId = this.clientId
+ }
this.editSelectChanceConfig.editVisible = true
} else if (value === "subbill") {
this.editSelCommonConfig.title = "閿�鍞瓙鍗�"
@@ -914,22 +965,37 @@
this.editSelCommonConfig.clientId = this.clientId
} else if (value === "quotation") {
this.editSelCommonConfig.title = "鎶ヤ环鍗�"
+ if (this.saleChanceId && this.clientId) {
+ this.editSelCommonConfig.clientId = this.clientId
+ // 姝ｅ悜閫夋嫨瀹㈡埛 閿�鍞満浼� 鎶ヤ环鍗�
+ this.editSelCommonConfig.isRequest = false
+ this.editSelCommonConfig.count = this.count
+ this.editSelCommonConfig.tableInfomation = [...this.quotationList]
+ } else {
+ // 鍙嶅悜閫夋嫨
+ this.editSelCommonConfig.isRequest = true
+ }
this.editSelCommonConfig.editVisible = true
- this.editSelCommonConfig.clientId = this.clientId
- this.editSelCommonConfig.tableInfomation = [...this.quotationList]
}
},
selClient(row, value) {
if (value === "client") {
this.editConfig.infomation.sale_chance_name = ""
+ this.saleChanceId = ""
this.editConfig.infomation.subbill_name = ""
+ // 娓呯┖鎶ヤ环鍗�
+ this.editConfig.infomation.quotation_number = ""
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
this.getSaleChanceList(row)
this.getSubOrderList(row)
} 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.editConfig.infomation.quotation_number = ""
this.isAddQuatation = false
this.getQuotation(row.id)
} else if (value === "subbill") {
@@ -937,8 +1003,14 @@
this.subbillId = row.id
} else if (value === "quotation") {
this.productTableList.tableData = row.products
- // this.tableData = row.products
+ this.tableData = row.products
this.editConfig.infomation.quotation_number = row.number
+ //鍙嶅悜 瀹㈡埛鍚嶇О
+ this.editConfig.infomation.client_name = row.client.name
+ this.clientId = row.client.id
+ //鍙嶅悜 閿�鍞満浼�
+ this.editConfig.infomation.sale_chance_name = row.sale_chance.name
+ this.saleChanceId = row.sale_chance.id
this.quotationId = row.id
}
},
@@ -953,12 +1025,14 @@
this.clientId = 0
this.saleChanceId = 0
this.subbillId = 0
+ this.getSaleChanceList()
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = ""
this.saleChanceId = 0
this.isAddQuatation = true
this.editConfig.infomation.quotation_number = ""
this.quotationId = 0
+ this.getQuotation(this.saleChanceId)
} else if (value === "subbill") {
this.editConfig.infomation.subbill_name = ""
this.subbillId = 0
@@ -967,6 +1041,7 @@
this.quotationId = 0
}
this.productTableList.tableData = []
+ this.tableData = []
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -1004,8 +1079,9 @@
}
this.productTableList = {
tableData: this.tableData,
+ isReturn: true,
tableColumn: [
- { label: "#", prop: "productId", width: 40 },
+ // { label: "#", prop: "productId", width: 40 },
{ label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true, min: 110 },
{ label: "瑙勬牸", prop: "specs" },
{ label: "鍨嬪彿", prop: "type" },
@@ -1022,9 +1098,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
}
})
@@ -1049,13 +1125,18 @@
// 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)
+ 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
},
--
Gitblit v1.8.0