From edd677bae7f9d241384a49df52c7ff3c62ba4334 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Sun, 15 Sep 2024 18:31:33 +0800
Subject: [PATCH] 9.15

---
 .../openCardGift/TimeLimited.vue              | 113 +++++++++++------
 .../EventMarketing/openCardGift/separate.vue  | 120 +++++++++++-------
 2 files changed, 145 insertions(+), 88 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
index 9bcda3f98..fecbf1b82 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
@@ -95,13 +95,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
       <!--        -->
       <div class="d-b" style="margin-bottom: 15px;margin-top: 20px">
         <div class="d-s">
@@ -314,7 +307,7 @@
         <div style="display: flex;width: 100%;margin: 20px 0;">
           <div style="width: 50%">
             <el-form-item label="限时优惠名称" prop="activeId">
-              <el-select v-model="ruleForm1.activeId" placeholder="请选择优惠名称">
+              <el-select v-model="ruleForm1.activeId" placeholder="请选择优惠名称" style="width: 100%">
                 <el-option
                   v-for="(item,index) in timeShareList"
                   :key="index"
@@ -333,7 +326,7 @@
               </el-checkbox-group>
             </el-form-item>
             <el-form-item label=" 会员标签" prop="babelIds">
-              <el-select v-model="ruleForm1.babelIds" multiple placeholder="请选择会员标签">
+              <el-select v-model="ruleForm1.babelIds" multiple placeholder="请选择会员标签" style="width: 100%">
                 <el-option
                   v-for="item in userLabelList"
                   :key="item.id+''"
@@ -341,36 +334,73 @@
                   :value="item.id+''"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="适用实收金额" required>
-              <el-col :span="11">
-                <el-form-item prop="moneyMin">
-                  <el-input v-model="ruleForm1.moneyMin"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="2">
-                <div style="margin-left: 5px">到</div>
-              </el-col>
-              <el-col :span="11">
-                <el-form-item prop="moneyMax">
-                  <el-input v-model="ruleForm1.moneyMax"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="适用加油升数" required>
-              <el-col :span="11">
-                <el-form-item prop="literMin">
-                  <el-input v-model="ruleForm1.literMin"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="2">
-                <div style="margin-left: 5px">到</div>
-              </el-col>
-              <el-col :span="11">
-                <el-form-item prop="literMax">
-                  <el-input v-model="ruleForm1.literMax"></el-input>
-                </el-form-item>
-              </el-col>
+            <el-form-item label="消费条件" required>
+              <div v-if="ruleForm1.consumeType!=1">
+                <el-col :span="7">
+                  <el-select v-model="ruleForm1.consumeType" style="width: 90%">
+                    <el-option label="实收金额" value="0"></el-option>
+                    <el-option label="加油升数" value="1"></el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item prop="moneyMin">
+                    <el-input v-model="ruleForm1.moneyMin">
+                      <template slot="append">元</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="2">
+                  <div style="margin-left: 10px">到</div>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item prop="moneyMax">
+                    <el-input v-model="ruleForm1.moneyMax">
+                      <template slot="append">元</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </div>
+              <div v-if="ruleForm1.consumeType==1">
+                <el-col :span="7">
+                  <el-select v-model="ruleForm1.consumeType" style="width: 90%">
+                    <el-option label="实收金额" value="0"></el-option>
+                    <el-option label="加油升数" value="1"></el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item prop="moneyMin">
+                    <el-input v-model="ruleForm1.literMin">
+                      <template slot="append">L</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="2">
+                  <div style="margin-left: 10px">到</div>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item prop="moneyMax">
+                    <el-input v-model="ruleForm1.literMax">
+                      <template slot="append">L</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </div>
             </el-form-item>
+<!--            <el-form-item label="适用加油升数" required>-->
+<!--              <el-col :span="11">-->
+<!--                <el-form-item prop="literMin">-->
+<!--                  <el-input v-model="ruleForm1.literMin"></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+<!--              <el-col :span="2">-->
+<!--                <div style="margin-left: 5px">到</div>-->
+<!--              </el-col>-->
+<!--              <el-col :span="11">-->
+<!--                <el-form-item prop="literMax">-->
+<!--                  <el-input v-model="ruleForm1.literMax"></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+<!--            </el-form-item>-->
             <el-form-item label="最大优惠金额" prop="disMax">
               <el-input v-model="ruleForm1.disMax"></el-input>
             </el-form-item>
@@ -383,7 +413,7 @@
               <el-input v-model="ruleForm1.ruleName"></el-input>
             </el-form-item>
             <el-form-item label="适用会员等级" prop="levelId">
-              <el-select v-model="ruleForm1.levelId" clearable placeholder="请选择会员等级">
+              <el-select v-model="ruleForm1.levelId" clearable placeholder="请选择会员等级" style="width: 100%">
                 <el-option
                   v-for="(item,index) in userGradeList"
                   :label="item.name"
