食堂的所有表单校验修改
This commit is contained in:
1 parent
8af084c695
commit
7f09bed91d
9 files changed
+395
-341
No files matched your search
@@ -1,180 +1,187 @@
|
||||
<template>
|
||||
<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-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="24" class="mb20">
|
||||
<el-form-item label="商户名" prop="name">
|
||||
<el-input v-model.trim="form.name" placeholder="请输入商户名" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="商户名" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入商户名" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="部门" prop="deptId">
|
||||
<select-dept v-model="form.deptId" placeholder="请选择部门" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="部门" prop="deptId">
|
||||
<select-dept v-model="form.deptId" placeholder="请选择部门" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="商户类型" prop="merchantType">
|
||||
<el-checkbox-group v-model="form.merchantType">
|
||||
<el-checkbox :label="item.value" v-for="(item, index) in merchant_type" border :key="index">
|
||||
{{ item.label }}
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="商户类型" prop="merchantType">
|
||||
<el-checkbox-group v-model="form.merchantType">
|
||||
<el-checkbox :label="item.value" v-for="(item, index) in merchant_type" border :key="index">
|
||||
{{ item.label }}
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="商户logo" prop="logoPic">
|
||||
<upload-img v-model:imageUrl="form.logoPic"></upload-img>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="商户logo" prop="logoPic">
|
||||
<upload-img v-model:imageUrl="form.logoPic"></upload-img>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="轮播图" prop="swiperPic">
|
||||
<upload-imgs v-model:imageUrls="form.swiperPic" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="轮播图" prop="swiperPic">
|
||||
<upload-imgs v-model:imageUrls="form.swiperPic" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="联系电话" prop="phone">
|
||||
<el-input v-model.trim="form.phone" placeholder="请输入联系电话" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="联系电话" prop="phone">
|
||||
<el-input v-model="form.phone" placeholder="请输入联系电话" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="营业时间" prop="rangeDate">
|
||||
<el-time-picker
|
||||
v-model="form.rangeDate"
|
||||
placeholder="请选择营业时间"
|
||||
is-range
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
value-format="HH:mm"
|
||||
format="HH:mm"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="营业时间" prop="rangeDate">
|
||||
<el-time-picker v-model="form.rangeDate" placeholder="请选择营业时间" is-range range-separator="至"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期" value-format="HH:mm" format="HH:mm" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="店铺地址" prop="address">
|
||||
<el-input type="textarea" v-model="form.address" 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>
|
||||
<el-col :span="24" class="mb20">
|
||||
<el-form-item label="店铺地址" prop="address">
|
||||
<el-input type="textarea" v-model.trim="form.address" 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="MerchantInfoDialog">
|
||||
import { useDict } from '/@/hooks/dict';
|
||||
import { useMessage } from "/@/hooks/message";
|
||||
import { getObj, addObj, putObj } from '/@/api/wallet/mch-manage'
|
||||
import { rule } from '/@/utils/validate';
|
||||
import { parseTime } from '/@/utils/formatTime'
|
||||
const emit = defineEmits(['refresh']);
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
import { useMessage } from "/@/hooks/message"
|
||||
import { getObj, addObj, putObj } from "/@/api/wallet/mch-manage"
|
||||
import { rule } from "/@/utils/validate"
|
||||
import { parseTime } from "/@/utils/formatTime"
|
||||
const emit = defineEmits(["refresh"])
|
||||
|
||||
// 定义变量内容
|
||||
const dataFormRef = ref();
|
||||
const dataFormRef = ref()
|
||||
const visible = ref(false)
|
||||
const loading = ref(false)
|
||||
//定义业务变量内容
|
||||
|
||||
// 定义字典
|
||||
const { merchant_type } = useDict('merchant_type')
|
||||
const { merchant_type } = useDict("merchant_type")
|
||||
|
||||
// 提交表单数据
|
||||
const form = reactive({
|
||||
id: '',
|
||||
deptId: '',
|
||||
name: '',
|
||||
merchantType: [],
|
||||
logoPic: '',
|
||||
collectMoneyCode: '',
|
||||
swiperPic: [],
|
||||
phone: '',
|
||||
businessTime: '',
|
||||
address: '',
|
||||
jobStartTime: '',
|
||||
jobEndTime: '',
|
||||
rangeDate: [],
|
||||
});
|
||||
id: "",
|
||||
deptId: "",
|
||||
name: "",
|
||||
merchantType: [],
|
||||
logoPic: "",
|
||||
collectMoneyCode: "",
|
||||
swiperPic: [],
|
||||
phone: "",
|
||||
businessTime: "",
|
||||
address: "",
|
||||
jobStartTime: "",
|
||||
jobEndTime: "",
|
||||
rangeDate: [],
|
||||
})
|
||||
|
||||
// 定义校验规则
|
||||
const dataRules = ref({
|
||||
name: [{ required: true, message: '商户名不能为空', trigger: 'blur' }],
|
||||
types: [{ required: true, message: '请选择商户类型', trigger: 'change' }],
|
||||
logoPic: [{ required: true, message: '请上传商户logo', trigger: 'change' }],
|
||||
swiperPic: [{ required: true, message: '请上传商户轮播图', trigger: 'change' }],
|
||||
rangeDate: [{ required: true, message: '请选择营业时间', trigger: 'change' }],
|
||||
deptId: [{ required: true, message: '请选择部门', trigger: 'change' }],
|
||||
merchantType: [{ required: true, message: '请选择商户类型', trigger: 'change' }],
|
||||
name: [{ required: true, message: "商户名不能为空", trigger: "blur" }],
|
||||
types: [{ required: true, message: "请选择商户类型", trigger: "change" }],
|
||||
logoPic: [{ required: true, message: "请上传商户logo", trigger: "change" }],
|
||||
swiperPic: [{ required: true, message: "请上传商户轮播图", trigger: "change" }],
|
||||
rangeDate: [{ required: true, message: "请选择营业时间", trigger: "change" }],
|
||||
deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
|
||||
merchantType: [{ required: true, message: "请选择商户类型", trigger: "change" }],
|
||||
})
|
||||
|
||||
// 打开弹窗
|
||||
const openDialog = (id: string) => {
|
||||
visible.value = true
|
||||
form.id = ''
|
||||
visible.value = true
|
||||
form.id = ""
|
||||
|
||||
// 重置表单数据
|
||||
nextTick(() => {
|
||||
dataFormRef.value?.resetFields();
|
||||
});
|
||||
// 重置表单数据
|
||||
nextTick(() => {
|
||||
dataFormRef.value?.resetFields()
|
||||
})
|
||||
|
||||
// 获取merchantInfo信息
|
||||
if (id) {
|
||||
form.id = id
|
||||
getmerchantInfoData(id)
|
||||
}
|
||||
};
|
||||
// 获取merchantInfo信息
|
||||
if (id) {
|
||||
form.id = id
|
||||
getmerchantInfoData(id)
|
||||
}
|
||||
}
|
||||
|
||||
const parseDate = (timeString: string) => {
|
||||
const now = new Date();
|
||||
const [hours, minutes] = timeString.split(":").map(Number)
|
||||
now.setHours(hours)
|
||||
now.setMinutes(minutes)
|
||||
now.setSeconds(0)
|
||||
now.setMilliseconds(0)
|
||||
return parseTime(now, "{h}:{i}:{s}")
|
||||
const now = new Date()
|
||||
const [hours, minutes] = timeString.split(":").map(Number)
|
||||
now.setHours(hours)
|
||||
now.setMinutes(minutes)
|
||||
now.setSeconds(0)
|
||||
now.setMilliseconds(0)
|
||||
return parseTime(now, "{h}:{i}:{s}")
|
||||
}
|
||||
|
||||
// 提交
|
||||
const onSubmit = async () => {
|
||||
const valid = await dataFormRef.value.validate().catch(() => { });
|
||||
if (!valid) return false;
|
||||
const _pa = { ...form, types: form.merchantType.join(",") }
|
||||
if (_pa.rangeDate && _pa.rangeDate.length) {
|
||||
_pa.jobStartTime = parseDate(_pa.rangeDate[0])
|
||||
_pa.jobEndTime = parseDate(_pa.rangeDate[1])
|
||||
}
|
||||
try {
|
||||
loading.value = true;
|
||||
form.id ? await putObj(form) : await addObj(_pa);
|
||||
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
|
||||
const _pa = { ...form, types: form.merchantType.join(",") }
|
||||
if (_pa.rangeDate && _pa.rangeDate.length) {
|
||||
_pa.jobStartTime = parseDate(_pa.rangeDate[0])
|
||||
_pa.jobEndTime = parseDate(_pa.rangeDate[1])
|
||||
}
|
||||
try {
|
||||
loading.value = true
|
||||
form.id ? await putObj(form) : await addObj(_pa)
|
||||
useMessage().success(form.id ? "修改成功" : "添加成功")
|
||||
visible.value = false
|
||||
emit("refresh")
|
||||
} catch (err: any) {
|
||||
useMessage().error(err.msg)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// 初始化表单数据
|
||||
const getmerchantInfoData = (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, { merchantType: res.data.types.split(",") })
|
||||
})
|
||||
.finally(() => {
|
||||
loading.value = false
|
||||
})
|
||||
}
|
||||
|
||||
// 暴露变量
|
||||
defineExpose({
|
||||
openDialog
|
||||
});
|
||||
openDialog,
|
||||
})
|
||||
</script>
|
||||
@@ -20,7 +20,7 @@
|
||||
v-auth="'wallet_mchManage_del'"
|
||||
@click="handleDelete(selectObjs)"
|
||||
>
|
||||
删除
|
||||
删 除
|
||||
</el-button>
|
||||
<right-toolbar
|
||||
v-model:showSearch="showSearch"
|
||||
@@ -44,7 +44,7 @@
|
||||
<el-table-column type="selection" width="40" align="center" />
|
||||
<el-table-column type="index" label="#" width="40" />
|
||||
<el-table-column prop="name" label="商户名" />
|
||||
<el-table-column prop="logoPic" label="log">
|
||||
<el-table-column prop="logoPic" label="logo">
|
||||
<template #default="{ row }">
|
||||
<preview-image :src="row.logoPic" />
|
||||
</template>
|
||||
@@ -54,7 +54,7 @@
|
||||
<preview-image :src="row.collectionCode" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip>
|
||||
<el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip :min-width="160">
|
||||
<template #default="{ row }">
|
||||
<div class="flex justify-center items-center">
|
||||
<div v-for="(v, i) in row.types.split(',')" :key="i" class="mr-1">
|
||||
@@ -65,7 +65,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="deptName" label="部门" />
|
||||
<el-table-column prop="phone" label="联系电话" show-overflow-tooltip />
|
||||
<el-table-column prop="businessTime" label="结束营业时间" show-overflow-tooltip>
|
||||
<el-table-column prop="businessTime" label="结束营业时间" show-overflow-tooltip :min-width="160">
|
||||
<template #default="{ row }">
|
||||
<div>
|
||||
<span>{{ row.jobStartTime }}</span>
|
||||
@@ -74,7 +74,7 @@
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
|
||||
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip :min-width="160" />
|
||||
<el-table-column label="操作" width="150">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
|
||||
Reference in new issue
Block a user