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

订单管理更新

This commit is contained in:
YeMingfei666 2024-10-31 09:54:42 +08:00
parent be0b3af8dd
commit ad00b46a24
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pagesOrder/detail/components/extra.vue
View File

@ -1,5 +1,5 @@
<template>
<view class="default-box-padding bg-fff border-r-12 u-m-t-20" v-if="packeFee>0||data.totalAmount>0">
<view class="default-box-padding bg-fff border-r-12 u-m-t-20" v-if="packeFee>0||data.priceAmount>0">
<view class="u-flex u-row-between">
<view class="font-bold">附加费</view>
<template v-if="extraCanTuicai(orderInfo,data)">
@ -10,21 +10,21 @@
</template>
</view>
<view>
<template v-if="data.status!='return'">
<view class="u-flex u-row-between u-m-t-24" v-if="data.totalAmount*1>0">
<view>{{data.name||'餐位费'}}</view>
<view>x{{data.number||0}}</view>
<view class="price-min-width">￥{{data.totalAmount}}</view>
<template v-if="data.status!='return'&&data.status!='refund'&&data.status!='refunding'">
<view class="u-flex u-row-between u-m-t-24" v-if="data.priceAmount*1>0">
<view>{{data.productName||'餐位费'}}</view>
<view>x{{data.num||0}}</view>
<view class="price-min-width">￥{{data.priceAmount}}</view>
</view>
</template>
<template v-else>
<view class="u-flex u-row-between u-m-t-24 color-999">
<view class="u-flex">
<view class="line-th ">{{data.name||'餐位费'}}</view>
<view class="tag yitui u-m-l-10">已退</view>
<view class="line-th ">{{data.productName||'餐位费'}}</view>
<view class="tag yitui u-m-l-10">{{data.status=='refunding'?'退款中': '已退'}}</view>
</view>
<view class="line-th">x{{data.number||0}}</view>
<view class="line-th">￥{{data.totalAmount}}</view>
<view class="line-th">x{{data.num||0}}</view>
<view class="line-th">￥{{data.priceAmount}}</view>
</view>
</template>
<!-- <view class="u-flex u-row-right u-m-t-24">
@ -54,10 +54,10 @@
returnPackFee
} from '@/commons/utils/goodsUtil.js'
function extraCanTuicai(orderInfo,data){
return orderInfo.status=='unpaid'&&data.status!='return'&&data.totalAmount*1>0
return orderInfo.status=='unpaid'&&data.status!='return'&&data.priceAmount*1>0
}
function extraCanTuiKuan(orderInfo,data){
return orderInfo.status=='closed'&&data.status!='return'&&data.totalAmount*1>0
return orderInfo.status=='closed'&&data.status!='return'&&data.priceAmount*1>0
}
const props = defineProps({
data: {

3
pagesOrder/detail/components/list.vue
View File

@ -129,6 +129,7 @@
<view></view>
<view>
<text>总计￥</text>
<!-- <text class="font-bold u-font-32">{{numSum([allPrice,seatFeePrice,packFee]) }}</text> -->
<text class="font-bold u-font-32">{{to2(allPrice*1+seatFeePrice*1+packFee*1) }}</text>
</view>
</view>
@ -147,7 +148,7 @@
import {
hasPermission
} from '@/commons/utils/hasPermission.js'
import {isTui,canTuiKuan,canTuicai} from '@/commons/utils/goodsUtil.js'
import {isTui,canTuiKuan,canTuicai,numSum} from '@/commons/utils/goodsUtil.js'
const emits = defineEmits(['tuicai', 'tuikuan', 'printOrder'])
function returnTotalMoney(item) {

24
pagesOrder/detail/detail.vue
View File

@ -75,7 +75,7 @@
})
function onSeatFeeTuicai(seatFee) {
seatFee={...seatFee,num:seatFee.number,productName:seatFee.name}
seatFee={...seatFee,num:seatFee.num,productName:seatFee.productName}
console.log(seatFee);
tuicai.show = true
tuicai.isSeatFee = seatFee
@ -94,26 +94,25 @@
return
}
const {
id,
id,cartId,
productId,
productSkuId,
name,
cartId,
number,
totalAmount,
salePrice
productName,
num,
priceAmount,
price
} = seatFee
go.to('PAGES_ORDER_TUIKUAN', {
orderId:orderDetail.info.id,
id:seatFee.id,
id:cartId,
productId,
productSkuId,
productName:name,
num:number,
productName,
num,
number: 0,
productSkuName: '',
priceAmount:totalAmount,
price:salePrice
priceAmount,
price
})
}
@ -282,6 +281,7 @@
}
}
console.log(res.seatInfo);
orderDetail.seatFee = res.seatInfo|| {
name: '客座费',
number: res.seatCount,

2
pagesOrder/index/compoents/order-item.vue
View File

@ -121,7 +121,7 @@
const priceSize = 9
function goodsPriceAmount(item){
return item.price*item.num
return (item.price*item.num).toFixed(2)
}
// const packeFee=computed(()=>{
// return props.data.detailList.reduce((prve,cur)=>{