Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/api/wallet/wallet-rule-price-config.ts

@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/wallet/wallet-rule-price-config/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/wallet/wallet-rule-price-config",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/wallet/wallet-rule-price-config/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/wallet/wallet-rule-price-config",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/wallet/wallet-rule-price-config",
+		method: "put",
+		data: obj,
+	})
+}

src/views/canteen/canteenSpu/index.vue

@@ -69,7 +69,7 @@
 						<dict-tag :options="spu_status" :value="scope.row.status" />
 					</template>
 				</el-table-column>
-        <el-table-column prop="isShow" label="是否在移动端显示" show-overflow-tooltip>
+        <el-table-column prop="isShow" label="是否在移动端显示 " show-overflow-tooltip>
           <template #default="scope">
             <dict-tag :options="is_show" :value="scope.row.isShow"></dict-tag>
           </template>

src/views/hard/hard-order/index.vue

@@ -3,16 +3,19 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 				<el-row>
-					<el-form-item style="width: 250px" label="用户" prop="userIds">
+					<el-form-item style="width: 300px" label="用户" prop="userIds">
 						<select-user v-model="state.queryForm.userIds" />
 					</el-form-item>
-					<el-form-item style="width: 220px" label="商户" prop="mchIds">
+					<el-form-item style="width: 300px" label="商户类型" prop="hardTypeCode">
+						<dict-select v-model="state.queryForm.hardTypeCode" dict-code="merchant_type" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="商户" prop="mchIds">
 						<select-mch v-model="state.queryForm.mchIds" />
 					</el-form-item>
 					<el-form-item style="width: 300px" label="用户部门" prop="deptId">
 						<select-dept v-model="state.queryForm.deptId" />
 					</el-form-item>
-					<el-form-item style="width: 200px" label="用餐时间段" prop="hourType">
+					<el-form-item style="width: 300px" label="用餐时间段" prop="hourType">
 						<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
 					</el-form-item>
 					<el-form-item style="width: 450px" label="创建时间" prop="payTimeList">
@@ -49,7 +52,7 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
 				@sort-change="sortChangeHandle"
-				show-summary
+				:show-summary="false"
 				:summary-method="getSummaries"
 			>
 				<el-table-column type="selection" width="60" align="center" />

src/views/wallet/mch-manage/index.vue

@@ -1,6 +1,28 @@
 <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>
+					<el-form-item style="width: 300px" label="商户名" prop="name">
+						<el-input v-model="state.queryForm.name" placeholder="商户名" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="商户类型" prop="types">
+						<dict-select v-model="state.queryForm.types" dict-code="merchant_type" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="是否显示在移动端" prop="visibleMobile">
+						<dict-select v-model="state.queryForm.visibleMobile" dict-code="yes_no_type" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="是否同步正元" prop="isSyncZy">
+						<dict-select v-model="state.queryForm.isSyncZy" dict-code="yes_no_type" />
+					</el-form-item>
+					<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%">
 					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_mchManage_add'">
@@ -134,7 +156,8 @@ import FormDialog from "./form.vue"
 import Setting from "./setting.vue"
 import { useUserInfo } from "/@/stores/userInfo"
 
-const { merchant_type, wallet_type } = useDict("merchant_type", "wallet_type")
+const { merchant_type, wallet_type, yes_no_type } = useDict("merchant_type", "wallet_type", "yes_no_type")
+
 // 定义变量内容
 const formDialogRef = ref()
 const settingDialogRef = ref()

src/views/wallet/rule-price-config/form.vue

