From b565a275fe240e2bd8a939c3b4beed98d03767bc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 20 二月 2025 18:17:15 +0800
Subject: [PATCH] ll
---
admin/src/views/combo/components/ComboDetail.vue | 81 ++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/admin/src/views/combo/components/ComboDetail.vue b/admin/src/views/combo/components/ComboDetail.vue
index 30b5899..6ab44db 100644
--- a/admin/src/views/combo/components/ComboDetail.vue
+++ b/admin/src/views/combo/components/ComboDetail.vue
@@ -8,31 +8,31 @@
<div class="title_wrap">
<div>
<span class="title">{{ detail.name }}</span>
- <span class="status">{{ detail.status === '1' ? '宸插惎鐢�' : '绂佺敤' }}</span>
+ <span class="status">{{ detail.status == '0' ? '宸插惎鐢�' : '绂佺敤' }}</span>
</div>
- <div class="placeholder9 mt10">姣忔棩閿�鍞檺閲忥細{{ detail.circulationDay }}</div>
+ <div class="placeholder9 mt10">姣忔棩閿�鍞檺閲忥細{{ detail.saleDayLimit }}</div>
</div>
</div>
<div class="right">
<div class="item">
<div class="key">鎬诲彂鏀炬暟閲�</div>
- <div class="value">{{ detail.circulationAll || '-' }}</div>
+ <div class="value">{{ detail.saleLimit || '涓嶉檺棰�' }}</div>
</div>
<div class="item">
<div class="key">宸查攢鍞暟閲�</div>
- <div class="value">{{ detail.sellNum }}</div>
+ <div class="value">{{ detail.saleNum }}</div>
</div>
<div class="item">
<div class="key">鍓╀綑鏁伴噺</div>
- <div v-if="detail.circulationAll" class="value">{{ detail.surplusDay }}</div>
- <div v-else class="value">{{ detail.surplusDay || '-' }}</div>
+ <div v-if="detail.saleLimit" class="value">{{ detail.saleLimit - detail.saleNum }}</div>
+ <div v-else class="value">涓嶉檺棰�</div>
</div>
</div>
</div>
<div class="createTime_wrap">
- <span class="item">鍒涘缓鏃堕棿锛歿{ detail.createTime }}</span>
+ <span class="item">鍒涘缓鏃堕棿锛歿{ detail.createDate }}</span>
<span class="item">鍒涘缓浜猴細{{ detail.creator }}</span>
- <span class="item">鏈�鍚庢洿鏂版椂闂达細{{ detail.editTime }}</span>
+ <span class="item">鏈�鍚庢洿鏂版椂闂达細{{ detail.editDate }}</span>
<span class="item">鏇存柊浜猴細{{ detail.editor }}</span>
</div>
</div>
@@ -44,52 +44,53 @@
</div>
<div class="line">
<div class="key">濂楅绫诲瀷锛�</div>
- <div v-if="detail.mealsType == '0'" class="value">鏈熼檺鍗�</div>
+ <div v-if="detail.type == '0'" class="value">鏈熼檺鍗�</div>
</div>
<div class="line">
- <div class="key">{{ detail.mealsType == '1' || detail.mealsType == '4' ? '姣忔棩楠戣闄愬埗锛�' : '濂楅娆℃暟锛�' }}</div>
- <div v-if="detail.mealsType == '1' || detail.mealsType == '4'" class="value">
- <span>{{ detail.inOutNum || '涓嶉檺鍒�' }}</span>
- </div>
- <div v-else class="value"><span>{{ detail.nums }}</span></div>
- </div>
- <div class="line">
- <div class="key">浣跨敤璇存槑锛�</div>
+ <div class="key">姣忔棩楠戣闄愬埗锛�</div>
<div class="value">
- <div>{{ detail.content }}</div>
+ <span>{{ detail.limitType == 0 ? '涓嶉檺鍒�' : detail.limitTime + '鍒嗛挓' }}</span>
+ </div>
+ </div>
+ <div class="line">
+ <div class="key">濂楅绠�浠嬶細</div>
+ <div class="value">
+ <div>{{ detail.desc }}</div>
</div>
</div>
<div class="property-title">閫傜敤瑙勫垯</div>
<div class="line">
<div class="key">閿�鍞椂闂存锛�</div>
- <div class="value">{{ detail.circulationAll || '涓嶉檺閲�' }}</div>
+ <div class="value">{{ detail.startDate }} 鑷� {{ detail.endDate }}</div>
</div>
<div class="line">
<div class="key">浣跨敤鏃堕棿锛�</div>
- <div class="value">{{ detail.circulationDay }}</div>
+ <div class="value" v-if="detail.useType == 0">{{ detail.useStartDate }} 鑷� {{ detail.useEndDate }}</div>
+ <div class="value" v-if="detail.useType == 1">璐拱鍚巤{ detail.useDays }}澶╁唴鏈夋晥</div>
+ <div class="value" v-if="detail.useType == 2">鑷獅{ detail.useStartDate }} 鍚� {{ detail.useDays }}澶╁唴鏈夋晥</div>
</div>
<div class="line">
<div class="key">閫傜敤鑼冨洿锛�</div>
- <div class="value">{{ detail.useVenue }}</div>
+ <div class="value">{{ detail.useWorkday == 1 && '宸ヤ綔鏃�' }} {{ detail.useWorkday && detail.useHoliday && '|' }} {{ detail.useHoliday == 1 && '鑺傚亣鏃�' }}</div>
</div>
<div class="line">
<div class="key">閫傜敤椤圭洰锛�</div>
- <div class="value">{{ detail.useProject }}</div>
+ <div class="value">{{ detail.isbike == 1 && '鑷杞�' }} {{ detail.isbike && detail.iselecbike && '|' }} {{ detail.iselecbike == 1 && '鐢靛姩杞�' }}</div>
+
</div>
<div class="line">
<div class="key">鎬婚檺棰濓細</div>
- <div class="value">{{ detail.useClassInfo || '涓嶉檺鍒�' }}</div>
+ <div class="value">{{ detail.saleLimit || '涓嶉檺鍒�' }}</div>
</div>
<div class="line">
<div class="key">姣忔棩闄愰锛�</div>
- <div class="value">{{ detail.useTeacherInfo || '涓嶉檺棰�' }}</div>
+ <div class="value">{{ detail.saleDayLimit || '涓嶉檺棰�' }}</div>
</div>
</GlobalWindow>
</template>
<script>
-// import { comboDetailPost, mealsCancelUse } from '@/api'
-// import dayjs from 'dayjs'
+import { comboDetailPost } from '@/api/business/combo.js'
import GlobalWindow from '@/components/common/GlobalWindow'
export default {
name: 'ComboDetail',
@@ -136,24 +137,13 @@
}
})
},
- getDetail(detail) {
- const { activeTab, pagination } = this
- const param = {
- listType: activeTab,
- type: detail.type,
- id: detail.id
- }
- this.tableLoading = true
- comboDetailPost({ pagination, param }).then(res => {
- this.tableLoading = false
- this.dataList = res.record.data || []
- this.totalCount = res.record.count || 0
- this.detail = { ...detail, useProject: res.record.useProject }
- this.$nextTick(() => {
- this.$refs.tableo.doLayout()
- })
+ getDetail(id) {
+ comboDetailPost(id).then(res => {
+ console.log('res', res)
+
+ this.detail = res
}, () => {
- this.tableLoading = false
+
})
},
tabClick(val) {
@@ -226,6 +216,7 @@
border: 1px solid $primaryColor;
color: $primaryColor;
margin-left: 10px;
+ padding: 0 4px;
}
}
@@ -275,10 +266,12 @@
line-height: 1.5;
color: #333;
}
-.property-title{
+
+.property-title {
margin-bottom: 16px;
color: $primaryColor;
}
+
.device-uploader {
width: 80px;
height: 80px;
--
Gitblit v1.9.3