Browse Source

增加展示,结算优惠信息,司机价结算优惠

zangguocen 3 years ago
parent
commit
9437ed1691
1 changed files with 11 additions and 11 deletions
  1. 11 11
      src/views/order/Order_Lng.vue

+ 11 - 11
src/views/order/Order_Lng.vue

@@ -64,21 +64,21 @@
     </el-form>
     <el-table :data="orderList">
       <af-table-column label="油站名" align="center" prop="stationName" v-if="jiBie==0||jiBie==1"/>
-    
+
       <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="sellOilPrice" />
-      <af-table-column label="司机价" align="center" prop="driverOilPrice" />
+      <af-table-column label="司机价" align="center" prop="driverOilPrice" v-if="jiBie==0||jiBie==1"/>
 
       <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="amt" v-if="jiBie==0||jiBie==1"/>
+      <af-table-column label="司机优惠金额" align="center" prop="driverDiscountAmt" v-if="jiBie==0||jiBie==1"/>
+      <af-table-column label="总优惠金额" align="center" prop="discountAmt" v-if="jiBie==0||jiBie==1"/>
       <!-- <af-table-column label="客户姓名" align="center" prop="consumer" /> -->
       <af-table-column label="手机号" align="center" prop="mobilePhone" />
       <!-- <af-table-column label="加油员" align="center" prop="oilPersonnel" /> -->
@@ -97,7 +97,7 @@
           }}</span>
         </template>
       </af-table-column> -->
-      
+
     </el-table>
     <pagination
       v-show="total > 0"
@@ -191,11 +191,11 @@ export default {
     /** 查询订单支付列表 */
     getList() {
       this.queryParams.levelId = this.levelId
-      let arrPro 
+      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)
@@ -203,7 +203,7 @@ export default {
       }else{
         arrPro = queryGroupOrder(
           this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
-        ) 
+        )
       }
       arrPro.then((response) => {
         this.orderList = response.rows;