From d940000ef05c3c6c07c70202d0c9a407b2126392 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 7 Jan 2025 18:22:21 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=85=85=E5=80=BC=E3=80=81?=
 =?UTF-8?q?=E6=B6=88=E8=B4=B9=E3=80=81=E9=80=80=E6=AC=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                         |  8 ++--
 src/api/wallet/wallet-transaction.ts     | 38 +++++++++++++---
 src/views/wallet/wallet-cz/index.vue     | 55 ++++++++++++++++++++----
 src/views/wallet/wallet-manage/index.vue |  2 +-
 src/views/wallet/wallet-tk/index.vue     | 23 +++++++++-
 src/views/wallet/wallet-xf/index.vue     | 23 +++++++++-
 6 files changed, 125 insertions(+), 24 deletions(-)

diff --git a/.env.development b/.env.development
index 422dfe8..54dfa3c 100644
--- a/.env.development
+++ b/.env.development
@@ -9,13 +9,13 @@ ENV = 'development'
 
 # ADMIN 服务地址
 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
-VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
-# VITE_ADMIN_PROXY_PATH = http://localhost:9999
+# VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
+VITE_ADMIN_PROXY_PATH = http://localhost:9999
 
 # 图片访问基础地址
-VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
+# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
-#  VITE_IMAGE_BASE_PATH = http://localhost:9999
+ VITE_IMAGE_BASE_PATH = http://localhost:9999
 
 # 代码生成服务地址
 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/src/api/wallet/wallet-transaction.ts b/src/api/wallet/wallet-transaction.ts
index 6c8679d..9be40fb 100644
--- a/src/api/wallet/wallet-transaction.ts
+++ b/src/api/wallet/wallet-transaction.ts
@@ -1,8 +1,32 @@
 import request from "/@/utils/request"
 
