修改班结信息，班结报表数据展示

Yijia-SaaS/yijia-ui/src/views/customer/setting/index.vue

@@ -10,8 +10,14 @@
       <el-table-column label="油品名称" align="center" prop="oilName" />
       <el-table-column label="等级名称" align="center" prop="grade" />
       <el-table-column label="优惠方式" align="center" prop="discountWay" />
-      <el-table-column label="会员条件" align="center" prop="memberCondit" />
+      <el-table-column label="会员条件" align="center" >
+        <template slot-scope="scope">
+          {{scope.row.memberConditStart}} - {{scope.row.memberConditEnd}}
+        </template>
+      </el-table-column>
       <el-table-column label="优惠/L" align="center" prop="gasoilDiscountLitre" />
+      <el-table-column label="初始值" align="center" v-if="false" prop="memberConditStart" />
+      <el-table-column label="结束值" align="center" v-if="false" prop="memberConditEnd" />
 <!--      <el-table-column label="柴油优惠/L" align="center" prop="dieseloilDiscountLitre" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -70,8 +76,11 @@
         <el-form-item label="优惠方式" prop="discountWay">
           <el-input v-model="form.discountWay" placeholder="请输入优惠方式" />
         </el-form-item>
-        <el-form-item label="会员条件" prop="discountWay">
-          <el-input v-model="form.memberCondit" placeholder="请输入优惠方式" />
+        <el-form-item label="会员条件" >
+          初始值
+          <el-input-number v-model="form.memberConditStart"  size="mini" :min="0"  />
+          终止值
+          <el-input-number v-model="form.memberConditEnd"   size="mini" :min="0" />
         </el-form-item>
         <el-form-item label="优惠/L" prop="gasoilDiscountLitre">
           <el-input v-model="form.gasoilDiscountLitre" placeholder="请输入汽油优惠/L" />

Yijia-SaaS/yijia-ui/src/views/market/plan/index.vue

@@ -11,9 +11,13 @@
       <el-table-column label="id" align="center" prop="id" v-if="false" />
       <el-table-column label="方案名称" align="center" prop="grade" />
       <el-table-column label="油品名称" align="center" prop="oilName" />
-      <el-table-column label="优惠条件" align="center" prop="discountTerm" />
+      <el-table-column label="优惠条件" align="center"  >
+        <template slot-scope="scope">
+         每满 {{scope.row.discountAmt}} 减 {{scope.row.gasoilDiscountAmt}}
+        </template>
+      </el-table-column>
       <el-table-column label="优惠条件金额" v-if="false" align="center" prop="discountAmt" />
-      <el-table-column label="优惠金额" align="center" prop="gasoilDiscountAmt" />
+      <el-table-column label="优惠金额" v-if="false"  align="center" prop="gasoilDiscountAmt" />
       <el-table-column label="会员优惠是否叠加" align="center" prop="vipDiscountyPlus" :formatter="vipDiscountyPlusFotmat" />
       <el-table-column label="可否叠加劵" align="center" prop="couponPlus" :formatter="couponPlusFotmat"
       />
@@ -43,6 +47,25 @@
         <el-form-item label="方案名称" prop="grade">
           <el-input v-model="form.grade" placeholder="请输入等级名称" />
         </el-form-item>
+        <el-form-item label="油站名称" prop="stationId" >
+          <el-select
+            v-model="form.stationId"
+            placeholder="请选择油站"
+            clearable
+            size="small"
+            @change="onInstitutionChang"
+          >
+            <el-option
+              v-for="item in stationOptions"
+              :key="item.stationId"
+              :label="item.stationName"
+              :value="item.stationId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="油站名称" v-show="false" prop="personnelName">
+          <el-input v-model="form.stationName" placeholder="请输入油站名称" />
+        </el-form-item>
         <el-form-item label="油品名称" prop="oilName">
           <el-select v-model="form.oilName" placeholder="油品名称" clearable size="small">
             <el-option
@@ -54,13 +77,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="优惠条件" prop="discountTerm">
-          <el-input v-model="form.discountTerm" placeholder="请输入优惠条件" />
-        </el-form-item>
-        <el-form-item v-show="false" label="优惠条件金额" prop="discountAmt">
-          <el-input v-model="form.discountAmt" placeholder="请输入优惠条件金额" />
-        </el-form-item>
-        <el-form-item label="优惠金额" prop="gasoilDiscountAmt">
-          <el-input v-model="form.gasoilDiscountAmt" placeholder="请输入汽油优惠金额" />
+            满
+            <el-input-number v-model="form.discountAmt"  size="mini" :min="0"  />
+            减
+            <el-input-number v-model="form.gasoilDiscountAmt"   size="mini" :min="0" />
         </el-form-item>
         <el-form-item label="会员优惠是否叠加" prop="vipDiscountyPlus">
           <el-radio-group v-model="form.vipDiscountyPlus">