@@ -0,0 +1,114 @@
+<template>
+	<el-dialog :title="form.id ? '编辑' : '新增'" width="30%" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="规则类型" prop="rulePriceType">
+						<dict-select v-model="form.rulePriceType" dict-code="wallet_rule_price_type" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="24" class="mb20">
+					<el-form-item label="基础金额" prop="basePrice">
+						<el-input-number v-model="form.basePrice" placeholder="请输入基础金额" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="24" class="mb20">
+					<el-form-item label="额外的倍数" prop="multiple">
+						<el-input-number v-model="form.multiple" 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="WalletRulePriceConfigDialog">
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/wallet/wallet-rule-price-config"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
+
+// 定义变量内容
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { wallet_rule_price_type } = useDict("wallet_rule_price_type")
+
+// 提交表单数据
+const form = reactive({
+	id: "",
+	rulePriceType: "",
+	basePrice: 20,
+	multiple: 0.5,
+})
+
+// 定义校验规则
+const dataRules = ref({
+	rulePriceType: { required: true, message: "规则类型", trigger: "blur" },
+	basePrice: { required: true, message: "基础金额", trigger: "blur" },
+	multiple: { required: true, message: "额外的倍数", trigger: "blur" },
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+	visible.value = true
+	form.id = ""
+
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
+
+	// 获取walletRulePriceConfig信息
+	if (id) {
+		form.id = id
+		getwalletRulePriceConfigData(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 getwalletRulePriceConfigData = (id: string) => {
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+
+// 暴露变量
+defineExpose({
+	openDialog,
+})
+</script>

src/views/wallet/rule-price-config/index.vue

@@ -0,0 +1,141 @@
+<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="'wallet_walletRulePriceConfig_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'wallet_walletRulePriceConfig_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'wallet_walletRulePriceConfig_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="id" label="主键" show-overflow-tooltip />
+				<el-table-column prop="rulePriceType" label="规则类型" show-overflow-tooltip>
+					<template #default="{ row }">
+						<dict-tag :options="wallet_rule_price_type" :value="row.rulePriceType" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="basePrice" label="基础金额" show-overflow-tooltip />
+				<el-table-column prop="multiple" label="金额的倍数必须大于1" show-overflow-tooltip />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'wallet_walletRulePriceConfig_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_walletRulePriceConfig_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="systemWalletRulePriceConfig">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/wallet/wallet-rule-price-config"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+// 定义查询字典
+const { wallet_rule_price_type } = useDict("wallet_rule_price_type")
+// 定义变量内容
+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: fetchList,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/wallet/walletRulePriceConfig/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRulePriceConfig.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>

src/views/wallet/wallet-cz/form.vue

@@ -1,96 +1,95 @@
 <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="会员钱包 id" prop="walletId">
-            <el-input v-model="form.walletId" placeholder="请输入会员钱包 id" />
-          </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-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="会员钱包 id" prop="walletId">
+						<el-input v-model="form.walletId" placeholder="请输入会员钱包 id" />
+					</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="WalletRechargeDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj } from "/@/api/wallet/wallet-recharge";
-import { rule } from '/@/utils/validate';
-const emit = defineEmits(['refresh']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/wallet/wallet-recharge"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-  id: '',
-  walletId: '',
-});
+	id: "",
+	walletId: "",
+})
 
 // 定义校验规则
-const dataRules = ref({
-})
+const dataRules = ref({})
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
-  nextTick(() => {
-    dataFormRef.value?.resetFields();
-  });
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取walletRecharge信息
-  if (id) {
-    form.id = id
-    getwalletRechargeData(id)
-  }
-};
+	// 获取walletRecharge信息
+	if (id) {
+		form.id = id
+		getwalletRechargeData(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 getwalletRechargeData = (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>
+	openDialog,
+})
+</script>

src/views/wallet/wallet-foreign/form.vue

@@ -1,127 +1,134 @@
 <template>
-  <el-dialog title="申请" v-model="visible" width="30%" :close-on-click-modal="false" draggable>
-    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="100px" v-loading="loading">
-      <el-row :gutter="24">
+	<el-dialog title="申请" v-model="visible" width="30%" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="100px" v-loading="loading">
+			<el-row :gutter="24">
+				<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="24" class="mb20">
-          <el-form-item label="申请人" prop="userId">
-            <select-user v-model="form.userId" />
-          </el-form-item>
-        </el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="申请数量" prop="count">
+						<el-input-number v-model="form.count" :min="1" :max="100" />
+					</el-form-item>
+				</el-col>
 
-        <el-col :span="24" class="mb20">
-          <el-form-item label="申请数量" prop="count">
-            <el-input-number v-model="form.count" :min="1" :max="100" />
-          </el-form-item>
-        </el-col>
+				<el-form-item label="申请有效期" prop="rangeDate">
+					<el-date-picker
+						v-model="form.rangeDate"
+						placeholder="请选择申请有效期"
+						type="daterange"
+						range-separator="至"
+						start-placeholder="开始日期"
+						end-placeholder="结束日期"
+						value-format="YYYY-MM-DD"
+						format="YYYY-MM-DD"
+					/>
+				</el-form-item>
 
-        <el-form-item label="申请有效期" prop="rangeDate">
-          <el-date-picker v-model="form.rangeDate" placeholder="请选择申请有效期" type="daterange" range-separator="至"
-            start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" format="YYYY-MM-DD" />
-        </el-form-item>
-
-        <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="WalletForeignDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/wallet/wallet-foreign'
-import { rule } from '/@/utils/validate';
-const emit = defineEmits(['refresh']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/wallet/wallet-foreign"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-  id: '',
-  userId: '',
-  count: '',
-  remark: '',
-  applyEndTime: '',
-  applyStartTime: '',
-  rangeDate: []
-});
+	id: "",
+	userId: "",
+	count: "",
+	remark: "",
+	applyEndTime: "",
+	applyStartTime: "",
+	rangeDate: [],
+})
 
 // 定义校验规则
 const dataRules = ref({
-  count: [{ required: true, message: '申请数量不能为空', trigger: 'blur' }],
-  userId: [{ required: true, message: '申请人id不能为空', trigger: 'blur' }],
-  rangeDate: [{ required: true, message: '申请人id不能为空', trigger: 'change' }],
+	count: [{ required: true, message: "申请数量不能为空", trigger: "blur" }],
+	userId: [{ required: true, message: "申请人id不能为空", trigger: "blur" }],
+	rangeDate: [{ required: true, message: "申请人id不能为空", trigger: "change" }],
 })
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
-  nextTick(() => {
-    dataFormRef.value?.resetFields();
-  });
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取walletForeign信息
-  if (id) {
-    form.id = id
-    getwalletForeignData(id)
-  }
-};
+	// 获取walletForeign信息
+	if (id) {
+		form.id = id
+		getwalletForeignData(id)
+	}
+}
 
 // 提交
 const onSubmit = async () => {
-  const valid = await dataFormRef.value.validate().catch(() => { });
-  if (!valid) return false;
-
-  try {
-    loading.value = true;
-    const pa: any = { ...form }
-    if (form.rangeDate && form.rangeDate.length) {
-      pa.applyStartTime = form.rangeDate[0]
-      pa.applyEndTime = form.rangeDate[1]
-    }
-    await addObj(pa);
-    useMessage().success('申请成功');
-    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
+		const pa: any = { ...form }
+		if (form.rangeDate && form.rangeDate.length) {
+			pa.applyStartTime = form.rangeDate[0]
+			pa.applyEndTime = form.rangeDate[1]
+		}
+		await addObj(pa)
+		useMessage().success("申请成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getwalletForeignData = (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>
+	openDialog,
+})
+</script>