From 0747a79c6f224bede6d03e434d5162daf4081af1 Mon Sep 17 00:00:00 2001
From: "@QQNZX" <cccccc420590@163.com>
Date: Fri, 17 Nov 2023 13:09:47 +0800
Subject: [PATCH] 11.16

---
 .../api/EventMarketing/activeConsumption.js   | 18 +++++++++++++++
 .../src/api/EventMarketing/activeDiscount.js  |  9 ++++++++
 .../src/api/EventMarketing/activeFullminus.js |  7 ++++++
 .../src/api/EventMarketing/activeNewlyweds.js |  7 ++++++
 .../src/api/EventMarketing/activeRecommend.js |  7 ++++++
 .../activeConsumption/index.vue               | 23 ++++++++++++++++---
 .../EventMarketing/activeDiscount/index.vue   | 14 ++++++++---
 .../EventMarketing/activeFullminus/index.vue  | 12 +++++++++-
 .../EventMarketing/activeNewlyweds/index.vue  | 10 +++++++-
 .../EventMarketing/storeOilBlock/index.vue    | 23 +++++++++++++++----
 fuintCashierWeb/package.json                  |  1 +
 11 files changed, 119 insertions(+), 12 deletions(-)

diff --git a/fuintAdmin/src/api/EventMarketing/activeConsumption.js b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
index 5bd2999ea..604a7cd39 100644
--- a/fuintAdmin/src/api/EventMarketing/activeConsumption.js
+++ b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
@@ -1,5 +1,23 @@
 import request from '@/utils/request'
 
+// 油品大类
+export function getoiltype() {
+  return request({
+    url: 'system/dict/data/type/oil_type',
+    method: 'get',
+
+  })
+}
+export function getoilName(query) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber/getOilName',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
 // 查询消费有礼活动列表
 export function listActiveConsumption(query) {
   return request({
diff --git a/fuintAdmin/src/api/EventMarketing/activeDiscount.js b/fuintAdmin/src/api/EventMarketing/activeDiscount.js
index 46f4a73a8..27b3ad4ab 100644
--- a/fuintAdmin/src/api/EventMarketing/activeDiscount.js
+++ b/fuintAdmin/src/api/EventMarketing/activeDiscount.js
@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 
+
 // 查询折扣营销列表
 export function listActiveDiscount(query) {
   return request({
@@ -8,6 +9,14 @@ export function listActiveDiscount(query) {
     params: query
   })
 }
+export function getoilName(query) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber/getOilName',
+    method: 'get',
+    params: query
+  })
+}
+
 
 // 查询折扣营销详细
 export function getActiveDiscount(id) {
diff --git a/fuintAdmin/src/api/EventMarketing/activeFullminus.js b/fuintAdmin/src/api/EventMarketing/activeFullminus.js
index f124737ec..5e89a03ef 100644
--- a/fuintAdmin/src/api/EventMarketing/activeFullminus.js
+++ b/fuintAdmin/src/api/EventMarketing/activeFullminus.js
@@ -8,6 +8,13 @@ export function listActiveFullminus(query) {
     params: query
   })
 }
+export function getoilName(query) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber/getOilName',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询满减营销详细
 export function getActiveFullminus(id) {
diff --git a/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js b/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
index 541e61e7d..b70a05947 100644
--- a/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
+++ b/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
@@ -8,6 +8,13 @@ export function listActiveNewlyweds(query) {
     params: query
   })
 }
+export function getoilName(query) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber/getOilName',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询新人有礼活动详细
 export function getActiveNewlyweds(id) {
diff --git a/fuintAdmin/src/api/EventMarketing/activeRecommend.js b/fuintAdmin/src/api/EventMarketing/activeRecommend.js
index 9f6447558..a8bee6817 100644
--- a/fuintAdmin/src/api/EventMarketing/activeRecommend.js
+++ b/fuintAdmin/src/api/EventMarketing/activeRecommend.js
@@ -31,6 +31,13 @@ export function getActiveRecommend(id) {
     method: 'get'
   })
 }
