bug

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

@@ -53,7 +53,7 @@
       <el-table-column label="活动名称" align="center" prop="name" />
       <el-table-column label="适用油品" align="center" prop="adaptOil" >
         <template slot-scope="scope">
-          <span > {{ scope.row.adaptOilss}} </span>
+          <span > {{ getName(oilNameList,scope.row.adaptOil) }} </span>
         </template>
       </el-table-column>
       <el-table-column label="适用用户" align="center" prop="adaptOil" >
@@ -290,6 +290,7 @@ import {
   updateActiveConsumption
 } from "@/api/EventMarketing/activeConsumption";
 import {listUserGrade} from "@/api/staff/user/usergrade";
+import {getOilNameList} from "@/api/order/oilnumgun";
 
 export default {
   name: "ActiveDiscount",
@@ -321,6 +322,8 @@ export default {
       total: 0,
       // 折扣营销表格数据
       activeDiscountList: [],
+      // 油号列表
+      oilNameList:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -420,6 +423,9 @@ export default {
         this.oillist = res.data
 
       })
+      getOilNameList().then( response => {
+        this.oilNameList = response.data;
+      })
 
     },
     listUserGrade(){
@@ -498,6 +504,19 @@ export default {
       this.open = true;
       this.title = "添加折扣营销";
     },
+    // 获取油号名称
+    getName(oilNameList,ids){
+      let name = ""
+      let _this = this;
+      ids.forEach(i => {
+        oilNameList.forEach(item => {
+          if (item.id == i){
+            name += item.oilName + ",";
+          }
+        })
+      })
+      return name;
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();

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

@@ -53,7 +53,7 @@
       <el-table-column label="活动名称" align="center" prop="name" />
       <el-table-column label="适用油品" align="center" prop="adaptOil" >
         <template slot-scope="scope">
-          <span > {{ scope.row.adaptOilss}} </span>
+          <span > {{ getName(oilNameList,scope.row.adaptOil) }} </span>
         </template>
       </el-table-column>
       <el-table-column label="适用用户" align="center" prop="adaptOil" >
@@ -266,6 +266,7 @@ import { listActiveFullminus, getActiveFullminus, delActiveFullminus, addActiveF
 import {delActiveDiscount, getActiveDiscount, updateActiveDiscount} from "@/api/EventMarketing/activeDiscount";
 import {getoilName, looklook, looklooklook} from "@/api/EventMarketing/activeConsumption";
 import {listUserGrade} from "@/api/staff/user/usergrade";
+import {getOilNameList} from "@/api/order/oilnumgun";
 
 export default {
   name: "ActiveFullminus",
@@ -295,6 +296,8 @@ export default {
       total: 0,
       // 满减营销表格数据
       activeFullminusList: [],
+      // 油号列表
+      oilNameList:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -382,6 +385,9 @@ export default {
         this.oillist = res.data
 
       })
+      getOilNameList().then( response => {
+        this.oilNameList = response.data;
+      })
     },
     listUserGrade(){
       listUserGrade().then(res=>{
@@ -464,6 +470,19 @@ export default {
       this.open = true;
       this.title = "添加满减营销";
     },
+    // 获取油号名称
+    getName(oilNameList,ids){
+      let name = ""
+      let _this = this;
+      ids.forEach(i => {
+        oilNameList.forEach(item => {
+          if (item.id == i){
+            name += item.oilName + ",";
+          }
+        })
+      })
+      return name;
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -4004,6 +4004,13 @@
           _this.amount = 0
           _this.seekZero = 0;
           _this.fullReduction = 0;
+          _this.fullReduceDiscount = []
+          _this.checkAll1 = false
+          _this.gradeDiscount = []
+          _this.checkAll2 = false
+          _this.checkAll3 = false
+          _this.checkAll4 = false
+          _this.checkAll5 = false
         };
         this.userNo = ""
         this.map = {