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

Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev

This commit is contained in:
YeMingfei666 2024-11-20 15:19:45 +08:00
parent fb811fa07e 4f566f37c7
commit 10ced0d770
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,12 +53,7 @@
returnCanComputedGoodsArr,canComputedPackFee, returnCanComputedGoodsArr,canComputedPackFee,
returnPackFee returnPackFee
} from '@/commons/utils/goodsUtil.js' } from '@/commons/utils/goodsUtil.js'
function extraCanTuicai(orderInfo,data){
return orderInfo.status=='unpaid'&&data.status!='return'&&data.priceAmount*1>0
}
function extraCanTuiKuan(orderInfo,data){
return orderInfo.status=='closed'&&data.status!='return'&&data.priceAmount*1>0
}
const props = defineProps({ const props = defineProps({
data: { data: {
type: Object, type: Object,
@ -77,6 +72,12 @@
default: () => {} default: () => {}
} }
}) })
function extraCanTuicai(orderInfo,data){
return orderInfo.status=='unpaid'&&data.status!='return'&&data.priceAmount*1>0
}
function extraCanTuiKuan(orderInfo,data){
return orderInfo.status=='closed'&&data.status!='refund'&&data.priceAmount*1>0
}
const packeNumbber = computed(() => { const packeNumbber = computed(() => {
if (!props.orderInfo.detailList) { if (!props.orderInfo.detailList) {
return 0 return 0