From d8689abdb2378bdd1c97317ca881173eca26283c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 14 一月 2026 17:13:52 +0800
Subject: [PATCH] 经销商管理

---
 admin/src/views/business/coupon.vue |   59 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/admin/src/views/business/coupon.vue b/admin/src/views/business/coupon.vue
index 7cdf90a..d306af7 100644
--- a/admin/src/views/business/coupon.vue
+++ b/admin/src/views/business/coupon.vue
@@ -2,19 +2,16 @@
   <TableLayout :permissions="['business:coupon:query']">
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-      <el-form-item label="浼樻儬鍒稿悕绉�" prop="name">
+      <el-form-item label="鍚嶇О" prop="name">
         <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヤ紭鎯犲埜鍚嶇О" @keypress.enter.native="search"></el-input>
       </el-form-item>
       <!-- 0鍟嗗浼樻儬鍒� 1骞冲彴浼樻儬鍒� -->
-      <!-- <el-form-item label="浼樻儬鍒哥被鍨�" prop="type">
-        <el-select
-          v-model="searchForm.type"
-          placeholder="璇烽�夋嫨浼樻儬鍒哥被鍨�"
-        >
-          <el-option key="0" :value="0" label="鍟嗗浼樻儬鍒�"></el-option>
-          <el-option key="1" :value="1" label="骞冲彴浼樻儬鍒�"></el-option>
+       <el-form-item label="绫诲瀷" prop="couponType">
+        <el-select  v-model="searchForm.couponType" clearable  placeholder="璇烽�夋嫨浼樻儬鍒哥被鍨�" >
+          <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>
       <section>
         <el-button type="primary" @click="search">鎼滅储</el-button>
         <el-button @click="reset">閲嶇疆</el-button>
@@ -23,9 +20,8 @@
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
       <ul class="toolbar" v-permissions="['business:coupon:create', 'business:coupon:delete']">
-        <li><el-button type="primary" @click="$refs.operaCouponWindow.open('鏂板缓骞冲彴浼樻儬鍒�', null, 1)" v-permissions="['business:coupon:create']">鏂板缓骞冲彴浼樻儬鍒�</el-button></li>
-        <li><el-button type="primary" @click="$refs.operaCouponWindow.open('鏂板缓鍟嗗浼樻儬鍒�', null, 0)" v-permissions="['business:coupon:create']">鏂板缓鍟嗗浼樻儬鍒�</el-button></li>
-        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:coupon:delete']">鍒犻櫎</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
         v-loading="isWorking.search"
@@ -35,23 +31,21 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="name" label="浼樻儬鍒稿悕绉�" align="center" min-width="120px">
+        <el-table-column prop="name" label="浼樻儬鍒稿悕绉�" align="center" min-width="120px"></el-table-column>
+        <el-table-column label="绫诲瀷" align="center" min-width="100px">
           <template slot-scope="{row}">
-            <el-button type="text" @click="showDetail(row)">{{ row.name }}</el-button>
+            <span v-if="row.couponType ===0"> 婊″噺鍒�</span>
+            <span v-if="row.couponType ===1"> 鎶樻墸鍒�</span>
           </template>
         </el-table-column>
-        <el-table-column label="浼樻儬瑙勫垯" align="center" min-width="100px">
+        <el-table-column label="浼樻儬瑙勫垯" align="center" min-width="150px" show-overflow-tooltip>
           <template slot-scope="{row}">
-            {{ `婊�${row.limitPrice}鍑�${row.price}` }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="type" label="浼樻儬鍒哥被鍨�" align="center" min-width="100px">
-          <template slot-scope="{row}">
-            {{ row.type==0?'鍟嗗浼樻儬鍒�':'骞冲彴浼樻儬鍒�' }}
+            <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>
           </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">
+        <el-table-column  label="宸插彂閫佹暟閲�" align="center" min-width="100px">
           <template slot-scope="{row}">
             <el-button type="text" @click="showCouponUse(row.id)">{{ row.unused + row.used }}</el-button>
           </template>
@@ -62,12 +56,17 @@
           </template>
         </el-table-column>
         <el-table-column prop="used" label="浣跨敤鏁伴噺" align="center" min-width="100px"></el-table-column>
-        <el-table-column prop="validDays" label="棰嗗彇鍚庢湁鏁堝ぉ鏁�" align="center" min-width="110px"></el-table-column>
-        <el-table-column prop="startDate" label="寮�濮嬫椂闂�" align="center" min-width="140px"></el-table-column>
-        <el-table-column prop="endDate" label="缁撴潫鏃堕棿" align="center" min-width="140px"></el-table-column>
-        <el-table-column label="杩涜鐘舵��" align="center" min-width="100px">
+        <el-table-column prop="validDays" label="浣跨敤鏈夋晥鏈�" align="center" min-width="210px">
           <template slot-scope="{row}">
-            {{ row.status==0 ? '鏈紑濮�' : row.status==1 ? '杩涜涓�' : '宸茬粨鏉�' }}
+            <span v-if="row.useType ===0"><li> 璧凤細{{ row.startDate}}</li> <li>姝細{{row.endDate }}</li></span>
+            <span v-if="row.useType ===1"> {{ `棰嗙敤鍚�${row.validDays||0}澶╂湁鏁坄 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="閫傜敤绫诲瀷" align="center" min-width="100px">
+          <template slot-scope="{row}">
+            <span v-if="row.applyType ===0"> 鍏ㄧ▼閫氱敤</span>
+            <span v-if="row.applyType ===1"> 鎸夊搧绫�</span>
+            <span v-if="row.applyType ===2"> 鎸囧畾鍟嗗搧</span>
           </template>
         </el-table-column>
         <el-table-column prop="status" label="鐘舵��" align="center" min-width="100px">
@@ -87,7 +86,7 @@
           label="鎿嶄綔"
           min-width="120"
           fixed="right"
-          align="center" 
+          align="center"
         >
           <template slot-scope="{row}">
             <el-button type="text" @click="$refs.operaCouponWindow.open('缂栬緫浼樻儬鍒�', row)" icon="el-icon-edit" v-permissions="['business:coupon:update']">缂栬緫</el-button>
@@ -126,7 +125,7 @@
       // 鎼滅储
       searchForm: {
         name: '',
-        type: ''
+        couponType: ''
       }
     }
   },
@@ -144,7 +143,7 @@
       this.$refs.operaCouponDetail.open('浼樻儬鍒歌鎯�', row)
     },
     showCouponUse(id) {
-      
+
       this.$refs.operaCouponUsedDetail.open('浼樻儬鍒搁鍙栬鎯�', id)
     },
     statusChange(row) {

--
Gitblit v1.9.3