大大的豆芽 11 meses atrás
pai
commit
00027262ed

+ 16 - 17
src/views/recharge/batchRecord/cardDetail.vue

@@ -9,7 +9,7 @@
             <!--          @keyup.enter.native="handleQuery"-->
             <!--        />-->
             <!--      </el-form-item>-->
-            <el-form-item label="充值卡号" 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">-->
@@ -20,27 +20,27 @@
             <!--          @keyup.enter.native="handleQuery"-->
             <!--        />-->
             <!--      </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-form-item prop="rechargeStatus" label-width="130">
+                <el-select v-model="queryParams.rechargeStatus" placeholder="请选择使用状态" clearable>
+                    <el-option key="0" label="未使用" value="0" />
+                    <el-option key="1" label="已使用" value="1" />
+                </el-select>
             </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="工厂">
+            <el-form-item 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="门店">
+                    </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>
+                            <el-option label="一七总部" value="03"> </el-option>
                         </template>
                     </el-option-group>
-                    <el-option-group label="客户端">
+                    <el-option-group label="门店">
                         <template>
-                            <el-option label="一七总部" value="03"> </el-option>
+                            <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-select>
@@ -54,14 +54,13 @@
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['recharge:batchRecord:export']">导出</el-button>
             </el-col>
-            <el-col :span="1.5">
+            <!-- <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['recharge:batchRecord:add']">新增充值卡</el-button>
-            </el-col>
+            </el-col> -->
             <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">
-            <el-table-column type="selection" width="55" align="center" fixed="left" />
             <el-table-column label="充值卡号" align="center" prop="cardNo" width="190" />
             <el-table-column label="客户名称" align="center" prop="appUserName" width="120">
                 <template slot-scope="scope">

+ 15 - 21
src/views/recharge/batchRecord/index.vue

@@ -10,12 +10,12 @@
             <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-form-item>
-            <el-form-item prop="lastUseLevel">
+            <!-- <el-form-item prop="lastUseLevel">
                 <el-radio-group v-model="queryParams.lastUseLevel">
                     <el-radio-button :key="0" :label="0">正常</el-radio-button>
                     <el-radio-button :key="1" :label="1">优先扣款</el-radio-button>
                 </el-radio-group>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -68,35 +68,35 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="batchRecordList" @selection-change="handleSelectionChange">
+        <Page uri="/mapi/recharge/card/batchRecord/findPage" :request-params="queryParams" ref="pagination">
             <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
             <el-table-column label="编号" align="center" prop="id" />
             <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="lastUseLevel">
+            <!-- <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>
                 </template>
-            </el-table-column>
-            <el-table-column label="客户星级" align="center" prop="starLevel" width="150">
+            </el-table-column> -->
+            <!-- <el-table-column label="客户星级" align="center" prop="starLevel" width="150">
                 <template slot-scope="scope">
                     <el-rate v-model="scope.row.starLevel" disabled disabled-void-color="#DCDFE6"></el-rate>
                 </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
+            </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">
                 <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="handleUseRecord(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>
-        </el-table>
-
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </Page>
 
+       
         <!-- 添加或修改充值批次记录对话框 -->
         <el-dialog :title="title" :visible.sync="open" size="30%" append-to-body>
             <el-row :gutter="15" style="margin-bottom: 80px; margin-left: 20px; width: calc(100% - 20px)">
@@ -204,8 +204,6 @@ export default {
             open: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 batchNo: null,
                 batchName: null,
                 lastExpireTime: null,
@@ -225,12 +223,8 @@ export default {
     methods: {
         /** 查询充值批次记录列表 */
         getList() {
-            this.loading = true
-            findBatchRecordPage(this.queryParams).then((response) => {
-                console.log(response)
-                this.batchRecordList = response.data.records
-                this.total = response.data.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮

+ 1 - 1
src/views/recharge/type/index.vue

@@ -25,12 +25,12 @@
             <el-table-column label="赠送金额(元)" align="center" prop="giveAmount" />
             <el-table-column label="赠送积分" align="center" prop="givePointAmount" />
             <el-table-column label="赠送有效期(月)" align="center" prop="expireMonth" />
+            <el-table-column label="备注" align="center" prop="remark" />
             <el-table-column label="状态" align="center" prop="status">
                 <template slot-scope="scope">
                     <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
                 </template>
             </el-table-column>
-            <el-table-column label="创建人" align="center" prop="createBy" />
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>