From 8bd63ea9f312fd00998eaebcd2dd80eb76d6d57d Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Tue, 3 Sep 2024 11:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../openCardGift/userConsume.vue              | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue
index faacca0be..f4c8884ac 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue
@@ -45,11 +45,8 @@
               {{ item }}
             </div>
             <el-select v-model="ruleForm.dieselUserLevel" multiple clearable placeholder="请选择油品油号（多选）">
-              <el-option
-                v-for="(item,index) in userGradeList"
-                :label="item.name"
-                :value="item.id.toString()"
-                :key="index"></el-option>
+              <el-option v-for="(item,index) in oilNumberList" :key="index"
+                         :label="getOilNamess(oilNameList,item.oilName)" :value="item.oilName"></el-option>
             </el-select>
           </div>
         </el-form-item>
@@ -155,6 +152,7 @@ import {
 } from "@/api/EventMarketing/activeFullminus";
 import {listCardCoupon} from "@/api/EventMarketing/cardCoupon";
 import {listUserGrade} from "@/api/staff/user/usergrade";
+import {getOilNameList, oilNumberList} from "@/api/order/oilnumgun";
 
 export default {
   name: "ActiveNewlyweds",
@@ -248,6 +246,9 @@ export default {
       // 优惠券列表信息
       cardCouponList:[],
       userGradeList: [],
+      oilNameList: [],
+      // 油号列表
+      oilNumberList: [],
       // 表单校验
       rules: {
         name: [
@@ -270,11 +271,31 @@ export default {
   },
   created() {
     // this.getList()
-    // this.getInfo()
+    this.getInfo()
     this.getCardCoupon()
     this.listUserGrade()
+    this.getOilList()
   },
   methods: {
+    getOilList(){
+      getOilNameList().then(response => {
+        this.oilNameList = response.data;
+      })
+      oilNumberList().then(response => {
+        this.oilNumberList = response.data.records;
+      })
+    },
+    getOilNamess(list, id) {
+      let name = ""
+      if (list != null && list != "") {
+        list.forEach(item => {
+          if (item.id == id) {
+            name = item.oilName;
+          }
+        })
+      }
+      return name;
+    },
     Typeindex4(index) {
       this.tindex4 = index
     },
@@ -294,12 +315,14 @@ export default {
       getInfoActiveNewlyweds().then(res => {
         if (res.data) {
           this.ruleForm = res.data
+          if (res.data.paymentType) this.ruleForm.paymentType = res.data.paymentType.split(",")
           if (res.data.courtesyReward) this.ruleForm.courtesyReward = res.data.courtesyReward.split(",")
           if (res.data.activeTimeType) this.tindex1 = res.data.activeTimeType
           if (res.data.couponList) this.couponList = res.data.couponList
         }else {
           this.ruleForm = {
             activeTimeType:0,
+            paymentType:[],
             courtesyReward:[]
           }
           this.tindex1 = 0