From f37e9d0d1adc70cb5a50b17edaad2ab7fb5b6211 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 5 Jun 2024 17:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/couponDetail.vue        |  5 ++-
 src/views/coupon/coupon-list/index.vue | 53 +++++++++++++++++++++-----
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/src/components/couponDetail.vue b/src/components/couponDetail.vue
index 4f0d446..6506fc4 100644
--- a/src/components/couponDetail.vue
+++ b/src/components/couponDetail.vue
@@ -115,6 +115,7 @@
           <a-form-item field="inquiry_type" label="问诊类型：">
             <a-select
               :style="{ width: '320px' }"
+              multiple
               placeholder="请选择问诊类型"
               v-model="modalForm.inquiry_type"
             >
@@ -260,7 +261,7 @@
         <a-col a-col :span="24">
           <a-form-item
             field="is_reissuable_after_expire"
-            label="是否允许过期之后再次发放："
+            label="过期再次发放："
           >
             <a-switch
               v-model="modalForm.is_reissuable_after_expire"
@@ -271,7 +272,7 @@
       </a-row>
       <a-row :gutter="24">
         <a-col a-col :span="24">
-          <a-form-item field="inquiry_type" label="是否发放：">
+          <a-form-item field="inquiry_type" label="状态：">
             <a-switch
               v-model="modalForm.coupon_status"
               :checked-value="1"
diff --git a/src/views/coupon/coupon-list/index.vue b/src/views/coupon/coupon-list/index.vue
index 7abe132..748b2a6 100644
--- a/src/views/coupon/coupon-list/index.vue
+++ b/src/views/coupon/coupon-list/index.vue
@@ -5,7 +5,9 @@
       <a-form-item field="coupon_name" label="优惠卷名称">
         <a-input :style="{ width: '182px' }" v-model="queryForm.coupon_name" placeholder="请输入患者名字" @press-enter="handleQuery" />
       </a-form-item>
-      
+      <a-form-item field="coupon_desc" label="优惠卷描述">
+        <a-input :style="{ width: '182px' }" v-model="queryForm.coupon_desc" placeholder="请输入优惠卷描述" @press-enter="handleQuery" />
+      </a-form-item>
       <a-form-item field="coupon_status" label="启用状态">
         <a-select  v-model="queryForm.coupon_status" placeholder="请选择启用状态" :style="{ width: '182px' }">
           <!-- 1:正常 2:强制失效 3:结束 4:删除 -->
@@ -39,6 +41,16 @@
 
         </a-select>
       </a-form-item>
+      <a-form-item field="application_scope" label="关联问诊类型">
+        <a-select  v-model="queryForm.application_scope" placeholder="请选择适用范围" :style="{ width: '182px' }">
+          <!--1:'专家问诊', 2:'快速问诊', 3:'公益问诊', 4:'问诊购药',5:'糖组检测'-->
+          <a-option value="1">专家问诊</a-option>
+          <a-option value="2">快速问诊</a-option>
+          <a-option value="3">公益问诊</a-option>
+          <a-option value="4">问诊购药</a-option>
+          <a-option value="5">糖组检测</a-option>
+        </a-select>
+      </a-form-item>
       
       <!-- <a-form-item field="create_range_time" label="创建时间范围">
         <a-range-picker
@@ -85,9 +97,12 @@
         <div>{{formatCouponRange(record.application_scope)}}</div>
       </template>
       <template #coupon_type="{record}">
-        <div>{{formatCouponType(record. coupon_type)}}</div>
+        <div>{{formatCouponType(record.coupon_type)}}</div>
+      </template>
+      <template #valid_type="{record}">
+        <div v-if="record.valid_type==1">绝对时效</div>
+        <div v-else-if="record.valid_type==2">相对时效</div>
       </template>
-     
       <template #coupon_status="{ record }">
         <!-- （1:正常 2:强制失效 3:结束 4:删除） -->
         <a-switch @click="showCoupon(value,record)" v-model="record.coupon_status"  :loading="loading"  :disabled="record.coupon_status==2"  :checked-value="1"  /> 
@@ -204,7 +219,7 @@ const isVisible=ref(false);
     dataIndex: 'coupon_client',
     slotName:'coupon_client'
   },{
-    title: '使用对象',
+    title: '发放对象',
     dataIndex: 'distribution_object',
     slotName:'distribution_object'
   },{
@@ -216,13 +231,31 @@ const isVisible=ref(false);
     dataIndex: 'application_scope',
     slotName:'application_scope'
   },
-  // {
-  //   title: '有效期',
-  //   dataIndex: 'valid_type',
-  //   slotName:'valid_type'
-  // },
   {
-    title: '是否开放',
+    title: '发放数量',
+    dataIndex:'coupon_count',
+    slotName:'coupon_count'
+  },
+  {
+    title: '已领取数量',
+    dataIndex:'coupon_take_count	'
+  },
+  {
+    title: '已使用数量',
+    dataIndex:'coupon_used_count'
+  },
+  {
+    title: '优惠卷金额',
+    dataIndex:'coupon_price',
+    slotName:'coupon_price'
+  },
+  {
+    title: '有效类型',
+    dataIndex:'valid_type',
+    slotName:'valid_type'
+  },
+  {
+    title: '状态',
     dataIndex: 'coupon_status',
     slotName:'coupon_status'
   }, { title: '操作', slotName: 'action'}])