From 0484f41556ea5582eb02f0b7f9501292e572664f Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Sun, 8 Sep 2024 18:09:40 +0800
Subject: [PATCH] 9.8

---
 .../EventMarketing/newCertificate/index.vue   | 117 ++++++++++--------
 1 file changed, 66 insertions(+), 51 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
index ca88bc56d..fe4f8b198 100644
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@@ -122,33 +122,37 @@
       </div>
     </el-drawer>
 
-    <el-dialog title="新增/编辑优惠券" :visible.sync="centerDialogVisible" width="90%">
+    <el-dialog title="新增/编辑优惠券" :visible.sync="centerDialogVisible" width="80%">
       <!--          表-->
       <el-form :model="ruleForm" :rules="rules" :label-position="labelPosition" ref="ruleForm" label-width="120px"
         class="demo-ruleForm">
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="优惠券编号" prop="number" style="width: 30%;">
+          <el-form-item label="优惠券编号" prop="number" style="width: 45%;">
             <el-input v-model="ruleForm.number" placeholder="请输入优惠券编号" style="width: 300px"></el-input>
           </el-form-item>
-          <el-form-item label="优惠券名称" prop="name" style="width: 30%;">
+          <el-form-item label="优惠券名称" prop="name" style="width: 45%;">
             <el-input v-model="ruleForm.name" placeholder="请输入优惠券名称" style="width: 300px"></el-input>
           </el-form-item>
-          <el-form-item label="投放类型" prop="putType" style="width: 30%;">
+
+        </div>
+        <div class="d-s" style="justify-content: space-between">
+          <el-form-item label="投放类型" prop="putType" style="width: 45%;">
             <el-select v-model="ruleForm.putType" placeholder="请选择投放类型" style="width: 300px">
               <el-option v-for="dict in dict.type.putType_type" :key="dict.value" :label="dict.label"
-                :value="dict.value" />
+                         :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="优惠类型" prop="name" style="width: 45%;">
+            <el-select v-model="ruleForm.type" placeholder="请选择投放类型" style="width: 300px">
+              <el-option v-for="dict in dict.type.CardCoupon_type" :key="dict.value" :label="dict.label"
+                         :value="dict.value" />
             </el-select>
           </el-form-item>
         </div>
         <div class="d-s" style="justify-content: space-between">
 
-          <el-form-item label="优惠类型" prop="name" style="width: 30%;">
-            <el-select v-model="ruleForm.type" placeholder="请选择投放类型" style="width: 300px">
-              <el-option v-for="dict in dict.type.CardCoupon_type" :key="dict.value" :label="dict.label"
-                :value="dict.value" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="消费条件" prop="name" style="width: 30%;">
+
+          <el-form-item label="消费条件" prop="name" style="width: 45%;">
             <div class="d-s">
               <el-select v-model="ruleForm.useType" placeholder="请选择金额">
               </el-select>
@@ -162,8 +166,9 @@
               </el-input>
             </div>
           </el-form-item>
+
           <!--  适用油品油号      oilNumber  -->
-          <el-form-item label="适用油品油号" prop="name" style="width: 30%;">
+          <el-form-item label="适用油品油号" prop="name" style="width: 45%;">
             <div class="d-s">
               <el-radio-group v-model="ruleForm.oilLimit">
                 <el-radio :label="1">不限</el-radio>
@@ -176,7 +181,6 @@
             </div>
           </el-form-item>
         </div>
-
         <div class="d-s" style="justify-content: space-between">
           <el-form-item label="适用会员等级" prop="name" style="width: 30%;">
             <el-select v-model="ruleForm.membershipLevel" multiple placeholder="请选择">
@@ -184,12 +188,24 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="是否允许收银台送券" label-width="160px" prop="name" style="width: 45%;">
+
+              <el-radio-group v-model="ruleForm.sySend">
+                <el-radio :label="0">否</el-radio>
+                <el-radio :label="1">是</el-radio>
+
+              </el-radio-group>
+
+          </el-form-item>
+        </div>
+        <div class="d-s" style="justify-content: space-between">
+
           <!-- 生效日期设置 timeType 字段 -->
-          <el-form-item label="生效日期设置" prop="name" style="width: 30%;">
+          <el-form-item label="生效日期设置" prop="name" style="width: 45%;">
             <div class="d-s">
               <el-radio-group v-model="ruleForm.timeType">
-                <el-radio :label="1">领取<el-input v-model="ruleForm.validityDay" placeholder="" style="width: 80px"></el-input>
-                  <div>天内有效</div></el-radio>
+                <el-radio :label="1">领取<el-input v-model="ruleForm.validityDay" placeholder="" style="width: 80px;margin: 0px 10px"></el-input>
+                  <span>天内有效</span></el-radio>
                 <el-radio :label="2">指定使用日期</el-radio>
 
               </el-radio-group>
@@ -197,7 +213,7 @@
             </div>
           </el-form-item>
           <!-- 生效日期  effectiveDateStart 字段 -->
