充值记录查询

src/api/business/accRecharge.js

@@ -8,7 +8,13 @@ export function listAccRecharge(query) {
     params: query
   })
 }
-
+export function listBill(query) {
+  return request({
+    url: '/business/accRecharge/page',
+    method: 'get',
+    params: query
+  })
+}
 // 查询账户充值记录所有列表
 export function listAllAccRecharge(query) {
   return request({

src/views/business/salaryAccount/index.vue

@@ -72,7 +72,7 @@
                                 <div style="width: 90%;">
                                     <el-row>
                                         <el-col :span="12"><el-button style="width:120px;" type="primary" plain
-                                                @click="showBill(ele.cardNo)">充值记录</el-button></el-col>
+                                                @click="showBill(ele.payAccNo)">充值记录</el-button></el-col>
                                         <el-col :span="12"><el-button style="width:120px;" type="primary" plain
                                                 @click="salarySelection(ele.payAccNo)">去发薪</el-button></el-col>
                                     </el-row>
@@ -361,10 +361,10 @@
             </el-tabs>
             <el-table v-loading="loading" :data="billDataList">
                 <el-table-column type="selection" width="55" align="center" />
-                <el-table-column label="账单类型" align="center" prop="billType">
+                <el-table-column label="账单类型" align="center" prop="capitalPurpose">
                     <template slot-scope="scope">
-                        <span v-if="scope.row.billType == 1">服务费账单</span>
-                        <span v-if="scope.row.billType == 2">余额</span>
+                        <span v-if="scope.row.capitalPurpose == 1">服务费账单</span>
+                        <span v-if="scope.row.capitalPurpose == 2">余额</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="收支类型" align="center" prop="tranType">
@@ -383,7 +383,7 @@
                         </span>
                     </template>
                 </el-table-column>
-                <el-table-column label="时间" align="center" prop="tranTime" width="180" />
+                <el-table-column label="时间" align="center" prop="createTime" width="180" />
             </el-table>
             <el-pagination small layout="prev, pager, next" :total="billTotal" :page.sync="billQuery.pageNum"
                 @size-change="handleSizeChange" @current-change="handleCurrentChange" :limit.sync="billQuery.pageSize"
@@ -399,14 +399,16 @@
 <script>
 import AccSelect from '@/views/business/accInfo/accSelect.vue'
 import { listAllAccInfo, getAccAliInfo } from '@/api/business/accInfo'
-import { addAccRecharge } from '@/api/business/accRecharge.js'
+import { addAccRecharge, listBill } from '@/api/business/accRecharge.js'
 import { addDateRange } from '@/utils/ruoyi'
+import { formatDate } from '@/utils'
 import QrCodeComponent from '@/components/QrCode.vue'
 export default {
     name: 'SalaryAccount',
     components: { QrCodeComponent, AccSelect },
     data() {
         return {
+          billPanel: false,
             qrPayPanel: {
                 open: false,
                 payUrl: ''
@@ -474,7 +476,7 @@ export default {
             billQuery: {
                 pageNum: 1,
                 pageSize: 10,
-                billType: 1, //账单类型:1-服务费;2-余额
+                capitalPurpose: 1, //账单类型:1-服务费;2-余额
                 tranType: '', //收支类型:1-收入;2-支出
                 startTime: '',
                 endTime: '',
@@ -483,7 +485,8 @@ export default {
             billDataList: [],
             billTotal: 0,
             userInfoName: null,
-            accountCollection: []
+            accountCollection: [],
+          loading: false
         }
     },
     created() { },
@@ -497,6 +500,10 @@ export default {
         }
     },
     methods: {
+      billTypeTabClick(tab) {
+        this.billQuery.capitalPurpose = tab.name === "second" ? 2 : 1 //1：服务费 2：余额
+        this.getBillList();
+      },
         showBill(cardNo) {
             this.billQuery.cardNo = cardNo;
             this.billPanel = true;