From 0d0e67818a45161af14114211f43aafd232a6da2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 27 一月 2026 10:52:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/memberCoupon.vue | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/business/memberCoupon.vue b/admin/src/views/business/memberCoupon.vue
index a9347d8..18a6639 100644
--- a/admin/src/views/business/memberCoupon.vue
+++ b/admin/src/views/business/memberCoupon.vue
@@ -2,34 +2,34 @@
<TableLayout :permissions="['business:membercoupon:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鐢ㄦ埛" prop="memberName">
- <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鐢ㄦ埛" prop="nikeName" >
+ <el-input v-model="searchForm.nikeName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�/鎵嬫満鍙� " clearable @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浼樻儬鍒稿悕绉�" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヤ紭鎯犲埜鍚嶇О" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヤ紭鎯犲埜鍚嶇О" clearable @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="绫诲瀷" prop="couponType">
- <el-select v-model="searchForm.couponType" placeholder="璇烽�夋嫨绫诲瀷" >
+ <el-select v-model="searchForm.couponType" placeholder="璇烽�夋嫨绫诲瀷" clearable @change="search" >
<el-option :key="0" :value="0" label="婊″噺鍒�"></el-option>
<el-option :key="1" :value="1" label="鎶樻墸鍒�"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
- <el-select v-model="searchForm.status" placeholder="鐘舵��" >
+ <el-select v-model="searchForm.status" placeholder="鐘舵��" clearable @change="search" >
<el-option :value="0" label="鏈娇鐢�"></el-option>
<el-option :value="1" label="宸蹭娇鐢�"></el-option>
<el-option :value="2" label="宸茶繃鏈�"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍙戞斁绫诲瀷" prop="getMethod">
- <el-select v-model="searchForm.getMethod" placeholder="鍙戞斁绫诲瀷" >
+ <el-select v-model="searchForm.getMethod" placeholder="鍙戞斁绫诲瀷" clearable @change="search" >
<el-option :value="0" label="棣栨娉ㄥ唽"></el-option>
<el-option :value="1" label="閭�璇峰ソ鍙�"></el-option>
<el-option :value="2" label="瀹氬悜鍙戞斁"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璁㈠崟鍙�" prop="orderCode">
- <el-input v-model="searchForm.orderCode" placeholder="璇疯緭鍏ヤ娇鐢ㄨ鍗曞彿" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.orderCode" placeholder="璇疯緭鍏ヤ娇鐢ㄨ鍗曞彿" clearable @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -38,12 +38,16 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:membercoupon:create', 'business:membercoupon:exportExcel']">
+ <li><el-button type="primary" @click="$refs.OperaMemberCouponWindow.open('瀹氬悜鍙戞斁浼樻儬鍒�', null)" v-permissions="['business:membercoupon:create']">瀹氬悜鍙戞斁</el-button></li>
+ <li> <el-button type="primary" :loading="isWorking.export" v-permissions="['business:membercoupon:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
+ </ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
stripe
>
- <el-table-column prop="memberName" label="鐢ㄦ埛" min-width="100px"></el-table-column>
+ <el-table-column prop="nikeName" label="鐢ㄦ埛" min-width="180px"></el-table-column>
<el-table-column prop="name" label="浼樻儬鍒稿悕绉�" min-width="100px"></el-table-column>
<el-table-column prop="couponType" label="浼樻儬鍒哥被鍨�" min-width="100px">
<template slot-scope="{row}">
@@ -63,7 +67,11 @@
<li> 璧凤細{{ row.startDate}}</li> <li>姝細{{row.endDate }}</li>
</template>
</el-table-column>
- <el-table-column prop="price" label="浼樻儬閲戦锛堝厓锛�" min-width="100px"></el-table-column>
+ <el-table-column prop="couponPrice" label="浼樻儬閲戦(鍏�)" min-width="120px">
+ <template slot-scope="{row}">
+ {{row.status==1?(row.couponPrice||0):'-'}}
+ </template>
+ </el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.status ===0" class="green"> 鏈娇鐢�</span>
@@ -83,22 +91,25 @@
>
</pagination>
</template>
+
+ <OperaMemberCouponWindow ref="OperaMemberCouponWindow" @success="handlePageChange"/>
</TableLayout>
</template>
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
+import OperaMemberCouponWindow from '@/components/business/OperaMemberCouponWindow'
import Pagination from '@/components/common/Pagination'
export default {
name: 'MemberCoupon',
extends: BaseTable,
- components: { TableLayout, Pagination },
+ components: { TableLayout, Pagination ,OperaMemberCouponWindow},
data () {
return {
// 鎼滅储
searchForm: {
- memberName: '',
+ nikeName: '',
name: '',
couponType: '',
status: '',
--
Gitblit v1.9.3