From 59aee8fa1a634f649cef2c0b235f52238120b04e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 3 Jan 2025 18:13:09 +0800
Subject: [PATCH] =?UTF-8?q?creaet:=E9=A5=AD=E5=8D=A1=E5=86=BB=E7=BB=93?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wallet/wallet-freeze/form.vue  | 29 ++++++++++++------------
 src/views/wallet/wallet-freeze/index.vue | 20 ++++++++++++----
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/views/wallet/wallet-freeze/form.vue b/src/views/wallet/wallet-freeze/form.vue
index df02569..888a34d 100644
--- a/src/views/wallet/wallet-freeze/form.vue
+++ b/src/views/wallet/wallet-freeze/form.vue
@@ -1,28 +1,22 @@
 <template>
-  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+  <el-dialog :title="form.id ? '编辑' : '新增'" width="40%" 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="钱包id" prop="walletId">
-            <el-input v-model="form.walletId" placeholder="请输入钱包id" />
+        <el-col :span="24" class="mb20">
+          <el-form-item label="用户" prop="userId">
+            <select-user v-model="form.userId" />
           </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-col :span="24" class="mb20">
+          <el-form-item label="钱包类型" prop="walletTypeId">
+            <select-wallet-type v-model="form.walletTypeId" placeholder="钱包类型" />
           </el-form-item>
         </el-col>
 
-        <el-col :span="12" class="mb20">
-          <el-form-item label="冻结状态" prop="freeStatus">
-            <el-input v-model="form.freeStatus" placeholder="请输入冻结状态" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12" class="mb20">
+        <el-col :span="24" class="mb20">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入备注" />
+            <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" :autosize="{ minRows: 6 }" />
           </el-form-item>
         </el-col>
 
@@ -54,6 +48,7 @@ const loading = ref(false)
 const form = reactive({
   id: '',
   walletId: '',
+  walletTypeId: '',
   userId: '',
   freeStatus: '',
   remark: '',
@@ -61,6 +56,10 @@ const form = reactive({
 
 // 定义校验规则
 const dataRules = ref({
+  walletId: [{ required: true, message: '钱包id不能为空', trigger: 'blur' }],
+  userId: [{ required: true, message: '用户id不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '审核状态不能为空', trigger: 'blur' }],
+  walletTypeId: [{ required: true, message: '请选择钱包类型', trigger: 'change' }]
 })
 
 // 打开弹窗
diff --git a/src/views/wallet/wallet-freeze/index.vue b/src/views/wallet/wallet-freeze/index.vue
index 512eac8..2e47382 100644
--- a/src/views/wallet/wallet-freeze/index.vue
+++ b/src/views/wallet/wallet-freeze/index.vue
@@ -42,10 +42,20 @@
         @sort-change="sortChangeHandle">
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column type="index" label="#" width="40" />
-        <el-table-column prop="walletId" label="钱包id" show-overflow-tooltip />
-        <el-table-column prop="userId" label="用户id" show-overflow-tooltip />
-        <el-table-column prop="freeStatus" label="冻结状态" show-overflow-tooltip />
-        <el-table-column prop="remark" label="备注" show-overflow-tooltip />
+        <el-table-column prop="username" label="申请人" />
+        <el-table-column prop="deptName" label="部门" />
+        <el-table-column prop="freeStatus" label="是否冻结">
+          <template #default="{ row }">
+            <dict-tag :options="yes_no_type" :value="row.freeStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="processStatus" label="审核状态">
+          <template #default="{ row }">
+            <dict-tag :options="check_status" :value="row.processStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="createTime" label="创建时间" />
         <el-table-column label="操作" width="150">
           <template #default="scope">
             <el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletFreeze_edit'"
@@ -73,7 +83,7 @@ import { useDict } from '/@/hooks/dict';
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
-
+const { check_status, yes_no_type } = useDict('check_status', 'yes_no_type');
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量