阶梯价bug修复、 lng平台完成

.env.production

@@ -2,4 +2,4 @@
 ENV = 'production'
 
 # 智慧易加管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/prod-api'

src/api/lng.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+// 查询积分消费订单列表
+export function getLngList(query) {
+  return request({
+    url: '/station/settlementPrice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询积分消费订单详细
+export function getLngSingle(id) {
+  return request({
+    url: '/station/settlementPrice/' + id,
+    method: 'get'
+  })
+}
+
+// 查询积分消费订单详细
+export function balanceChange(data) {
+  return request({
+    url: '/station/stationBalanceChange/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询积分消费订单详细
+export function balanceChangegList() {
+  return request({
+    url: '/station/stationBalanceChange/list',
+    method: 'get',
+  })
+}
+

src/components/SelectDept/index.vue

@@ -79,7 +79,7 @@
           <input
             type="email"
             class="form-control"
-            id="exampleDropdownFormEmail1"
+            id="exampleDropdownFormEmail2"
             placeholder=""
             autocomplete="off"
             @input="filterMethod"
@@ -98,7 +98,7 @@
       </div>
     </div>
     <!--站点-->
-    <button type="button" class="btn btn-sm btn-success" disabled>
+    <button type="button" class="btn btn-sm btn-primary"  style="background-color:#1890ff">
       {{ tip  + (jiBie !=2 ? "：" : "") + currentShow.deptName }}
     </button>
   </div>

src/views/label/Label_Batch.vue

@@ -1,82 +1,345 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="标签状态" prop="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          placeholder="请输入客户名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员名" prop="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          placeholder="请输入客户名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="油品" prop="cardOilsType">
-        <el-select
-          v-model="queryParams.cardOilsType"
-          placeholder="请选择油品"
-          clearable
-          size="small"
-        >
-          <el-option label="汽油卡" value="1"></el-option>
-          <el-option label="柴油卡" value="2"></el-option>
-          <el-option label="非油品卡" value="3"></el-option>
-          <el-option label="LNG卡" value="4"></el-option>
-          <el-option label="CNG卡" value="5"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="类型" prop="usageType">
-        <el-select
-          v-model="queryParams.usageType"
-          placeholder="请选择消费充值类型"
-          clearable
-          size="small"
-        >
-          <el-option label="充值" value="+" />
-          <el-option label="消费" value="-" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button
-          type="cyan"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-      </el-form-item>
-    </el-form>
+    <div class="container">
+      <div class="row">
+        <div class="col-sm col-md-3">
+          <div class="input-group input-group-sm flex-nowrap">
+            <div class="input-group-prepend" style="width: 80px"></div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">油品：</span>
+            </div>
+            <select
+              class="custom-select"
+              id="inputGroupSelect01"
+              style="width: 80px"
+            >
+              <option selected>Choose...</option>
+              <option value="1">One</option>
+              <option value="2">Two</option>
+              <option value="3">Three</option>
+            </select>
+          </div>
+        </div>
+        <div class="col-sm col-md-8">
+          <div class="input-group input-group-sm flex-nowrap">
+            <div class="input-group-prepend" style="width: 80px"></div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >加油时间：</span
+              >
+              <el-date-picker
+                v-model="dateRangeCreatedDate"
+                type="datetimerange"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                size="mini"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="margin-top: 2px; max-width: 350px"
+              >
+              </el-date-picker>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-sm col-md-9">
+          <div class="input-group input-group-sm flex-nowrap">
+            <div class="input-group-prepend" style="width: 80px"></div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >加油频率：</span
+              >
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">次</span>
+            </div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >>= 加油次数 >=</span
+              >
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">次</span>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-sm col-md-9">
+          <div class="input-group input-group-sm flex-nowrap">
+            <div class="input-group-prepend" style="width: 80px">
+              <select
+                class="custom-select custom-select-sm"
+                id="inputGroupSelect01"
+              >
+                <option value="1">或者</option>
+                <option value="2">并且</option>
+              </select>
+            </div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >加油金额：</span
+              >
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">元</span>
+            </div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">
+                >= 加油金额 >=
+              </span>
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">元</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-sm col-md-9">
+          <div class="input-group input-group-sm flex-nowrap">
+            <div class="input-group-prepend" style="width: 80px">
+              <select
+                class="custom-select custom-select-sm"
+                id="inputGroupSelect01"
+              >
+                <option value="1">或者</option>
+                <option value="2">并且</option>
+              </select>
+            </div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >加油升数：</span
+              >
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">升</span>
+            </div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >>= 加油升数 >=</span
+              >
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">升</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+   <hr/>
+    <div class="container">
+      <div class="row">
+        <div class="col-sm col-md-8">
+          <div class="input-group input-group-sm flex-nowrap">
+            <div class="input-group-prepend" style="width: 80px"></div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >加油时间：</span
+              >
+              <el-date-picker
+                v-model="dateRangeCreatedDate"
+                type="datetimerange"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                size="mini"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="margin-top: 2px; max-width: 350px"
+              >
+              </el-date-picker>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-sm col-md-9">
+          <div class="input-group input-group-sm flex-nowrap">
+            <div class="input-group-prepend" style="width: 80px"></div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >加油频率：</span
+              >
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">次</span>
+            </div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >>= 加油次数 >=</span
+              >
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">次</span>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-sm col-md-9">
+          <div class="input-group input-group-sm flex-nowrap">
+            <div class="input-group-prepend" style="width: 80px">
+              <select
+                class="custom-select custom-select-sm"
+                id="inputGroupSelect01"
+              >
+                <option value="1">或者</option>
+                <option value="2">并且</option>
+              </select>
+            </div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >加油金额：</span
+              >
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">元</span>
+            </div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">
+                >= 加油金额 >=
+              </span>
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">元</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-sm col-md-9">
+          <div class="input-group input-group-sm flex-nowrap">
+            <div class="input-group-prepend" style="width: 80px">
+              <select
+                class="custom-select custom-select-sm"
+                id="inputGroupSelect01"
+              >
+                <option value="1">或者</option>
+                <option value="2">并且</option>
+              </select>
+            </div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >加油升数：</span
+              >
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">元</span>
+            </div>
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping"
+                >>= 加油升数 >=</span
+              >
+            </div>
+            <input
+              type="text"
+              class="form-control"
+              aria-label="Username"
+              aria-describedby="addon-wrapping"
+            />
+            <div class="input-group-prepend">
+              <span class="input-group-text" id="addon-wrapping">元</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+ 
+    <hr />
     <el-table :data="labelList">
-      <af-table-column align="center" prop="id"  type="selection"/>
+      <af-table-column align="center" prop="id" type="selection" />
       <af-table-column label="姓名" align="center" prop="id" />
       <af-table-column label="当前归属的标签" align="center" prop="id" />
       <af-table-column label="手机号" align="center" prop="stationName" />
-      <af-table-column label="最后一笔消费时间" align="center" prop="stationName" />
-      <af-table-column label="近期详细消费" align="center" prop="stationName" width="160px">
+      <af-table-column
+        label="最后一笔消费时间"
+        align="center"
+        prop="stationName"
+      />
+      <af-table-column
+        label="近期详细消费"
+        align="center"
+        prop="stationName"
+        width="160px"
+      >
         <template slot-scope="scope">
           <el-button
             type="text"
             icon="el-icon-search"
             class="underline btn24"
             size="mini"
-            @click="handleMoveLabel('right', 1, scope.row)"
-          >查询</el-button>
+            @click="orderOpenMethod(scope.row)"
+            >查询</el-button
+          >
         </template>
       </af-table-column>
       <af-table-column label="操作" align="center" width="160px">
@@ -87,14 +350,16 @@
             class="underline btn24"
             size="mini"
             @click="handleMoveLabel('right', 1, scope.row)"
-          >打标签</el-button>
+            >打标签</el-button
+          >
           <el-button
             type="text"
             icon="el-icon-circle-plus-outline"
             class="underline btn24"
             size="mini"
             @click="handleMoveLabel('right', 1, scope.row)"
-          >删除当前标签</el-button>
+            >删除当前标签</el-button
+          >
         </template>
       </af-table-column>
     </el-table>
@@ -105,6 +370,95 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+    <el-dialog
+      title="1235555"
+      :visible.sync="orderOpen"
+      width="750px"
+      append-to-body
+    >
+      <div class="app-container">
+        <el-table :data="orderList">
+          <af-table-column label="油站" align="center" prop="stationName" />
+          <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="orderLiters" />
+          <af-table-column label="实付金额" align="center" prop="amt" />
+          <af-table-column
+            label="消费者昵称"
+            width="120"
+            align="center"
+            prop="consumer"
+          />
+          <af-table-column
+            label="加油员"
+            width="120"
+            align="center"
+            prop="oilPersonnel"
+          />
+          <af-table-column label="加油枪号" align="center" prop="oilGun" />
+          <!--
+          <af-table-column
+            label="支付类型"
+            align="center"
+            prop="payType"
+            :formatter="payTypeFotmat"
+          />
+          -->
+          <af-table-column
+            label="油站名称"
+            width="120"
+            align="center"
+            prop="stationName"
+            v-if="false"
+          />
+          <af-table-column
+            label="用户id(消费者)"
+            align="center"
+            prop="consumerId"
+            v-if="false"
+          />
+          <af-table-column
+            label="油站id"
+            align="center"
+            prop="stationId"
+            v-if="false"
+          />
+          <af-table-column
+            label="支付完成时间"
+            align="center"
+            prop="payDate"
+            width="160px"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                parseTime(scope.row.payDate, "{y}-{m}-{d} {h}:{i}:{s}")
+              }}</span>
+            </template>
+          </af-table-column>
+          <af-table-column
+            label="订单创建时间"
+            align="center"
+            prop="createdDate"
+            width="160px"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                parseTime(scope.row.createdDate, "{y}-{m}-{d} {h}:{i}:{s}")
+              }}</span>
+            </template>
+          </af-table-column>
+        </el-table>
+        <pagination
+          v-show="totalInfo > 0"
+          :total="totalInfo"
+          :page.sync="query.pageNum"
+          :limit.sync="query.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -130,6 +484,21 @@ export default {
         payType: null,
         cardOilsType: null,
       },
+      orderList: [{}],
+      orderOpen: false,
+      totalInfo: 0,
+      query: {
+        pageNum: 1,
+        pageSize: 10,
+        unionId: null,
+        customerName: null,
+        recordType: null,
+        integral: null,
+        stationId: null,
+        stationName: null,
+        levelId: this.levelId,
+      },
+      dateRangeCreatedDate: [],
     };
   },
   created() {
@@ -173,6 +542,18 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    orderOpenMethod() {
+      this.orderOpen = true;
+    },
   },
 };
 </script>
