From 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 三月 2026 16:40:54 +0800
Subject: [PATCH] 合并
---
admin/src/views/business/coupon.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/business/coupon.vue b/admin/src/views/business/coupon.vue
index cc9f372..65e5772 100644
--- a/admin/src/views/business/coupon.vue
+++ b/admin/src/views/business/coupon.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:coupon:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヤ紭鎯犲埜鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -20,7 +20,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:coupon:create', 'business:coupon:delete']">
- <li><el-button type="primary" icon="el-icon-plus" @click="$refs.operaCouponWindow.open('鏂板缓', null, 1)" v-permissions="['business:coupon:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" icon="el-icon-plus" @click="$refs.operaCouponWindow.open('鏂板缓浼樻儬鍒�', null, 1)" v-permissions="['business:coupon:create']">鏂板缓</el-button></li>
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:coupon:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -38,21 +38,28 @@
<span v-if="row.couponType ===1"> 鎶樻墸鍒�</span>
</template>
</el-table-column>
- <el-table-column label="浼樻儬瑙勫垯" align="center" min-width="150px" show-overflow-tooltip>
+ <el-table-column label="浼樻儬瑙勫垯" align="center" min-width="200px" show-overflow-tooltip>
<template slot-scope="{row}">
<span v-if="row.couponType ===0"> {{ `璁㈠崟婊�${row.limitPrice||0}鍏冿紝鍑�${row.price||0}` }}鍏�</span>
- <span v-if="row.couponType ===1"> {{ `璁㈠崟婊�${row.limitPrice||0}鍏冿紝浜�${row.price||0}鎶榒 }}</span>
+ <span v-if="row.couponType ===1"> {{ `璁㈠崟婊�${row.limitPrice||0}鍏冿紝浜�${row.price||0}鎶橈紝`}}</span><br>
+ <span v-if="row.couponType ===1"> {{ `浼樻儬閲戦涓婇檺${row.maxPrice||0}鍏� `}}</span>
</template>
</el-table-column>
- <el-table-column prop="num" label="鍙戞斁鎬婚噺" align="center" min-width="100px"></el-table-column>
<el-table-column label="宸插彂閫佹暟閲�" align="center" min-width="100px">
<template slot-scope="{row}">
<el-button type="text" @click="showCouponUse(row.id)">{{ row.received||0 }}</el-button>
</template>
</el-table-column>
+ <el-table-column prop="num" label="鍙戞斁鎬婚噺" align="center" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.num "> {{ row.num}}</span>
+ <span v-if="!row.num ||row.num<=0 ">涓嶉檺</span><br>
+ </template>
+ </el-table-column>
<el-table-column label="鍓╀綑鏁伴噺" align="center" min-width="100px">
<template slot-scope="{row}">
- {{ (row.num||0) - (row.received||0) }}
+ <span v-if="row.num "> {{ (row.num||0) - (row.received||0) }}</span>
+ <span v-if="!row.num ||row.num<=0 ">涓嶉檺</span><br>
</template>
</el-table-column>
<!--
@@ -145,7 +152,6 @@
this.$refs.operaCouponDetail.open('浼樻儬鍒歌鎯�', row)
},
showCouponUse(id) {
-
this.$refs.operaCouponUsedDetail.open('浼樻儬鍒搁鍙栬鎯�', id)
},
statusChange(row) {
--
Gitblit v1.9.3