Browse Source

正式版

Joe 3 years ago
parent
commit
6937bb8dba

+ 1 - 3
src/api/station/order.js

@@ -74,15 +74,13 @@ export function exportLngOrderStation(query) {
 // 查询站点订单
 export function queryGroupOrder(query) {
   return request({
-    url: '/station/order/LNGDeptList',
+    url: '/station/order/LNGlist',
     method: 'get',
     params: query
   })
 }
 
 
-
-
 // 查询积分消费订单详细
 export function queryStationOrder(query) {
   return request({

+ 1 - 9
src/components/SelectDept/index.vue

@@ -120,18 +120,10 @@ export default {
       num: 0,
       tip:'',
       Agency: {
-        deptId: 1,
+        deptId: 100,
         deptName: this.$store.state.user.deptName,
       },
       groups: [
-        {
-          deptId: 3,
-          deptName: "李哈哈的集团",
-        },
-        {
-          deptId: 2,
-          deptName: "李哈哈的顶级集团",
-        },
       ],
       stations: [
         {

+ 0 - 1
src/views/lng/Lng_GroupSet.vue

@@ -71,7 +71,6 @@
                 {{ ele.balance === null ? 0 : ele.balance }}
                 <a href="#"
                   class="mb-2 ml-2"
-                  icon="el-icon-edit"
                   @click="toggleBalanceFlag(ele)"
                   >{{ !ele.balanceFlag ? "调整" : "收起" }}
                 </a>

+ 5 - 3
src/views/order/Order_Lng.vue

@@ -69,8 +69,8 @@
       <af-table-column label="油品名称" align="center" prop="oilName" />
       
       <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="sellOilPrice" />
+      <af-table-column label="司机价" align="center" prop="driverOilPrice" />
 
       <af-table-column label="加油升数" align="center" prop="orderLiters" />
       <af-table-column label="应付金额" align="center" prop="receivableAmt" />
@@ -201,7 +201,9 @@ export default {
           this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
         )
       }else{
-        return ;
+        arrPro = queryGroupOrder(
+          this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
+        ) 
       }
       arrPro.then((response) => {
         this.orderList = response.rows;