From 563bb48cea737e75d690fbcd9fc4dde81b3f88ca Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Wed, 25 Sep 2024 15:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/views/userGrade/index.vue      | 115 ++++++++++--------
 .../views/cashier/NewComponents/newHome.vue   |   6 +
 2 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue
index 0120f5b65..f0f62f2c6 100644
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@@ -647,7 +647,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open2" append-to-body width="42%">
-      <el-form ref="form2" :model="form2" :rules="rules" label-width="120px">
+        <el-form ref="form2" :model="form2" :rules="rules" label-width="120px">
 
         <el-form-item label="会员等级" prop="gradeId">
           <el-select v-model="form2.gradeId" placeholder="请选择会员等级" style="width: 100%">
@@ -677,23 +677,17 @@
         </el-form-item>
 
         <el-form-item label="节假日是否通用" prop="holidayIsUse">
-          <div class="d-s">
-            <div class="icon-type" v-for="(item,index) in useTypeList" :key="index"
-                 :class="{ 'acvtive' : index === tindex1 }" @click="Typeindex1(index)">
-              <img src="../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex1">
-              <img src="../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex1">
-              {{ item }}
-            </div>
-          </div>
+          <el-radio-group v-model="form2.holidayIsUse">
+            <el-radio :label="'0'">可用</el-radio>
+            <el-radio :label="'1'">不可用</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="适用日期" prop="suitDateType">
           <div class="d-s">
-            <div class="icon-type" v-for="(item,index) in dateTypeList" :key="index"
-                 :class="{ 'acvtive' : index === tindex2 }" @click="Typeindex2(index)">
-              <img src="../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex1">
-              <img src="../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex1">
-              {{ item }}
-            </div>
+            <el-radio-group v-model="form2.suitDateType">
+              <el-radio :label="'0'">永久</el-radio>
+              <el-radio :label="'1'">自定义</el-radio>
+            </el-radio-group>
             <el-date-picker
               v-model="form2.suitDateFront"
               style="width: 160px"
@@ -709,19 +703,23 @@
             </el-date-picker>
           </div>
         </el-form-item>
-        <el-form-item label="适用时间段" prop="suitTimeSlotType">
+
+        <el-form-item label="时间段设置" prop="availableOrUn">
+          <el-radio-group v-model="form2.availableOrUn">
+            <el-radio :label="'0'">适用时间段</el-radio>
+            <el-radio :label="'1'">不可用时间段</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="form2.availableOrUn == '0'" label="适用时间段" prop="suitTimeSlotType">
           <div>
-            <div class="icon-type" v-for="(item,index) in weekMonthTypeList" :key="index"
-                 :class="{ 'acvtive' : index === tindex3 }" @click="Typeindex3(index)">
-              <img src="../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex3">
-              <img src="../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex3">
-              {{ item }}
-              <el-checkbox-group v-model="weekDay" v-if="item=='每周'" style="margin-left: 20px" :disabled="tindex3!=0">
+            <el-radio-group v-model="form2.suitTimeSlotType">
+              <el-radio :label="'1'">每周
+                <el-checkbox-group v-model="weekDay"  style="margin-left: 20px" :disabled="form2.suitTimeSlotType!='1'">
                 <el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
               </el-checkbox-group>
-              <el-select v-model="monthDay" placeholder="请选择每月固定日期" multiple v-if="item=='每月'"
-                         :disabled="tindex3!=1"
-                         style="margin-left: 20px">
+              </el-radio>
+              <el-radio :label="'2'">每月
+                <el-select :disabled="form2.suitTimeSlotType!='2'" v-model="monthDay" placeholder="请选择每月固定日期" multiple style="margin-left: 20px">
                 <el-option
                   v-for="item in 31"
                   :key="item.value"
@@ -729,7 +727,8 @@
                   :value="item">
                 </el-option>
               </el-select>
-            </div>
+              </el-radio>
+            </el-radio-group>
           </div>
           <div style="margin-top: 20px">
             <el-form-item label="时间段" prop="suitTimeSlotFront" label-width="70px">
@@ -749,28 +748,27 @@
             </el-form-item>
           </div>
         </el-form-item>
-        <el-form-item label="指定不可用日期" prop="noUseTimeType">
+        <el-form-item v-else label="不适用时间段" prop="noUseTimeType">
           <div>
