优化最新版打印机逻辑

This commit is contained in:
gyq
2026-04-22 14:23:46 +08:00
parent fa67997c86
commit d5568c48d0
16 changed files with 2872 additions and 345 deletions

View File

@@ -195,12 +195,13 @@ export function commOrderPrintData(orderInfo) {
categoryId: item.categoryId,
name: item.isGift === 1 ? `[赠]${item.productName}` : item.productName,
number: item.num - item.returnNum,
skuName: item.skuName,
skuName: item.skuName || '',
salePrice: formatDecimal(+price),
totalAmount: formatDecimal(+item.payAmount),
proGroupInfo: item.proGroupInfo
? item.proGroupInfo.map((item) => item.goods).flat()
: "",
remark: item.remark
});
});
} else {
@@ -215,18 +216,19 @@ export function commOrderPrintData(orderInfo) {
categoryId: item.categoryId,
name: item.isGift === 1 ? `[赠]${item.productName}` : item.productName,
number: item.num - item.returnNum,
skuName: item.skuName,
skuName: item.skuName || '',
salePrice: formatDecimal(+price),
totalAmount: formatDecimal((item.num - item.returnNum) * price),
proGroupInfo: item.proGroupInfo
? item.proGroupInfo.map((item) => item.goods).flat()
: "",
remark: item.remark || ''
});
});
}
if (orderInfo.dineMode == 'dine-in') {
if (orderInfo.seatAmount > 0 && orderInfo.isGuest && orderInfo.placeNum == 1 && !orderInfo.isRefundDish) {
if (orderInfo.seatAmount > 0 && orderInfo.isGuest && orderInfo.placeNum == 1 && !orderInfo.isRefundDish && !orderInfo.isNotPrint) {
data.carts.push({
categoryId: '',
name: '餐位费',
@@ -235,10 +237,11 @@ export function commOrderPrintData(orderInfo) {
salePrice: formatDecimal(orderInfo.seatAmount / orderInfo.seatNum),
totalAmount: orderInfo.seatAmount,
proGroupInfo: "",
remark: ''
})
}
if (orderInfo.seatAmount > 0 && !orderInfo.isGuest && !orderInfo.isRefundDish) {
if (orderInfo.seatAmount > 0 && !orderInfo.isGuest && !orderInfo.isRefundDish && !orderInfo.isNotPrint) {
data.carts.push({
categoryId: '',
name: '餐位费',
@@ -247,11 +250,12 @@ export function commOrderPrintData(orderInfo) {
salePrice: formatDecimal(orderInfo.seatAmount / orderInfo.seatNum),
totalAmount: orderInfo.seatAmount,
proGroupInfo: "",
remark: ''
})
}
}
if (orderInfo.packFee > 0 && !orderInfo.isRefundDish) {
if (orderInfo.packFee > 0 && !orderInfo.isRefundDish && !orderInfo.isNotPrint) {
let packNum = 0;
orderInfo.cartList.forEach(item => {
packNum += item.packNumber
@@ -264,10 +268,11 @@ export function commOrderPrintData(orderInfo) {
salePrice: '',
totalAmount: formatDecimal(orderInfo.packFee),
proGroupInfo: "",
remark: ''
})
}
console.log('最终组合打印数据===', data);
// console.log('最终组合打印数据===', data);
return data;
}