+<style scoped lang="scss">
+.app-container {
+  .container {
+    .row {
+      margin-bottom: 10px;
+    }
+  }
+}
+</style>

src/views/lng/Lng_BalaceRecord.vue

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    
+  </div>
+</template>
+
+<script>
+import { 
+getLngList, 
+getLngSingle,
+updateInfo,
+balanceChange,
+balanceChangegList
+} from "@/api/lng";
+export default {
+  name: 'Lng_BalaceRecord',
+  created(){
+    balanceChangegList().then((res)=>{
+      console.log(res);
+    })
+  },
+  methods:{
+
+  }
+
+}
+</script>
+
+<style>
+
+</style>

src/views/lng/Lng_GroupSet.vue

@@ -0,0 +1,242 @@
+<template>
+  <div>
+    <div
+      class="accordion"
+      :id="'accordionExample' + index"
+      v-for="(ele, index) in list"
+      :key="index"
+    >
+      <div class="card  m-auto" style="width: 500px">
+        <div class="card-header" :id="'headingOne' + index">
+          <h2 class="mb-0">
+            <button
+              class="btn btn-link btn-block text-left"
+              type="button"
+              data-toggle="collapse"
+              :data-target="'#collapseOne' + index"
+              aria-expanded="true"
+              :aria-controls="'collapseOne' + index"
+            >
+              {{ ele.stationName }}
+            </button>
+          </h2>
+        </div>
+
+        <div
+          :id="'collapseOne' + index"
+          class="collapse"
+          :aria-labelledby="'headingOne' + index"
+          :data-parent="'#accordionExample' + index"
+        >
+          <div class="card-body">
+            <el-form
+              :model="ele"
+              status-icon
+              :ref="'listForm' + index"
+              label-width="120px"
+              class="demo-ruleForm w-75 m-auto"
+            >
+              <el-form-item label="结算优惠类型" prop="settlementType">
+                <el-radio-group
+                  v-model="ele.settlementType"
+                  :disabled="!ele.editFlag"
+                >
+                  <el-radio label="1">直降</el-radio>
+                  <el-radio label="2">折扣</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="结算优惠金额" prop="settlementPrice">
+                {{ ele.settlementType == 1 ? "直降" : "折扣" }}
+                <input
+                  type="text"
+                  class="form-control form-control-sm d-inline-block"
+                  style="width: 80px"
+                  v-model.number="ele.settlementPrice"
+                  :disabled="!ele.editFlag"
+                />
+                {{ ele.settlementType == 1 ? "元" : "%" }}
+              </el-form-item>
+              <el-form-item label="司机优惠折扣" prop="driverPrice">
+                折扣
+                <input
+                  type="text"
+                  class="form-control form-control-sm d-inline-block"
+                  style="width: 80px"
+                  v-model.number="ele.driverPrice"
+                  :disabled="!ele.editFlag"
+                />
+                %
+              </el-form-item>
+              <el-form-item label="站点交易余额" prop="balance">
+                {{ ele.balance === null ? 0 : ele.balance }}
+                <a href="#"
+                  class="mb-2 ml-2"
+                  icon="el-icon-edit"
+                  @click="toggleBalanceFlag(ele)"
+                  >{{ !ele.balanceFlag ? "调整" : "收起" }}
+                </a>
+                <div class="mt-2" v-show="!!ele.balanceFlag">
+                  <select
+                    class="custom-select custom-select-sm mb-1 mr-1"
+                    :id="'inputGroupSelect' + index"
+                    style="width: 50px"
+                    :disabled="!ele.balanceFlag"
+                    v-model.number="ele.type"
+                  >
+                    <option value="+"> + </option>
+                    <option value="-"> - </option>
+                  </select>
+                  <input
+                    type="text"
+                    class="form-control form-control-sm d-inline-block"
+                    style="width: 80px"
+                    :disabled="!ele.balanceFlag"
+                    v-model.number="ele.amt"
+                  />
+
+                  <el-button
+                    class="btn btn-outline-dark btn-sm mb-1 ml-1"
+                    :disabled="!ele.balanceFlag"
+                    @click="changeBalance(ele, index)"
+                  >
+                    确认
+                  </el-button>
+                </div>
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  @click="submitForm(ele,index)"
+                  class="mr-2"
+                  :disabled="!ele.editFlag"
+                  >提交</el-button
+                >
+                <el-button @click="toggleEditFlag(ele,index)" >{{
+                  !ele.editFlag ? "修改" : "取消"
+                }}</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { 
+getLngList, 
+getLngSingle,
+updateInfo,
+balanceChange
+} from "@/api/lng";
+
+export default {
+  name: "Lng_GroupSet",
+  data() {
+    return {
+      list: [
+        {
+          settlementType: "1",
+          settlementPrice: 1,
+          driverPrice: 97,
+          balance: 1000,
+        },
+        {
+          settlementType: "1",
+          settlementPrice: 2,
+          driverPrice: 95,
+          balance: 2000,
+        },
+      ],
+    };
+  },
+  created() {
+    this.getLngList();
+  },
+  methods: {
+    getLngSingle(id, index) {
+      return getLngSingle(id)
+        .then((res) => {
+          if (res.code == 200) {
+            console.log(res.data);
+            this.list[index] = res.data;
+            this.list = [...this.list];
+          } else {
+            throw new Error("");
+          }
+        })
+        .catch(() => {
+          this.msgError("拉取气站列表失败");
+        });
+    },
+    getLngList() {
+      getLngList()
+        .then((res) => {
+          if (res.code == 200) {
+            this.list = res.rows;
+          } else {
+            throw new Error("");
+          }
+        })
+        .catch(() => {
+          this.msgError("拉取气站列表失败");
+        });
+    },
+    toggleBalanceFlag(ele) {
+      ele.type = "+"
+      ele.balanceFlag = !ele.balanceFlag;
+      ele.editFlag = false;
+      this.list = [...this.list];
+    },
+    toggleEditFlag(ele, index) {
+      ele.editFlag = !ele.editFlag;
+      ele.balanceFlag = false;
+      if (!ele.editFlag) {
+        this.getLngSingle(ele.id, index)
+      }else{
+        this.list = [...this.list];
+      }
+    },
+    submitForm(ele, index){
+      updateInfo(ele).then((res)=>{
+        if(res.code == 200){
+          this.getLngSingle(ele.id, index).then((res)=>{
+            this.editFlag = false
+          })
+        }else{
+          throw new Error("");
+        }
+      }).catch(()=>{
+        this.msgError("修改失败，请刷新后重试")
+      }) 
+    },
+    changeBalance(ele, index){
+      if(!ele.type || !ele.amt || !ele.deptId || ele.amt<=0){
+        this.msgError("请正确填写参数")
+        return;
+      }
+      balanceChange({
+        type:ele.type,
+        amt:ele.amt,
+        stationId: ele.deptId
+      }).then((res)=>{
+        if(res.code == 200){
+          this.getLngSingle(ele.id,index).then((res)=>{
+            ele.type = '+'
+            ele.amt = 0
+            ele.balanceFlag = false;
+          })
+        }else{
+          throw new Error("");
+        }
+      }).catch(()=>{
+        this.msgError("修改失败，请刷新后重试")
+      })
+    }
+  },
+};
+</script>
+
+<style>
+</style>

