Changes

src/views/recharge/batchRecord/cardDetail.vue

@@ -62,11 +62,6 @@
 
         <el-table v-loading="loading" fit highlight-current-row border stripe :data="recordList" @selection-change="handleSelectionChange">
             <el-table-column label="充值卡号" align="center" prop="cardNo" width="190" />
-            <el-table-column label="客户名称" align="center" prop="appUserName" width="120">
-                <template slot-scope="scope">
-                    {{ scope.row.appUserName == null ? '--' : scope.row.appUserName }}
-                </template>
-            </el-table-column>
             <el-table-column label="所属门店" align="center" width="140">
                 <template slot-scope="scope">
                     <span>
@@ -74,10 +69,15 @@
                     </span>
                 </template>
             </el-table-column>
-            <el-table-column label="充值金额（元）" align="center" prop="rechargeAmount" width="120" />
+            <el-table-column label="客户名称" align="center" prop="appUserName" width="120">
+                <template slot-scope="scope">
+                    {{ scope.row.appUserName == null ? '--' : scope.row.appUserName }}
+                </template>
+            </el-table-column>
+            <el-table-column label="现金金额（元）" align="center" prop="rechargeAmount" width="120" />
             <el-table-column label="赠送金额（元）" align="center" prop="giveAmount" width="120" />
-            <el-table-column label="充值余额（元）" align="center" prop="rechargeBalance" width="120" />
-            <el-table-column label="赠送余额（元）" align="center" prop="giveBalance" width="120" />
+            <el-table-column label="剩余现金金额（元）" align="center" prop="rechargeBalance" width="140" />
+            <el-table-column label="剩余赠送余额（元）" align="center" prop="giveBalance" width="140" />
             <el-table-column label="是否支持洗衣" align="center" prop="isSupportCloth" width="110">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isSupportCloth" />

src/views/recharge/batchRecord/index.vue

@@ -8,7 +8,7 @@
                 <el-input v-model="queryParams.batchName" placeholder="请输入批次名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item prop="lastExpireTime">
-                <el-date-picker v-model="queryParams.lastExpireTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                <el-date-picker v-model="queryParams.lastExpireTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="激活过期日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
             <!-- <el-form-item prop="lastUseLevel">
                 <el-radio-group v-model="queryParams.lastUseLevel">
@@ -74,7 +74,7 @@
             <el-table-column label="批次号" align="center" prop="batchNo" />
             <el-table-column label="批次名称" align="center" prop="batchName" />
             <el-table-column label="备注" align="center" prop="remark" />
-            <el-table-column label="到期时间" align="center" prop="lastExpireTime" width="180" />
+            <el-table-column label="激活过期时间" align="center" prop="lastExpireTime" width="180" />
             <!-- <el-table-column label="优先消费" align="center" prop="lastUseLevel">
                 <template slot-scope="scope">
                     <el-switch v-model="scope.row.lastUseLevel" :active-value="1" :inactive-value="0" @change="handleUpdateUseLevel(scope.row)"></el-switch>
@@ -87,18 +87,17 @@
             </el-table-column> -->
             <el-table-column label="创建人" align="center" prop="createBy" width="120" />
             <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
-                    <!-- <el-button type="text" icon="el-icon-edit" @click="handleUpdateExpireTime(scope.row)" v-hasPermi="['recharge:batchRecord:edit']">修改过期时间</el-button> -->
+                    <el-button type="text" icon="el-icon-edit" @click="handleUpdateExpireTime(scope.row)" v-hasPermi="['recharge:batchRecord:edit']">修改过期时间</el-button>
                     <el-button type="text" icon="el-icon-edit" @click="handleCardDetail(scope.row)" v-hasPermi="['recharge:batchRecord:edit']">充值卡明细</el-button>
                     <el-button type="text" icon="el-icon-edit" @click="handleUseRecord(scope.row)" v-hasPermi="['recharge:batchRecord:edit']">充值卡使用记录</el-button>
                 </template>
             </el-table-column>
         </Page>
 
-       
         <!-- 添加或修改充值批次记录对话框 -->
-        <el-dialog :title="title" :visible.sync="open" size="30%" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
             <el-row :gutter="15" style="margin-bottom: 80px; margin-left: 20px; width: calc(100% - 20px)">
                 <el-form ref="form" :model="form" :rules="rules" label-width="100px">
                     <el-col :span="24">
@@ -111,27 +110,19 @@
                                 <template slot="label"> 批次名称 </template>
                                 {{ form.batchName }}
                             </el-descriptions-item>
-                            <el-descriptions-item>
-                                <template slot="label"> 使用优先级 </template>
-                                {{ form.lastUseLevel == '1' ? '优先扣款' : '正常' }}
-                            </el-descriptions-item>
                         </el-descriptions>
                     </el-col>
                     <el-col :span="24" style="margin-top: 15px">
