yudao-team/oa-ui
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pancaihua 2024-11-18 15:36:57 +08:00
commit 2c27b76273
6 changed files with 57 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/home/hygl/index.ts
View File

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

14
src/views/Home/homeimg/imgForm.vue
View File

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

29
src/views/Home/hygl/hyinfo/index.vue
View File

@ -1,10 +1,15 @@
<template>
<ContentWrap>
<el-button-group style="display: flex; justify-content: space-between;">
<el-button size="large" @click="selectDate(-1)">上月</el-button>
<el-button size="large" @click="today()">今天</el-button>
<el-button size="large" @click="selectDate(1)">下月</el-button>
</el-button-group>
<el-form-item label="会议申请历史" prop="createTime"/>
<el-calendar
ref="calendar"
class="custom-calendar"
:model-value="new Date()"
:model-value="new Date(currentYear,currentMonth,currentDay)"
>
<template #header="{ date }">
<el-row>
@ -44,6 +49,21 @@ import HyInfoForm from "@/views/Home/hygl/hyinfo/HyInfoForm.vue";
defineOptions({ name: 'HyInfo' })
const currentDay = ref(new Date().getDate()) // 获取当前天份
const currentMonth = ref(new Date().getMonth()) // 获取当前年份
const currentYear = ref(new Date().getFullYear()) // 获取当前年份
//改变月份
const selectDate = (val:number) => {
if (!val){
return
}
currentMonth.value+=val
console.log("today",currentYear.value,currentMonth.value,currentDay.value)
}
//回到今天
const today = () => {
currentMonth.value = new Date().getMonth() // 获取当前月份
}
/** 添加/修改操作 */
const formRef = ref()
//根据id获取数据
@ -101,7 +121,7 @@ const queryParamsHygl = reactive({
userId: undefined,
deptName: undefined,
deptId: undefined,
time: [],
time: [] as string[],
depict: undefined,
type: undefined,
theme: undefined,
@ -129,10 +149,8 @@ const getList = async () => {
const hyglData = await HyglApi.getHyglPage(queryParamsHygl)
listHygl.value = hyglData.list
for(let item of listHygl.value){
const formattedDate = formatDate2(item.createTime);
const formattedDate = formatDate2(item.time);
// 如果 holidays2[formattedDate] 不存在或不是数组，初始化为数组
if (!Array.isArray(holidays2[formattedDate])) {
holidays2[formattedDate] = [];
@ -140,6 +158,7 @@ const getList = async () => {
// 将 title 添加到数组中
holidays2[formattedDate].push({id:item.id,title:item.title});
}
// console.log("holidays2",holidays2)
} finally {
}
}

15
src/views/Home/rcgl/RcglForm.vue
View File

@ -13,7 +13,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="日程状态" prop="status">
<el-select v-model="formData.status" placeholder="请选择日程状态类型">
<el-select v-model="formData.status" placeholder="请选择日程状态">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.RCGL_RC_STATUS)"
:key="dict.value"
@ -37,14 +37,6 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="开始日期" prop="date">
<el-date-picker
v-model="formData.date"
type="date"
value-format="x"
placeholder="选择开始日期"
/>
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="预计开始时间" prop="startTime">
@ -107,7 +99,7 @@ const formData = ref({
title: undefined,
location: undefined,
videoLink: undefined,
content: undefined,
content: "<p><br></p>",
date: undefined,
startTime: undefined,
endTime: undefined,
@ -117,7 +109,6 @@ const formData = ref({
})
const formRules = reactive({
title: [{ required: true, message: '日程标题不能为空', trigger: 'blur' }],
date: [{ required: true, message: '开始日期不能为空', trigger: 'blur' }],
startTime: [{ required: true, message: '日程开始时间不能为空', trigger: 'blur' }],
ispublic: [{ required: true, message: '日程是否公开不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '日程结束时间不能为空', trigger: 'blur' }],
@ -186,7 +177,7 @@ const resetForm = () => {
title: undefined,
location: undefined,
videoLink: undefined,
content: undefined,
content: "<p><br></p>",
date: undefined,
startTime: undefined,
endTime: undefined,

2
src/views/Home/rcgl/index.vue
View File

@ -138,7 +138,7 @@
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="序号" align="center" type="index" width="70" />
<el-table-column label="日程标题" align="center" prop="title" />
<el-table-column label="日程地点" align="center" prop="location" />
<!-- <el-table-column label="日程地点" align="center" prop="location" />-->
<!-- <el-table-column label="日程相关链接" align="center" prop="videoLink" />-->
<!-- <el-table-column label="日程内容" align="center" prop="content" />-->
<el-table-column

22
src/views/Home/rcgl/rcglInfo/index.vue
View File

@ -1,10 +1,15 @@
<template>
<ContentWrap>
<el-button-group style="display: flex; justify-content: space-between;">
<el-button size="large" @click="selectDate(-1)">上月</el-button>
<el-button size="large" @click="today()">今天</el-button>
<el-button size="large" @click="selectDate(1)">下月</el-button>
</el-button-group>
<el-form-item label="领导日程展示" prop="createTime"/>
<el-calendar
ref="calendar"
class="custom-calendar"
:model-value="new Date()"
:model-value="new Date(currentYear,currentMonth,currentDay)"
>
<template #header="{ date }">
<el-row>
@ -62,6 +67,21 @@ const queryParamsRcgl = reactive({
createTime: [] as string[],
})
const currentDay = ref(new Date().getDate()) // 获取当前天份
const currentMonth = ref(new Date().getMonth()) // 获取当前年份
const currentYear = ref(new Date().getFullYear()) // 获取当前年份
//改变月份
const selectDate = (val:number) => {
if (!val){
return
}
currentMonth.value+=val
console.log("today",currentYear.value,currentMonth.value,currentDay.value)
}
//回到今天
const today = () => {
currentMonth.value = new Date().getMonth() // 获取当前月份
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (id: number) => {