From 20c1e8ec91bc6fcf7cb478c208c4cf9202eba4eb Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 29 三月 2024 15:55:24 +0800
Subject: [PATCH] crm销售明细单产品信息发货信息制造信采购信息委外信息5个模块请求接口的问题优化和产品信息逻辑修改
---
src/views/sales/salesDetails/index.vue | 274 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 181 insertions(+), 93 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 82b47e0..56c7778 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -221,11 +221,26 @@
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "鍗曚綅", prop: "unit" },
{ label: "璁㈠崟鏁伴噺", prop: "amount" },
- { label: "宸插畬鎴愭暟閲�", prop: "finishAmount" },
- { label: "宸插彂璐ф暟閲�", prop: "deliveryAmount" },
- { label: "閲囪喘鏁伴噺", prop: "purchaseAmount" },
- { label: "鐢熶骇鏁伴噺", prop: "makeAmount" },
- { label: "濮斿鏁伴噺", prop: "outsourcingAmount" },
+ {
+ label: "宸插畬鎴愭暟閲�",
+ prop: "finishAmount",
+ isClass: true,
+ getClassName: this.getAmountClassName,
+ },
+ { label: "宸插彂璐ф暟閲�", prop: "deliveryAmount",
+ isClass: true,
+ getClassName: this.getAmountClassName, },
+ { label: "閲囪喘鏁伴噺",
+ isClass: true,
+ getClassName: this.getFinishAmountClassName,
+ prop: "purchaseAmount",
+ },
+ { label: "鐢熶骇鏁伴噺", prop: "makeAmount" ,
+ isClass: true,
+ getClassName: this.getFinishAmountClassName, },
+ { label: "濮斿鏁伴噺", prop: "outsourcingAmount",
+ isClass: true,
+ getClassName: this.getFinishAmountClassName, },
{ label: "閿�鍞崟浠�", prop: "price", price: true },
{ label: "鎴愭湰鍗曚环", prop: "cost" },
{ label: "姣涘埄", prop: "profit" },
@@ -433,7 +448,7 @@
TabsIndex: "0",
productTableList: {},
productColumn: productColumn,
- showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О","浜у搧瑙勬牸", "鍗曚綅", "璁㈠崟鏁伴噺", "宸插畬鎴愭暟閲�", "宸插彂璐ф暟閲�", "閲囪喘鏁伴噺", "鐢熶骇鏁伴噺", "濮斿鏁伴噺","閿�鍞崟浠�","鎴愭湰鍗曚环","姣涘埄","姣涘埄鐜�","浠风◣鍚堣"],
+ showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О","浜у搧瑙勬牸", "鍗曚綅", "璁㈠崟鏁伴噺", "宸插畬鎴愭暟閲�", "宸插彂璐ф暟閲�", "閲囪喘鏁伴噺", "鐢熶骇鏁伴噺", "濮斿鏁伴噺","閿�鍞崟浠�","鎴愭湰鍗曚环","姣涘埄","姣涘埄鐜�(%)","浠风◣鍚堣"],
inventoryColumn: inventoryColumn,
showInventoryCol: [
"鍑哄簱鍗�",
@@ -450,7 +465,7 @@
"鐘舵��"
],
makeColumn: makeColumn,
- showMakeCol: ["鐢熶骇璁㈠崟", "浜у搧鍚嶇О", "璁㈠崟鐘舵��", "宸ュ崟缂栧彿", "宸ュ崟鐘舵��", "璁″垝寮�濮嬫椂闂�", "璁″垝缁撴潫鏃堕棿"],
+ showMakeCol: ["鐢熶骇璁㈠崟", "浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍗曚綅", "璁㈠崟鏁伴噺", "瀹屾垚鏁伴噺","宸ュ崟缂栧彿","宸ュ崟鐘舵��","璁″垝寮�濮嬫椂闂�","璁″垝缁撴潫鏃堕棿"],
// 閲囪喘
purchaseColumn: purchaseColumn,
outsourceColumn:outsourceColumn,
@@ -467,7 +482,9 @@
projectId: [{ required: true, message: "璇烽�夋嫨椤圭洰", trigger: "change" }]
},
purchaseStatusList: getDataByType("purchaseStatus"),
- loading: false
+ loading: false,
+ isRequest: true, //璇锋眰
+ productDataBottom:{},
}
},
created() {
@@ -483,6 +500,29 @@
this.getProjectList()
},
methods: {
+ getFinishAmountClassName(val, row) {
+ let parts = val.split("/");
+ let numerator = parseInt(parts[0], 10); // 鍒嗗瓙
+ let denominator = parseInt(parts[1], 10); // 鍒嗘瘝
+ let classname = "";
+ if (numerator / denominator === 0||numerator===0) {
+ classname = "error";
+ }else if(numerator / denominator === 1){
+ classname = "success";
+ }else if((numerator / denominator) > 0&&(numerator / denominator) <1){
+ classname = "warning-radio";
+ }
+ console.log(classname, numerator,denominator,"鐪嬩笅")
+ return classname;
+ },
+ getAmountClassName(val){
+ console.log(val,"val11")
+ let classname = "";
+ if(val===0){
+ classname = "error";
+ }
+ return classname;
+ },
getpurchaseStatus(val) {
if (val) {
for (let i in this.purchaseStatusList) {
@@ -612,21 +652,12 @@
})
},
// 鑾峰彇浜у搧/搴撳瓨淇℃伅
- async getProductInventoryInfo(row) {
- if (this.TabsIndex == 0 || row.status == 1) {
- this.getProductOrderInfo(row)
- // row.products.map((item)=>{
- // item.purchaseAmount=item.purchaseFinishAmount+"/"+item.purchaseAmount
- // item.makeAmount=item.makeFinishAmount+"/"+item.makeAmount
- // item.outsourcingAmount=item.outsourcingFinishAmount+"/"+item.outsourcingAmount
-
- // })
- // this.productTableList.tableInfomation = row.products || []
- } else {
- if (row.number) {
+ async getProductInventoryInfo(number) {
+ if (number) {
this.loading = true
- await getProductInventoryInfo(row.number)
+ await getProductInventoryInfo(number)
.then((res) => {
+ console.log(res,"resss")
this.productTableList.tableInfomation = res.data?.length > 0 ? res.data : []
this.loading = false
})
@@ -635,15 +666,65 @@
this.loading = false
})
}
- }
},
// 鑾峰彇鍒堕�犱俊鎭�
async getProductOrderInfo(number) {
if (number) {
- this.loading = true
- await getProductOrderInfo(number)
- .then((res) => {
- if (this.TabsIndex == 0) {
+ if (this.TabsIndex == 0) {
+ // 浜у搧淇℃伅鍒楄〃
+ this.tableBottomColumn = this.productColumn // 琛ㄥご
+ this.showBottomCol = this.showProductCol // 鍔ㄦ�佽〃澶�
+ this.setBottomList()
+ }else if(this.TabsIndex == 1){
+ // 鍙戣揣淇℃伅鍒楄〃
+ this.tableBottomColumn = this.inventoryColumn
+ this.showBottomCol = this.showInventoryCol
+ this.setBottomList()
+ }else if (this.TabsIndex == 2) {
+ // 鍒堕�犱俊鎭垪琛�
+ this.tableBottomColumn = this.makeColumn
+ this.showBottomCol = this.showMakeCol
+ this.setBottomList()
+
+ } else if (this.TabsIndex == 3) {
+ // 閲囪喘淇℃伅鍒楄〃
+ this.tableBottomColumn = this.purchaseColumn
+ this.showBottomCol = this.showPurchaseCol
+ this.setBottomList()
+ }else if (this.TabsIndex == 4) {
+ // 濮斿淇℃伅鍒楄〃
+ this.tableBottomColumn = this.outsourceColumn
+ this.showBottomCol = this.showOutsourceCol
+ this.setBottomList()
+ }
+ console.log(this.isRequest,'===isRequest')
+ if (this.TabsIndex != 1&&this.isRequest == false) {
+ this.isRequest = true;
+ this.getListValue(this.productDataBottom)
+ return true;
+ }
+
+ if (this.TabsIndex == 1&&this.selectRow.status == 1) {
+ this.productTableList.tableInfomation = []
+ }
+ console.log(this.selectRow,"鐪嬬湅")
+ this.getProductInventoryInfo(number)
+
+ this.loading = true
+ await getProductOrderInfo(number)
+ .then((res) => {
+ this.productDataBottom=res;
+ this.getListValue(this.productDataBottom)
+ this.loading = false
+ })
+ .catch(() => {
+ this.productTableList.tableInfomation = []
+ this.loading = false
+ })
+ }
+ },
+ getListValue(res){
+ if (this.TabsIndex == 0) {
if(res&&res.data){
res.data.productInfo.map((item=>{
item.purchaseAmount=item.purchaseFinishAmount+"/"+item.purchaseAmount
@@ -652,22 +733,13 @@
}))
}
this.productTableList.tableInfomation = res.data && res.data.productInfo ? res.data.productInfo : []
- } else if (this.TabsIndex == 1) {
- this.productTableList.tableInfomation = res.data ? res.data : []
- } else if (this.TabsIndex == 2) {
+ } else if (this.TabsIndex == 2) {
this.productTableList.tableInfomation = res.data && res.data.makeInfo ? res.data.makeInfo : []
} else if (this.TabsIndex == 3) {
this.productTableList.tableInfomation = res.data && res.data.purchaseInfo ? res.data.purchaseInfo : []
} else if(this.TabsIndex == 4) {
this.productTableList.tableInfomation = res.data && res.data.outsourcingInfo ? res.data.outsourcingInfo : []
}
- this.loading = false
- })
- .catch(() => {
- this.productTableList.tableInfomation = []
- this.loading = false
- })
- }
},
// 鎼滅储
onFilterSearch(searchText) {
@@ -727,17 +799,78 @@
shipmentsClick(row){
this.editShipmentsConfig.visible=true
this.editShipmentsConfig.infomation.saleDetailID=row.id
+ this.editShipmentsConfig.infomation.deliverType=row.deliverType?row.deliverType:1
this.editShipmentsConfig.infomation.saleDetailNumber=row.number
this.editShipmentsConfig.infomation.projectId=row.projectId
},
// 纭鍙戣揣瀹屾垚
async confirmClick(row){
- await confirmOutputOver({saleDetailNumber:row.number}).then((res)=>{
- if(res&&res.code===200){
- this.$message.success("纭鍙戣揣瀹屾垚")
- this.getData()
- }
- })
+ this.selectRow = row
+ await getProductInventoryInfo(this.selectRow.number)
+ .then((res) => {
+ console.log(res,"resss")
+ if(res.data){
+ this.productTableList.tableInfomation = res.data?.length > 0 ? res.data : []
+ // let accumulator=res.data
+ // const reducedArray = array.reduce((accumulator, currentItem) => {
+ // // 鏌ユ壘褰撳墠number鏄惁宸插瓨鍦ㄤ簬accumulator涓�
+ // const existingItem = accumulator.find(item => item.number === currentItem.number);
+ // if (existingItem) {
+ // // 濡傛灉瀛樺湪锛岀疮鍔爊um
+ // existingItem.amount += currentItem.amount;
+ // } else {
+ // // 濡傛灉涓嶅瓨鍦紝灏嗗綋鍓嶉」娣诲姞鍒癮ccumulator涓�
+ // accumulator.push(currentItem);
+ // }
+ // return accumulator;
+ // }, []); // 鍒濆鍖朼ccumulator涓轰竴涓┖鏁扮粍
+
+ // console.log(reducedArray,"鏂版暟缁�");
+ }
+ this.loading = false
+ })
+ // let obj=[
+ // {
+ // name:"灏忔槑",
+ // id:1,
+ // num:10
+ // },
+ // {
+ // name:"灏忔槑",
+ // id:1,
+ // num:20
+ // },
+ // {
+ // name:"灏忔槑",
+ // id:1,
+ // num:5
+ // },
+ // {
+ // name:"灏忕孩",
+ // id:1,
+ // num:5
+ // },
+ // {
+ // name:"灏忕孩",
+ // id:1,
+ // num:10
+ // },
+ // {
+ // name:"灏忔埧",
+ // id:5,
+ // num:3
+ // },
+ // ]
+ .catch(() => {
+ this.productTableList.tableInfomation = []
+ this.loading = false
+ })
+ // await confirmOutputOver({saleDetailNumber:row.number}).then((res)=>{
+ // if(res&&res.code===200){
+ // this.$message.success("纭鍙戣揣瀹屾垚")
+ // this.getData()
+ // }
+ // })
},
// 鍏抽棴
closeClick(row) {
@@ -815,41 +948,12 @@
//鑾峰彇褰撳墠閫変腑璧勬簮鐨刬d
getTab(tab) {
this.TabsIndex = tab
- if (this.TabsIndex == 0) {
- // 浜у搧淇℃伅鍒楄〃
- this.tableBottomColumn = this.productColumn // 琛ㄥご
- this.showBottomCol = this.showProductCol // 鍔ㄦ�佽〃澶�
- this.setBottomList()
- this.getProductInventoryInfo(this.selectRow.number)
- } else if (this.TabsIndex == 1) {
- // 鍙戣揣淇℃伅鍒楄〃
- this.tableBottomColumn = this.inventoryColumn
- this.showBottomCol = this.showInventoryCol
- this.setBottomList()
- if (this.selectRow.status == 1) {
- this.productTableList.tableInfomation = []
- } else {
- this.getProductInventoryInfo(this.selectRow)
- }
- } else if (this.TabsIndex == 2) {
- // 鍒堕�犱俊鎭垪琛�
- this.tableBottomColumn = this.makeColumn
- this.showBottomCol = this.showMakeCol
- this.setBottomList()
- this.getProductOrderInfo(this.selectRow.number)
- } else if (this.TabsIndex == 3) {
- // 閲囪喘淇℃伅鍒楄〃
- this.tableBottomColumn = this.purchaseColumn
- this.showBottomCol = this.showPurchaseCol
- this.setBottomList()
- this.getProductOrderInfo(this.selectRow.number)
- }if (this.TabsIndex == 4) {
- // 濮斿淇℃伅鍒楄〃
- this.tableBottomColumn = this.outsourceColumn
- this.showBottomCol = this.showOutsourceCol
- this.setBottomList()
- this.getProductOrderInfo(this.selectRow.number)
+ if (this.TabsIndex == 1) {
+ this.isRequest =true;
+ } else{
+ this.isRequest = false;
}
+ this.getProductOrderInfo(this.selectRow.number)
},
// 鐘舵��
getStatus(val) {
@@ -858,23 +962,7 @@
// top 琛岀偣鍑�
tableRowClick(row) {
this.selectRow = row
- if (this.TabsIndex == 0) {
- this.getProductInventoryInfo(this.selectRow.number)
- } else if (this.TabsIndex == 1) {
- if (this.selectRow.status == 1) {
- this.productTableList.tableInfomation = []
- } else {
- this.getProductInventoryInfo(this.selectRow)
- }
- } else if (this.TabsIndex == 2) {
- this.getProductOrderInfo(this.selectRow.number)
- } else if (this.TabsIndex == 3) {
- // 閲囪喘淇℃伅
- this.getProductOrderInfo(this.selectRow.number)
- }else if(this.TabsIndex == 4){
- // 濮斿淇℃伅
- this.getProductOrderInfo(this.selectRow.number)
- }
+ this.getProductOrderInfo(this.selectRow.number)
},
// 鑾峰彇椤圭洰鍒楄〃
async getProjectList() {
--
Gitblit v1.8.0