lex-xin 5 年之前
父節點
當前提交
a8274ff0df
共有 3 個文件被更改,包括 73 次插入3 次删除
  1. 1 1
      src/api/studentManager.js
  2. 15 0
      src/utils/vueFilter.js
  3. 57 2
      src/views/studentManager/components/studentOrder.vue

+ 1 - 1
src/api/studentManager.js

@@ -244,7 +244,7 @@ export function findStudentCourseGroupsWithWeb (data) {
 // 账户流水列表
 export function cashAccountDetail (data) {
   return request({
-    url: api + `/cashAccountDetail/queryPageb`,
+    url: api + `/cashAccountDetail/queryPage`,
     method: 'get',
     params: data
   })

+ 15 - 0
src/utils/vueFilter.js

@@ -411,6 +411,21 @@ Vue.filter('payStatus', value => {
   return template[value]
 })
 
+// payType  交易类型
+Vue.filter('payType', value => {
+  let template = {
+    RECHARGE: "充值",
+    WITHDRAW: "提现",
+    PAY_FEE: "缴费",
+    SPORADIC: "零星收费",
+    FILL_ACCOUNT: "人工补账",
+    REFUNDS: "退费",
+    REWARDS: "奖励",
+    WAGE: "工资"
+  }
+  return template[value]
+})
+
 // 课程组状态 FINISH
 Vue.filter('courseGroup', value => {
   let template = {

+ 57 - 2
src/views/studentManager/components/studentOrder.vue

@@ -33,6 +33,7 @@
           <p>微信:<span>{{ dataInfo.wxBalance }}</span></p>
         </div> -->
       </div>
+      <el-button @click="onCashAccount" type="primary">交易明细</el-button>
     </div>
     <!-- 搜索类型 -->
     <el-form :inline="true"
@@ -128,6 +129,32 @@
                   :page-sizes="pageInfo.page_size"
                   @pagination="getList" />
     </div>
+    <el-dialog title='交易明细'
+               width="800px"
+               :visible.sync="cashAccount.status">
+      <el-table :data="cashAccount.gridData">
+        <el-table-column align='center'
+                         property="userName"
+                         label="操作时间"></el-table-column>
+        <el-table-column align='center'
+                         property="phone"
+                         label="操作人"></el-table-column>
+        <el-table-column align='center'
+                         property="subjectName"
+                         label="金额变动"></el-table-column>
+        <el-table-column align='center'
+                         property="subjectName"
+                         label="余额"></el-table-column>
+        <el-table-column align='center'
+                         property="subjectName"
+                         label="备注"></el-table-column>
+      </el-table>
+      <pagination :total="cashAccount.total"
+                  :page.sync="cashAccount.page"
+                  :limit.sync="cashAccount.limit"
+                  :page-sizes="cashAccount.page_size"
+                  @pagination="getCashAccount" />
+    </el-dialog>
     <el-dialog :title="moneyForm.title" width="450px" @close="onFormClose('moneyForm')" :visible.sync="moneyVisible">
       <el-form ref="moneyForm" :rules="moneyRule" :model="moneyForm" label-width="80px">
         <el-form-item label="操作选择" prop="type">
@@ -234,6 +261,14 @@ export default {
         type: [{ required: true, message: '请选择操作类型', trigger: 'change' }],
         money: [{ required: true, validator: validPrice, trigger: 'blur' }],
         remark: [{ required: true, message: '请输入备注', trigger: 'blur' }],
+      },
+      cashAccount: { // 点名表
+        status: false,
+        gridData: [],
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
       }
     }
   },
@@ -280,6 +315,26 @@ export default {
       }
       this.moneyVisible = true
     },
+    onCashAccount (item) { // 点名表
+      this.cashAccount.page = 1
+      this.getCashAccount()
+    },
+    getCashAccount() {
+      let cashAccount = this.cashAccount
+      let params = {
+        page: cashAccount.page,
+        rows: cashAccount.limit,
+        userId: this.searchForm.studentId
+      }
+      cashAccountDetail(params).then(res => {
+        let result = res.data
+        cashAccount.status = true
+        if (res.code == 200) {
+          cashAccount.gridData = result.rows
+          cashAccount.total = result.total
+        }
+      })
+    },
     submitMoney(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -301,7 +356,7 @@ export default {
             updateCourseBalance({
               userId: this.searchForm.studentId,
               decimal: courseBalance,
-              memo: moneyForm.remark
+              description: moneyForm.remark
             }).then(res => {
               let result = res.data
               if (res.code == 200) {
@@ -328,7 +383,7 @@ export default {
             updateBalance({
               userId: this.searchForm.studentId,
               decimal: balance,
-              memo: moneyForm.remark
+              description: moneyForm.remark
             }).then(res => {
               let result = res.data
               if (res.code == 200) {