dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10.24

Browse Source
This commit is contained in:
cun-nan 2024-10-24 18:01:22 +08:00
parent 82bbcefc9c
commit 03673579f5
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintAdmin/src/views/EventMarketing/center/index.vue
View File

@ -237,7 +237,11 @@
<span>{{ scope.row.userGradeName || "--" }}</span> <span>{{ scope.row.userGradeName || "--" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sendNum" label="已领数量"></el-table-column> <el-table-column prop="sendNum" label="已领数量">
<template slot-scope="scope">
<span>{{ scope.row.sendNum || 0 }}</span>
</template>
</el-table-column>
<el-table-column prop="activeStatus" label="状态"> <el-table-column prop="activeStatus" label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch

22
fuintAdmin/src/views/handover/info/rec/trading.vue
View File

@ -210,22 +210,22 @@
<span v-else="">其他</span> <span v-else="">其他</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodsMoney" align="center" label="订单金额"> <el-table-column prop="goodsMoney" align="center" label="订单金额（元）">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.type=='3'">{{scope.row.goodsMoney + scope.row.payMoney}}</span> <span v-if="scope.row.type=='3'">{{scope.row.goodsMoney + scope.row.payMoney}}</span>
<span v-else>{{scope.row.goodsMoney}}</span> <span v-else>{{scope.row.goodsMoney}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="payMoney" align="center" label="优惠后应付金额"> </el-table-column> <el-table-column prop="payMoney" align="center" label="优惠金额（元）"> </el-table-column>
<el-table-column prop="refMoney" align="center" label="退款金额"> <el-table-column prop="payMoney" align="center" label="实收金额（元）"> </el-table-column>
<el-table-column prop="payMoney" align="center" label="会员消费金额（元）"> </el-table-column>
<el-table-column prop="refMoney" align="center" label="挂账/归还金额（元）">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status == 'refund'">{{scope.row.payMoney}}</span> <span v-if="scope.row.status == 'refund'">{{scope.row.payMoney}}</span>
<span type="danger" v-else>--</span> <span type="danger" v-else>--</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="payMoney" align="center" label="实收金额"> </el-table-column> <el-table-column prop="userName" align="center" label="用户手机号" > </el-table-column>
<!-- <el-table-column prop="payAmount" align="center" label="手续费"> </el-table-column>-->
<el-table-column prop="userName" align="center" label="付款用户" > </el-table-column>
<el-table-column prop="payType" align="center" label="支付方式"> <el-table-column prop="payType" align="center" label="支付方式">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.payType=='CASH'">现金</span> <span v-if="scope.row.payType=='CASH'">现金</span>
@ -242,11 +242,19 @@
<el-tag type="danger" v-else>支付失败</el-tag> <el-tag type="danger" v-else>支付失败</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
<el-table-column prop="createBy" align="center" label="关联员工"> </el-table-column> <el-table-column prop="createBy" align="center" label="关联员工"> </el-table-column>
<el-table-column prop="createTime" align="center" label="订单创建时间" width="220"> </el-table-column> <el-table-column prop="createTime" align="center" label="订单创建时间" width="220"> </el-table-column>
<el-table-column prop="updateTime" align="center" label="订单完成时间" width="220"> </el-table-column> <el-table-column prop="updateTime" align="center" label="订单完成时间" width="220"> </el-table-column>
<el-table-column align="center" label="操作">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="getOrdersInfo(scope.row)"
>详情</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<pagination <pagination