diff --git a/src/views/goods/goods/goodsAdd.vue b/src/views/goods/goods/goodsAdd.vue
index 1ebca15..ff6d644 100644
--- a/src/views/goods/goods/goodsAdd.vue
+++ b/src/views/goods/goods/goodsAdd.vue
@@ -562,7 +562,7 @@
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -622,7 +622,7 @@
成本价
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -630,7 +630,7 @@
吊牌价
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -638,7 +638,7 @@
销售单价
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -651,7 +651,7 @@
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -659,7 +659,7 @@
代理价
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -679,7 +679,7 @@
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
diff --git a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
index b2ff51c..91689bb 100644
--- a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
+++ b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
@@ -117,26 +117,26 @@
-
+
-
+
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
-
+
-
+
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -194,7 +194,7 @@
采购运费
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
运费分摊方式
@@ -225,7 +225,7 @@
其他费用
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -243,7 +243,7 @@
预付金额
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -476,10 +476,10 @@
const value = Number(curr)
if (!isNaN(value)) {
this.allCount = prev + curr
- return (Number(prev) + Number(curr)).toFixed(2)
+ return (Number(prev) + Number(curr)).toFixed(4)
} else {
this.allCount = prev
- return Number(prev).toFixed(2)
+ return Number(prev).toFixed(4)
}
}, 0)
sums[index] += ''
@@ -488,10 +488,10 @@
const value = Number(curr)
if (!isNaN(value)) {
this.allPcsNum = prev + curr
- return (Number(prev) + Number(curr)).toFixed(2)
+ return (Number(prev) + Number(curr)).toFixed(4)
} else {
this.allPcsNum = prev
- return Number(prev).toFixed(2)
+ return Number(prev).toFixed(4)
}
}, 0)
sums[index] += ''
@@ -500,10 +500,10 @@
const value = Number(curr)
if (!isNaN(value)) {
this.allShareAmount = prev + curr
- return (Number(prev) + Number(curr)).toFixed(2)
+ return (Number(prev) + Number(curr)).toFixed(4)
} else {
this.allShareAmount = prev
- return Number(prev).toFixed(2)
+ return Number(prev).toFixed(4)
}
}, 0)
sums[index] += ''
@@ -512,10 +512,10 @@
const value = Number(curr)
if (!isNaN(value)) {
this.allAmount = prev + curr
- return (Number(prev) + Number(curr)).toFixed(2)
+ return (Number(prev) + Number(curr)).toFixed(4)
} else {
this.allAmount = prev
- return Number(prev).toFixed(2)
+ return Number(prev).toFixed(4)
}
}, 0)
sums[index] += ''
@@ -524,10 +524,10 @@
const value = Number(curr)
if (!isNaN(value)) {
this.allNotTaxPprice = prev + curr
- return (Number(prev) + Number(curr)).toFixed(2)
+ return (Number(prev) + Number(curr)).toFixed(4)
} else {
this.allNotTaxPprice = prev
- return Number(prev).toFixed(2)
+ return Number(prev).toFixed(4)
}
}, 0)
sums[index] += ''
@@ -536,10 +536,10 @@
const value = Number(curr)
if (!isNaN(value)) {
this.allTotalTax = prev + curr
- return (Number(prev) + Number(curr)).toFixed(2)
+ return (Number(prev) + Number(curr)).toFixed(4)
} else {
this.allTotalTax = prev
- return Number(prev).toFixed(2)
+ return Number(prev).toFixed(4)
}
}, 0)
sums[index] += ''
@@ -548,10 +548,10 @@
const value = Number(curr)
if (!isNaN(value)) {
this.allTotalNotTaxPprice = prev + curr
- return (Number(prev) + Number(curr)).toFixed(2)
+ return (Number(prev) + Number(curr)).toFixed(4)
} else {
this.allTotalNotTaxPprice = prev
- return Number(prev).toFixed(2)
+ return Number(prev).toFixed(4)
}
}, 0)
sums[index] += ''
@@ -582,7 +582,7 @@
if (Number(item.count) != 0) {
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count) / Number(item
- .discountRate) * 100).toFixed(2)
+ .discountRate) * 100).toFixed(4)
}
// item.cost = Number(item.cost1)
@@ -605,7 +605,7 @@
// item.cost = Number(item.cost1)
if (Number(item.count) != 0) {
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count) / Number(item
- .discountRate1) * 100).toFixed(2)
+ .discountRate1) * 100).toFixed(4)
}
this.calculation2(item)
@@ -663,8 +663,8 @@
for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) {
var item = this.formobj.purchaseBillDetailList[i]
- totalAmount = (Number(totalAmount) + Number(item.amount)).toFixed(2)
- // totalAmount = (Number(totalAmount) + Number(Number(item.cost) * Number(item.count))).toFixed(2)
+ totalAmount = (Number(totalAmount) + Number(item.amount)).toFixed(4)
+ // totalAmount = (Number(totalAmount) + Number(Number(item.cost) * Number(item.count))).toFixed(4)
}
// 分摊金额 = (采购运费+其他费用)*单价*数量/ 原所有商品总价
@@ -678,17 +678,17 @@
if (Number(price) == 0) {
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count) / Number(item
- .discountRate) * 100).toFixed(2)
+ .discountRate) * 100).toFixed(4)
item.shareAmount = 0.00
} else {
// 最后一条数据
item.cost1 = (Number(item.cost) - Number(item.shareAmount) / Number(item.count) / Number(item
- .discountRate) * 100).toFixed(2)
- item.shareAmount = (Number(price) - Number(all)).toFixed(2)
+ .discountRate) * 100).toFixed(4)
+ item.shareAmount = (Number(price) - Number(all)).toFixed(4)
- // 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(4)
item.cost = (Number(item.cost1) + Number(item.shareAmount) / Number(item.count) / Number(item
- .discountRate) * 100).toFixed(2)
+ .discountRate) * 100).toFixed(4)
}
}
@@ -697,17 +697,17 @@
if (Number(item.count) != 0) {
if (Number(price) == 0) {
item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count) / Number(item
- .discountRate) * 100).toFixed(2)
+ .discountRate) * 100).toFixed(4)
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)
+ .toFixed(4)
- // 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(4)
item.cost = (Number(item.cost1) + Number(item.shareAmount) / Number(item.count) / Number(item
- .discountRate) * 100).toFixed(2)
+ .discountRate) * 100).toFixed(4)
all += Number(item.shareAmount)
}
@@ -727,24 +727,24 @@
calculation2(row) {
// 折后单价 = 单价*折扣率 / 100
- row.discountPrice = (Number(row.cost) * Number(row.discountRate) / 100).toFixed(2)
+ row.discountPrice = (Number(row.cost) * Number(row.discountRate) / 100).toFixed(4)
// console.log("calculation》》》》", row.discountPrice)
// 总价 = 单价* 数量*折扣率 / 100
- row.amount = (Number(row.count) * Number(row.cost) * Number(row.discountRate) / 100).toFixed(2)
+ row.amount = (Number(row.count) * Number(row.cost) * Number(row.discountRate) / 100).toFixed(4)
// console.log("calculation》》》》", row.amount)
// 总税额 = 总价/(1+税率)*税率
row.taxAmount = (Number(row.amount) / (1 + Number(row.taxRate) / 100) * Number(row.taxRate) / 100)
- .toFixed(2)
+ .toFixed(4)
// console.log("calculation2》》》》", row.taxAmount)
// 未含税价 =(总价-总税额)/数量
- row.unTaxPrice = ((Number(row.amount) - Number(row.taxAmount)) / row.count).toFixed(2)
+ row.unTaxPrice = ((Number(row.amount) - Number(row.taxAmount)) / row.count).toFixed(4)
// console.log("calculation2》》》》", row.unTaxPrice)
// 未含税总价 = 总价-总税额
- row.unTaxTotalAmount = (Number(row.amount) - Number(row.taxAmount)).toFixed(2)
+ row.unTaxTotalAmount = (Number(row.amount) - Number(row.taxAmount)).toFixed(4)
// console.log("calculation2》》》》", row.unTaxTotalAmount)
},