From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/combo/components/SaleDetail.vue | 139 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 139 insertions(+), 0 deletions(-)
diff --git a/admin/src/views/combo/components/SaleDetail.vue b/admin/src/views/combo/components/SaleDetail.vue
new file mode 100644
index 0000000..8fb3e0b
--- /dev/null
+++ b/admin/src/views/combo/components/SaleDetail.vue
@@ -0,0 +1,139 @@
+<template>
+ <GlobalWindow title="濂楅鍗¤鎯�" :visible.sync="isShowModal" width="1000px" @close="close" @confirm="close">
+ <div>
+ <div class="modal_title">濂楅鍚嶇О锛歿{ detail.name }}</div>
+ <div class="place">
+ <span>濂楅鍙凤細{{ detail.code }}</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>
+ <div class="df_ac">
+ <el-tabs style="flex: 1;" v-model="activeTab" @tab-click="handleClick">
+ <el-tab-pane label="濂楅浣跨敤鏄庣粏" name="0" />
+ <el-tab-pane label="濂楅鎿嶄綔璁板綍" name="2" />
+ </el-tabs>
+ <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="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 }}鍒嗛挓
+ </template>
+ </el-table-column>
+ <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="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>
+ </template>
+ </el-table-column>
+ <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" />
+ </div>
+ </div>
+ </GlobalWindow>
+</template>
+<script>
+import { comboSalerDetailPost, discountLogLog } from '@/api/business/combo.js'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import BasePageTemp from '@/components/base/BasePageTemp'
+export default {
+ name: 'ComboDetail',
+ extends: BasePageTemp,
+ components: {
+ GlobalWindow
+ },
+ data() {
+ return {
+ isShowModal: false,
+ activeTab: '0',
+ detail: {},
+ pagination: {
+ page: 1,
+ rows: 10
+ },
+ totalCount: 0,
+ list: [],
+ loading: false
+ }
+ },
+ created() {
+ // this.detail = this.$route.query
+ // this.comboDetail()
+ },
+ methods: {
+ getDetail(row) {
+ comboSalerDetailPost(row.id).then(res => {
+ this.detail = res
+ this.activeTab = '0'
+ this.getList()
+ }, () => {
+
+ })
+ },
+ handleClick(val) {
+ this.getList()
+ },
+ getList(page) {
+ const { pagination, activeTab, detail } = this
+ this.loading = true
+ if (page) { pagination.page = page }
+ discountLogLog({
+ model: {
+ type: activeTab,
+ discountMemberId: detail.id
+ },
+ capacity: pagination.pageSize,
+ page: pagination.page,
+ }).then(res => {
+ this.loading = false
+ this.list = res.records || []
+ this.pagination.total = res.total || 0
+ }, () => {
+ this.loading = false
+ })
+ },
+ close() {
+ this.isShowModal = false
+ this.$emit('close')
+ },
+ currentPageChange(val) {
+ this.pagination.page = val
+ this.comboDetail()
+ },
+ pageSizeChange(val) {
+ this.pagination.rows = val
+ this.comboDetail()
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+.modal_title {
+ font-size: 18px;
+ font-weight: 500;
+ margin-bottom: 6px;
+}
+
+.place {
+ color: #999999;
+ font-size: 13px;
+ display: flex;
+ margin-bottom: 8px;
+
+ span {
+ margin-right: 60px;
+ }
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3