From 4f226d37f4af7c484cdbb3dae14187c8f60c6878 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Mon, 31 Jul 2023 16:26:20 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=B7=BB=E5=8A=A0=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E4=BB=8B=E7=BB=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Coupons/components/AddDialog.vue            |  6 ++++++
 .../Coupons/components/DetailDialog.vue         |  8 ++++++--
 .../Marketing/CouponManage/Coupons/index.vue    | 17 +++++++++++------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/views/business/Marketing/CouponManage/Coupons/components/AddDialog.vue b/src/views/business/Marketing/CouponManage/Coupons/components/AddDialog.vue
index 1ddf859..83f27d0 100644
--- a/src/views/business/Marketing/CouponManage/Coupons/components/AddDialog.vue
+++ b/src/views/business/Marketing/CouponManage/Coupons/components/AddDialog.vue
@@ -22,6 +22,11 @@
 
 
       <el-row>
+        <el-col :lg="24">
+          <el-form-item :label-width="labelWidth" label="优惠劵介绍" prop="couponDesc">
+            <el-input v-model="formData.couponDesc" placeholder="请输入优惠劵介绍" />
+          </el-form-item>
+        </el-col>
         <el-col :lg="24">
           <el-form-item :label-width="labelWidth" label="优惠劵类型" prop="couponType">
             <el-radio-group v-model="formData.couponType">
@@ -237,6 +242,7 @@ const imgData = ref({
 const rules = reactive({
   couponGuid: [{ required: true, message: "不能为空", trigger: "blur", type: "number" }],
   couponName: [{ required: true, message: "优惠劵名称不能为空", trigger: "blur" }],
+  couponDesc: [{ required: true, message: "优惠劵介绍不能为空", trigger: "blur" }],
   couponType: [{ required: true, message: "优惠劵类型不能为空", trigger: "blur", type: "number" }],
   couponMinConsumeMoney: [{ required: true, message: "最低消费金额不能为空", trigger: "blur" }],
   couponExpireType: [{ required: true, message: "到期类型不能为空", trigger: "blur", type: "number" }],
diff --git a/src/views/business/Marketing/CouponManage/Coupons/components/DetailDialog.vue b/src/views/business/Marketing/CouponManage/Coupons/components/DetailDialog.vue
index 3cb489b..ff60ae5 100644
--- a/src/views/business/Marketing/CouponManage/Coupons/components/DetailDialog.vue
+++ b/src/views/business/Marketing/CouponManage/Coupons/components/DetailDialog.vue
@@ -22,6 +22,11 @@
 
 
       <el-row>
+        <el-col :lg="24">
+          <el-form-item :label-width="labelWidth" label="优惠劵介绍" prop="couponDesc">
+            <el-input v-model="formData.couponDesc" placeholder="请输入优惠劵介绍" />
+          </el-form-item>
+        </el-col>
         <el-col :lg="24">
           <el-form-item :label-width="labelWidth" label="优惠劵类型" prop="couponType">
             <el-radio-group v-model="formData.couponType">
@@ -69,8 +74,7 @@
           <el-form-item :label-width="labelWidth" label="" prop="couponFixedStartTime">
             <!-- <el-date-picker v-model="formData.couponFixedStartTime" type="datetime" :teleported="false"
             ></el-date-picker> -->
-            <el-date-picker v-model="formData.couponFixedTime" type="daterange" range-separator="-"
-              start end />
+            <el-date-picker v-model="formData.couponFixedTime" type="daterange" range-separator="-" start end />
           </el-form-item>
         </el-col>
         <el-col :lg="24">
diff --git a/src/views/business/Marketing/CouponManage/Coupons/index.vue b/src/views/business/Marketing/CouponManage/Coupons/index.vue
index 0382cf8..42c82e5 100644
--- a/src/views/business/Marketing/CouponManage/Coupons/index.vue
+++ b/src/views/business/Marketing/CouponManage/Coupons/index.vue
@@ -23,8 +23,8 @@
         </el-form-item>
         <el-form-item label="显示状态" prop="couponDisplayStatus">
           <el-radio-group v-model="queryParams.couponDisplayStatus">
-            <el-radio v-for="item in  display_status " :key="item.dictValue"
-              :label="item.dictValue">{{ item.dictLabel }}</el-radio>
+            <el-radio v-for="item in  display_status " :key="item.dictValue" :label="item.dictValue">{{ item.dictLabel
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item>
@@ -72,7 +72,12 @@
         </template>
       </el-table-column>
       <el-table-column prop="couponEffectiveDays" label="有效天数" align="center" />
-      <el-table-column prop="couponSendNumber" label="发送数量" align="center" />
+      <el-table-column prop="couponSendNumber" label="发送数量" align="center">
+        <template #default="scope">
+          <div v-if="scope.row.couponSendNumber == -1">不限量</div>
+          <div v-else>{{ scope.row.couponSendNumber }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="couponDisplayStatus" label="显示状态" align="center">
         <template #default="scope">
           <dict-tag :options="display_status" :value="scope.row.couponDisplayStatus" />
@@ -201,13 +206,13 @@ function getList() {
       total.value = res.data.totalNum;
 
       dataList.value.forEach(item => {
-        if(item.couponGoodsIdsArr.length !=- 0){
+        if (item.couponGoodsIdsArr.length != - 0) {
           item.couponGoodsIds = item.couponGoodsIdsArr.split(',')
         }
-        if(item.couponApplicableScopeConfig){
+        if (item.couponApplicableScopeConfig) {
           item.couponApplicableScopeConfig = JSON.parse(item.couponApplicableScopeConfig)
         }
-        if(item.couponFixedStartTime && item.couponFixedEndTime){
+        if (item.couponFixedStartTime && item.couponFixedEndTime) {
           item.couponFixedTime = []
           item.couponFixedTime.push(item.couponFixedStartTime)
           item.couponFixedTime.push(item.couponFixedEndTime)