Compare commits

..

No commits in common. "bdc3b4a780e6354ccd586a752d04939e0e9bdb9f" and "de428998199d1a542fb0014251d2a92d82d61215" have entirely different histories.

3 changed files with 10 additions and 10 deletions

View File

@ -8,7 +8,7 @@ export interface HyglVO {
userId: number // 申请人id
deptName: string // 申请部门名字
deptId: number // 申请部门id
time: number // 申请时间
time: Date // 申请时间
depict: string // 描述
type: number // 会议类型
theme: string // 会议主题

View File

@ -129,18 +129,18 @@ const formData = ref({
newsImg: [],
newsContent: undefined,
contentType: undefined,
newsStatus: '<p><br></p>',
newsStatus: undefined,
status: undefined,
deptId: undefined,
userId: undefined,
})
const formRules = reactive({
newsName: [{ required: true, message: '新闻名称不能为空', trigger: 'blur' }],
newsImg: [{ required: true, message: '轮换图片不能为空', trigger: 'blur' }],
newsContent: [{ required: true, message: '新闻内容不能为空', trigger: 'blur' }],
imgName: [{ required: true, message: '新闻名称不能为空', trigger: 'blur' }],
imgImg: [{ required: true, message: '轮换图片不能为空', trigger: 'blur' }],
imgContent: [{ required: true, message: '新闻内容不能为空', trigger: 'blur' }],
contentType: [{ required: true, message: '新闻分类不能为空', trigger: 'change' }],
newsStatus: [{ required: true, message: '新闻图片状态不能为空', trigger: 'change' }],
status: [{ required: true, message: '新闻状态不能为空', trigger: 'change' }],
imgStatus: [{ required: true, message: '新闻图片状态不能为空', trigger: 'change' }],
contentStatus: [{ required: true, message: '新闻状态不能为空', trigger: 'change' }],
})
const formRef = ref() // Ref
@ -198,7 +198,7 @@ const resetForm = () => {
newsName: undefined,
newsCreatetime: undefined,
newsImg: undefined,
newsContent: '<p><br></p>',
newsContent: undefined,
contentType: undefined,
newsStatus: undefined,
status: undefined,

View File

@ -121,7 +121,7 @@ const queryParamsHygl = reactive({
userId: undefined,
deptName: undefined,
deptId: undefined,
time: [] as string[],
time: [],
depict: undefined,
type: undefined,
theme: undefined,
@ -150,7 +150,7 @@ const getList = async () => {
listHygl.value = hyglData.list
for(let item of listHygl.value){
const formattedDate = formatDate2(item.time);
const formattedDate = formatDate2(item.createTime);
// holidays2[formattedDate]
if (!Array.isArray(holidays2[formattedDate])) {
holidays2[formattedDate] = [];