@@ -100,10 +120,13 @@
       <el-table-column label="id" align="center" prop="id" v-if="false" />
       <el-table-column label="方案名称" align="center" prop="grade" />
       <el-table-column label="油品名称" align="center" prop="oilName" />
-      <el-table-column label="优惠条件" align="center" prop="discountTerm" />
+      <el-table-column label="优惠条件" align="center"  >
+        <template slot-scope="scope1">
+          满 {{scope1.row.discountAmt}} 减 {{scope1.row.gasoilDiscountAmt}}
+        </template>
+      </el-table-column>
       <el-table-column label="优惠条件金额" v-if="false" align="center" prop="discountAmt" />
-      <el-table-column label="优惠金额" align="center" prop="gasoilDiscountAmt" />
-<!--      <el-table-column label="柴油优惠金额" align="center" prop="dieseloilDiscountAmt" />-->
+      <el-table-column label="优惠金额" v-if="false"align="center" prop="gasoilDiscountAmt" />
       <el-table-column label="会员优惠是否叠加" align="center" prop="vipDiscountyPlus" :formatter="vipDiscountyPlusFotmat" />
       <el-table-column label="可否叠加劵" align="center" prop="couponPlus" :formatter="couponPlusFotmat" />
       <el-table-column label="优惠方案类型" v-if="false" align="center" prop="discountPlanType" />
@@ -132,6 +155,25 @@
         <el-form-item label="方案名称" prop="grade">
           <el-input v-model="dtform.grade" placeholder="请输入等级名称" />
         </el-form-item>
+        <el-form-item label="油站名称" prop="stationId" >
+          <el-select
+            v-model="dtform.stationId"
+            placeholder="请选择油站"
+            clearable
+            size="small"
+            @change="onInstitutionChang1"
+          >
+            <el-option
+              v-for="item in stationOptions"
+              :key="item.stationId"
+              :label="item.stationName"
+              :value="item.stationId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="油站名称" v-show="false" prop="personnelName">
+          <el-input v-model="dtform.stationName" placeholder="请输入油站名称" />
+        </el-form-item>
         <el-form-item label="油品名称" prop="oilName">
           <el-select v-model="dtform.oilName" placeholder="油品名称" clearable size="small">
             <el-option
@@ -142,14 +184,11 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="优惠条件" prop="discountTerm">
-          <el-input v-model="dtform.discountTerm" placeholder="请输入优惠条件" />
-        </el-form-item>
-        <el-form-item label="优惠条件金额" v-show="false" prop="discountAmt">
-          <el-input v-model="dtform.discountAmt" placeholder="请输入优惠条件金额" />
-        </el-form-item>
-        <el-form-item label="优惠金额" prop="gasoilDiscountAmt">
-          <el-input v-model="dtform.gasoilDiscountAmt" placeholder="请输入汽油优惠金额" />
+        <el-form-item label="优惠条件">
+          满
+          <el-input-number v-model="dtform.discountAmt"  size="mini" :min="0"  />
+          减
+          <el-input-number v-model="dtform.gasoilDiscountAmt"   size="mini" :min="0" />
         </el-form-item>
 <!--        <el-form-item label="柴油优惠金额" prop="dieseloilDiscountAmt">
           <el-input v-model="dtform.dieseloilDiscountAmt" placeholder="请输入柴油优惠金额" />
@@ -188,7 +227,7 @@
 
 <script>
   import { listPlan, getPlan, delPlan, addPlan, updatePlan, exportPlan } from "@/api/market/plan";
