pull/19/head^2
xiaozhiyong 1 year ago
parent bcc4da0b06
commit 142d70d164
  1. 4
      src/utils/index.js
  2. 18
      src/views/refineryCenter/index.vue

@ -52,10 +52,6 @@ export function isLicensePlate(number) {
return instance.test(number) return instance.test(number)
} }
export function cellStyle() {
return 'text-align:center'
}
// 类型判断 // 类型判断
export function typeJudgment(object) { export function typeJudgment(object) {
let res = {}.__proto__.toString.call(object) let res = {}.__proto__.toString.call(object)

@ -85,7 +85,7 @@
当前 <span>{{ row.currentRechargeBalance }}</span> 当前 <span>{{ row.currentRechargeBalance }}</span>
</p> </p>
<p class="gray"> <p class="gray">
上次 <span>{{ row.lasttRechargeBalance }}</span> 上次 <span>{{ row.lastRechargeBalance }}</span>
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
@ -99,7 +99,7 @@
</p> </p>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column prop="orderId" label="业务单号" minWidth="180"> </el-table-column> <el-table-column prop="reverseId" label="业务单号" minWidth="180"> </el-table-column>
<el-table-column prop="createTime" label="创建时间" minWidth="210"> </el-table-column> <el-table-column prop="createTime" label="创建时间" minWidth="210"> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
@ -158,6 +158,10 @@ export default {
return '订单退款' return '订单退款'
case 'TRANSFER': case 'TRANSFER':
return '转账' return '转账'
case 'refineryRECHARGE':
return '炼厂充值'
case 'refineryTURN':
return '炼厂圈回'
} }
return val ? val : '暂无数据' return val ? val : '暂无数据'
} }
@ -327,7 +331,15 @@ export default {
// this.total = res.data.totalCount; // this.total = res.data.totalCount;
}) })
order.getRecordsByActld(this.parameter).then(res => { order.getRecordsByActld(this.parameter).then(res => {
this.tableData = res.data.list let data = res.data.list.map(item => {
// 2023.06.20
if (item.refineryAccountName) {
item.transactionType === 'TURN' && (item.transactionType = 'refineryRECHARGE')
item.transactionType === 'RECHARGE' && (item.transactionType = 'refineryTURN')
}
return item
})
this.tableData = data
this.total = res.data.totalCount this.total = res.data.totalCount
}) })
}, },

Loading…
Cancel
Save