+export function pageCz(obj?: Object) {
+  return request({
+    url: '/wallet/wallet-transaction/page-cz',
+    method: 'get',
+    params: obj
+  })
+}
+
+export function pageXf(obj?: Object) {
+  return request({
+    url: '/wallet/wallet-transaction/page-xf',
+    method: 'get',
+    params: obj
+  })
+}
+
+export function pageTk(obj?: Object) {
+  return request({
+    url: '/wallet/wallet-transaction/page-tk',
+    method: 'get',
+    params: obj
+  })
+}
+
 export function updateBalance(obj?: Object) {
   return request({
-    url: '/wallet/walletTransaction/update-balance',
+    url: '/wallet/wallet-transaction/update-balance',
     method: 'put',
     data: obj
   })
@@ -10,7 +34,7 @@ export function updateBalance(obj?: Object) {
 
 export function fetchList(query?: Object) {
   return request({
-    url: '/wallet/walletTransaction/page',
+    url: '/wallet/wallet-transaction/page',
     method: 'get',
     params: query
   })
@@ -18,7 +42,7 @@ export function fetchList(query?: Object) {
 
 export function pageJoin(query?: Object) {
   return request({
-    url: '/wallet/walletTransaction/page-join',
+    url: '/wallet/wallet-transaction/page-join',
     method: 'get',
     params: query
   })
@@ -26,7 +50,7 @@ export function pageJoin(query?: Object) {
 
 export function addObj(obj?: Object) {
   return request({
-    url: '/wallet/walletTransaction',
+    url: '/wallet/wallet-transaction',
     method: 'post',
     data: obj
   })
@@ -34,14 +58,14 @@ export function addObj(obj?: Object) {
 
 export function getObj(id?: string) {
   return request({
-    url: '/wallet/walletTransaction/' + id,
+    url: '/wallet/wallet-transaction/' + id,
     method: 'get'
   })
 }
 
 export function delObjs(ids?: Object) {
   return request({
-    url: '/wallet/walletTransaction',
+    url: '/wallet/wallet-transaction',
     method: 'delete',
     data: ids
   })
@@ -49,7 +73,7 @@ export function delObjs(ids?: Object) {
 
 export function putObj(obj?: Object) {
   return request({
-    url: '/wallet/walletTransaction',
+    url: '/wallet/wallet-transaction',
     method: 'put',
     data: obj
   })
diff --git a/src/views/wallet/wallet-cz/index.vue b/src/views/wallet/wallet-cz/index.vue
index ca90d81..b220965 100644
--- a/src/views/wallet/wallet-cz/index.vue
+++ b/src/views/wallet/wallet-cz/index.vue
@@ -1,6 +1,25 @@
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view">
+      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-row :gutter="24">
+          <el-col :span="4">
+            <el-form-item class="w100" label="用户" prop="userIds">
+              <select-user v-model="state.queryForm.userIds" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
+              <select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+            </el-form-item>
+          </el-col>
+          <el-form-item>
+            <el-button icon="Search" type="primary" @click="getDataList">{{ $t('common.queryBtn')
+              }}</el-button>
+            <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
       <el-row>
         <div class="mb8" style="width: 100%">
           <right-toolbar :search="false" v-model:showSearch="showSearch" :export="'wallet_walletRecharge_export'"
@@ -13,17 +32,36 @@
         @sort-change="sortChangeHandle">
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column type="index" label="#" width="40" />
-        <el-table-column prop="username" label="用户" show-overflow-tooltip />
-        <el-table-column prop="userAvatar" label="头像" show-overflow-tooltip>
+        <el-table-column prop="username" label="用户"  />
+        <el-table-column prop="userAvatar" label="头像" >
           <template #default="{ row }">
             <preview-image :src="row.userAvatar" />
           </template>
         </el-table-column>
-        <el-table-column prop="userMobile" width="120" label="手机号" show-overflow-tooltip />
+        <el-table-column prop="userMobile" width="120" label="手机号"  />
+        <el-table-column prop="walletTypeUniqueCode" width="200" label="饭卡类型">
+          <template #default="{ row }">
+            <div class="flex items-center justify-center">
+              <div class="color-primary">{{ row.walletTypeName }}</div>
+              <div class="flex items-center just ml5">
+                <dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="walletTypeUniqueCode" width="200" label="充值金额">
+          <template #default="{ row }">
+            <div class="color-success">{{ displayPrice(row.price) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="walletTypeUniqueCode" width="200" label="饭卡余额">
+          <template #default="{ row }">
+            <div class="color-primary">{{ displayPrice(row.balance) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" width="200" label="创建时间" show-overflow-tooltip />
         <el-table-column label="操作" width="150">
           <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletRecharge_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
             <el-button icon="delete" text type="primary" v-auth="'wallet_walletRecharge_del'"
               @click="handleDelete([scope.row.id])">删除</el-button>
           </template>
@@ -40,14 +78,15 @@
 
 <script setup lang="ts" name="systemWalletRecharge">
 import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs, pageJoin } from "/@/api/wallet/wallet-recharge";
+import { pageCz } from "/@/api/wallet/wallet-transaction";
 import { useMessage, useMessageBox } from "/@/hooks/message";
 import { useDict } from '/@/hooks/dict';
+import { displayPrice } from "/@/utils/formatMoney"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
-
+const { wallet_type } = useDict('wallet_type');
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -59,7 +98,7 @@ const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
   queryForm: {},
-  pageList: pageJoin
+  pageList: pageCz
 })
 
 //  table hook
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index 815e4aa..3f93684 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -44,7 +44,7 @@
         </el-table-column>
         <el-table-column prop="userMobile" width="120" label="手机号" show-overflow-tooltip />
         <el-table-column prop="deptName" label="部门" show-overflow-tooltip />
-        <el-table-column prop="walletTypeUniqueCode" width="150" label="饭卡类型" show-overflow-tooltip>
+        <el-table-column prop="walletTypeUniqueCode" width="150" label="饭卡类型">
           <template #default="{ row }">
             <div class="flex items-center justify-center">
               <div class="color-primary">{{ row.walletTypeName }}</div>
diff --git a/src/views/wallet/wallet-tk/index.vue b/src/views/wallet/wallet-tk/index.vue
index ca90d81..2716e1b 100644
--- a/src/views/wallet/wallet-tk/index.vue
+++ b/src/views/wallet/wallet-tk/index.vue
@@ -1,6 +1,25 @@
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view">
+      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-row :gutter="24">
+          <el-col :span="4">
+            <el-form-item class="w100" label="用户" prop="userIds">
+              <select-user v-model="state.queryForm.userIds" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
+              <select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+            </el-form-item>
+          </el-col>
+          <el-form-item>
+            <el-button icon="Search" type="primary" @click="getDataList">{{ $t('common.queryBtn')
+              }}</el-button>
+            <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
       <el-row>
         <div class="mb8" style="width: 100%">
           <right-toolbar :search="false" v-model:showSearch="showSearch" :export="'wallet_walletRecharge_export'"
@@ -40,7 +59,7 @@
 
 <script setup lang="ts" name="systemWalletRecharge">
 import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs, pageJoin } from "/@/api/wallet/wallet-recharge";
+import { pageTk } from "/@/api/wallet/wallet-transaction";
 import { useMessage, useMessageBox } from "/@/hooks/message";
 import { useDict } from '/@/hooks/dict';
 
@@ -59,7 +78,7 @@ const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
   queryForm: {},
-  pageList: pageJoin
+  pageList: pageTk
 })
 
 //  table hook
diff --git a/src/views/wallet/wallet-xf/index.vue b/src/views/wallet/wallet-xf/index.vue
index ca90d81..ac12074 100644
--- a/src/views/wallet/wallet-xf/index.vue
+++ b/src/views/wallet/wallet-xf/index.vue
@@ -1,6 +1,25 @@
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view">
+      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-row :gutter="24">
+          <el-col :span="4">
+            <el-form-item class="w100" label="用户" prop="userIds">
+              <select-user v-model="state.queryForm.userIds" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
+              <select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+            </el-form-item>
+          </el-col>
+          <el-form-item>
+            <el-button icon="Search" type="primary" @click="getDataList">{{ $t('common.queryBtn')
+              }}</el-button>
+            <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
       <el-row>
         <div class="mb8" style="width: 100%">
           <right-toolbar :search="false" v-model:showSearch="showSearch" :export="'wallet_walletRecharge_export'"
@@ -40,7 +59,7 @@
 
 <script setup lang="ts" name="systemWalletRecharge">
 import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs, pageJoin } from "/@/api/wallet/wallet-recharge";
+import { pageXf } from "/@/api/wallet/wallet-transaction";
 import { useMessage, useMessageBox } from "/@/hooks/message";
 import { useDict } from '/@/hooks/dict';
 
@@ -59,7 +78,7 @@ const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
   queryForm: {},
-  pageList: pageJoin
+  pageList: pageXf
 })
 
 //  table hook