@@ -499,7 +529,7 @@ export default {
       // 限时
       queryParams: {
         pageNo: 1,
-        pageSize: 5,
+        pageSize: 1000,
         activeType: 2
       },
       total: 0,
@@ -576,6 +606,7 @@ export default {
       ruleForm1: {
         activeType: 2,
         timeType: 0,
+        consumeType:'',
         paymentType: []
       }
     }
@@ -666,7 +697,7 @@ export default {
     },
     // 查询限时优惠列表信息
     getTimeShareList() {
-      getRequestList({pageNo: 1, pageSize: 10000}).then(res => {
+      getRequestList({pageNo: 1, pageSize: 10000,activeType:2}).then(res => {
         this.timeShareList = res.data.records
       })
     },
diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
index 96c8e3b0f..0da4423a5 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
@@ -95,13 +95,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
       <!--        -->
       <div class="d-b" style="margin-bottom: 15px;margin-top: 20px">
         <div class="d-s">
@@ -342,41 +335,72 @@
               </el-select>
             </el-form-item>
             <el-form-item label="消费条件" required>
-              <el-col :span="7">
-                <el-select v-model="ruleForm1.consumeType" multiple style="width: 90%">
-                  <el-option label="实收金额" value="0"></el-option>
-                  <el-option label="加油升数" value="1"></el-option>
-                </el-select>
-              </el-col>
-              <el-col :span="7">
-                <el-form-item prop="moneyMin">
-                  <el-input v-model="ruleForm1.moneyMin"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="3">
-                <div style="margin-left: 10px">到</div>
-              </el-col>
-              <el-col :span="7">
-                <el-form-item prop="moneyMax">
-                  <el-input v-model="ruleForm1.moneyMax"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="适用加油升数" required>
-              <el-col :span="11">
-                <el-form-item prop="literMin">
-                  <el-input v-model="ruleForm1.literMin"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="2">
-                <div style="margin-left: 5px">到</div>
-              </el-col>
-              <el-col :span="11">
-                <el-form-item prop="literMax">
-                  <el-input v-model="ruleForm1.literMax"></el-input>
-                </el-form-item>
-              </el-col>
+              <div v-if="ruleForm1.consumeType!=1">
+                <el-col :span="7">
+                  <el-select v-model="ruleForm1.consumeType" style="width: 90%">
+                    <el-option label="实收金额" value="0"></el-option>
+                    <el-option label="加油升数" value="1"></el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item prop="moneyMin">
+                    <el-input v-model="ruleForm1.moneyMin">
+                      <template slot="append">元</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="2">
+                  <div style="margin-left: 10px">到</div>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item prop="moneyMax">
+                    <el-input v-model="ruleForm1.moneyMax">
+                      <template slot="append">元</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </div>
+              <div v-if="ruleForm1.consumeType==1">
+                <el-col :span="7">
+                  <el-select v-model="ruleForm1.consumeType" style="width: 90%">
+                    <el-option label="实收金额" value="0"></el-option>
+                    <el-option label="加油升数" value="1"></el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item prop="moneyMin">
+                    <el-input v-model="ruleForm1.literMin">
+                      <template slot="append">L</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="2">
+                  <div style="margin-left: 10px">到</div>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item prop="moneyMax">
+                    <el-input v-model="ruleForm1.literMax">
+                      <template slot="append">L</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </div>
             </el-form-item>
+<!--            <el-form-item label="适用加油升数" required>-->
+<!--              <el-col :span="11">-->
+<!--                <el-form-item prop="literMin">-->
+<!--                  <el-input v-model="ruleForm1.literMin"></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+<!--              <el-col :span="2">-->
+<!--                <div style="margin-left: 5px">到</div>-->
+<!--              </el-col>-->
+<!--              <el-col :span="11">-->
+<!--                <el-form-item prop="literMax">-->
+<!--                  <el-input v-model="ruleForm1.literMax"></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+<!--            </el-form-item>-->
             <el-form-item label="最大优惠金额" prop="disMax">
               <el-input v-model="ruleForm1.disMax"></el-input>
             </el-form-item>
@@ -502,7 +526,7 @@ export default {
       // 分时
       queryParams: {
         pageNo: 1,
-        pageSize: 5,
+        pageSize: 10000,
         activeType: 1
       },
       total: 0,
@@ -579,6 +603,7 @@ export default {
       ruleForm1: {
         activeType: 1,
         timeType: 0,
+        consumeType:'',
         paymentType: []
       }
     }
@@ -589,9 +614,10 @@ export default {
   },
   methods: {
     // 重置活动规则
-    resetRule(){
+    resetRule() {
       this.ruleForm1 = {
         activeType: 1,
+        consumeType:'',
         timeType: 0,
         paymentType: []
       }
@@ -600,7 +626,7 @@ export default {
       this.monthDay = []
     },
     // 删除活动规则
-    deleteRule(data){
+    deleteRule(data) {
       deletePriceRule(data.id).then(res => {
         this.$message.success("删除成功")
         this.getRuleList()
@@ -616,12 +642,12 @@ export default {
         this.getUserLabelList()
         this.showDialogVisible = true
 
-        if (res.data){
+        if (res.data) {
           this.ruleForm1 = res.data
           if (res.data.paymentType) this.ruleForm1.paymentType = res.data.paymentType.split(",")
           if (res.data.babelIds) this.ruleForm1.babelIds = res.data.babelIds.split(",")
 
-          if (res.data.timeSlots){
+          if (res.data.timeSlots) {
             if (res.data.timeType == "0") {
               this.weekDay = this.ruleForm1.timeSlots.split(",")
             } else if (this.ruleForm1.timeType == "1") {
@@ -669,7 +695,7 @@ export default {
     },
     // 查询分时优惠列表信息
     getTimeShareList() {
-      getRequestList({pageNo: 1, pageSize: 10000}).then(res => {
+      getRequestList({pageNo: 1, pageSize: 10000,activeType:1}).then(res => {
         this.timeShareList = res.data.records
       })
     },