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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-03-15 16:46:44 +08:00
commit e4b88ac99c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue
View File

@ -18,7 +18,8 @@
<el-table-column align="center" prop="balance" label="变动金额"/> <el-table-column align="center" prop="balance" label="变动金额"/>
<el-table-column align="center" label="变动前余额"> <el-table-column align="center" label="变动前余额">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.afterTheChange?parseFloat(scope.row.afterTheChange + scope.row.balance).toFixed(2) : '/'}}</span> <span v-if="scope.row.changeType == 0">{{ scope.row.afterTheChange?parseFloat(scope.row.afterTheChange + scope.row.balance).toFixed(2) : '/'}}</span>
<span v-else>{{ scope.row.afterTheChange?parseFloat(scope.row.afterTheChange - scope.row.balance).toFixed(2) : '/'}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="afterTheChange" label="变动后余额"> <el-table-column align="center" prop="afterTheChange" label="变动后余额">

3
fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue
View File

@ -18,7 +18,8 @@
<el-table-column align="center" prop="balance" label="变动金额"/> <el-table-column align="center" prop="balance" label="变动金额"/>
<el-table-column align="center" label="变动前余额"> <el-table-column align="center" label="变动前余额">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.afterTheChange?parseFloat(scope.row.afterTheChange + scope.row.balance).toFixed(2) : '/'}}</span> <span v-if="scope.row.changeType == 0">{{ scope.row.afterTheChange?parseFloat(scope.row.afterTheChange + scope.row.balance).toFixed(2) : '/'}}</span>
<span v-else>{{ scope.row.afterTheChange?parseFloat(scope.row.afterTheChange - scope.row.balance).toFixed(2) : '/'}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="afterTheChange" label="变动后余额"> <el-table-column align="center" prop="afterTheChange" label="变动后余额">