-                        <el-form-item label="到期时间" prop="lastExpireTime">
+                        <el-form-item label="激活过期时间" prop="lastExpireTime">
                             <el-date-picker clearable v-model="form.lastExpireTime" type="date" value-format="yyyy-MM-dd" placeholder="到期时间"> </el-date-picker>
                         </el-form-item>
-                        <el-form-item label="客户星级" prop="starLevel" label-width="140px">
-                            <div style="margin-top: 8px">
-                                <el-rate v-model="form.starLevel"></el-rate>
-                            </div>
-                        </el-form-item>
-                        <el-form-item label="优先扣款" prop="lastUseLevel" label-width="140px">
-                            <el-radio-group v-model.number="form.lastUseLevel">
-                                <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="lastUseLevel" label-width="140px">-->
+                        <!--                            <el-radio-group v-model.number="form.lastUseLevel">-->
+                        <!--                                <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="是否有洗衣权限" label-width="140px">
                             <template>
                                 <el-radio-group v-model="form.isSupportCloth">

src/views/recharge/batchRecord/useRecord.vue

@@ -16,18 +16,9 @@
             <el-form-item label="下单时间" prop="queryCreateTime">
                 <el-date-picker clearable v-model="queryParams.queryCreateTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="下单时间" end-placeholder="结束日期"> </el-date-picker>
             </el-form-item>
-            <el-form-item label="消费工厂/门店" label-width="120px" prop="orgIndex" v-if="userInfoVO.userType == '00'">
+            <el-form-item label="消费门店" label-width="120px" prop="orgIndex" v-if="userInfoVO.userType == '00'">
                 <el-select v-model="queryParams.orgIndex" placeholder="请选择门店" clearable>
-                    <!--                    <el-option-group label="工厂">-->
-                    <!--                        <template>-->
-                    <!--                            <el-option v-for="factory in factoryList" :key="factory.id + factory.sourceType" :label="factory.name" :value="factory.id + ',' + factory.sourceType"> </el-option>-->
-                    <!--                        </template>-->
-                    <!--                    </el-option-group>-->
-                    <el-option-group label="门店">
-                        <template>
-                            <el-option v-for="store in storeList" :key="store.id + store.sourceType" :label="store.name" :value="store.id + ',' + store.sourceType"> </el-option>
-                        </template>
-                    </el-option-group>
+                    <el-option v-for="store in storeList" :key="store.id + store.sourceType" :label="store.name" :value="store.id + ',' + store.sourceType"> </el-option>
                 </el-select>
             </el-form-item>
             <el-form-item>
@@ -43,10 +34,8 @@
         </el-row>
 
         <Page uri="/mapi/recharge/card/batchRecord/listCardUseRecordByBatchNo" :request-params="queryParams" ref="pagination">
-            <el-table-column type="selection" width="55" align="center" fixed="left" />
             <el-table-column label="充值卡编号" align="center" prop="rechargeCardId" width="190" />
-            <!--      <el-table-column label="批次号" align="center"  prop="batchNo" width="190"/>-->
-            <!--      <el-table-column label="充值卡号" align="center" prop="cardNo" width="190"/>-->
+            <el-table-column label="充值卡号" align="center" prop="cardNo" width="190" />
             <el-table-column label="客户名称" align="center" prop="appUserName" width="120" />
             <el-table-column label="消费订单号" align="center" prop="orderNo" width="190" />
             <el-table-column label="订单类型" align="center" prop="title" width="120" />
@@ -63,7 +52,6 @@
                     {{ scope.row.isRefund == 'Y' && scope.row.payTotalAmount.toString() != '0' ? '退款：' + scope.row.payTotalAmount.toString().replace('-', '') : scope.row.payTotalAmount.toString().replace('-', '') }}
                 </template>
             </el-table-column>
-            <!--      <el-table-column label="现金支付金额（元）" align="center" prop="cashPayAmount" width="140"/>-->
             <el-table-column label="充值余额支付金额（元）" align="center" prop="rechargePayAmount" width="170">
                 <template slot-scope="scope">
                     {{ scope.row.isRefund == 'Y' && scope.row.rechargePayAmount.toString() != '0' ? '退款：' + scope.row.rechargePayAmount.toString().replace('-', '') : scope.row.rechargePayAmount.toString().replace('-', '') }}
@@ -74,7 +62,7 @@
                     {{ scope.row.isRefund == 'Y' && scope.row.givePayAmount.toString() != '0' ? '退款：' + scope.row.givePayAmount.toString().replace('-', '') : scope.row.givePayAmount.toString().replace('-', '') }}
                 </template>
             </el-table-column>
