From e999023c83237e0bf18cf9596fa25488d0d94b28 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 14 Mar 2025 16:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A5=AD=E5=8D=A1=E5=85=85=E5=80=BC=E9=92=B1?=
 =?UTF-8?q?=E5=8C=85=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Select/SelectWalletType.vue    |  14 +-
 .../wallet/wallet-recharge-apply/form.vue     | 183 +++++++++---------
 .../wallet/wallet-recharge-apply/index.vue    |   6 +-
 3 files changed, 107 insertions(+), 96 deletions(-)

diff --git a/src/components/Select/SelectWalletType.vue b/src/components/Select/SelectWalletType.vue
index 3fa1119..d4cf70f 100644
--- a/src/components/Select/SelectWalletType.vue
+++ b/src/components/Select/SelectWalletType.vue
@@ -31,12 +31,14 @@ import { getWalletTypeSimple } from "/@/api/wallet/wallet-type"
 
 const selectId = defineModel()
 
-export type Props = {
-	placeholder?: string
-}
-const props = withDefaults(defineProps<Props>(), {
-	placeholder: "请选择",
-})
+const props = withDefaults(
+	defineProps<{
+		placeholder?: string
+	}>(),
+	{
+		placeholder: "请选择",
+	},
+)
 
 const queryForm = reactive<any>({
 	name: "",
diff --git a/src/views/wallet/wallet-recharge-apply/form.vue b/src/views/wallet/wallet-recharge-apply/form.vue
index 33d4ba6..1e1d256 100644
--- a/src/views/wallet/wallet-recharge-apply/form.vue
+++ b/src/views/wallet/wallet-recharge-apply/form.vue
@@ -1,122 +1,127 @@
 <template>
-  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" width="30%" :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="24" class="mb20">
-          <el-form-item label="充值时间" prop="importTime">
-            <el-date-picker v-model="form.importTime" type="month" value-format="YYYY-MM-DD" placeholder="请选择充值时间" />
-          </el-form-item>
-        </el-col>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" width="30%" :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="24" class="mb20">
+					<el-form-item label="充值时间" prop="importTime">
+						<el-date-picker v-model="form.importTime" type="month" value-format="YYYY-MM-DD" placeholder="请选择充值时间" />
+					</el-form-item>
+				</el-col>
 
-        <el-col :span="24" class="mb20">
-          <el-form-item label="充值类型" prop="bizType">
-            <dict-select v-model="form.bizType" dict-code="wallet_biz_recharge" placeholder="请选择饭卡类型" />
-          </el-form-item>
-        </el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="充值类型" prop="bizType">
+						<dict-select v-model="form.bizType" dict-code="wallet_biz_recharge" placeholder="请选择饭卡类型" />
+					</el-form-item>
+				</el-col>
 
-        <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="24" class="mb20">
+					<el-form-item label="钱包" prop="walletTypeId">
+						<!-- <select-wallet-type v-model="form.walletTypeId" placeholder="请选择钱包" :disabled="false" /> -->
+						<el-select v-model="form.walletTypeId" :disabled="true">
+							<el-option v-for="item in walletTypeOptions" :key="item.id" :label="item.name" :value="item.id" />
+						</el-select>
+					</el-form-item>
+				</el-col>
 
-        <el-col :span="24" class="mb20">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" :autosize="{ minRows: 6 }" />
-          </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>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="备注" prop="remark">
+						<el-input v-model="form.remark" placeholder="请输入备注" type="textarea" :autosize="{ minRows: 6 }" />
+					</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="WalletRechargeApplyDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/wallet/wallet-recharge-apply'
-import { rule } from '/@/utils/validate';
-const emit = defineEmits(['refresh']);
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/wallet/wallet-recharge-apply"
+const emit = defineEmits(["refresh"])
+import { getWalletTypeSimple } from "/@/api/wallet/wallet-type"
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-  id: '',
-  userId: '',
-  bizType: '',
-  walletTypeId: '',
-  deptId: '',
-  importTime: '',
-  remark: '',
-});
+	id: "",
+	userId: "",
+	bizType: "",
+	walletTypeId: "",
+	deptId: "",
+	importTime: "",
+	remark: "",
+})
+const walletTypeOptions = ref()
 
 // 定义校验规则
 const dataRules = ref({
-  importTime: [{ required: true, message: '导入时间(手动选择)不能为空', trigger: 'change' }],
-  bizType: [{ required: true, message: '请选择充值类型', trigger: 'change' }],
-  walletTypeId: [{ required: true, message: '请选择钱包类型', trigger: 'change' }],
+	importTime: [{ required: true, message: "导入时间(手动选择)不能为空", trigger: "change" }],
+	bizType: [{ required: true, message: "请选择充值类型", trigger: "change" }],
+	walletTypeId: [{ required: true, message: "请选择钱包类型", trigger: "change" }],
 })
 
 // 打开弹窗
-const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+const openDialog = async (id: string) => {
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
-  nextTick(() => {
-    dataFormRef.value?.resetFields();
-  });
+	// 重置表单数据
+	dataFormRef.value?.resetFields()
 
-  // 获取walletRechargeApply信息
-  if (id) {
-    form.id = id
-    getwalletRechargeApplyData(id)
-  }
-};
+	// 获取walletRechargeApply信息
+	if (id) {
+		form.id = id
+		getwalletRechargeApplyData(id)
+	}
+
+	const res = await getWalletTypeSimple()
+	walletTypeOptions.value = res.data.records
+	form.walletTypeId = res.data.records.find((item: any) => item.uniqueCode == "1").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 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 getwalletRechargeApplyData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
+	// 获取数据
+	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
+	openDialog,
+})
+</script>
diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index 812250c..9e3f9b4 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -74,7 +74,11 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="deptName" width="200" label="部门" />
-				<el-table-column prop="importTime" width="100" label="充值月" />
+				<el-table-column prop="importTime" width="100" label="充值月">
+					<template #default="{ row }">
+						{{ row.importTime?.substring(0, 7) }}
+					</template>
+				</el-table-column>
 				<el-table-column prop="processStatus" width="100" label="审核状态">
 					<template #default="{ row }">
 						<dict-tag :options="check_status" :value="row.processStatus" />