-            <div class="icon-type" v-for="(item,index) in weekMonthTypeList" :key="index"
-                 :class="{ 'acvtive' : index === tindex4 }" @click="Typeindex4(index)">
-              <img src="../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex4">
-              <img src="../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex4">
-              {{ item }}
-              <el-checkbox-group v-model="weekDay1" :disabled="tindex4!=0" v-if="item=='每周'"
-                                 style="margin-left: 20px">
-                <el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
-              </el-checkbox-group>
-              <el-select v-model="monthDay1" placeholder="请选择每月固定日期" multiple v-if="item=='每月'"
-                         :disabled="tindex4!=1"
-                         style="margin-left: 20px">
-                <el-option
-                  v-for="item in 31"
-                  :key="item"
-                  :label="item+'日'"
-                  :value="item+''">
-                </el-option>
-              </el-select>
-            </div>
+
+
+            <el-radio-group v-model="form2.noUseTimeType">
+              <el-radio :label="'1'">每周
+                <el-checkbox-group v-model="weekDay1"  style="margin-left: 20px" :disabled="form2.noUseTimeType!='1'">
+                  <el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
+                </el-checkbox-group>
+              </el-radio>
+              <el-radio :label="'2'">每月
+                <el-select :disabled="form2.noUseTimeType!='2'" v-model="monthDay1" placeholder="请选择每月固定日期" multiple style="margin-left: 20px">
+                  <el-option
+                    v-for="item in 31"
+                    :key="item.value"
+                    :label="item+'日'"
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </el-radio>
+            </el-radio-group>
           </div>
           <div style="margin-top: 20px">
             <el-form-item label="时间段" prop="noUseTimeFront" label-width="70px">
@@ -1107,7 +1105,9 @@ export default {
       catchTypeList: [],
       // 是否显示弹出层
       open: false,
-      form2: {},
+      form2: {
+        availableOrUn:'0'
+      },
       open2: false,
       gradeList: [],
 
@@ -1178,6 +1178,9 @@ export default {
       total2: 0,
       // 表单校验
       rules: {
+        availableOrUn:[
+          {required: true, message: "不能为空", trigger: "blur"},
+        ],
         grade: [
           {required: true, message: "升降顺序不能为空", trigger: "blur"},
           {pattern: /^[0-9]{1,10}$/, message: `必须正整数`, trigger: 'blur'}
@@ -1244,14 +1247,17 @@ export default {
         suitTimeSlotType: [
           {required: true, message: "请选择适用时间段", trigger: "blur"},
         ],
+        noUseTimeType: [
+          {required: true, message: "请选择不适用时间段", trigger: "blur"},
+        ],
         suitTimeSlotFront: [
           {required: true, message: "请选择适用时间段", trigger: "blur"},
         ],
         noUseDate: [
-          {required: true, message: "请选择指定不可用日期", trigger: "blur"},
+          {required: true, message: "请选择不适用时间段", trigger: "blur"},
         ],
         noUseTimeFront: [
-          {required: true, message: "请选择指定不可用日期", trigger: "blur"},
+          {required: true, message: "请选择不适用时间段", trigger: "blur"},
         ],
       }
     };
@@ -1374,10 +1380,11 @@ export default {
     handleAdd2() {
       this.form2 = {
         usePaymentWay: [],
-        holidayIsUse: 0,
-        suitDateType: 0,
-        suitTimeSlotType: 0,
-        noUseTimeType: 0,
+        holidayIsUse: '0',
+        suitDateType: '0',
+        suitTimeSlotType: '0',
+        noUseTimeType: '0',
+        availableOrUn:'0'
       }
       this.weekDay = []
       this.monthDay = []
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 3c604c641..4c5a7a390 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -433,6 +433,7 @@
           ￥{{ payForm.realyPayBills }}
         </div>
         <!-- <div style="text-align: center;margin-bottom: 10px">赠送金额</div> -->
+
         <div v-if="payForm.paymentType !== 'CASH' ">
           <div>
             <el-input v-model="payForm.authCode"
@@ -553,7 +554,12 @@ export default {
       //加油升数
       oilLiter:0,
       openConfirm:false,
+      // 是否支付
       isPay:false,
+      isPaySuccess:false,
+      isAwait: false,
+      rechargeBalCard:false,
+      isQuery:true,
       loading:false,
       // 门店二维码
       collectionImg: '',