src/views/market/Market_Discount.vue

@@ -69,6 +69,7 @@
           />
         </el-form-item>
         <el-form-item label="油品名称" prop="oilName">
+
           <select
             v-model="updateForm.oilName"
             class="form-control form-control-sm w-50"
@@ -81,6 +82,7 @@
             >
               {{ dict.oilName }}
             </option>
+            <option :value="updateForm.oilName" v-if="ladderUp">{{updateForm.oilName}}</option>
           </select>
         </el-form-item>
 
@@ -538,7 +540,7 @@
                 
               />
               <div class="input-group-append">
-                <span class="input-group-text"> {{updateForm.discountTerm==1 ? '升&lt;= 加油升数 &lt;': "元&lt;= 加油金额 &lt;"}}  </span>
+                <span class="input-group-text"> {{item.discountTerm == 1 ? '升&lt;= 加油升数 &lt;': "元&lt;= 加油金额 &lt;"}}  </span>
               </div>
               <input
                 type="text"
@@ -547,7 +549,7 @@
                 disabled
               />
               <div class="input-group-append">
-                <span class="input-group-text">{{updateForm.discountTerm==1 ? '升，':'元，'}}</span>
+                <span class="input-group-text">{{item.discountTerm==1 ? '升，':'元，'}}</span>
               </div>
               <div class="input-group-append">
                 <span class="input-group-text">每升优惠</span>
