czg_team/cashier-web
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 耗材单位换算计算统一为第一单位大，第二单位*换算值=第一单位

Browse Source
This commit is contained in:
YeMingfei666
2025-03-21 14:19:19 +08:00
parent 61bdfb924b
commit c011ae22e4
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/views/inventory/operation_in/index.vue
View File

@@ -341,11 +341,11 @@ export default {
if (!row.unit) {
return price;
}
if (row.unit && row.defaultUnit && row.unit != row.defaultUnit) {
price = price / row.conUnitTwoConvert;
} else {
price = price;
if (row.unit == row.conUnit) {
return price;
}
if (row.conUnitTwo && row.unit == row.conUnitTwo) {
return price / row.conUnitTwoConvert;
}
return price;
},
@@ -353,7 +353,10 @@ export default {
if (!row.unit) {
return number;
}
if (row.defaultUnit && row.unit != row.defaultUnit) {
if (row.unit == row.conUnit) {
return number;
}
if (row.conUnitTwo && row.unit == row.conUnitTwo) {
return number * row.conUnitTwoConvert;
}
return number;
@@ -433,10 +436,13 @@ export default {
try {
this.queryFormLoading = true;
const bodyList = this.tableData.list.map((v) => {
const inOutNumber =
v.defaultUnit && v.unit != v.defaultUnit
? v.stockNumber / v.conUnitTwoConvert
: v.stockNumber;
let inOutNumber = v.stockNumber;
if (v.unit == v.conUnit) {
inOutNumber = v.stockNumber;
}
if (v.conUnitTwo && v.unit == v.conUnitTwo) {
inOutNumber = v.stockNumber / v.conUnitTwoConvert;
}
return {
conId: v.id,
conName: v.conName,
@@ -476,8 +482,9 @@ export default {
item.stockNumber = 0;
item.costPrice = item.price;
item.conInfoId = item.id;
item.unit = item.defaultUnit;
item.unit = item.defaultUnit || item.conUnit;
item.originPrice = item.price;
item.price = this.returnPrice(item, item.price);
return item;
});
this.tableData.list = [...this.tableData.list, ...arr];