-          <el-form-item label="生效日期" prop="name" style="width: 30%;">
+          <el-form-item label="生效日期" prop="name" style="width: 45%;">
             <el-date-picker v-model="ruleForm.effectiveDateStart" type="daterange" range-separator="至"
               start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
@@ -205,17 +221,16 @@
         </div>
         <!-- 是否与其他优惠同时使用 useWithOther -->
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="是否与其他优惠同时使用" label-width="180px" prop="name" style="width: 30%;">
-            <div class="d-s">
+          <el-form-item label="是否与其他优惠同时使用" label-width="180px" prop="name" style="width: 45%;">
+
               <el-radio-group v-model="ruleForm.useWithOther">
                 <el-radio :label="0">不可以</el-radio>
                 <el-radio :label="1">可以</el-radio>
 
               </el-radio-group>
 
-            </div>
           </el-form-item>
-          <el-form-item label="使用次数限制" prop="name" style="width: 30%;">
+          <el-form-item label="使用次数限制" prop="name" style="width: 45%;">
             <div class="d-s">
               <div style="margin: 0px 5px;">每</div>
               <el-input placeholder="" v-model="ruleForm.limitTotalDay" style="width: 140px">
@@ -228,35 +243,10 @@
             </div>
           </el-form-item>
           <!-- 每人领卷限制 getNumLimit -->
-          <el-form-item label="每人领券限制" prop="name" style="width: 30%;">
-            <el-input v-model="ruleForm.getNumLimit" placeholder="请输入内容"></el-input>
-          </el-form-item>
-        </div>
 
-        <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="是否允许收银台送券" label-width="160px" prop="name" style="width: 30%;">
-            <div class="d-s">
-              <el-radio-group v-model="ruleForm.sySend">
-                <el-radio :label="0">否</el-radio>
-                <el-radio :label="1">是</el-radio>
-
-              </el-radio-group>
-            </div>
-          </el-form-item>
-          <!-- 每日领卷限制 dayGetLimit -->
-          <el-form-item label="每日领券限制" prop="name" style="width: 30%;">
-            <el-input v-model="ruleForm.dayGetLimit" placeholder="请输入内容"></el-input>
-          </el-form-item>
-          <el-form-item label="投放总数" prop="name" style="width: 30%;">
-            <el-input v-model="ruleForm.tfTotal" placeholder="请输入内容"></el-input>
-          </el-form-item>
         </div>
-        <!-- 使用条件  useCondition -->
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="使用条件" style="width: 30%;">
-            <el-input type="textarea" v-model="ruleForm.useCondition"></el-input>
-          </el-form-item>
-          <el-form-item label="适用时间段" prop="name" style="width: 30%;">
+          <el-form-item label="适用时间段" prop="name" style="width: 45%;">
             <el-radio-group v-model="ruleForm.availableType">
               <el-radio :label="1" style="margin-bottom: 15px">每周           <el-select v-model="ruleForm.availableWeek" multiple placeholder="请选择周日期">
                 <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value">
@@ -294,7 +284,7 @@
             </div>
 
           </el-form-item>
-          <el-form-item label="不适用时间段" prop="name" style="width: 30%;">
+          <el-form-item label="不适用时间段" prop="name" style="width: 45%;">
             <el-radio-group v-model="ruleForm.unAvailableType">
               <el-radio :label="1" style="margin-bottom: 15px">每周           <el-select v-model="ruleForm.unAvailableWeek" multiple placeholder="请选择周日期">
                 <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value">
@@ -332,13 +322,38 @@
             </div>
 
           </el-form-item>
+        </div>
+        <div class="d-s" style="justify-content: space-between">
+          <el-form-item label="每人领券限制" prop="name" style="width: 45%;">
+            <el-input v-model="ruleForm.getNumLimit" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="每日领券限制" prop="name" style="width: 45%;">
+            <el-input v-model="ruleForm.dayGetLimit" placeholder="请输入内容"></el-input>
+          </el-form-item>
+        </div>
+
+        <div class="d-s" style="justify-content: space-between">
+
+          <!-- 每日领卷限制 dayGetLimit -->
+
+          <el-form-item label="投放总数" prop="name" style="width: 45%;">
+            <el-input v-model="ruleForm.tfTotal" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="使用条件" style="width: 45%;">
+            <el-input type="textarea" v-model="ruleForm.useCondition"></el-input>
+          </el-form-item>
+        </div>
+        <!-- 使用条件  useCondition -->
+        <div class="d-s" style="justify-content: space-between">
+
+
 
         </div>
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="背景图" prop="name" style="width: 30%;">
+          <el-form-item label="背景图" prop="name" style="width: 45%;">
             <imgUpload :limit="1" v-model="ruleForm.backgroundImage"></imgUpload>
           </el-form-item>
-          <el-form-item label="备注" prop="name" style="width: 30%;">
+          <el-form-item label="备注" prop="name" style="width: 45%;">
             <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="ruleForm.remark">
             </el-input>
           </el-form-item>