From d158529d79be9a55900177ee04216eacc2a3a052 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Tue, 17 Sep 2024 11:18:25 +0800
Subject: [PATCH] 9.17

---
 .../EventMarketing/newCertificate/index.vue   | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
index c4fdb5626..449be5222 100644
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@@ -112,22 +112,22 @@
       <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: 45%;">
+          <el-form-item label="优惠券编号" required style="width: 45%;">
             <el-input v-model="ruleForm.number" placeholder="请输入优惠券编号"></el-input>
           </el-form-item>
-          <el-form-item label="优惠券名称" prop="name" style="width: 50%;">
+          <el-form-item label="优惠券名称" required style="width: 50%;">
             <el-input v-model="ruleForm.name" placeholder="请输入优惠券名称"></el-input>
           </el-form-item>
 
         </div>
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="投放类型" prop="putType" style="width: 45%;">
+          <el-form-item label="投放类型" required style="width: 45%;">
             <el-select v-model="ruleForm.putType" placeholder="请选择投放类型" style="width: 100%">
               <el-option v-for="dict in dict.type.putType_type" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="优惠券类型" prop="type" style="width: 50%;">
+          <el-form-item label="优惠券类型" required style="width: 50%;">
             <el-select v-model="ruleForm.type" placeholder="请选择优惠券类型" style="width: 100%">
               <el-option v-for="dict in dict.type.CardCoupon_type" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
@@ -137,7 +137,7 @@
         <div class="d-s" style="justify-content: space-between">
 
 
-          <el-form-item label="消费条件" prop="useType" style="width: 45%;"
+          <el-form-item label="消费条件" required style="width: 45%;"
                         v-if="ruleForm.type=='1' || ruleForm.type=='5'">
             <div class="d-s">
               <el-select v-model="ruleForm.useType" placeholder="请选择金额">
@@ -159,13 +159,13 @@
             </div>
           </el-form-item>
 
-          <el-form-item label="兑换内容" prop="useType" style="width: 45%;" v-if="ruleForm.type=='2'">
+          <el-form-item label="兑换内容" required style="width: 45%;" v-if="ruleForm.type=='2'">
             <el-input placeholder="" v-model="ruleForm.exchangeContent"></el-input>
           </el-form-item>
 
-          <el-form-item label="优惠条件" prop="useType" style="width: 45%;" v-if="ruleForm.type=='3'">
+          <el-form-item label="优惠条件" required style="width: 45%;" v-if="ruleForm.type=='3'">
             <div class="d-s">
-              <el-select v-model="ruleForm.useType" placeholder="请选择金额" style="width: 100px">
+              <el-select v-model="ruleForm.useType" placeholder="请选择" style="width: 100px">
                 <el-option label="订单金额" value="1"/>
                 <el-option label="实收金额" value="2"/>
                 <el-option label="兑换券" value="3"/>
@@ -174,21 +174,21 @@
                 <el-option label="单品代金券" value="6"/>
               </el-select>
               <div style="margin: 0px 5px;">范围</div>
-              <el-input placeholder="" v-model="ruleForm.zkStartAmount" style="width: 60px">
+              <el-input placeholder="" v-model="ruleForm.zkStartAmount" style="width: 110px">
                 <template slot="append">元</template>
               </el-input>
               <div style="margin: 0px 5px;">~</div>
-              <el-input placeholder="" v-model="ruleForm.zkEndAmount" style="width: 60px">
+              <el-input placeholder="" v-model="ruleForm.zkEndAmount" style="width: 110px">
                 <template slot="append">元</template>
               </el-input>
               <div style="width: 60px;text-align: center">优惠</div>
-              <el-input placeholder="" v-model="ruleForm.zkData" style="width: 140px">
+              <el-input placeholder="" v-model="ruleForm.zkData" style="width: 110px">
                 <template slot="append">折</template>
               </el-input>
             </div>
           </el-form-item>
 
-          <el-form-item label="消费条件" prop="useType" style="width: 45%;" v-if="ruleForm.type=='4'">
+          <el-form-item label="消费条件" required style="width: 45%;" v-if="ruleForm.type=='4'">
             <div class="d-s">
               <el-select v-model="ruleForm.useType" placeholder="请选择金额">
                 <el-option label="订单金额" value="1"/>
@@ -214,7 +214,7 @@
           </el-form-item>
 
           <!--  适用油品油号      oilNumber  -->
-          <el-form-item label="适用油品油号" prop="oilLimit" style="width: 50%;">
+          <el-form-item label="适用油品油号" required style="width: 50%;">
             <div class="d-s">
               <el-radio-group v-model="ruleForm.oilLimit">
                 <el-radio :label="'1'">不限</el-radio>
