Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm

# Conflicts:
#	src/components/bpmnProcessDesigner/package/theme/index.scss
This commit is contained in:
YunaiV
2024-11-09 19:01:12 +08:00
19 changed files with 78 additions and 48 deletions

View File

@@ -121,7 +121,7 @@
label="创建时间"
align="center"
prop="createTime"
width="180"
width="170"
:formatter="dateFormatter"
/>
<el-table-column label="支付金额" align="center" prop="payPrice" width="100">
@@ -157,7 +157,7 @@
</p>
</template>
</el-table-column>
<el-table-column label="退款状态" align="center" prop="status">
<el-table-column label="退款状态" align="center" prop="status" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.PAY_REFUND_STATUS" :value="scope.row.status" />
</template>