@@ -819,6 +821,7 @@ export default {
         });
         return flag;
       });
+      
     },
   },
   created() {
@@ -953,6 +956,7 @@ export default {
       listPlan(query).then((response) => {
         if (this.discountSetting == 4) {
           this.discountListTep = response.rows;
+          console.log(this.discountListTep);
           return;
         }
         this.discountList = response.rows;

src/views/order/Order_Lng.vue

@@ -0,0 +1,242 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="订单号" prop="orderNo">
+        <el-input
+          v-model="queryParams.orderNo"
+          placeholder="请输入订单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户姓名" prop="likeConsumer">
+        <el-input
+          v-model="queryParams.likeConsumer"
+          placeholder="请输入客户姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="创建时间" prop="createdDate">
+        <el-date-picker
+          style="width: 350px"
+          v-model="dateRangeCreatedDate"
+          size="mini"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button
+          type="info"
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
+          >重置</el-button
+        >
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          >导出</el-button
+        >
+      </el-form-item>
+    </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="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="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="payDate">
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.payDate, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </af-table-column>
+      <af-table-column label="创建时间" align="center" prop="createdDate">
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.createdDate, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </af-table-column>
+      
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+<script>
+import { listOrder, exportOrder } from "@/api/station/order";
+import { stationinfo } from "@/api/station/gun";
+import { listPrice, getPrice } from "@/api/station/price";
+
+export default {
+  name: "Order_Lng",
+  data() {
+    return {
+      //创建订单时间间隔
+      dateRangeCreatedDate: [],
+      // 总条数
+      total: 0,
+      // 订单支付表格数据
+      orderList: [],
+      oilNameOptions: [],
+      // 字典
+      payTypeOptions: [],
+      // 下拉油站
+      stationOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        levelId:this.levelId,
+        pageNum: 1,
+        pageSize: 10,
+        oilGun: null,
+        oilName: null,
+        stationId: null,
+        orderType: 1,
+        oilPersonnel: null,
+        createdDate: null,
+        likeConsumer: null,
+        orderNo:null
+      },
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    console.log(this.levelId)
+    this.getList();
+    //字典
+    this.getDicts("pay_type").then((response) => {
+      this.payTypeOptions = response.data;
+    });
+    stationinfo().then((response) => {
+      this.stationOptions = response.rows;
+    });
+    this.getDicts("oil_name").then((response) => {
+      this.oilNameOptions = response.data;
+    });
+  },
+  methods: {
+    payTypeFotmat(row, column) {
+      if (row.payType === "wx") {
+        return "微信支付";
+      } else if (row.payType === "zfb") {
+        return "支付宝支付";
+      } else if (row.payType === "xj") {
+        return "现金支付";
+      } else if (row.payType === "dzk") {
+        return "电子卡支付";
+      } else if (row.payType === "POS") {
+        return "POS机支付";
+      } else if (row.payType === "yzf") {
+        return "预支付";
+      } else if (row.payType === "kbzf") {
+        return "卡包支付";
+      }
+    },
+    statusFotmat(row, column) {
+      if (row.status === "0") {
+        return "未支付";
+      } else if (row.status === "1") {
+        return "已支付";
+      }
+    },
+    /** 查询订单支付列表 */
+    getList() {
+      this.queryParams.levelId = this.levelId
+      listOrder(
+        this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
+      ).then((response) => {
+        this.orderList = response.rows;
+        this.total = response.total;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreatedDate = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有订单支付数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return exportOrder(queryParams);
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+  },
+};
+</script>

src/views/point/Point_Bill.vue

@@ -53,6 +53,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    
      <!-- 添加或修改客户积分记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body>
       <div class="app-container">