czg_team
/
cashier_desktop
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复优化

This commit is contained in:
gyq 2025-04-07 09:37:08 +08:00
parent 429283e542
commit ebf912ecd8
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/utils/index.js
View File

@ -164,9 +164,10 @@ export function commOrderPrintData(orderInfo) {
carts: [], carts: [],
amount: formatDecimal(orderInfo.payAmount), amount: formatDecimal(orderInfo.payAmount),
originAmount: formatDecimal(orderInfo.originAmount), originAmount: formatDecimal(orderInfo.originAmount),
discountAmount: formatDecimal( discountAmount:
orderInfo.originAmount - orderInfo.orderAmount orderInfo.status == "unpaid"
), ? "0.00"
: formatDecimal(orderInfo.originAmount - orderInfo.orderAmount),
discount: orderInfo.discountRatio, discount: orderInfo.discountRatio,
remark: orderInfo.remark, remark: orderInfo.remark,
orderInfo: orderInfo, orderInfo: orderInfo,

4
src/views/home/components/cartOperation.vue
View File

@ -499,8 +499,8 @@ const noteList = ref([
// 显示 // 显示
function showDiscountModalHandle() { function showDiscountModalHandle() {
let item = goodsStore.cartList[goodsStore.cartActiveIndex] let item = goodsStore.cartList[goodsStore.cartActiveIndex]
if ((item && item.id) && (!item.is_temporary || !item.is_gift)) { if ((item && item.id) && (!item.is_temporary && !item.is_gift)) {
// 存在商品并且不能为临时菜 // 存在商品并且不能为临时菜或者赠送
showDiscountModal.value = true showDiscountModal.value = true
} }
} }

5
src/views/order/components/printDrawer.vue
View File

@ -60,8 +60,9 @@
</div> </div>
<div class="row between"> <div class="row between">
<span>折扣</span> <span>折扣</span>
<span> <span>-{{ orderInfo.status == "unpaid"
{{ formatDecimal(orderInfo.originAmount - orderInfo.orderAmount) }} ? "0.00"
: formatDecimal(orderInfo.originAmount - orderInfo.orderAmount) }}
</span> </span>
</div> </div>
<div class="line"></div> <div class="line"></div>