yxt_product
/
oms-ui-admin
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善 金额\数量 可设置4位小数

master
myTest383 8 months ago
parent
e0560278e0
commit
e29c8977ba
2 changed files with 49 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/views/goods/goods/goodsAdd.vue
  2. 84
      src/views/purchase/purchaseOrder/purchaseOrderAdd.vue

14
src/views/goods/goods/goodsAdd.vue
View File

@ -562,7 +562,7 @@
<el-form-item>
<el-input v-model="itemInfo.finalPurchasePrice" placeholder="最后采购价" clearable
class="addinputw addinputInfo"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')" />
</el-form-item>
</el-col>
@ -622,7 +622,7 @@
<div class="span-sty">成本价</div>
<el-form-item>
<el-input v-model="itemInfo.costPrice" placeholder="成本价" clearable class="addinputw addinputInfo"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')" />
</el-form-item>
</el-col>
@ -630,7 +630,7 @@
<div class="span-sty">吊牌价</div>
<el-form-item>
<el-input v-model="itemInfo.tagPrice" placeholder="吊牌价" clearable class="addinputw addinputInfo"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')" />
</el-form-item>
</el-col>
@ -638,7 +638,7 @@
<div class="span-sty">销售单价</div>
<el-form-item>
<el-input v-model="itemInfo.salesPrice" placeholder="销售单价" clearable class="addinputw addinputInfo"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')" />
</el-form-item>
</el-col>
@ -651,7 +651,7 @@
<el-form-item>
<el-input v-model="itemInfo.standardPurchasePrice" placeholder="标准进价" clearable
class="addinputw addinputInfo"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')" />
</el-form-item>
</el-col>
@ -659,7 +659,7 @@
<div class="span-sty">代理价</div>
<el-form-item>
<el-input v-model="itemInfo.agencyPrice" placeholder="代理价" clearable class="addinputw addinputInfo"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')" />
</el-form-item>
</el-col>
@ -679,7 +679,7 @@
<el-form-item>
<el-input v-model="itemInfo.minimumSalesPrice" placeholder="最低零售价" clearable
class="addinputw addinputInfo"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')" />
</el-form-item>
</el-col>

84
src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
View File

@ -117,26 +117,26 @@
<el-table-column label="商品名称" prop="goodsSkuTitle" width="150" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" width="120" align="center" />
<el-table-column label="单位" prop="unit" width="60" align="center" />
<el-table-column label="采购数量" align="center" prop="count" width="100">
<el-table-column label="采购数量" align="center" prop="count" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.count" clearable placeholder=""
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')"
@input="calculation(scope.row,'count')" />
</template>
</el-table-column>
<el-table-column label="数量(pcs)" prop="pcsCount" align="center" width="100">
<el-table-column label="数量(pcs)" prop="pcsCount" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.pcsCount" clearable placeholder=""
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')" />
</template>
</el-table-column>
<!-- <el-table-column label="数量(pcs)" prop="pcsNum" width="120" align="center" /> -->
<el-table-column label="吊牌价" prop="tagPrice" width="80" align="center" />
<el-table-column label="吊牌价" prop="tagPrice" width="100" align="center" />
<!-- <el-table-column label="单价" prop="cost" width="120" align="center" /> -->
<el-table-column label="单价" align="center" width="120">
<el-table-column label="单价" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.cost" clearable placeholder="" @input="calculation(scope.row,'cost')"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')" />
</template>
</el-table-column>
<el-table-column label="折扣率(%)" align="center" width="100">
@ -194,7 +194,7 @@
<div class="span-sty">采购运费</div>
<el-form-item prop="freight"> <el-input class="addinputw addinputInfo"
v-model="formobj.purchaseBillAmount.freight" clearable placeholder="" @change="computeShareAmount"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" /></el-form-item>
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">运费分摊方式</div>
@ -225,7 +225,7 @@
<div class="span-sty">其他费用</div>
<el-form-item prop="otherAmount"> <el-input class="addinputw addinputInfo"
v-model="formobj.purchaseBillAmount.otherAmount" clearable placeholder="" @change="computeShareAmount"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')" />
</el-form-item>
</el-col>
@ -243,7 +243,7 @@
<div class="span-sty">预付金额</div>
<el-form-item prop="prepayment"> <el-input class="addinputw addinputInfo"
v-model="formobj.purchaseBillAmount.prepayment" clearable placeholder=""
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\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, '')" />
</el-form-item>
</el-col>
</el-row>
@ -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)
},

Write Preview
Loading…
Cancel
Save