From c44a3930b77fa244a514628eb42e1f0bc9c5e9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Tue, 6 Aug 2024 13:32:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=8F=98=E5=8A=A8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ss/recordBalance/index.vue | 150 ++++++++++++++++-----------
 src/views/system/smUser/detail.vue   |   1 +
 2 files changed, 92 insertions(+), 59 deletions(-)

diff --git a/src/views/ss/recordBalance/index.vue b/src/views/ss/recordBalance/index.vue
index 2d4082d..ceb15ff 100644
--- a/src/views/ss/recordBalance/index.vue
+++ b/src/views/ss/recordBalance/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户名称" prop="userName">
+      <el-form-item label="用户名称" prop="userName" v-if="notHasView(views.user)">
         <el-input
           v-model="queryParams.userId"
           placeholder="请输入用户名称"
@@ -17,6 +17,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="业务类型" prop="bstType">
+        <el-select v-model="queryParams.bstType" placeholder="请输入变动原因" clearable @change="handleQuery">
+          <el-option v-for="dict in dict.type.record_balance_bst_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -24,38 +29,38 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['ss:recordBalance:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['ss:recordBalance:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['ss:recordBalance:remove']"
-        >删除</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['ss:recordBalance:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['ss:recordBalance:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['ss:recordBalance:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -71,30 +76,42 @@
 
     <el-table v-loading="loading" :data="recordBalanceList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" sortable="custom" :sort-orders="orderSorts" v-if="isShow('id')"/>
+      <el-table-column label="记录ID" align="center" prop="id" sortable="custom" :sort-orders="orderSorts" v-if="isShow('id')" width="100"/>
       <el-table-column label="用户名称" align="center" prop="userName" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('userName')"/>
-      <el-table-column label="变动前余额" align="center" prop="beforeBalance" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('beforeBalance')"/>
-      <el-table-column label="变动后余额" align="center" prop="afterBalance" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('afterBalance')"/>
-      <el-table-column label="变动原因" align="center" prop="reason" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('reason')"/>
-      <el-table-column label="变动时间" align="center" prop="createTime" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('createTime')"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['ss:recordBalance:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ss:recordBalance:remove']"
-          >删除</el-button>
+      <el-table-column label="业务类型" align="center" prop="bstType" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('bstType')">
+        <template slot-scope="d">
+          <dict-tag :value="d.row.bstType" :options="dict.type.record_balance_bst_type"/>
         </template>
       </el-table-column>
+      <el-table-column label="变动时间" align="center" prop="createTime" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('createTime')"/>
+      <el-table-column label="变动金额" align="center" prop="beforeBalance" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('amount')">
+        <template slot-scope="d">{{d.row.amount | money}} 元</template>
+      </el-table-column>
+      <el-table-column label="变动前余额" align="center" prop="beforeBalance" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('beforeBalance')">
+        <template slot-scope="d">{{d.row.beforeBalance | money}} 元</template>
+      </el-table-column>
+      <el-table-column label="变动后余额" align="center" prop="afterBalance" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('afterBalance')">
+        <template slot-scope="d">{{d.row.afterBalance | money}} 元</template>
+      </el-table-column>
+      <el-table-column label="变动原因" align="center" prop="reason" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('reason')" min-width="200"/>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['ss:recordBalance:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['ss:recordBalance:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -131,7 +148,7 @@
 
 <script>
 import { listRecordBalance, getRecordBalance, delRecordBalance, addRecordBalance, updateRecordBalance } from "@/api/ss/recordBalance";
-import { $showColumns } from '@/utils/mixins';
+import { $showColumns, $view } from '@/utils/mixins'
 
 // 默认排序字段
 const defaultSort = {
@@ -141,17 +158,28 @@ const defaultSort = {
 
 export default {
   name: "RecordBalance",
-  mixins: [$showColumns],
+  mixins: [$showColumns, $view],
+  dicts: ['record_balance_bst_type'],
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
   data() {
     return {
       // 字段列表
       columns: [
         {key: 'id', visible: true, label: 'ID'},
         {key: 'userName', visible: true, label: '用户名称'},
-        {key: 'beforeBalance', visible: true, label: '变动前余额（元）'},
-        {key: 'afterBalance', visible: true, label: '变动后余额（元）'},
-        {key: 'reason', visible: true, label: '变动原因'},
+        {key: 'bstType', visible: true, label: '业务类型'},
         {key: 'createTime', visible: true, label: '变动时间'},
+        {key: 'amount', visible: true, label: '变动金额'},
+        {key: 'beforeBalance', visible: true, label: '变动前余额'},
+        {key: 'afterBalance', visible: true, label: '变动后余额'},
+        {key: 'reason', visible: true, label: '变动原因'},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
@@ -206,6 +234,10 @@ export default {
     };
   },
   created() {
+    this.queryParams = {
+      ...this.queryParams,
+      ...this.query
+    }
     this.getList();
   },
   methods: {
diff --git a/src/views/system/smUser/detail.vue b/src/views/system/smUser/detail.vue
index 5709ad2..f41d577 100644
--- a/src/views/system/smUser/detail.vue
+++ b/src/views/system/smUser/detail.vue
@@ -35,6 +35,7 @@
                   </el-descriptions-item>
                   <el-descriptions-item label="账户余额">{{userData.balance | money | defaultValue}} 元</el-descriptions-item>
                   <el-descriptions-item label="总收入">{{userData.totalIncome | money | defaultValue}} 元</el-descriptions-item>
+                  <el-descriptions-item label="总充值">{{userData.rechargeAmount | money | defaultValue}} 元</el-descriptions-item>
                   <el-descriptions-item label="总提现">{{userData.withDrawlAmount | money | defaultValue}} 元</el-descriptions-item>
                 </el-descriptions>
               </div>