Merge remote-tracking branch 'origin/master'

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

@@ -54,7 +54,8 @@
       <el-table-column label="活动名称" align="center" prop="name" />
       <el-table-column label="适用油品" align="center" prop="adaptOil" >
         <template slot-scope="scope">
-          <span v-for="item in scope.row.adaptOils">{{ item }}, </span>
+<!--          <span v-for="item in scope.row.adaptOils">{{ item }}, </span>-->
+          <span >{{ getName(oilNameList,scope.row.adaptOil) }} </span>
         </template>
       </el-table-column>
       <el-table-column label="满足金额" align="center" prop="participationConditionMoney" >
@@ -636,6 +637,7 @@
 <script>
 import { getoiltype,getoilName, listActiveConsumption,listExchange,listLJGoods, getActiveConsumption, delActiveConsumption, addActiveConsumption, updateActiveConsumption,listFavorable,looklook,looklooklook } from "@/api/EventMarketing/activeConsumption";
 import {listUserGrade} from "@/api/staff/user/usergrade";
+import {getOilNameList} from "@/api/order/oilnumgun";
 
 export default {
   name: "ActiveConsumption",
@@ -650,6 +652,8 @@ export default {
       ],
       labelPosition:'left',
       userGradeList:[],
+      // 油号列表
+      oilNameList:[],
       pdidlist:[],//判断优惠券id
       pddhidlist:[],//判断兑换券id
       pdswidlist:[],//判断实物id
@@ -847,6 +851,19 @@ export default {
 
       })
     },
+    // 获取油号名称
+    getName(oilNameList,ids){
+      let name = ""
+      let _this = this;
+      ids.forEach(i => {
+        oilNameList.forEach(item => {
+          if (item.id == i){
+            name += item.oilName + ",";
+          }
+        })
+      })
+      return name;
+    },
     // 查询油类
     getoiltypeliet(){
       getoiltype().then(res=>{
@@ -861,6 +878,9 @@ export default {
 
       })
 
+      getOilNameList().then( response => {
+        this.oilNameList = response.data;
+      })
     },
     swchange(e){
       console.log(this.shopdata)
@@ -1105,6 +1125,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.tableData1 = []
       this.open = true;
       this.title = "添加消费有礼活动";
     },