From 79be4b989db155cda989ab004eb0f843d6aff0cc Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 7 Jan 2025 17:40:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=94=AE=E5=90=8E=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                         |   8 +-
 src/api/hard/hard-after-sale-log.ts      |  49 ++++++
 src/api/hard/hard-after-sale.ts          |  49 ++++++
 src/views/hard/hard-after-sale/form.vue  | 209 +++++++++++++++++++++++
 src/views/hard/hard-after-sale/index.vue | 118 +++++++++++++
 5 files changed, 429 insertions(+), 4 deletions(-)
 create mode 100644 src/api/hard/hard-after-sale-log.ts
 create mode 100644 src/api/hard/hard-after-sale.ts
 create mode 100644 src/views/hard/hard-after-sale/form.vue
 create mode 100644 src/views/hard/hard-after-sale/index.vue

diff --git a/.env.development b/.env.development
index a4aba57..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://pjcloud.center.takin.cc
-#  VITE_IMAGE_BASE_PATH = http://localhost:9999
+# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
+ VITE_IMAGE_BASE_PATH = http://localhost:9999
 
 # 代码生成服务地址
 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/src/api/hard/hard-after-sale-log.ts b/src/api/hard/hard-after-sale-log.ts
new file mode 100644
index 0000000..5c76dd3
--- /dev/null
+++ b/src/api/hard/hard-after-sale-log.ts
@@ -0,0 +1,49 @@
+import request from "/@/utils/request"
+
+export function pagejoin(query?: Object) {
+  return request({
+    url: '/hard/hard-after-sale-log/page-join',
+    method: 'get',
+    params: query
+  })
+}
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/hard/hard-after-sale-log/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/hard/hard-after-sale-log',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/hard/hard-after-sale-log/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/hard/hard-after-sale-log',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/hard/hard-after-sale-log',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/api/hard/hard-after-sale.ts b/src/api/hard/hard-after-sale.ts
new file mode 100644
index 0000000..2b96fdc
--- /dev/null
+++ b/src/api/hard/hard-after-sale.ts
@@ -0,0 +1,49 @@
+import request from "/@/utils/request"
+
+export function pageJoin(query?: Object) {
+  return request({
+    url: '/hard/hard-after-sale/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/hard/hard-after-sale/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/hard/hard-after-sale',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/hard/hard-after-sale/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/hard/hard-after-sale',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/hard/hard-after-sale',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/views/hard/hard-after-sale/form.vue b/src/views/hard/hard-after-sale/form.vue
new file mode 100644
index 0000000..c7156de
--- /dev/null
+++ b/src/views/hard/hard-after-sale/form.vue
@@ -0,0 +1,209 @@
+<template>
+    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
+      :close-on-click-modal="false" draggable>
+      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+       <el-row :gutter="24">
+    <el-col :span="12" class="mb20">
+      <el-form-item label="售后单号" prop="no">
+        <el-input v-model="form.no" placeholder="请输入售后单号"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="售后类型" prop="type">
+        <el-input v-model="form.type" placeholder="请输入售后类型"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="售后状态" prop="status">
+        <el-input v-model="form.status" placeholder="请输入售后状态"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="售后方式" prop="way">
+        <el-input v-model="form.way" placeholder="请输入售后方式"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="用户id" prop="userId">
+        <el-input v-model="form.userId" placeholder="请输入用户id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="申请原因" prop="applyReason">
+        <el-input v-model="form.applyReason" placeholder="请输入申请原因"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="补充描述" prop="applyDescription">
+        <el-input v-model="form.applyDescription" placeholder="请输入补充描述"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="补充凭证图片" prop="applyPicUrls">
+        <el-input v-model="form.applyPicUrls" placeholder="请输入补充凭证图片"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="订单编号" prop="orderId">
+        <el-input v-model="form.orderId" placeholder="请输入订单编号"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="订单流水号" prop="orderNo">
+        <el-input v-model="form.orderNo" placeholder="请输入订单流水号"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="审批时间" prop="auditTime">
+        <el-input v-model="form.auditTime" placeholder="请输入审批时间"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="审批人" prop="auditUserId">
+        <el-input v-model="form.auditUserId" placeholder="请输入审批人"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="审批备注" prop="auditReason">
+        <el-input v-model="form.auditReason" placeholder="请输入审批备注"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="退款金额，单位：分" prop="refundPrice">
+        <el-input v-model="form.refundPrice" placeholder="请输入退款金额，单位：分"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="支付退款编号" prop="payRefundId">
+        <el-input v-model="form.payRefundId" placeholder="请输入支付退款编号"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="退款时间" prop="refundTime">
+        <el-input v-model="form.refundTime" placeholder="请输入退款时间"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="退货时间" prop="deliveryTime">
+        <el-input v-model="form.deliveryTime" placeholder="请输入退货时间"/>
+      </el-form-item>
+      </el-col>
+
+			</el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="HardAfterSaleDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/hard/hard-after-sale'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  no: '',
+	  type: '',
+	  status: '',
+	  way: '',
+	  userId: '',
+	  applyReason: '',
+	  applyDescription: '',
+	  applyPicUrls: '',
+	  orderId: '',
+	  orderNo: '',
+	  auditTime: '',
+	  auditUserId: '',
+	  auditReason: '',
+	  refundPrice: '',
+	  payRefundId: '',
+	  refundTime: '',
+	  deliveryTime: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取hardAfterSale信息
+  if (id) {
+    form.id = id
+    gethardAfterSaleData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {});
+	if (!valid) return false;
+
+	try {
+    loading.value = true;
+		form.id ? await putObj(form) : await addObj(form);
+		useMessage().success(form.id ? '修改成功' : '添加成功');
+		visible.value = false;
+		emit('refresh');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const gethardAfterSaleData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
\ No newline at end of file
diff --git a/src/views/hard/hard-after-sale/index.vue b/src/views/hard/hard-after-sale/index.vue
new file mode 100644
index 0000000..d43c936
--- /dev/null
+++ b/src/views/hard/hard-after-sale/index.vue
@@ -0,0 +1,118 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'hard_hardAfterSale_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'hard_hardAfterSale_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'hard_hardAfterSale_export'"
+                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border 
+        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+          <el-table-column prop="userId" label="用户id"  show-overflow-tooltip/>
+          <el-table-column prop="applyReason" label="申请原因"  show-overflow-tooltip/>
+          <el-table-column prop="applyDescription" label="补充描述"  show-overflow-tooltip/>
+          <el-table-column prop="applyPicUrls" label="补充凭证图片"  show-overflow-tooltip/>
+          <el-table-column prop="orderId" label="订单编号"  show-overflow-tooltip/>
+          <el-table-column prop="orderNo" label="订单流水号"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'hard_hardAfterSale_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'hard_hardAfterSale_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemHardAfterSale">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { pageJoin, delObjs } from  '/@/api/hard/hard-after-sale'
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: pageJoin
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/hard/hardAfterSale/export', Object.assign(state.queryForm, { ids: selectObjs }), 'hardAfterSale.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>
\ No newline at end of file

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 2/2] =?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