+export function getoilName(query) {
+  return request({
+    url: 'business/petrolStationManagement/oilNumber/getOilName',
+    method: 'get',
+    params: query
+  })
+}
 
 // 新增推荐有礼
 export function addActiveRecommend(data) {
diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 8a8da070b..1469faa61 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -125,8 +125,9 @@
 
         <el-form-item label="可用油品" prop="adaptOil" >
           <el-checkbox-group v-model="form.adaptOil">
-            <el-checkbox v-for="city in oillist" :label="city" :key="city">{{city}}</el-checkbox>
+            <el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
           </el-checkbox-group>
+
         </el-form-item>
         <el-form-item label="适用用户" prop="adaptUserType">
           <el-radio-group v-model="form.adaptUserType">
@@ -553,7 +554,7 @@
 </template>
 
 <script>
-import { listActiveConsumption,listExchange,listLJGoods, getActiveConsumption, delActiveConsumption, addActiveConsumption, updateActiveConsumption,listFavorable } from "@/api/EventMarketing/activeConsumption";
+import { getoiltype,getoilName, listActiveConsumption,listExchange,listLJGoods, getActiveConsumption, delActiveConsumption, addActiveConsumption, updateActiveConsumption,listFavorable } from "@/api/EventMarketing/activeConsumption";
 
 export default {
   name: "ActiveConsumption",
@@ -708,6 +709,8 @@ export default {
   },
   created() {
     this.getList();
+    // this.getoiltypeliet()
+    this.getoilName()
   },
   methods: {
     /** 查询消费有礼活动列表 */
@@ -719,8 +722,22 @@ export default {
         this.loading = false;
       });
     },
-    swchange(e){
+    // 查询油类
+    getoiltypeliet(){
+      getoiltype().then(res=>{
+        console.log(res)
+      })
+    },
+    //
+    getoilName(){
+      getoilName().then(res=>{
+        console.log(res)
+        this.oillist = res.data
 
+      })
+
+    },
+    swchange(e){
       console.log(this.shopdata)
     },
     // 请求实物
diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
index 216d04e31..6fd97e050 100644
--- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
@@ -75,7 +75,6 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-
           >修改</el-button>
           <el-button
             size="mini"
@@ -140,7 +139,7 @@
         </el-form-item>
         <el-form-item label="可用油品" prop="adaptOil" >
           <el-checkbox-group v-model="form.adaptOil">
-            <el-checkbox v-for="city in oillist" :label="city" :key="city">{{city}}</el-checkbox>
+            <el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="柴油会员等级"  prop="dieselUserLevel">
@@ -215,7 +214,7 @@
 
 <script>
 import { listActiveDiscount, getActiveDiscount, delActiveDiscount, addActiveDiscount, updateActiveDiscount } from "@/api/EventMarketing/activeDiscount";
-import {getActiveConsumption, updateActiveConsumption} from "@/api/EventMarketing/activeConsumption";
+import {getActiveConsumption, getoilName, updateActiveConsumption} from "@/api/EventMarketing/activeConsumption";
 
 export default {
   name: "ActiveDiscount",
@@ -303,6 +302,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getoilName();
   },
   methods: {
     /** 查询折扣营销列表 */
@@ -315,6 +315,14 @@ export default {
         this.loading = false;
       });
     },
+    getoilName(){
+      getoilName().then(res=>{
+        console.log(res)
+        this.oillist = res.data
+
+      })
+
+    },
     // 新增
     addactiveDiscountChildList(){
       let data = {
diff --git a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
index dc14ceacd..bd484c557 100644
--- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
@@ -146,7 +146,7 @@
         </el-form-item>
         <el-form-item label="可用油品" prop="adaptOil" >
           <el-checkbox-group v-model="form.adaptOil">
-            <el-checkbox v-for="city in oillist" :label="city" :key="city">{{city}}</el-checkbox>
+            <el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="柴油会员等级"  prop="dieselUserLevel">
@@ -222,6 +222,7 @@
 <script>
 import { listActiveFullminus, getActiveFullminus, delActiveFullminus, addActiveFullminus, updateActiveFullminus } from "@/api/EventMarketing/activeFullminus";
 import {getActiveDiscount, updateActiveDiscount} from "@/api/EventMarketing/activeDiscount";
+import {getoilName} from "@/api/EventMarketing/activeConsumption";
 
 export default {
   name: "ActiveFullminus",
@@ -307,6 +308,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getoilName()
   },
   methods: {
     /** 查询满减营销列表 */
@@ -318,6 +320,14 @@ export default {
         this.loading = false;
       });
     },
+    getoilName(){
+      getoilName().then(res=>{
+        console.log(res)
+        this.oillist = res.data
+
+      })
+
+    },
     // 新增
     addactiveDiscountChildList(){
       let data = {
diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index ac173778d..5e8540f0c 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -432,7 +432,7 @@
 
 <script>
 import { listActiveNewlyweds, getActiveNewlyweds, delActiveNewlyweds, addActiveNewlyweds, updateActiveNewlyweds } from "@/api/EventMarketing/activeNewlyweds";
-import {listExchange, listFavorable} from "@/api/EventMarketing/activeConsumption";
+import {getoilName, listExchange, listFavorable} from "@/api/EventMarketing/activeConsumption";
 import QRCode from "qrcodejs2";
 import {getActiveFullminus, updateActiveFullminus} from "@/api/EventMarketing/activeFullminus";
 
@@ -543,6 +543,14 @@ export default {
         this.loading = false;
       });
     },
+    getoilName(){
+      getoilName().then(res=>{
+        console.log(res)
+        this.oillist = res.data
+
+      })
+
+    },
     qrcodelook(url) {
       this.loadingdialog = true
       this.centerDialogVisible = true
diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
index 7dc8a008b..345b3c8a2 100644
--- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
@@ -167,11 +167,14 @@
               <el-select v-model="ruleForm.oilType" placeholder="请选择" >
                 <el-option
                   v-for="dict in oilList"
-                  :key="dict.oilName"
+
+                  :key="dict.id.toString()"
                   :label="dict.oilName"
-                  :value="dict.oilName">
+
+                  :value="dict.id.toString()">
                 </el-option>
               </el-select>
+
 <!--              <el-radio-group v-model="ruleForm.oilType" >-->
 <!--                <el-radio-->
 <!--                  v-for="dict in oilList"-->
@@ -325,12 +328,22 @@
     watch:{
       'ruleForm.rechargeBalance':{
         handler: function() {
-          this.ruleForm.incomeLitres = this.ruleForm.rechargeBalance / this.ruleForm.lockupPrice
+          if(this.ruleForm.rechargeBalance != 0 && this.ruleForm.lockupPrice != 0 ){
+            this.ruleForm.incomeLitres = this.ruleForm.rechargeBalance / this.ruleForm.lockupPrice
+          }else {
+            this.ruleForm.incomeLitres = 0
+          }
+
         },
       },
       'ruleForm.lockupPrice':{
         handler: function() {
-          this.ruleForm.incomeLitres = this.ruleForm.rechargeBalance / this.ruleForm.lockupPrice
+
+          if(this.ruleForm.rechargeBalance != 0 && this.ruleForm.lockupPrice != 0 ){
+            this.ruleForm.incomeLitres = this.ruleForm.rechargeBalance / this.ruleForm.lockupPrice
+          }else {
+            this.ruleForm.incomeLitres = 0
+          }
         },
       }
     },
@@ -346,6 +359,7 @@
     },
 
     methods:{
+      //
       radiovalue(){
 
         this.oilList = []
@@ -371,6 +385,7 @@
             lockupPrice: 0 ,
             rechargeBalance:0,
             incomeLitres:0,
+
             points:'',
             activeTime:'1',
             activeStatus:'1',
diff --git a/fuintCashierWeb/package.json b/fuintCashierWeb/package.json
index bafa4c837..96ab3ddc3 100644
--- a/fuintCashierWeb/package.json
+++ b/fuintCashierWeb/package.json
@@ -38,6 +38,7 @@
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
+    "bignumber.js": "^9.1.2",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
     "echarts": "4.9.0",