From 7fbfeddedebd05e2d23ce411be887106d31e8eff Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 27 三月 2024 15:02:18 +0800
Subject: [PATCH] 销售明细单产品列表添加动态表头，产品信息列表根据完成数量展示字体色
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 373 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 266 insertions(+), 107 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index c8fcea5..3422c40 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -115,8 +115,9 @@
@select="handleSelectClient('chance', $event)"
:disabled="isNameChanceEdit || isView"
></el-autocomplete>
+ <!-- &&editConfig.infomation.client_name -->
<div
- v-if="!isNameChanceEdit && !isView&&editConfig.infomation.client_name"
+ v-if="!isNameChanceEdit && !isView"
class="common-select-btn"
@click="selClientClick('chance')"
>
@@ -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&&editConfig.infomation.sale_chance_name"
- 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"
@@ -443,6 +442,7 @@
@getSelectArray="getSelectArray"
@emptyProductClick="emptyProductClick"
@clearupProduct="clearupProduct"
+ @selTableCol="selTableCol"
></CommonFormTableView>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
@@ -535,6 +535,7 @@
import { getDataByType } from "@/api/data"
import { mapActions } from "vuex"
import { getQuotationList } from "@/api/sales/quotation"
+import { getSystemSet } from "@/api/systemSet/commonSet"
export default {
name: "AddSalesDetailsDialog",
@@ -555,7 +556,7 @@
computed: {
clientList() {
return this.$store.state.getClientName.clientList
- }
+ },
// saleChancelist() {
// return this.$store.state.getClientName.saleChancelist
// },
@@ -565,7 +566,7 @@
},
data() {
return {
- dialogWidth: "50%",
+ dialogWidth: "60%",
editConfig: this.editCommonConfig,
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
@@ -636,11 +637,50 @@
disabledDate(time) {
return time.getTime() > Date.now()
}
- }
+ },
+ isRelevancyValue:"鏄�", //鏄惁鍚屾鎶ヤ环鍗�
+ isCollectionPlan:"鏄�", // 鏄惁鐢熸垚鏀舵璁″垝
+ isBjdRequird : false,
+ tableColumn: [
+ // { label: "#", prop: "productId", width: 40 },
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true, min: 110 },
+ { label: "瑙勬牸", prop: "specs" , },
+ { label: "鍨嬪彿", prop: "type" },
+ { label: "浜у搧缂栧彿", prop: "number" },
+ { label: "鍗曚綅", prop: "unit" },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: !this.isBjdRequird, },
+ { label: "鎴愭湰鍗曚环", prop: "cost", input: !this.isBjdRequird },
+ { label: "姣涘埄", prop: "profit" },
+ { label: "姣涘埄鐜�(%)", prop: "margin", min: 90 },
+ { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "浠风◣鍚堣", prop: "total" }
+ ],
+ showCol: ["浜у搧鍚嶇О", "瑙勬牸", "鍨嬪彿", "浜у搧缂栧彿", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环","姣涘埄","姣涘埄鐜�(%)","鏁伴噺","浠风◣鍚堣"],
}
},
+ mounted(){
+ this.getSaleChanceList()
+ this.getQuotation()
+ },
created() {
+ this.getSystemSet()
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")
@@ -665,6 +705,41 @@
// },
methods: {
...mapActions(["getChanceFilter", "getSubunitFliter"]),
+ async getSystemSet(){
+ await getSystemSet().then((res) => {
+ if (res.code == 200) {
+ console.log(res,"resss")
+ if (res.data) {
+ this.isRelevancyValue = this.checkValueById(res.data.CRM, 5);
+ this.isCollectionPlan=this.checkValueById(res.data.CRM, 4);
+ console.log(this.isRelevancyValue,"鏄惁鍏宠仈")
+ }
+ }
+ })
+ },
+ setColumnVisible(showCol, tableColumn) {
+ return tableColumn.map((ele) => {
+ return {
+ ...ele,
+ isShowColumn: showCol.includes(ele.label)
+ }
+ })
+ },
+ selTableCol(val) {
+ this.showcol = val
+ this.productTableList.tableColumn = this.setColumnVisible(val, this.tableColumn)
+ },
+ checkValueById(data, id) {
+ for (const key in data) {
+ if (data.hasOwnProperty(key)) {
+ const obj = data[key];
+ if (obj.id === id) {
+ return obj.value;
+ }
+ }
+ }
+ return null; // 濡傛灉娌℃湁鎵惧埌鍖归厤鐨刬d锛屽垯杩斿洖null
+ },
formInfo() {
this.objCode.type = "閿�鍞槑缁嗙紪鐮�"
this.objCode.codeStandID = ""
@@ -702,61 +777,71 @@
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)
+ }
+ 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
}
- })
- } else {
- getUpdateSalesDetails(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("缂栬緫鎴愬姛")
+ if(this.isCollectionPlan==="鏄�"){
+ this.$emit("addCollectionPlanClick", config)
+ }else{
this.$parent.getData()
}
- })
- }
+ }
+ })
+ } 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
}
+ // } 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 +851,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,17 +884,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;
+ this.count = res.data.count
if (value === "鍏ㄩ儴浜у搧") {
// this.quotationList.map((item) => {
// if (item.id === this.editConfig.infomation.quotationId) {
@@ -835,15 +923,11 @@
restaurants = this.clientList
console.log(restaurants, "瀹㈡埛鍗�")
} else if (value === "chance") {
- if(this.editConfig.infomation.client_name){
restaurants = this.saleChancelist
- }
} else if (value === "subbill") {
restaurants = this.subOrderList
} else if (value === "quotation") {
- if(this.editConfig.infomation.sale_chance_name){
restaurants = this.quotationList
- }
}
var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
@@ -859,13 +943,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
})
@@ -894,24 +987,39 @@
} 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
+ } else if (value === "quotation") { //閿�鍞姤浠峰崟
+ if(this.isRelevancyValue==="鏄�"){
+ 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 = "閿�鍞瓙鍗�"
@@ -919,33 +1027,55 @@
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.isRequest = false
- this.editSelCommonConfig.count=this.count
- 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") {
this.editConfig.infomation.subbill_name = row.number
this.subbillId = row.id
} else if (value === "quotation") {
- this.productTableList.tableData = row.products
- // this.tableData = row.products
+ if(this.isRelevancyValue==="鏄�"){
+ this.productTableList.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
}
},
@@ -960,12 +1090,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
@@ -973,7 +1105,15 @@
this.editConfig.infomation.quotation_number = ""
this.quotationId = 0
}
- this.productTableList.tableData = []
+ if(this.isRelevancyValue==="鏄�" && value === "quotation"){
+ this.productTableList.tableData = []
+ this.tableData = []
+ }else if(this.isRelevancyValue==="鍚�" && value === "quotation"){
+ console.log("false")
+ }else{
+ this.productTableList.tableData = []
+ this.tableData = []
+ }
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -1005,33 +1145,47 @@
this.getQuotation(this.editConfig.infomation.saleChanceId, "鍏ㄩ儴浜у搧")
}
// let productData = this.quotationList.products
- let isBjdRequird = false
+ this.isBjdRequird = false
if (this.autoCodeHeadersObj.Bjd == "yes") {
- isBjdRequird = true
+ this.isBjdRequird = true
}
this.productTableList = {
tableData: this.tableData,
- tableColumn: [
- { label: "#", prop: "productId", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true, min: 110 },
- { label: "瑙勬牸", prop: "specs" },
- { label: "鍨嬪彿", prop: "type" },
- { label: "浜у搧缂栧彿", prop: "number" },
- { label: "鍗曚綅", prop: "unit" },
- { label: "閿�鍞崟浠�", prop: "price", inputFloat: !isBjdRequird, isRequird: true },
- { label: "鎴愭湰鍗曚环", prop: "cost", input: !isBjdRequird },
- { label: "姣涘埄", prop: "profit" },
- { label: "姣涘埄鐜�(%)", prop: "margin", min: 90 },
- { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
- { label: "浠风◣鍚堣", prop: "total" }
- ]
+ isReturn: true,
+ allcol: [],
+ showcol: this.showCol,
+ // tableColumn: [
+ // // { label: "#", prop: "productId", width: 40 },
+ // { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true, min: 110 },
+ // { label: "瑙勬牸", prop: "specs" },
+ // { label: "鍨嬪彿", prop: "type" },
+ // { label: "浜у搧缂栧彿", prop: "number" },
+ // { label: "鍗曚綅", prop: "unit" },
+ // { label: "閿�鍞崟浠�", prop: "price", inputFloat: !this.isBjdRequird, },
+ // { label: "鎴愭湰鍗曚环", prop: "cost", input: !this.isBjdRequird },
+ // { label: "姣涘埄", prop: "profit" },
+ // { label: "姣涘埄鐜�(%)", prop: "margin", min: 90 },
+ // { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ // { label: "浠风◣鍚堣", prop: "total" }
+ // ],
+ tableColumn: this.setColumnVisible(this.showCol, this.tableColumn)
+ }
+ this.setTableList(this.productTableList)
+ },
+ setTableList(productTableList) {
+ productTableList.allcol = productTableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
+ this.searchOptions = []
+ for (let i = 0; i < productTableList.tableColumn.length; i++) {
+ const label = productTableList.tableColumn[i].label
+ const value = productTableList.tableColumn[i].prop
+ this.searchOptions.push({ value: value, label: label })
}
},
// 浜у搧鍒楄〃杈撳叆
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
}
})
@@ -1056,13 +1210,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