@@ -229,7 +229,7 @@
         </div>
 
         <div class="d-s" style="justify-content: space-between" v-if="ruleForm.type=='3'">
-          <el-form-item label="最大优惠金额" prop="membershipLevel" style="width: 45%;">
+          <el-form-item label="最大优惠金额" required style="width: 45%;">
             <el-input placeholder="" v-model="ruleForm.zkMaxAmount">
               <template slot="append">元</template>
             </el-input>
@@ -237,7 +237,7 @@
         </div>
 
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="适用会员等级" prop="membershipLevel" style="width: 45%;">
+          <el-form-item label="适用会员等级" required style="width: 45%;">
             <el-select v-model="ruleForm.membershipLevel" multiple placeholder="请选择" style="width: 100%">
 
               <el-option
@@ -247,7 +247,7 @@
                 :key="index"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="是否允许收银台送券" label-width="160px" prop="sySend" style="width: 50%;">
+          <el-form-item label="是否允许收银台送券" label-width="160px" required style="width: 50%;">
 
             <el-radio-group v-model="ruleForm.sySend">
               <el-radio :label="'0'">否</el-radio>
@@ -260,7 +260,7 @@
         <div class="d-s" style="justify-content: space-between">
 
           <!-- 生效日期设置 timeType 字段 -->
-          <el-form-item label="生效日期设置" prop="timeType" style="width: 45%;">
+          <el-form-item label="生效日期设置" required style="width: 45%;">
             <div class="d-s">
               <el-radio-group v-model="ruleForm.timeType">
                 <el-radio :label="'1'">领取
@@ -274,7 +274,7 @@
             </div>
           </el-form-item>
           <!-- 生效日期  effectiveDateStart 字段 -->
-          <el-form-item label="生效日期" prop="effectiveDateStart" style="width: 50%;" v-if="ruleForm.timeType=='2'">
+          <el-form-item label="生效日期" required style="width: 50%;" v-if="ruleForm.timeType=='2'">
             <el-date-picker
               v-model="ruleForm.effectiveDateStart"
               style="width: 160px"
@@ -294,7 +294,7 @@
         </div>
         <!-- 是否与其他优惠同时使用 useWithOther -->
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="是否与其他优惠同时使用" label-width="180px" prop="useWithOther" style="width: 45%;">
+          <el-form-item label="是否与其他优惠同时使用" label-width="180px" required style="width: 45%;">
 
             <el-radio-group v-model="ruleForm.useWithOther">
               <el-radio :label="'0'">不可以</el-radio>
@@ -303,7 +303,7 @@
             </el-radio-group>
 
           </el-form-item>
-          <el-form-item label="使用次数限制" prop="limitTotalDay" style="width: 50%;">
+          <el-form-item label="使用次数限制" required style="width: 50%;">
             <div class="d-s">
               <div style="margin: 0px 5px;">每</div>
               <el-input placeholder="" v-model="ruleForm.limitTotalDay" style="width: 140px">
@@ -408,10 +408,10 @@
           </el-form-item>
         </div>
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="每人领券限制" prop="getNumLimit" style="width: 45%;">
+          <el-form-item label="每人领券限制" required style="width: 45%;">
             <el-input v-model="ruleForm.getNumLimit" placeholder="请输入内容"></el-input>
           </el-form-item>
-          <el-form-item label="每日领券限制" prop="dayGetLimit" style="width: 50%;">
+          <el-form-item label="每日领券限制" required style="width: 50%;">
             <el-input v-model="ruleForm.dayGetLimit" placeholder="请输入内容"></el-input>
           </el-form-item>
         </div>
@@ -420,7 +420,7 @@
 
           <!-- 每日领卷限制 dayGetLimit -->
 
-          <el-form-item label="投放总数" prop="name" style="width: 45%;">
+          <el-form-item label="投放总数" required style="width: 45%;">
             <el-input v-model="ruleForm.tfTotal" placeholder="请输入内容"></el-input>
           </el-form-item>
           <el-form-item label="使用条件" style="width: 50%;">
@@ -431,10 +431,10 @@
         <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: 45%;">
+          <el-form-item label="背景图" required style="width: 45%;">
             <imgUpload :limit="1" v-model="ruleForm.backgroundImage"></imgUpload>
           </el-form-item>
-          <el-form-item label="备注" prop="name" style="width: 50%;">
+          <el-form-item label="备注"  style="width: 50%;">
             <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="ruleForm.remark">
             </el-input>
           </el-form-item>