xuhaifeng 11 bulan lalu
induk
melakukan
165a7d690a

+ 4 - 0
src/assets/styles/ruoyi.scss

@@ -102,6 +102,10 @@
   }
 }
 
+ .el-form--inline .el-form-item__label {
+   display: none;
+ }
+
 /** 表单布局 **/
 .form-header {
   font-size:15px;

+ 6 - 8
src/views/recharge/batchRecord/cardDetail.vue

@@ -9,7 +9,7 @@
             <!--          @keyup.enter.native="handleQuery"-->
             <!--        />-->
             <!--      </el-form-item>-->
-            <el-form-item  prop="cardNo">
+            <el-form-item prop="cardNo">
                 <el-input v-model="queryParams.cardNo" placeholder="请输入充值卡号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <!--      <el-form-item label="客户名称" prop="appUserName">-->
@@ -74,17 +74,10 @@
                     </span>
                 </template>
             </el-table-column>
-            <el-table-column label="到期时间" align="center" prop="expireTime" width="180">
-                <template slot-scope="scope">
-                    {{ scope.row.expireTime == null ? '--' : scope.row.expireTime }}
-                </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="welfareAmount" 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="welfareBalance" width="120" />
             <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" />
@@ -105,6 +98,11 @@
                     <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isSupportCar" />
                 </template>
             </el-table-column>
+            <el-table-column label="到期时间" align="center" prop="expireTime" width="180">
+                <template slot-scope="scope">
+                    {{ scope.row.expireTime == null ? '--' : scope.row.expireTime }}
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
                 <template slot-scope="scope">
                     <el-button type="text" icon="el-icon-edit" @click="handleRefundOrderCard(scope.row)" v-hasPermi="['recharge:batchRecord:edit']" v-if="scope.row.rechargeStatus == '1'">撤单</el-button>

+ 11 - 22
src/views/recharge/batchRecord/useRecord.vue

@@ -14,21 +14,15 @@
                 <el-input v-model="queryParams.appUserName" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <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="充值卡使用状态" prop="rechargeStatus" label-width="130">
-                <el-radio-group v-model="queryParams.rechargeStatus">
-                    <el-radio-button label="0">未使用</el-radio-button>
-                    <el-radio-button label="1">已使用</el-radio-button>
-                </el-radio-group>
+                <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-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-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>
@@ -48,7 +42,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="recordList" @selection-change="handleSelectionChange">
+        <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"/>-->
@@ -85,9 +79,7 @@
                     {{ scope.row.isRefund == 'Y' && scope.row.welfarePayAmount.toString() != '0' ? '退款:' + scope.row.welfarePayAmount.toString().replace('-', '') : scope.row.welfarePayAmount.toString().replace('-', '') }}
                 </template>
             </el-table-column>
-        </el-table>
-
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </Page>
     </div>
 </template>
 
@@ -167,7 +159,6 @@ export default {
         },
         /** 查询充值订单列表 */
         getList() {
-            this.loading = true
             this.queryParams.batchNo = this.batchNo
             if (this.queryParams.orgIndex != null) {
                 this.queryParams.orgId = this.queryParams.orgIndex.split(',')[0]
@@ -182,10 +173,8 @@ export default {
                 param.endCreateTime = this.queryParams.queryCreateTime[1]
                 param.queryCreateTime = null
             }
-            listCardUseRecordByBatchNo(param).then((response) => {
-                this.recordList = response.data.records
-                this.total = response.data.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮

+ 4 - 3
src/views/recharge/cardVersion/index.vue

@@ -88,9 +88,13 @@
                         <el-form-item label="备注" prop="remark" label-width="140px" required>
                             <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>
+                        <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-form-item>
                         <!--                        <el-form-item label="客户星级" prop="starLevel" label-width="140px">-->
                         <!--                            <div style="margin-top: 8px">-->
                         <!--                                <el-rate v-model="multiInsertForm.starLevel"></el-rate>-->
@@ -134,9 +138,6 @@
                                 </el-radio-group>
                             </template>
                         </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-form-item>
                     </el-col>
                 </el-form>
             </el-card>