From eafe75484fc48fd3b7894dac6c99106ed752249e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 21 Jan 2025 11:07:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wallet/wallet-foreign/index.vue        | 15 +++++++++++----
 src/views/wallet/wallet-freeze/index.vue         |  1 +
 src/views/wallet/wallet-recharge-apply/index.vue |  8 ++++++--
 src/views/wallet/wallet-recharge-water/index.vue | 12 +++++++++++-
 src/views/wallet/wallet-stride/index.vue         | 15 +++++++++++----
 5 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/src/views/wallet/wallet-foreign/index.vue b/src/views/wallet/wallet-foreign/index.vue
index c5fafea..f6d31ab 100644
--- a/src/views/wallet/wallet-foreign/index.vue
+++ b/src/views/wallet/wallet-foreign/index.vue
@@ -65,18 +65,25 @@
 						<span>{{ row.applyEndTime }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="count" label="申请数量" />
-				<el-table-column prop="useCount" label="使用数量" />
-				<el-table-column prop="processStatus" label="审核状态">
+				<el-table-column prop="count" width="100" label="申请数量" />
+				<el-table-column prop="useCount" width="100" label="使用数量" />
+				<el-table-column prop="processStatus" width="100" label="审核状态">
 					<template #default="{ row }">
 						<dict-tag :options="check_status" :value="row.processStatus" />
 					</template>
 				</el-table-column>
+				<el-table-column prop="processTime" label="审核时间" />
 				<el-table-column prop="createTime" label="创建时间" />
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">
 						<el-button icon="Promotion" text type="primary" @click="doInfo(row)"> 查看审批 </el-button>
-						<el-button icon="InfoFilled" text type="primary" @click="codeUseTableRef.openDialog(row.id)">
+						<el-button
+							v-if="row.processStatus == 2"
+							icon="InfoFilled"
+							text
+							type="primary"
+							@click="codeUseTableRef.openDialog(row.id)"
+						>
 							使用情况
 						</el-button>
 						<el-button
diff --git a/src/views/wallet/wallet-freeze/index.vue b/src/views/wallet/wallet-freeze/index.vue
index a1f35ef..d51fe81 100644
--- a/src/views/wallet/wallet-freeze/index.vue
+++ b/src/views/wallet/wallet-freeze/index.vue
@@ -75,6 +75,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="remark" label="备注" />
+				<el-table-column prop="processTime" label="审核时间" />
 				<el-table-column prop="createTime" label="创建时间" />
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">
diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index b5a9e2a..11029e5 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -97,7 +97,7 @@
 							>数据</el-button
 						>
 						<el-button
-							v-if="row.importTime && row.processStatus != 1 && row.processStatus != 2"
+							v-if="row.importTime && !row.processId"
 							icon="Connection"
 							text
 							type="primary"
@@ -204,8 +204,12 @@ const doApply = async (row: any) => {
 		await walletRechargeApplyApi.apply({ id: row.id })
 		useMessage().success("提交成功")
 		getDataList()
-	} finally {
 		setTimeout(() => loading.close(), 500)
+	} catch (error: any) {
+		loading.close()
+		if (error && error.code != 0) {
+			useMessage().error(error.msg)
+		}
 	}
 }
 
diff --git a/src/views/wallet/wallet-recharge-water/index.vue b/src/views/wallet/wallet-recharge-water/index.vue
index cbefbcc..43b1e01 100644
--- a/src/views/wallet/wallet-recharge-water/index.vue
+++ b/src/views/wallet/wallet-recharge-water/index.vue
@@ -93,6 +93,11 @@
 						</div>
 					</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="processTime" label="审核时间" align="center" />
 				<el-table-column prop="beforePrice" label="操作前的金额" align="center">
 					<template #default="{ row }">
@@ -130,7 +135,12 @@ import { useDict } from "/@/hooks/dict"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import * as walletRechargeImportApi from "/@/api/wallet/wallet-recharge-import"
 
-const { wallet_biz_recharge, wallet_type } = useDict("wallet_biz_recharge", "wallet_type", "check_status")
+const { wallet_biz_recharge, wallet_type, check_status } = useDict(
+	"wallet_biz_recharge",
+	"wallet_type",
+	"check_status",
+	"check_status",
+)
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
diff --git a/src/views/wallet/wallet-stride/index.vue b/src/views/wallet/wallet-stride/index.vue
index 1df0a4d..ba04a09 100644
--- a/src/views/wallet/wallet-stride/index.vue
+++ b/src/views/wallet/wallet-stride/index.vue
@@ -58,13 +58,14 @@
 				<el-table-column type="index" label="#" width="40" />
 				<el-table-column prop="username" label="申请人" />
 				<el-table-column prop="deptName" label="部门" />
-				<el-table-column prop="count" label="申请数量" />
-				<el-table-column prop="useCount" label="使用数量" />
-				<el-table-column prop="processStatus" label="审核状态">
+				<el-table-column prop="count" width="100" label="申请数量" />
+				<el-table-column prop="useCount" width="100" label="使用数量" />
+				<el-table-column prop="processStatus" width="100" label="审核状态">
 					<template #default="{ row }">
 						<dict-tag :options="check_status" :value="row.processStatus" />
 					</template>
 				</el-table-column>
+				<el-table-column prop="processTime" label="审核时间" />
 				<el-table-column prop="createTime" label="创建时间" />
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">
@@ -87,7 +88,13 @@
 							>删除</el-button
 						>
 						<el-button icon="Promotion" text type="primary" @click="doInfo(row)"> 查看审批 </el-button>
-						<el-button icon="InfoFilled" text type="primary" @click="codeUseTableRef.openDialog(row.id)">
+						<el-button
+							v-if="row.processStatus == 2"
+							icon="InfoFilled"
+							text
+							type="primary"
+							@click="codeUseTableRef.openDialog(row.id)"
+						>
 							使用情况
 						</el-button>
 					</template>