bug修复

src/api/lng.js

@@ -1,6 +1,16 @@
 import request from '@/utils/request'
 
 // 查询积分消费订单列表
+export function updateInfo(data) {
+  return request({
+    url: '/station/settlementPrice',
+     method: 'put',
+     data: data
+  })
+}
+
+
+// 查询积分消费订单列表
 export function getLngList(query) {
   return request({
     url: '/station/settlementPrice/list',
@@ -25,12 +35,11 @@ export function balanceChange(data) {
     data: data
   })
 }
-
-// 查询积分消费订单详细
-export function balanceChangegList() {
-  return request({
-    url: '/station/stationBalanceChange/list',
-    method: 'get',
-  })
-}
+export function updatePlan(data) {
+    return request({
+      url: '/market/plan',
+      method: 'put',
+      data: data
+    })
+  }
 

src/api/station/order.js

@@ -50,4 +50,44 @@ export function exportOrder(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 导出lng集团订单
+export function exportLngOrderGroup(query) {
+  return request({
+    url: '/station/order/LNGExport',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出lng站点订单
+export function exportLngOrderStation(query) {
+  return request({
+    url: '/station/order/LNGDeptExport',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询站点订单
+export function queryGroupOrder(query) {
+  return request({
+    url: '/station/order/LNGDeptList',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+
+// 查询积分消费订单详细
+export function queryStationOrder(query) {
+  return request({
+    url: '/station/order/LNGDeptList',
+    method: 'get',
+    params: query
+  })
+}

src/views/lng/Lng_GroupSet.vue

@@ -198,7 +198,9 @@ export default {
       }
     },
     submitForm(ele, index){
+      console.log(12)
       updateInfo(ele).then((res)=>{
+        console.log(12);
         if(res.code == 200){
           this.getLngSingle(ele.id, index).then((res)=>{
             this.editFlag = false

src/views/order/Order_Lng.vue

@@ -15,7 +15,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="客户姓名" prop="likeConsumer">
+      <!-- <el-form-item label="客户姓名" prop="likeConsumer">
         <el-input
           v-model="queryParams.likeConsumer"
           placeholder="请输入客户姓名"
@@ -23,7 +23,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="创建时间" prop="createdDate">
         <el-date-picker
@@ -68,32 +68,21 @@
       <af-table-column label="订单号" align="center" prop="orderNo" />
       <af-table-column label="油品名称" align="center" prop="oilName" />
       
-      <af-table-column label="油基价格" align="center" prop="oilPirce" />
+      <af-table-column label="枪标价" align="center" prop="oilPirce" />
+      <af-table-column label="结算价" align="center" prop="sell_oil_price" />
+      <af-table-column label="司机价" align="center" prop="driver_oil_price" />
 
       <af-table-column label="加油升数" align="center" prop="orderLiters" />
       <af-table-column label="应付金额" align="center" prop="receivableAmt" />
       <af-table-column label="结算金额" align="center" prop="sellAmt" />
       <af-table-column label="司机金额" align="center" prop="amt" />
-      <af-table-column label="结算优惠金额" align="center" prop="sellDiscountAmt" />
-      <af-table-column label="司机优惠金额" align="center" prop="discountAmt" />
+      <!-- <af-table-column label="结算优惠金额" align="center" prop="sellDiscountAmt" /> -->
+      <!-- <af-table-column label="司机优惠金额" align="center" prop="discountAmt" /> -->
 
-      <af-table-column label="客户姓名" align="center" prop="consumer" />
-      <af-table-column label="加油员" align="center" prop="oilPersonnel" />
-      <af-table-column label="加油枪号" align="center" prop="oilGun" />
-      <af-table-column
-        label="支付类型"
-        align="center"
-        prop="payType"
-        width="150px"
-        :formatter="payTypeFotmat"
-      />
-      <af-table-column
-        label="状态"
-        width="130px"
-        align="center"
-        prop="status"
-        :formatter="statusFotmat"
-      />
+      <!-- <af-table-column label="客户姓名" align="center" prop="consumer" /> -->
+      <af-table-column label="手机号" align="center" prop="mobilePhone" />
+      <!-- <af-table-column label="加油员" align="center" prop="oilPersonnel" /> -->
+      <!-- <af-table-column label="加油枪号" align="center" prop="oilGun" /> -->
       <af-table-column label="支付时间" align="center" prop="payDate">
         <template slot-scope="scope">
           <span>{{
@@ -120,7 +109,7 @@
   </div>
 </template>
 <script>
-import { listOrder, exportOrder } from "@/api/station/order";
+import { listOrder, exportOrder, exportLngOrderGroup, exportLngOrderStation,  queryGroupOrder, queryStationOrder  } from "@/api/station/order";
 import { stationinfo } from "@/api/station/gun";
 import { listPrice, getPrice } from "@/api/station/price";
 
@@ -162,7 +151,6 @@ export default {
     };
   },
   created() {
-    console.log(this.levelId)
     this.getList();
     //字典
     this.getDicts("pay_type").then((response) => {
@@ -203,9 +191,19 @@ export default {
     /** 查询订单支付列表 */
     getList() {
       this.queryParams.levelId = this.levelId
-      listOrder(
-        this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
-      ).then((response) => {
+      let arrPro 
+      if(this.jiBie == 1){
+        arrPro = queryGroupOrder(
+          this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
+        )        
+      }else if(this.jiBie == 2){
+        arrPro = queryStationOrder(
+          this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
+        )
+      }else{
+        return ;
+      }
+      arrPro.then((response) => {
         this.orderList = response.rows;
         this.total = response.total;
       });
@@ -224,6 +222,7 @@ export default {
 
     /** 导出按钮操作 */
     handleExport() {
+      const that = this;
       const queryParams = this.queryParams;
       this.$confirm("是否确认导出所有订单支付数据项?", "警告", {
         confirmButtonText: "确定",
@@ -231,7 +230,11 @@ export default {
         type: "warning",
       })
         .then(function () {
-          return exportOrder(queryParams);
+          if(that.jiBie == 1){
+            return exportLngOrderGroup(queryParams);
+          }else if(that.jiBie == 2){
+            return exportLngOrderStation(queryParams)
+          }
         })
         .then((response) => {
           this.download(response.msg);

src/views/overview/Overview_Daily.vue

@@ -464,7 +464,6 @@ export default {
 
     //获取折线图用到的数据
     getDatas() {
-      console.log('levelId',this.levelId)
       this.queryParams.levelId = this.levelId;
       Promise.all([
         this.getXData(),