From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并
---
admin/src/views/business/memberCoupon.vue | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/admin/src/views/business/memberCoupon.vue b/admin/src/views/business/memberCoupon.vue
index a8835c4..fecceab 100644
--- a/admin/src/views/business/memberCoupon.vue
+++ b/admin/src/views/business/memberCoupon.vue
@@ -1,35 +1,40 @@
<template>
<TableLayout :permissions="['business:membercoupon:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鐢ㄦ埛" prop="nikeName">
- <el-input v-model="searchForm.nikeName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�/鎵嬫満鍙� " clearable @keypress.enter.native="search"></el-input>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
+ <el-form-item label="鐢ㄦ埛" prop="nikeName" >
+ <el-input v-model="searchForm.nikeName" placeholder="鐢ㄦ埛鏄电О/鎵嬫満鍙�" style="width: 150px;" clearable @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浼樻儬鍒稿悕绉�" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヤ紭鎯犲埜鍚嶇О" clearable @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.name" placeholder="浼樻儬鍒稿悕绉�" style="width: 150px;" clearable @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="绫诲瀷" prop="couponType">
- <el-select v-model="searchForm.couponType" placeholder="璇烽�夋嫨绫诲瀷" clearable @change="search" >
+ <el-select v-model="searchForm.couponType" style="width: 150px;" 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="鐘舵��" clearable @change="search" >
+ <el-form-item label="鐘舵��" prop="status" >
+ <el-select v-model="searchForm.status" placeholder="鐘舵��" style="width: 150px;" clearable @change="changeStatus" >
<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="isexpire" v-if="searchForm.status ===0">
+ <el-select v-model="searchForm.isexpire" placeholder="鐘舵��" style="width: 150px;" clearable @change="search" >
+ <el-option :value="0" label="鏈繃鏈�"></el-option>
+ <el-option :value="1" label="宸茶繃鏈�"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍙戞斁绫诲瀷" prop="getMethod">
- <el-select v-model="searchForm.getMethod" placeholder="鍙戞斁绫诲瀷" clearable @change="search" >
+ <el-select v-model="searchForm.getMethod" placeholder="鍙戞斁绫诲瀷" style="width: 150px;" 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="璇疯緭鍏ヤ娇鐢ㄨ鍗曞彿" clearable @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.orderCode" placeholder="浣跨敤璁㈠崟鍙�" style="width: 150px;" clearable @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -39,7 +44,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<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" @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
@@ -47,7 +52,7 @@
:data="tableData.list"
stripe
>
- <el-table-column prop="nikeName" 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}">
@@ -67,12 +72,19 @@
<li> 璧凤細{{ row.startDate}}</li> <li>姝細{{row.endDate }}</li>
</template>
</el-table-column>
- <el-table-column prop="price" label="浼樻儬閲戦(鍏�)" min-width="120px"></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>
+ <div v-if="row.status ===0" >
+ <span class="grey" v-if="row.isexpire ===1" >宸茶繃鏈�</span>
+ <span class="green" v-else> 鏈娇鐢�</span>
+ </div>
<span v-else-if="row.status ===1" class="blue"> 宸蹭娇鐢�</span>
- <span v-else class="grey">宸茶繃鏈�</span>
+
</template>
</el-table-column>
<el-table-column prop="useDate" label="浣跨敤鏃堕棿" min-width="100px"></el-table-column>
@@ -108,10 +120,12 @@
nikeName: '',
name: '',
couponType: '',
- status: '',
+ status: null,
+ isexpire: '',
getMethod: '',
orderCode: ''
- }
+ },
+ hiddenexpire: false
}
},
created () {
@@ -122,6 +136,12 @@
'field.main': 'id'
})
this.search()
+ },
+ methods:{
+ changeStatus(){
+ this.searchForm.isexpire=''
+ this.search()
+ }
}
}
</script>
--
Gitblit v1.9.3