From 0673f89ff23ff48b79c0ebeeac6ac97e2f98e35b Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 1 Aug 2024 16:10:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../purchaseOrder/purchaseOrderAdd.vue | 149 +++++++++++-------
src/views/purchase/purchaseReview/index.vue | 14 +-
.../purchaseReview/purchaseOrderInfo.vue | 2 +-
3 files changed, 101 insertions(+), 64 deletions(-)
diff --git a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
index 2e57bfd..78c45cc 100644
--- a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
+++ b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
@@ -319,7 +319,7 @@
"deptSid": window.sessionStorage.getItem('defaultDeptSid'),
"deptName": window.sessionStorage.getItem('defaultDeptName'),
"useOrgSid": window.sessionStorage.getItem('orgSid'),
- "createOrgSid": window.sessionStorage.getItem('defaultDeptSid'),
+ "createOrgSid": window.sessionStorage.getItem('orgSid'),
"orgPath": window.sessionStorage.getItem('orgSidPath'),
"purchaseBillAmount": {
"sid": "",
@@ -405,7 +405,7 @@
init() {
// 供应商
choiceSupplierInfo({
- createOrgSid: window.sessionStorage.getItem('orgSidPath')
+ createOrgSid: window.sessionStorage.getItem('orgSid')
}).then((resp) => {
if (resp.success) {
this.supplierList = resp.data
@@ -414,7 +414,7 @@
// 仓库
getWarehouses({
- orgPath: window.sessionStorage.getItem('orgSidPath'),
+ orgPath: window.sessionStorage.getItem('orgSid'),
}).then((res) => {
if (res.success) {
this.warehouseList = res.data
@@ -423,7 +423,7 @@
// 业务员
selAllByOrgSidPath({
- orgSidPath: window.sessionStorage.getItem('orgSidPath')
+ orgSidPath: window.sessionStorage.getItem('orgSid')
}).then((res) => {
if (res.success) {
this.allOrgperList = res.data
@@ -574,11 +574,18 @@
for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) {
var item = this.formobj.purchaseBillDetailList[i]
-
if (row.sid != item.sid) {
+ // console.log("item.cost1》》》》", item.cost)
+ // console.log("item.shareAmount》》》》", item.shareAmount)
+ // console.log("item.count》》》》", item.count)
// 列表其他数据 先计算单价
- // item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count)).toFixed(2)
- item.cost = Number(item.cost1)
+
+ if (Number(item.count) != 0) {
+ item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count)).toFixed(2)
+ }
+
+ // item.cost = Number(item.cost1)
+ // console.log("item.cost2》》》》", item.cost)
this.calculation2(item)
} else {
@@ -590,10 +597,16 @@
// }
if (updateProp == 'cost') {
- // 修改的不是单价
+ // 修改的是单价
this.calculation2(item)
} else {
- item.cost = Number(item.cost1)
+ // item.cost = Number(item.cost1)
+ if (Number(item.count) != 0) {
+ item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count)).toFixed(2)
+ }
+
+ // console.log("item.cost》》》》", item.cost)
+
this.calculation2(item)
}
@@ -622,6 +635,73 @@
},
+ // 计算分摊金额
+ computeShareAmount() {
+ // 分摊金额 = (采购运费+其他费用)*单价*数量/所有商品总价
+
+ var price = Number(this.formobj.purchaseBillAmount.freight) + Number(this.formobj.purchaseBillAmount
+ .otherAmount)
+
+ var all = 0 // 除去最后一个的分摊总和
+ var totalAmount = 0 // 原所有商品总价
+ for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) {
+
+ var item = this.formobj.purchaseBillDetailList[i]
+ totalAmount = (Number(totalAmount) + Number(Number(item.cost1) * Number(item.count1))).toFixed(2)
+ // totalAmount = (Number(totalAmount) + Number(Number(item.cost) * Number(item.count))).toFixed(2)
+ }
+
+ // 分摊金额 = (采购运费+其他费用)*单价*数量/ 原所有商品总价
+
+ for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) {
+
+ var item = this.formobj.purchaseBillDetailList[i]
+ if (i == this.formobj.purchaseBillDetailList.length - 1) {
+
+ if (Number(item.count) != 0) {
+
+ if (Number(price) == 0) {
+ item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count)).toFixed(2)
+ item.shareAmount = 0.00
+ } else {
+ // 最后一条数据
+ item.cost1 = (Number(item.cost) - Number(item.shareAmount) / Number(item.count)).toFixed(2)
+ item.shareAmount = (Number(price) - Number(all)).toFixed(2)
+
+ // item.cost = (Number(item.cost1) + (Number(item.shareAmount) / Number(item.count))).toFixed(2)
+ item.cost = (Number(item.cost1) + Number(item.shareAmount) / Number(item.count)).toFixed(2)
+ }
+ }
+
+ } else {
+
+ if (Number(item.count) != 0) {
+ if (Number(price) == 0) {
+ item.shareAmount = 0.00
+ } else {
+ // 分摊金额 = (采购运费+其他费用)*单价*数量/所有商品总价
+ // item.shareAmount = (Number(price) * Number(item.cost1) * Number(item.count) / Number(totalAmount))
+ item.shareAmount = (Number(price) * Number(item.cost1) * Number(item.count) / Number(totalAmount))
+ .toFixed(2)
+
+ // item.cost = (Number(item.cost1) + (Number(item.shareAmount) / Number(item.count))).toFixed(2)
+ item.cost = (Number(item.cost1) + Number(item.shareAmount) / Number(item.count)).toFixed(2)
+
+ all += Number(item.shareAmount)
+ }
+
+ }
+
+
+ }
+
+ this.calculation2(item)
+
+ }
+
+ },
+
+
calculation2(row) {
// 折后单价 = 单价*折扣率 / 100
@@ -654,8 +734,6 @@
},
manufactureDateChange(row) {
- console.log("manufactureDateChange》》》》", row.madeDate)
- console.log("manufactureDateChange》》》》", row.shelfLife)
row.expireDate = this.addDate(row.madeDate, Number(row.shelfLife))
let reg = new RegExp('-', 'g') //g代表全部
@@ -680,50 +758,7 @@
return time
},
- // 计算分摊金额
- computeShareAmount() {
- // 分摊金额 = (采购运费+其他费用)*单价*数量/所有商品总价
-
- var price = Number(this.formobj.purchaseBillAmount.freight) + Number(this.formobj.purchaseBillAmount
- .otherAmount)
- var all = 0 // 除去最后一个的分摊总和
- var totalAmount = 0 // 原所有商品总价
- for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) {
-
- var item = this.formobj.purchaseBillDetailList[i]
- totalAmount = (Number(totalAmount) + Number(Number(item.cost1) * Number(item.count1))).toFixed(2)
- }
-
- console.log("price》》》》", price)
- console.log("totalAmount》》》》", totalAmount)
- // 分摊金额 = (采购运费+其他费用)*单价*数量/ 原所有商品总价
-
- for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) {
-
- var item = this.formobj.purchaseBillDetailList[i]
-
- if (i == this.formobj.purchaseBillDetailList.length - 1) {
- // 最后一条数据
- item.shareAmount = (Number(price) - Number(all)).toFixed(2)
- item.cost = (Number(item.cost1) + (Number(item.shareAmount) / Number(item.count))).toFixed(2)
-
- } else {
-
- item.shareAmount = (Number(price) * Number(item.cost1) * Number(item.count) / Number(totalAmount))
- .toFixed(2)
- item.cost = (Number(item.cost1) + (Number(item.shareAmount) / Number(item.count))).toFixed(2)
- all += Number(item.shareAmount)
-
-
- }
-
- // this.calculation(item)
- this.calculation2(item)
-
- }
-
- },
goodsAdd() {
this.viewState = 2
@@ -773,8 +808,8 @@
"count1": value[i].count != null ? value[i].count1 : '0',
"pcsCount": value[i].pcsNum != null ? value[i].pcsNum : '0',
"tagPrice": value[i].tagPrice != null ? value[i].tagPrice : '',
- "cost": value[i].cost != null ? value[i].cost : '',
- "cost1": value[i].cost != null ? value[i].cost1 : '',
+ "cost": value[i].cost != null ? value[i].cost : '0.00',
+ "cost1": value[i].cost != null ? value[i].cost1 : '0.00',
"discountRate": value[i].discountRate != null ? value[i].discountRate : '100',
"discountPrice": value[i].discountPrice != null ? value[i].discountPrice : '0.00',
"shareAmount": value[i].shareAmount != null ? value[i].shareAmount : '0.00',
@@ -892,7 +927,7 @@
"deptSid": window.sessionStorage.getItem('defaultDeptSid'),
"deptName": window.sessionStorage.getItem('defaultDeptName'),
"useOrgSid": window.sessionStorage.getItem('orgSid'),
- "createOrgSid": window.sessionStorage.getItem('defaultDeptSid'),
+ "createOrgSid": window.sessionStorage.getItem('orgSid'),
"orgPath": window.sessionStorage.getItem('orgSidPath'),
"purchaseBillAmount": {
"sid": "",
diff --git a/src/views/purchase/purchaseReview/index.vue b/src/views/purchase/purchaseReview/index.vue
index ee6751a..ae00ad2 100644
--- a/src/views/purchase/purchaseReview/index.vue
+++ b/src/views/purchase/purchaseReview/index.vue
@@ -100,7 +100,7 @@
-
+
@@ -110,9 +110,9 @@
-
-
-
+
+
+
@@ -365,7 +365,7 @@
}
})
getWarehouses({
- orgPath: window.sessionStorage.getItem('orgSidPath'),
+ orgPath: window.sessionStorage.getItem('orgSid'),
}).then((res) => {
if (res.success) {
this.warehouseList = res.data
@@ -376,7 +376,7 @@
})
getGoodsListAllByOrg({
- orgPath: window.sessionStorage.getItem('orgSidPath'),
+ orgPath: window.sessionStorage.getItem('orgSid'),
}).then((res) => {
if (res.success) {
this.goodsList = res.data
@@ -719,6 +719,7 @@
message: resp.msg,
showClose: true
})
+ this.orderInfo = {}
this.dialogVisible = false
this.loadList()
} else {
@@ -728,6 +729,7 @@
},
handleDialogClose() {
+ this.orderInfo = {}
this.dialogVisible = false
}
diff --git a/src/views/purchase/purchaseReview/purchaseOrderInfo.vue b/src/views/purchase/purchaseReview/purchaseOrderInfo.vue
index fd7eea8..f84230d 100644
--- a/src/views/purchase/purchaseReview/purchaseOrderInfo.vue
+++ b/src/views/purchase/purchaseReview/purchaseOrderInfo.vue
@@ -120,7 +120,7 @@
其他费用
{{ formobj.purchaseBillAmount.otherAmountName }}
+ class="addinputInfo">{{ formobj.purchaseBillAmount.otherAmount }}