From 6ebeddfe87542e4b3abfbe1adeb9187204f63ba8 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 07 七月 2026 13:47:24 +0800
Subject: [PATCH] 新增功能
---
admin/src/views/combo/components/SaleDetail.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/combo/components/SaleDetail.vue b/admin/src/views/combo/components/SaleDetail.vue
index 7d1dd41..ecf66b5 100644
--- a/admin/src/views/combo/components/SaleDetail.vue
+++ b/admin/src/views/combo/components/SaleDetail.vue
@@ -1,10 +1,13 @@
<template>
<GlobalWindow title="濂楅鍗¤鎯�" :visible.sync="isShowModal" width="1000px" @close="close" @confirm="close">
<div>
- <div class="modal_title">濂楅鍚嶇О锛歿{ detail.name }}</div>
+ <div class="modal_title">
+ 濂楅鍚嶇О锛歿{ detail.name }}
+ <el-tag>{{ detail.channel == 1 ? '鎶栭煶鍥㈣喘' : '灏忕▼搴忕' }}</el-tag>
+ </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 +19,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 +29,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 +78,7 @@
getDetail(row) {
comboSalerDetailPost(row.id).then(res => {
this.detail = res
+ this.activeTab = '0'
this.getList()
}, () => {
--
Gitblit v1.9.3