修改导出功能，修改页面后台控制台上出现错误信息问题

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

@@ -2,13 +2,6 @@
   <div class="app-container">
     <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <el-row>
-        <el-col :span="6" style=""> 
-          <el-form-item label="是否启用充值规则">
-            <el-checkbox-group v-model="cardOilsTypeList">
-              <el-checkbox v-for = "item in checkList" :key="item.id" :label="item.id" :value="item.value">{{item.value}}</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item> 
-        </el-col>
         <el-col :span="8" style=""> 
           <el-button type="primary" style="" @click="handleAdd">新增充值规则</el-button>
         </el-col> 
@@ -154,11 +147,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-form-item label="是否启用充值规则">
+        <el-checkbox-group v-model="cardOilsTypeList">
+          <el-checkbox v-for = "item in checkList" :key="item.id" :label="item.id" :value="item.value">{{item.value}}</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="submitForm">确 定</el-button>
     </div>
-
      <!-- 添加或修改客户电子会员卡充值优惠设置明细对话框 -->
     <el-dialog :title="title" :visible.sync="open"  append-to-body>
       <el-form ref="infoform" :model="infoform" :rules="rules" label-width="110px">
@@ -519,6 +516,7 @@ export default {
             });
           } else {
             if(this.num==0){
+              let datepicker = this.form.discountTimeType;
               if(datepicker=="1"){
                 if(this.collectClickWorkDay!=null&&this.collectClickWorkDay.length>0){
                   let discountTime=null;

Yijia-SaaS/yijia-ui/src/views/customer/report/customerReport.vue

@@ -39,7 +39,7 @@
             @current-change="findPage"
             :current-page.sync="pageNow"
             background
-            :pager-count="6"
+            :pager-count="7"
             :page-sizes="[5,10,20,50,100]"
             :page-size="size"
             layout="total, sizes, prev, pager, next, jumper"

Yijia-SaaS/yijia-ui/src/views/integral/record/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="主键自增" align="center" prop="id" />
       <el-table-column label="微信用户唯一标识" align="center" prop="unionId" />
       <el-table-column label="客户名称" align="center" prop="customerName" />

Yijia-SaaS/yijia-ui/src/views/integral/wares/index.vue

@@ -19,7 +19,7 @@
     </el-form>
 
     <el-table v-loading="loading" :data="waresList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="商品id" align="center" prop="id"  v-if="false" />
       <el-table-column label="商品类别" align="center" prop="waresType"  v-if="false" />
       <el-table-column label="商品名称" align="center" prop="waresName" />

Yijia-SaaS/yijia-ui/src/views/station/order/notOil.vue

@@ -41,8 +41,7 @@
       <el-table-column label="应付金额" align="center" prop="receivableAmt" />
       <el-table-column label="实付金额" align="center" prop="amt" />
       <el-table-column label="客户姓名" width="120" align="center" prop="consumer" />
-      <el-table-column label="加油员" width="120" align="center" prop="oilPersonnel" />
-
+      <!-- <el-table-column label="加油员" width="120" align="center" prop="oilPersonnel" /> -->
       <el-table-column label="支付类型" align="center" prop="payType" :formatter="payTypeFotmat"/>
       <el-table-column label="油站名称" width="120" align="center" v-if="false" prop="stationName" />
       <el-table-column v-if="false" label="用户id(消费者)" align="center" prop="consumerId" />

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

@@ -63,7 +63,7 @@
     <el-dialog :title="titleAdjust" :visible.sync="open1" :rules="rules" width="500px" append-to-body>
       <el-form ref="form1" :model="form1"  label-width="80px">
         <el-form-item label="油品名称" prop="oilName" >
-          <el-select :disabled="disabled" v-model="form1.oilName" placeholder="油品名称" clearable size="small">
+          <el-select :disabled="editInfo" v-model="form1.oilName" placeholder="油品名称" clearable size="small">
             <el-option
               v-for="dict in oilNameOptions"
               :key="dict.dictLabel"
@@ -92,7 +92,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="油站名称"  prop="stationId"  >
-          <el-select disabled="disabled"
+          <el-select :disabled="editInfo"
             v-model="form1.stationId"
             placeholder="请选择油站"
             clearable