-            <el-table-column label="福利金余额支付金额（元）" align="center" prop="welfarePayAmount" width="180">
+            <el-table-column label="福利金支付金额（元）" align="center" prop="welfarePayAmount" width="180">
                 <template slot-scope="scope">
                     {{ scope.row.isRefund == 'Y' && scope.row.welfarePayAmount.toString() != '0' ? '退款：' + scope.row.welfarePayAmount.toString().replace('-', '') : scope.row.welfarePayAmount.toString().replace('-', '') }}
                 </template>

src/views/recharge/card/index.vue

@@ -4,6 +4,9 @@
             <el-form-item prop="cardNo">
                 <el-input v-model="queryParams.cardNo" placeholder="请输入卡号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
+            <el-form-item prop="batchNo">
+                <el-input v-model="queryParams.batchNo" placeholder="请输入批次号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
             <el-form-item prop="rechargeStatus">
                 <el-select v-model="queryParams.rechargeStatus" placeholder="请选择使用状态" clearable>
                     <el-option v-for="dict in dict.type.recharge_use_status" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -56,39 +59,39 @@
             <!--      </el-table-column>-->
             <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" />-->
             <el-table-column label="使用状态" align="center" prop="rechargeStatus">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.recharge_use_status" :value="scope.row.rechargeStatus" />
                 </template>
             </el-table-column>
-            <el-table-column label="充值时间" align="center" prop="rechargeTime" width="180">
-                <template slot-scope="scope">
-                    {{ scope.row.rechargeTime == null ? '--' : scope.row.rechargeTime }}
-                </template>
-            </el-table-column>
-            <el-table-column label="充值门店" align="center" prop="rechargeStoreName" width="150">
+            <el-table-column label="充值用户" align="center" prop="rechargeUserName" width="150">
                 <template slot-scope="scope">
-                    {{ scope.row.rechargeStoreName == null ? '--' : scope.row.rechargeStoreName }}
+                    {{ scope.row.rechargeUserName == null ? '未激活' : scope.row.rechargeUserName }}
                 </template>
             </el-table-column>
-            <el-table-column label="充值用户" align="center" prop="rechargeUserName" width="150">
+            <el-table-column label="充值时间" align="center" prop="rechargeTime" width="150">
                 <template slot-scope="scope">
-                    {{ scope.row.rechargeUserName == null ? '--' : scope.row.rechargeUserName }}
+                    {{ scope.row.rechargeTime == null ? '--' : scope.row.rechargeTime }}
                 </template>
             </el-table-column>
-            <el-table-column label="到期时间" align="center" prop="expireTime" width="180">
+            <el-table-column label="充值门店" align="center" prop="rechargeStoreName" width="150">
                 <template slot-scope="scope">
-                    {{ scope.row.expireTime == null ? '--' : scope.row.expireTime }}
+                    {{ scope.row.rechargeStoreName == null ? '--' : scope.row.rechargeStoreName }}
                 </template>
             </el-table-column>
-            <el-table-column label="赠送金额激活时间" align="center" prop="giveActiveTime" width="180">
+            <!--            <el-table-column label="到期时间" align="center" prop="expireTime" width="150">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    {{ scope.row.expireTime == null ? '&#45;&#45;' : scope.row.expireTime }}-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
+            <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="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>

src/views/recharge/cardVersion/index.vue

@@ -89,23 +89,23 @@
                             <el-input type="textarea" v-model="multiInsertForm.remark" placeholder="请输入备注" style="width: 300px" />
                         </el-form-item>
 
-                        <el-form-item label="过期时间" label-width="140px" required>
-                            <el-date-picker v-model="multiInsertForm.expireTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"> </el-date-picker>
+                        <el-form-item label="批次激活过期时间" label-width="140px" required>
+                            <el-date-picker style="width: 300px" v-model="multiInsertForm.expireTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"> </el-date-picker>
                         </el-form-item>
                         <el-form-item label="生成数量" prop="createNum" required label-width="140px">
-                            <el-input-number v-model="multiInsertForm.createNum" placeholder="请输入充值金额" :precision="0" :min="0" :max="10000" />
+                            <el-input-number style="width: 300px" v-model="multiInsertForm.createNum" placeholder="请输入充值金额" :precision="0" :min="1" :max="10000" />
                         </el-form-item>
                         <!--                        <el-form-item label="客户星级" prop="starLevel" label-width="140px">-->
                         <!--                            <div style="margin-top: 8px">-->
                         <!--                                <el-rate v-model="multiInsertForm.starLevel"></el-rate>-->
                         <!--                            </div>-->
                         <!--                        </el-form-item>-->
-                        <el-form-item label="优先扣款" prop="level" label-width="140px">
-                            <el-radio-group v-model.number="multiInsertForm.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" label-width="140px">-->
+                        <!--                            <el-radio-group v-model.number="multiInsertForm.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="是否有洗衣权限" label-width="140px">
                             <template>
                                 <el-radio-group v-model="multiInsertForm.isSupportCloth">