diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index efee05d..ca8bb1e 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -11,6 +11,11 @@ export const ProjectTypeEnums = { PACK_PRO: { name: '打包项目', value: 8 } } +// 会议类型 +export const MeetTypeEnums = { + safetyCenter: { name: '功能安全中心', value: '8' }, +} + // 参会人员身份类型 export const MeetIdentifyTypeEnums = { guest: { name: '嘉宾', index: 1 }, diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue b/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue new file mode 100644 index 0000000..e4ccc0e --- /dev/null +++ b/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue @@ -0,0 +1,348 @@ + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + 新增 + 批量删除 + + + + + + + + + + + {{ text }} + {{ text }} + + + + + + + + + 在研项目 + 其他分发资料 + 项目会议 + 复制 + 基本信息维护 + 删除 + + + + + + + + + + + + + diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue new file mode 100644 index 0000000..d656cc3 --- /dev/null +++ b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue @@ -0,0 +1,399 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + 新增 + + 导出 + + + 批量删除 + + 发布 + + + + + + + + + + + + + + + + + + + 会议纪要 + 上传文件 + + 编辑 + 删除 + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue b/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue new file mode 100644 index 0000000..c321039 --- /dev/null +++ b/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue @@ -0,0 +1,522 @@ + + + + + + 项目信息 + + + + + + {{ item.title }}: + + + + {{ detail[item.fieldName] }} + + + 任务及目标: + {{ detail.missionAndObjectives }} + + + 备注: + {{ detail.remarks }} + + + + + + + + + + 入会信息 + + + + + 报名链接:{{ showSignUpHref }} + + + 报名二维码:复制 + + + + + + + + + + 成员信息 + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + + 添加成员 + + + 导入 + + + 导出 + + 下载模板 + + + 批量删除 + + + + + + + + + + + + + + + + + {{ text }} + {{ text }} + + + + + 编辑 + 删除 + + + + + + + + + + + + + diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyUnderStudyProject.vue b/src/views/functionalSafetyCenter/FunctionalSafetyUnderStudyProject.vue new file mode 100644 index 0000000..d9f5b7c --- /dev/null +++ b/src/views/functionalSafetyCenter/FunctionalSafetyUnderStudyProject.vue @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + 新增 + 批量删除 + + + + + + + + + + + + + 编辑 + 删除 + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue b/src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue new file mode 100644 index 0000000..c034711 --- /dev/null +++ b/src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue @@ -0,0 +1,715 @@ + + + + + + + + + + + + + {{ item.projectName }} + + + + + + 添加 + 删除 + + + + + + + + + + + + + + + + + + + + + + {e.target.value = (e.target.value + '').trim()}"> + + + + + 添加 + 删除 + + + + + + + {e.target.value = (e.target.value + '').trim()}"/> + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue b/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue new file mode 100644 index 0000000..6774cc2 --- /dev/null +++ b/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue @@ -0,0 +1,202 @@ + + + + + + + + {e.target.value = (e.target.value + '').trim()}"> + + + + + + + + + + + + + + {e.target.value = (e.target.value + '').trim()}"/> + + + + + + + {e.target.value = (e.target.value + '').trim()}"/> + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/functionalSafetyCenter/modules/SafetyCenterUnderStudyProjectModal.vue b/src/views/functionalSafetyCenter/modules/SafetyCenterUnderStudyProjectModal.vue new file mode 100644 index 0000000..a9c6c21 --- /dev/null +++ b/src/views/functionalSafetyCenter/modules/SafetyCenterUnderStudyProjectModal.vue @@ -0,0 +1,183 @@ + + + + + + + + {e.target.value = (e.target.value + '').trim()}"> + + + + + + + {e.target.value = (e.target.value + '').trim()}"> + + + + + {e.target.value = (e.target.value + '').trim()}"> + + + + + + + + + 最多只能添加20个文件,如果文件过多,请打包上传 + + + + + + + + + + + diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 90732de..2258347 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -630,7 +630,7 @@ import JImageUpload from '@comp/jero/JImageUpload' import {checkMeetingName} from '@/utils/validateOnly' import {addZero} from '@/utils/util' import {money, phoneReg} from '@/utils/validate' -import { LinkTopicsEnums } from '../../../enums/commonEnums' +import {LinkTopicsEnums, MeetTypeEnums} from '../../../enums/commonEnums' export default { @@ -802,6 +802,14 @@ export default { } else { return false } + }, + // 是否应用安全中心来的 + isSafetyCenterId() { + if (this.$route.query.safetyCenterId) { + return true + } else { + return false + } } }, mounted() { @@ -922,8 +930,8 @@ export default { // 后端需要的注册签到时间 this.newSignInTime = [this.model.startSignInTime, this.model.endSignInTime] - // 起草组会议费用默认0 - if (this.meetingType === '7') { + // 起草组会议费用默认0 (功能安全中心同起草组) + if (this.meetingType === '7' || this.meetingType === MeetTypeEnums.safetyCenter.value) { this.model.meetingCosts = '0.00' this.QRcodeBool = false } @@ -1039,6 +1047,11 @@ export default { formData.meetingType = '7' formData.draftingGroupId = this.$route.query.draftingGroupProjectId } + // 如果是 应用安全中心 来的加上id和会议类型 + if (this.isSafetyCenterId) { + formData.meetingType = MeetTypeEnums.safetyCenter.value + formData.projectId = this.$route.query.safetyCenterId + } // 转换召开时间 formData.startTime = this.newConvokeTime[0] formData.endTime = this.newConvokeTime[1] diff --git a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue index 518697f..0ed6da5 100644 --- a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue @@ -184,6 +184,11 @@ export default { this.canOperate = this.$route.query.canOperate === 'true' this.projectType = 4 this.filters.projectType = 4 + } else if (this.$route.query.hasOwnProperty.call(this.$route.query, 'safetyCenterId')) { + // 功能安全中心 + this.filters.projectId = this.$route.query.safetyCenterId + this.projectType = 5 + this.filters.projectType = 5 } this.projectId = this.filters.projectId this.loadData()