.

src/views/recharge/card/index.vue

@@ -29,14 +29,15 @@
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button type="info" plain icon="el-icon-upload2" @click="handleImport(1)" v-hasPermi="['system:user:import']">导入</el-button>
+                <el-button type="info" plain icon="el-icon-upload2" @click="handleImport(1)" v-hasPermi="['system:user:import']">充值卡导入</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['recharge:card:export']">导出</el-button>
+                <el-button type="info" plain icon="el-icon-upload2" @click="handleImport(2)" v-hasPermi="['system:user:import']">用户直充导入</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="info" plain icon="el-icon-upload2" @click="handleImport(2)" v-hasPermi="['system:user:import']">直充用户</el-button>
+                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['recharge:card:export']">导出</el-button>
             </el-col>
+
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
@@ -54,9 +55,14 @@
             <!--          </template>-->
             <!--        </template>-->
             <!--      </el-table-column>-->
+            <el-table-column label="归属门店" align="center" prop="rechargeStoreName" width="150" />
             <el-table-column label="充值金额(元)" align="center" prop="rechargeAmount" width="150" />
             <el-table-column label="赠送金额(元)" align="center" prop="giveAmount" width="150" />
-            <el-table-column label="赠送积分(元)" align="center" prop="givePointAmount" width="150" />
+            <el-table-column label="赠送积分" align="center" prop="givePointAmount" width="150" >
+                <template slot-scope="scope">
+                    {{ scope.row.givePointAmount == null || scope.row.givePointAmount == '' ? '0' : scope.row.givePointAmount }}
+                </template>
+                </el-table-column>
             <el-table-column label="使用状态" align="center" prop="rechargeStatus">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.recharge_use_status" :value="scope.row.rechargeStatus" />
@@ -69,7 +75,7 @@
             </el-table-column>
             <el-table-column label="充值门店" align="center" prop="rechargeStoreName" width="150">
                 <template slot-scope="scope">
-                    {{ scope.row.rechargeStoreName == null ? '--' : scope.row.rechargeStoreName }}
+                    {{ scope.row.useBindStoreName == null ? '--' : scope.row.useBindStoreName }}
                 </template>
             </el-table-column>
             <el-table-column label="充值用户" align="center" prop="rechargeUserName" width="150">
@@ -77,18 +83,18 @@
                     {{ scope.row.rechargeUserName == null ? '--' : scope.row.rechargeUserName }}
                 </template>
             </el-table-column>
-            <el-table-column label="到期时间" align="center" prop="expireTime" width="180">
+            <el-table-column label="到期时间" align="center" prop="expireTime" width="150">
                 <template slot-scope="scope">
                     {{ scope.row.expireTime == null ? '--' : scope.row.expireTime }}
                 </template>
             </el-table-column>
-            <el-table-column label="赠送金额激活时间" align="center" prop="giveActiveTime" width="180">
+            <el-table-column label="赠送金额激活时间" align="center" prop="giveActiveTime" width="150">
                 <template slot-scope="scope">
                     {{ scope.row.giveActiveTime == null ? '--' : scope.row.giveActiveTime }}
                 </template>
             </el-table-column>
-            <el-table-column label="创建人" align="center" prop="createBy" />
-            <el-table-column label="创建时间" align="center" prop="createTime" width="180"> </el-table-column>
+            <el-table-column label="制卡人" align="center" prop="createBy" />
+            <el-table-column label="制卡时间" align="center" prop="createTime" width="150"> </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
                     <el-button type="text" @click="handleDetail(scope.row)" v-if="scope.row.rechargeStatus == 1">消费明细</el-button>
@@ -107,17 +113,6 @@
                         <el-form-item label="过期时间">
                             <el-date-picker v-model="importForm.expireTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"> </el-date-picker>
                         </el-form-item>
-                        <el-form-item label="优先扣款" prop="level">
-                            <el-radio-group v-model.number="importForm.level">
-                                <el-radio-button label="0">默认</el-radio-button>
-                                <el-radio-button label="1">优先</el-radio-button>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="客户星级" prop="level">
-                            <div style="margin-top: 8px">
-                                <el-rate v-model="importForm.starLevel"></el-rate>
-                            </div>
-                        </el-form-item>
                     </el-col>
                 </el-form>
             </el-card>
@@ -129,8 +124,8 @@
                 :headers="upload.headers"
                 :action="
                     num == 1
-                        ? upload.url + '?batchName=' + importForm.batchName + '&expireTime=' + importForm.expireTime + '&level=' + importForm.level + '&starLevel=' + importForm.starLevel
-                        : upload.url2 + '?batchName=' + importForm.batchName + '&expireTime=' + importForm.expireTime + '&level=' + importForm.level + '&starLevel=' + importForm.starLevel
+                        ? upload.url + '?batchName=' + importForm.batchName + '&expireTime=' + importForm.expireTime 
+                        : upload.url2 + '?batchName=' + importForm.batchName + '&expireTime=' + importForm.expireTime
                 "
                 :disabled="upload.isUploading"
                 :on-progress="handleFileUploadProgress"