bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题修改6

This commit is contained in:
zzyuan 2025-06-26 16:21:41 +08:00
parent d85adcbbc5
commit 088d20c1f6
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/canteen/order/offlineManagement/index.vue
View File

@ -343,7 +343,13 @@
<el-descriptions-item>
<template slot="label"> 订单状态</template>
<dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/>
<span v-if="orderInfoData.orderState==1">已下单</span>
<span v-if="orderInfoData.orderState==2">已完成</span>
<span v-if="orderInfoData.orderState==3&&orderInfoData.payState==3">已退单</span>
<span v-if="orderInfoData.orderState==3&&orderInfoData.payState==4">已取消</span>
<span v-if="orderInfoData.orderState==4">待下单</span>
<span v-if="orderInfoData.orderState==5">部分退单</span>
<!-- <dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/> -->
</el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label"> 流水号</template>

8
src/views/canteen/order/reserveManagement/index.vue
View File

@ -326,7 +326,13 @@
<el-descriptions-item>
<template slot="label"> 订单状态</template>
<dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/>
<span v-if="orderInfoData.orderState==1">已下单</span>
<span v-if="orderInfoData.orderState==2">已完成</span>
<span v-if="orderInfoData.orderState==3&&orderInfoData.payState==3">已退单</span>
<span v-if="orderInfoData.orderState==3&&orderInfoData.payState==4">已取消</span>
<span v-if="orderInfoData.orderState==4">待下单</span>
<span v-if="orderInfoData.orderState==5">部分退单</span>
<!-- <dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/> -->
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 备注</template>

6
src/views/canteen/reportCenter/tradeSumByDishes/index.vue
View File

@ -77,10 +77,10 @@
<span>{{ (scope.row.dinnerConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="夜宵数量" align="center" prop="otherQuantityCount" :show-overflow-tooltip="true" />
<el-table-column label="夜宵金额" align="center" prop="otherConsumeCount" :show-overflow-tooltip="true" >
<el-table-column label="夜宵数量" align="center" prop="midnightSnackQuantityCount" :show-overflow-tooltip="true" />
<el-table-column label="夜宵金额" align="center" prop="midnightSnackConsumeCount" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<span>{{ (scope.row.otherConsumeCount/100).toFixed(2) }}</span>
<span>{{ (scope.row.midnightSnackConsumeCount/100).toFixed(2) }}</span>
</template>
</el-table-column>
</el-table>