From 3a61aa096c3191e97770a92e4e145fe63ddc1aa4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 18:41:05 +0800
Subject: [PATCH] 经销商管理

---
 admin/src/views/business/memberCoupon.vue |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/admin/src/views/business/memberCoupon.vue b/admin/src/views/business/memberCoupon.vue
index 71f5b44..a84dbeb 100644
--- a/admin/src/views/business/memberCoupon.vue
+++ b/admin/src/views/business/memberCoupon.vue
@@ -2,7 +2,7 @@
   <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-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">
@@ -14,11 +14,16 @@
             <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="鐘舵��"  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="鐘舵��"  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">
@@ -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}">
@@ -74,9 +79,12 @@
         </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>
@@ -112,10 +120,12 @@
         nikeName: '',
         name: '',
         couponType: '',
-        status: '',
+        status: null,
+        isexpire: '',
         getMethod: '',
         orderCode: ''
-      }
+      },
+      hiddenexpire: false
     }
   },
   created () {
@@ -126,6 +136,12 @@
       'field.main': 'id'
     })
     this.search()
+  },
+  methods:{
+    changeStatus(){
+      this.searchForm.isexpire=''
+      this.search()
+    }
   }
 }
 </script>

--
Gitblit v1.9.3