-
+  import {stationinfo} from "@/api/station/gun";
   export default {
     name: "Setting",
     data() {
@@ -210,6 +249,7 @@
         DTplanList: [],
         couponPlusOptions:[],
         vipDiscountyPlusOptions:[],
+        stationOptions:[],
         oilNameOptions:[],
         // 弹出层标题
         title: "",
@@ -274,8 +314,25 @@
       this.getDicts("oil_name").then(response => {
         this.oilNameOptions = response.data;
       });
+      stationinfo().then(response => {
+        this.stationOptions = response.rows;
+      });
     },
     methods: {
+      onInstitutionChang(e){
+        let obj = {};
+        obj = this.stationOptions.find((item)=>{//这里的userList就是上面遍历的数据源
+          return item.stationId === e;//筛选出匹配数据
+        })
+        this.form.stationName=obj.stationName;
+      },
+      onInstitutionChang1(e){
+        let obj = {};
+        obj = this.stationOptions.find((item)=>{//这里的userList就是上面遍历的数据源
+          return item.stationId === e;//筛选出匹配数据
+        })
+        this.dtform.stationName=obj.stationName;
+      },
       /** 查询客户优惠等级设置列表 */
       getList() {
         this.queryParams.discountPlanType="1";
@@ -340,6 +397,24 @@
         };
         this.resetForm("form");
       },
+      resetDT() {
+        this.dtform = {
+          id: null,
+          grade: null,
+          discountWay: null,
+          gasoilDiscountLitre: null,
+          dieseloilDiscountLitre: null,
+          gradeType: null,
+          gasoilConsume: null,
+          gasoilGrowthValue: null,
+          dieseloilConsume: null,
+          dieseloilGrowthValue: null,
+          growthValue: null,
+          date: null,
+          deductionGrowthValue: null
+        };
+        this.resetForm("dtform");
+      },
 
       /** 新增按钮操作 */
       handleAdd() {
@@ -359,13 +434,13 @@
       },
       /** 新增按钮操作 */
       handleAddDT() {
-        this.reset();
+        this.resetDT();
         this.opendt = true;
         this.title = "添加客户优惠等级设置";
       },
       /** 修改按钮操作 */
       handleUpdateDT(row) {
-        this.reset();
+        this.resetDT();
         const id = row.id || this.ids
         getPlan(id).then(response => {
           this.dtform = response.data;

Yijia-SaaS/yijia-ui/src/views/market/plan/index1.vue

@@ -1,356 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="等级名称" prop="grade">
-        <el-input
-          v-model="queryParams.grade"
-          placeholder="请输入等级名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="优惠条件" prop="discountTerm">
-        <el-input
-          v-model="queryParams.discountTerm"
-          placeholder="请输入优惠条件"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="优惠条件金额" prop="discountAmt">
-        <el-input
-          v-model="queryParams.discountAmt"
-          placeholder="请输入优惠条件金额"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="汽油优惠金额" prop="gasoilDiscountAmt">
-        <el-input
-          v-model="queryParams.gasoilDiscountAmt"
-          placeholder="请输入汽油优惠金额"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="柴油优惠金额" prop="dieseloilDiscountAmt">
-        <el-input
-          v-model="queryParams.dieseloilDiscountAmt"
-          placeholder="请输入柴油优惠金额"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员优惠是否叠加" prop="vipDiscountyPlus">
-        <el-input
-          v-model="queryParams.vipDiscountyPlus"
-          placeholder="请输入会员优惠是否叠加"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="可否叠加劵" prop="couponPlus">
-        <el-input
-          v-model="queryParams.couponPlus"
-          placeholder="请输入可否叠加劵"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="优惠方案类型" prop="discountPlanType">
-        <el-select v-model="queryParams.discountPlanType" placeholder="请选择优惠方案类型" clearable size="small">
-          <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>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['market:plan:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['market:plan:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['market:plan:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['market:plan:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="等级名称" align="center" prop="grade" />
-      <el-table-column label="优惠条件" align="center" prop="discountTerm" />
-      <el-table-column label="优惠条件金额" align="center" prop="discountAmt" />
-      <el-table-column label="汽油优惠金额" align="center" prop="gasoilDiscountAmt" />
-      <el-table-column label="柴油优惠金额" align="center" prop="dieseloilDiscountAmt" />
-      <el-table-column label="会员优惠是否叠加" align="center" prop="vipDiscountyPlus" />
-      <el-table-column label="可否叠加劵" align="center" prop="couponPlus" />
-      <el-table-column label="优惠方案类型" align="center" prop="discountPlanType" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['market:plan:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['market:plan:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改营销方案对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="等级名称" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入等级名称" />
-        </el-form-item>
-        <el-form-item label="优惠条件" prop="discountTerm">
-          <el-input v-model="form.discountTerm" placeholder="请输入优惠条件" />
-        </el-form-item>
-        <el-form-item label="优惠条件金额" prop="discountAmt">
-          <el-input v-model="form.discountAmt" placeholder="请输入优惠条件金额" />
-        </el-form-item>
-        <el-form-item label="汽油优惠金额" prop="gasoilDiscountAmt">
-          <el-input v-model="form.gasoilDiscountAmt" placeholder="请输入汽油优惠金额" />
-        </el-form-item>
-        <el-form-item label="柴油优惠金额" prop="dieseloilDiscountAmt">
-          <el-input v-model="form.dieseloilDiscountAmt" placeholder="请输入柴油优惠金额" />
-        </el-form-item>
-        <el-form-item label="会员优惠是否叠加" prop="vipDiscountyPlus">
-          <el-input v-model="form.vipDiscountyPlus" placeholder="请输入会员优惠是否叠加" />
-        </el-form-item>
-        <el-form-item label="可否叠加劵" prop="couponPlus">
-          <el-input v-model="form.couponPlus" placeholder="请输入可否叠加劵" />
-        </el-form-item>
-        <el-form-item label="优惠方案类型" prop="discountPlanType">
-          <el-select v-model="form.discountPlanType" placeholder="请选择优惠方案类型">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listPlan, getPlan, delPlan, addPlan, updatePlan, exportPlan } from "@/api/market/plan";
-
-export default {
-  name: "Plan",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 营销方案表格数据
-      planList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        grade: null,
-        discountTerm: null,
-        discountAmt: null,
-        gasoilDiscountAmt: null,
-        dieseloilDiscountAmt: null,
-        vipDiscountyPlus: null,
-        couponPlus: null,
-        discountPlanType: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询营销方案列表 */
-    getList() {
-      this.loading = true;
-      listPlan(this.queryParams).then(response => {
-        this.planList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        grade: null,
-        discountTerm: null,
-        discountAmt: null,
-        gasoilDiscountAmt: null,
-        dieseloilDiscountAmt: null,
-        vipDiscountyPlus: null,
-        couponPlus: null,
-        discountPlanType: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加营销方案";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getPlan(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改营销方案";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updatePlan(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addPlan(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除营销方案编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delPlan(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有营销方案数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportPlan(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-    }
-  }
-};
-</script>

Yijia-SaaS/yijia-ui/src/views/station/pay/index.vue

@@ -75,6 +75,15 @@
               >{{dict.dictLabel}}</el-radio>
             </el-radio-group>
           </el-form-item>
+          <el-form-item label="优惠方案" >
+            <el-radio-group v-model="ruleForm.discountSetting">
+              <el-radio
+                v-for="dict in discountSettingOptions"
+                :key="dict.dictValue"
+                :label="dict.dictValue"
+              >{{dict.dictLabel}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -95,6 +104,7 @@ export default {
       wsPrintFlagOptions:[],
       printSettingOptions:[],
       cardEnabledFlagOptions:[],
+      discountSettingOptions:[],
       stationOptions:[],
       ruleForm:{
       },
@@ -120,6 +130,10 @@ export default {
     this.getDicts("card_enabled_flag").then(response => {
       this.cardEnabledFlagOptions = response.data;
     });
+    this.getDicts("discount_setting").then(response => {
+      this.discountSettingOptions = response.data;
+    });
+
   },
   methods: {
     onInstitutionChang(e){

Yijia-SaaS/yijia-ui/src/views/station/summary/index.vue

@@ -67,10 +67,12 @@
       <el-table-column label="订单数" align="center" prop="orderNum" />
       <el-table-column label="小票数量" align="center" prop="printNum" />
       <el-table-column label="销量L" align="center" prop="saleLiters" />
-      <el-table-column label="销售额元" align="center" prop="saleAmt" />
-      <el-table-column label="微信销售金额" align="center" prop="wxAmt" />
-      <el-table-column label="支付宝销售金额" align="center" prop="zfbAmt" />
-      <el-table-column label="电子卡销售金额" align="center" prop="dzkAmt" />
+      <el-table-column label="应收金额" align="center" prop="saleAmt" />
+      <el-table-column label="实收金额" align="center" prop="amt" />
+      <el-table-column label="优惠金额" align="center" prop="discountAmt" />
+      <el-table-column label="微信支付金额" align="center" prop="wxAmt" />
+      <el-table-column label="支付支付金额" align="center" prop="zfbAmt" v-if="false" />
+      <el-table-column label="电子卡支付金额" align="center" prop="dzkAmt"  v-if="false"/>
       <el-table-column label="班结人" align="center" prop="classesMan" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">