Merge remote-tracking branch 'origin/master'

fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue

@@ -59,22 +59,11 @@
         <span v-if="scope.row.adaptUserType == 2">等级会员</span>
       </template>
       </el-table-column>
-      <el-table-column label="柴油会员等级" align="center" prop="dieselUserLevel" >
+      <el-table-column label="会员等级" align="center" prop="dieselUserLevel" >
       <template slot-scope="scope">
-      <span v-for="(item,index) in scope.row.dieselUserLevel "> V{{item}}会员 </span>
+        <span v-for="(item,index) in scope.row.dieselUserLevel "> {{item}} </span>
       </template>
       </el-table-column>
-      <el-table-column label="汽油会员等级" align="center" prop="gasolineUserLevel" >
-      <template slot-scope="scope">
-        <span v-for="(item,index) in scope.row.gasolineUserLevel "> V{{item}}会员 </span>
-      </template>
-      </el-table-column>
-      <el-table-column label="天然气会员等级 " align="center" prop="naturalUserLevel" >
-      <template slot-scope="scope">
-        <span v-for="(item,index) in scope.row.naturalUserLevel "> V{{item}}会员 </span>
-      </template>
-      </el-table-column>
-
       <el-table-column label="活动状态" align="center" prop="status" >
       <template slot-scope="scope">
 
@@ -332,45 +321,12 @@
                           placeholder="请选择活动结束时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-if="form.adaptUserType == 2" label="柴油会员等级"  prop="dieselUserLevel">
+        <el-form-item label="请选择会员等级" prop="dieselUserLevel" >
-          <el-select v-model="form.dieselUserLevel"  multiple clearable placeholder="请选择柴油会员等级">
+          <el-select v-model="form.dieselUserLevel"  multiple clearable placeholder="请选择会员等级">
-            <el-option label="V1会员" value="1"></el-option>
+            <el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" >  </el-option>
-            <el-option label="V2会员" value="2"></el-option>
-            <el-option label="V3会员" value="3"></el-option>
-            <el-option label="V4会员" value="4"></el-option>
-            <el-option label="V5会员" value="5"></el-option>
-            <el-option label="V6会员" value="6"></el-option>
-            <el-option label="V7会员" value="7"></el-option>
-            <el-option label="V8会员" value="8"></el-option>
-            <el-option label="V9会员" value="9"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="form.adaptUserType == 2" label="汽油会员等级" prop="gasolineUserLevel">
-          <el-select v-model="form.gasolineUserLevel"  multiple clearable placeholder="请选择汽油会员等级">
-            <el-option label="V1会员" value="1"></el-option>
-            <el-option label="V2会员" value="2"></el-option>
-            <el-option label="V3会员" value="3"></el-option>
-            <el-option label="V4会员" value="4"></el-option>
-            <el-option label="V5会员" value="5"></el-option>
-            <el-option label="V6会员" value="6"></el-option>
-            <el-option label="V7会员" value="7"></el-option>
-            <el-option label="V8会员" value="8"></el-option>
-            <el-option label="V9会员" value="9"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="form.adaptUserType == 2" label="天然气会员等级" prop="naturalUserLevel">
-          <el-select v-model="form.naturalUserLevel"  multiple clearable placeholder="请选择天然气会员等级">
-            <el-option label="V1会员" value="1"></el-option>
-            <el-option label="V2会员" value="2"></el-option>
-            <el-option label="V3会员" value="3"></el-option>
-            <el-option label="V4会员" value="4"></el-option>
-            <el-option label="V5会员" value="5"></el-option>
-            <el-option label="V6会员" value="6"></el-option>
-            <el-option label="V7会员" value="7"></el-option>
-            <el-option label="V8会员" value="8"></el-option>
-            <el-option label="V9会员" value="9"></el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item label="参与条件" prop="participationCondition">
           <el-select v-model="form.participationCondition" clearable placeholder="请选择天参与条件">
             <el-option label="不限制" value="0"></el-option>
@@ -389,12 +345,6 @@
         <el-form-item label="赠送积分" prop="points">
           <el-input-number v-model="form.points" controls-position="right" :min="1" :max="999999"></el-input-number>
         </el-form-item>
-<!--        <el-form-item label="是否上线" prop="isonline">-->
-<!--          <el-select v-model="form.isonline" clearable placeholder="请选择参与次数类别">-->
-<!--            <el-option label="上线" value="0"></el-option>-->
-<!--            <el-option label="下线" value="1"></el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -555,11 +505,13 @@
 
 <script>
 import { getoiltype,getoilName, listActiveConsumption,listExchange,listLJGoods, getActiveConsumption, delActiveConsumption, addActiveConsumption, updateActiveConsumption,listFavorable } from "@/api/EventMarketing/activeConsumption";
+import {listUserGrade} from "@/api/staff/user/usergrade";
 
 export default {
   name: "ActiveConsumption",
   data() {
     return {
+      userGradeList:[],
       pdidlist:[],//判断优惠券id
       pddhidlist:[],//判断兑换券id
       pdswidlist:[],//判断实物id
@@ -711,6 +663,7 @@ export default {
     this.getList();
     // this.getoiltypeliet()
     this.getoilName()
+    this.listUserGrade()
   },
   methods: {
     /** 查询消费有礼活动列表 */
@@ -722,6 +675,14 @@ export default {
         this.loading = false;
       });
     },
+    listUserGrade(){
+      listUserGrade().then(res=>{
+        if(res.code == 200){
+          this.userGradeList = res.data.records
+        }
+
+      })
+    },
     // 查询油类
     getoiltypeliet(){
       getoiltype().then(res=>{