CC/ruoyi-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
van
2026-04-07 02:23:46 +08:00
parent 1ad851fb6f
commit 0d261efd49
5 changed files with 90 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
src/views/system/jdorder/orderList.vue
View File

@@ -506,79 +506,62 @@
</template>
</template>
</el-table-column>
<el-table-column label="备注/状态" prop="status" min-width="100" show-overflow-tooltip/>
<el-table-column label="下单人" prop="buyer" width="80"/>
<!-- 退款状态拆分为多列，避免行高被撑大 -->
<el-table-column label="退款" prop="isRefunded" width="70" align="center">
<!-- 退款/到账/价保/专票/评价：合并为一列 -->
<el-table-column label="状态" align="center" width="200" class-name="order-status-flags-cell">
<template slot-scope="scope">
<el-tag
:type="scope.row.isRefunded === 1 ? 'warning' : 'info'"
size="small"
:title="scope.row.isRefunded === 1 && scope.row.refundDate ? '退款日期：' + parseTime(scope.row.refundDate) : ''"
@click.native="toggleRefunded(scope.row)"
style="cursor: pointer;">
{{ scope.row.isRefunded === 1 ? '已退款' : '未退款' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="退款到账" prop="isRefundReceived" width="80" align="center">
<template slot-scope="scope">
<el-tag
:type="scope.row.isRefundReceived === 1 ? 'success' : 'info'"
size="small"
:title="scope.row.isRefundReceived === 1 && scope.row.refundReceivedDate ? '退款到账日期：' + parseTime(scope.row.refundReceivedDate) : ''"
@click.native="toggleRefundReceived(scope.row)"
style="cursor: pointer;">
{{ scope.row.isRefundReceived === 1 ? '已到账' : '未到账' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="后返到账" prop="isRebateReceived" width="76" align="center">
<template slot-scope="scope">
<el-tag
:type="scope.row.isRebateReceived === 1 ? 'success' : 'info'"
size="small"
:title="scope.row.isRebateReceived === 1 && scope.row.rebateReceivedDate ? '后返到账日期：' + parseTime(scope.row.rebateReceivedDate) : ''"
@click.native="toggleRebateReceived(scope.row)"
style="cursor: pointer;">
{{ scope.row.isRebateReceived === 1 ? '已到账' : '未到账' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="价保" prop="isPriceProtected" width="66" align="center">
<template slot-scope="scope">
<el-tag
:type="scope.row.isPriceProtected === 1 ? 'warning' : 'info'"
size="small"
:title="scope.row.isPriceProtected === 1 && scope.row.priceProtectedDate ? '价保日期：' + parseTime(scope.row.priceProtectedDate) : ''"
@click.native="togglePriceProtected(scope.row)"
style="cursor: pointer;">
{{ scope.row.isPriceProtected === 1 ? '是' : '否' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="专票" prop="isInvoiceOpened" width="60" align="center">
<template slot-scope="scope">
<el-tag
:type="scope.row.isInvoiceOpened === 1 ? 'success' : 'info'"
size="small"
:title="scope.row.isInvoiceOpened === 1 && scope.row.invoiceOpenedDate ? '开票日期：' + parseTime(scope.row.invoiceOpenedDate) : ''"
@click.native="toggleInvoiceOpened(scope.row)"
style="cursor: pointer;">
{{ scope.row.isInvoiceOpened === 1 ? '是' : '否' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="评价" prop="isReviewPosted" width="60" align="center">
<template slot-scope="scope">
<el-tag
:type="scope.row.isReviewPosted === 1 ? 'success' : 'info'"
size="small"
:title="scope.row.isReviewPosted === 1 && scope.row.reviewPostedDate ? '评价日期：' + parseTime(scope.row.reviewPostedDate) : ''"
@click.native="toggleReviewPosted(scope.row)"
style="cursor: pointer;">
{{ scope.row.isReviewPosted === 1 ? '是' : '否' }}
</el-tag>
<div class="order-status-flags">
<el-tag
:type="scope.row.isRefunded === 1 ? 'warning' : 'info'"
size="mini"
:title="scope.row.isRefunded === 1 && scope.row.refundDate ? '退款日期：' + parseTime(scope.row.refundDate) : '退款'"
@click.native="toggleRefunded(scope.row)"
style="cursor: pointer;">
{{ scope.row.isRefunded === 1 ? '已退款' : '未退款' }}
</el-tag>
<el-tag
:type="scope.row.isRefundReceived === 1 ? 'success' : 'info'"
size="mini"
:title="scope.row.isRefundReceived === 1 && scope.row.refundReceivedDate ? '退款到账日期：' + parseTime(scope.row.refundReceivedDate) : '退款到账'"
@click.native="toggleRefundReceived(scope.row)"
style="cursor: pointer;">
{{ scope.row.isRefundReceived === 1 ? '已到账' : '未到账' }}
</el-tag>
<el-tag
:type="scope.row.isRebateReceived === 1 ? 'success' : 'info'"
size="mini"
:title="scope.row.isRebateReceived === 1 && scope.row.rebateReceivedDate ? '后返到账日期：' + parseTime(scope.row.rebateReceivedDate) : '后返到账'"
@click.native="toggleRebateReceived(scope.row)"
style="cursor: pointer;">
{{ scope.row.isRebateReceived === 1 ? '已到账' : '未到账' }}
</el-tag>
<el-tag
:type="scope.row.isPriceProtected === 1 ? 'warning' : 'info'"
size="mini"
:title="scope.row.isPriceProtected === 1 && scope.row.priceProtectedDate ? '价保日期：' + parseTime(scope.row.priceProtectedDate) : ''"
@click.native="togglePriceProtected(scope.row)"
style="cursor: pointer;">
{{ scope.row.isPriceProtected === 1 ? '是' : '否' }}
</el-tag>
<el-tag
:type="scope.row.isInvoiceOpened === 1 ? 'success' : 'info'"
size="mini"
:title="scope.row.isInvoiceOpened === 1 && scope.row.invoiceOpenedDate ? '开票日期：' + parseTime(scope.row.invoiceOpenedDate) : ''"
@click.native="toggleInvoiceOpened(scope.row)"
style="cursor: pointer;">
{{ scope.row.isInvoiceOpened === 1 ? '是' : '否' }}
</el-tag>
<el-tag
:type="scope.row.isReviewPosted === 1 ? 'success' : 'info'"
size="mini"
:title="scope.row.isReviewPosted === 1 && scope.row.reviewPostedDate ? '评价日期：' + parseTime(scope.row.reviewPostedDate) : ''"
@click.native="toggleReviewPosted(scope.row)"
style="cursor: pointer;">
{{ scope.row.isReviewPosted === 1 ? '是' : '否' }}
</el-tag>
</div>
</template>
</el-table-column>
@@ -591,7 +574,6 @@
</el-table-column>
<!-- 其他信息列（可折叠） -->
<el-table-column label="备注/状态" prop="status" min-width="100" show-overflow-tooltip/>
<el-table-column label="订单状态" prop="orderStatus" width="80" align="center">
<template slot-scope="scope">
<el-tag
@@ -2917,6 +2899,19 @@ export default {
padding: 8px 0;
}
/* 合并列：退款/到账/价保等标签换行排列 */
.order-status-flags {
display: flex;
flex-wrap: wrap;
justify-content: center;
align-items: center;
gap: 4px;
max-width: 100%;
}
.order-status-flags .el-tag {
margin: 0;
}
/* 优化地址列显示，防止过长换行 */
.order-table ::v-deep .el-table .address-cell {
max-width: 280px;