From 25908f5bd4a2dae4625b49d325525849feb676a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 09:32:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/combo/components/SaleDetail.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/combo/components/SaleDetail.vue b/admin/src/views/combo/components/SaleDetail.vue
index 7d1dd41..8fb3e0b 100644
--- a/admin/src/views/combo/components/SaleDetail.vue
+++ b/admin/src/views/combo/components/SaleDetail.vue
@@ -4,7 +4,7 @@
<div class="modal_title">濂楅鍚嶇О锛歿{ detail.name }}</div>
<div class="place">
<span>濂楅鍙凤細{{ detail.code }}</span>
- <span v-if="detail.useType == 1">鏈夋晥鏈燂細{{ detail.useDays }}澶�</span>
+ <span v-if="detail.useType == 1">鏈夋晥鏈燂細{{ detail.useStartDate }}鑷硔{ detail.useEndDate }}</span>
<span v-if="detail.useType == 0">鏈夋晥鏈燂細{{ detail.useStartDate }}鑷硔{ detail.useEndDate }}</span>
<span v-if="detail.useType == 2">鏈夋晥鏈燂細{{ detail.useStartDate }}鑷硔{ detail.useEndDate }}</span>
</div>
@@ -16,8 +16,8 @@
<div style="border-bottom: 2px solid #e5e7ec; margin-top: 1px;">{{ activeTab == 0 ? '浣跨敤鎯呭喌' : '鎿嶄綔鎯呭喌' }}锛歿{ pagination.total }}娆�</div>
</div>
<el-table v-if="activeTab == 0" v-loading="loading" :data="list" stripe border>
- <el-table-column prop="createDate" align="center" label="浣跨敤鏃堕棿" min-width="100" show-overflow-tooltip />
- <el-table-column prop="discountMemberId" align="center" label="鍏宠仈璁㈠崟" min-width="120" show-overflow-tooltip />
+ <el-table-column prop="createDate" align="center" label="浣跨敤鏃堕棿" min-width="120" show-overflow-tooltip />
+ <el-table-column prop="goodsorderId" align="center" label="鍏宠仈璁㈠崟" min-width="140" show-overflow-tooltip />
<el-table-column prop="" align="center" label="楠戣溅鏃堕暱" min-width="80" show-overflow-tooltip>
<template v-slot="{ row }">
{{ row.rideTime }}鍒嗛挓
@@ -26,16 +26,16 @@
<el-table-column prop="ridePrice" align="center" label="鎶垫墸閲戦" min-width="100" show-overflow-tooltip />
</el-table>
<el-table v-if="activeTab == 2" v-loading="loading" :data="list" stripe border>
- <el-table-column prop="createDate" align="center" label="鎿嶄綔鏃堕棿" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createDate" align="center" label="鎿嶄綔鏃堕棿" min-width="120" show-overflow-tooltip />
<el-table-column prop="info" align="center" label="鎿嶄綔绫诲瀷" min-width="100" show-overflow-tooltip>
<template v-slot="{ row }">
<span v-if="row.type == 0">鐢ㄦ埛楠戣浣跨敤</span>
- <span v-if="row.type == 1">骞冲彴浣滃簾</span>
- <span v-if="row.type == 2">骞冲彴璋冩暣</span>
+ <span v-if="row.type == 1">濂楅浣滃簾</span>
+ <span v-if="row.type == 2">濂楅璋冩暣</span>
</template>
</el-table-column>
- <el-table-column prop="editInfo" align="center" label="鎿嶄綔澶囨敞" min-width="100" show-overflow-tooltip />
- <el-table-column prop="creatorName" align="center" label="鎿嶄綔浜�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="editInfo" align="center" label="鎿嶄綔澶囨敞" min-width="200" show-overflow-tooltip />
+ <el-table-column prop="creatorName" align="center" label="鎿嶄綔浜�" min-width="80" show-overflow-tooltip />
</el-table>
<div class="table_btns">
<Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
@@ -75,6 +75,7 @@
getDetail(row) {
comboSalerDetailPost(row.id).then(res => {
this.detail = res
+ this.activeTab = '0'
this.getList()
}, () => {
--
Gitblit v1.9.3