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

优化

Browse Source
This commit is contained in:
齐天大圣 2024-06-12 17:43:37 +08:00
parent 610aa48b50
commit 3d8cba8da4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -127,7 +127,7 @@
<el-table-column type="index" width="50" align="center" label="序号"/> <el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="payTime" align="center" label="支付时间" width="220"> </el-table-column> <el-table-column prop="payTime" align="center" label="支付时间" width="220"> </el-table-column>
<el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column> <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
<el-table-column prop="storeName" align="center" label="门店"> </el-table-column> <el-table-column prop="storeName" align="center" label="门店" width="150"> </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="payChannel" align="center" label="支付渠道"> <el-table-column prop="payChannel" align="center" label="支付渠道">
<template slot-scope="scope"> <template slot-scope="scope">
@ -139,9 +139,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column> <el-table-column prop="mchntCd" align="center" label="商户号" width="150"> </el-table-column>
<el-table-column prop="amount" align="center" label="费率"> </el-table-column> <!-- <el-table-column prop="amount" align="center" label="费率"> </el-table-column>-->
<el-table-column prop="type" align="center" label="订单来源"> <el-table-column prop="type" align="center" label="订单来源" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.type=='1'">油品</span> <span v-if="scope.row.type=='1'">油品</span>
<span v-else-if="scope.row.type=='2'">商品</span> <span v-else-if="scope.row.type=='2'">商品</span>
@ -177,7 +177,7 @@
</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="优惠后应付金额" width="150"> </el-table-column>
<el-table-column prop="refMoney" align="center" label="退款金额"> <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>
@ -186,7 +186,7 @@
</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="payAmount" 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="userName" align="center" label="付款用户" width="135"> </el-table-column>
<el-table-column prop="content" align="content" label="备注" > </el-table-column> <el-table-column prop="content" align="content" label="备注" > </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">

1
fuintAdmin_zt/src/views/tag/tagCode/index.vue
View File

@ -63,6 +63,7 @@
<!-- <el-table-column label="码牌二维码：域名+字符串" align="center" prop="tagCodeSn" />--> <!-- <el-table-column label="码牌二维码：域名+字符串" align="center" prop="tagCodeSn" />-->
<!-- <el-table-column label="二维码ID" align="center" prop="id" />--> <!-- <el-table-column label="二维码ID" align="center" prop="id" />-->
<el-table-column label="二维码ID" align="center" prop="tagCodeSn" /> <el-table-column label="二维码ID" align="center" prop="tagCodeSn" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="二维码" align="center" prop="imageUrl" > <el-table-column label="二维码" align="center" prop="imageUrl" >
<template slot-scope="scope"> <template slot-scope="scope">