From 7ed658f9d80f79109ec67481b5d33deac6d995b8 Mon Sep 17 00:00:00 2001 From: danshihao Date: Wed, 19 Jun 2024 11:22:45 +0800 Subject: [PATCH 01/30] =?UTF-8?q?[add=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83]=20=E5=9F=BA=E7=A1=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/commonEnums.js | 5 + .../FunctionalSafetyCenter.vue | 348 +++++++++ .../FunctionalSafetyConferenceMaintenance.vue | 399 ++++++++++ .../FunctionalSafetyMemberUnitMaintenance.vue | 522 +++++++++++++ .../FunctionalSafetyUnderStudyProject.vue | 178 +++++ .../modules/SafetyCenterMemberUnitModule.vue | 715 ++++++++++++++++++ .../modules/SafetyCenterModule.vue | 202 +++++ .../SafetyCenterUnderStudyProjectModal.vue | 183 +++++ .../meetManage/AddOrDetailMeet.vue | 19 +- .../WorkingGroupProjectDataMaintenance.vue | 5 + 10 files changed, 2573 insertions(+), 3 deletions(-) create mode 100644 src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue create mode 100644 src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue create mode 100644 src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue create mode 100644 src/views/functionalSafetyCenter/FunctionalSafetyUnderStudyProject.vue create mode 100644 src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue create mode 100644 src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue create mode 100644 src/views/functionalSafetyCenter/modules/SafetyCenterUnderStudyProjectModal.vue 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 @@ + + + + + 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 @@ + + + + + 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 @@ + + + + + \ 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 @@ + + + + + \ 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 @@ + + + + + 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() From b1d1ecde9b39bae901dac6b86aee69a05fb0c1d7 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 1 Jul 2024 17:42:56 +0800 Subject: [PATCH 02/30] =?UTF-8?q?[update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83]=20=E5=88=97=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/incomePaymentsApi.js | 8 +- src/enums/commonEnums.js | 28 +- .../FunctionalSafetyCenter.vue | 75 +--- .../FunctionalSafetyConferenceMaintenance.vue | 6 +- .../FunctionalSafetyMemberUnitMaintenance.vue | 194 +-------- .../FunctionalSafetyUnderStudyProject.vue | 178 --------- .../modules/SafetyCenterMemberUnitModule.vue | 376 ++---------------- .../modules/SafetyCenterModule.vue | 6 +- .../SafetyCenterUnderStudyProjectModal.vue | 183 --------- 9 files changed, 113 insertions(+), 941 deletions(-) delete mode 100644 src/views/functionalSafetyCenter/FunctionalSafetyUnderStudyProject.vue delete mode 100644 src/views/functionalSafetyCenter/modules/SafetyCenterUnderStudyProjectModal.vue diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index a03e814..9236aa1 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -170,6 +170,10 @@ const updatePackageEnterprise = (params) => postAction('/company/payCompanyManag // 判断是否打包企业 const judgeCompanyIsPackaged = (params) => getAction('/company/payCompanyManagement/judgeCompanyIsPackaged', params) +// 2024年6月变更 功能安全中心 +// 通过id获取功能安全中心详情 +const getSafetyCenterById = (params) => getAction('/SafetyCenter/queryById', params) + export { getWorkingGroupById, getChargeNotice, @@ -257,5 +261,7 @@ export { workingGroupEditAccount, getAllDraftProjects, updatePackageEnterprise, - judgeCompanyIsPackaged + judgeCompanyIsPackaged, + + getSafetyCenterById } diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index ca8bb1e..4b00b16 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -8,12 +8,8 @@ export const ProjectTypeEnums = { STANDARD_MEMBER_PRO: {name: '标协会员项目', value: 5}, STANDARD_CERTIFICATE_PRO: {name: '标协证书项目', value: 6}, DRAFT_PRO: {name: '起草组项目', value: 7}, - PACK_PRO: { name: '打包项目', value: 8 } -} - -// 会议类型 -export const MeetTypeEnums = { - safetyCenter: { name: '功能安全中心', value: '8' }, + PACK_PRO: { name: '打包项目', value: 8 }, + SAFETY_CENTER_PRO: { name: '功能安全中心项目', value: 9 } } // 参会人员身份类型 @@ -67,4 +63,24 @@ export const PayMode = { remittance: { name: '汇款', value: 1 }, onSitePayment: { name: '现场缴费', value: 2 }, pack: { name: '打包', value: 3 }, +} + +// 会议类型 +export const MeetingTypeEnums = { + workGroup: { name: '工作组会议', value: '1' }, + standard: { name: '标协会议', value: '2' }, + internationalSeminar: { name: '国际研讨会', value: '3' }, + other: { name: '其他会议', value: '4' }, + committee: { name: '分标委会议', value: '5' }, + council: { name: '理事会会议', value: '6' }, + draftGroup: { name: '起草会会议', value: '7' }, + overseas: { name: '海外会议', value: '8' }, + safetyCenter: { name: '功能安全中心会议', value: '9' } +} + +// 功能安全中心-项目类型 +export const SafetyCenterProjectTypeEnums = { + safetyCenter: { name: '功能安全中心', value: '1' }, + studyGroup: { name: '研究组', value: '2' }, + projectGroup: { name: '项目组', value: '3' } } \ No newline at end of file diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue b/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue index e4ccc0e..cc9cae8 100644 --- a/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue +++ b/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue @@ -1,6 +1,7 @@ - 在研项目 + + 在研项目 其他分发资料 项目会议 - 复制 + 基本信息维护 - 删除 + 删除 @@ -85,10 +89,9 @@ import { JeroListMixin } from '@/mixins/JeroListMixin' import SelectPrincipal from '@comp/company/SelectPrincipal' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' import IconDraftingGruop from '@/assets/imgs/icon/icon_drafting_group.png' -import {copyDraftingGroup} from '@api/incomePaymentsApi' import { getAction } from '@api/manage' import SafetyCenterModule from '@views/functionalSafetyCenter/modules/SafetyCenterModule' -import {MeetTypeEnums} from '@/enums/commonEnums' +import {MeetingTypeEnums, SafetyCenterProjectTypeEnums} from '@/enums/commonEnums' export default { name: 'FunctionalSafetyCenter', @@ -96,6 +99,7 @@ export default { mixins: [JeroListMixin], data() { return { + SafetyCenterProjectTypeEnums, IconDraftingGruop, labelCol: { xs: { span: 24 }, @@ -106,9 +110,9 @@ export default { sm: { span: 10 } }, url: { - list: '/FunctionalSafetyCenter/page', - delete: '/FunctionalSafetyCenter/delete', - deleteBatch: '/FunctionalSafetyCenter/deleteBatch' + list: '/SafetyCenter/page', + delete: '/SafetyCenter/delete', + deleteBatch: '/SafetyCenter/deleteBatch' }, columns: [ { @@ -140,8 +144,7 @@ export default { } ], queryParam: {}, - lastQueryParam: {}, - operateData: [] // 进行操作权限校验时使用的数据 + lastQueryParam: {} } }, methods: { @@ -174,36 +177,8 @@ export default { } }).finally(() => { this.loading = false - // 判断登录用户是否为负责人B 2021-10-13：修改为后端在列表字段返回checkoutOperation字段控制，1--可操作，2--不可操作 - // if (this.dataSource.length > 0) { - // for (let index = 0; index < this.dataSource.length; index++) { - // this.checkWorkingGroupPrincipal(index).then((res) => { - // res.showOperate = true - // this.$set(this.dataSource, index, res) - // }) - // } - // } }) }, - /** - * 判断登录用户是否为负责人B - */ - // checkWorkingGroupPrincipal(index) { - // let item = this.dataSource[index] - // // （负责人B不可操作） - // return new Promise(resolve => { - // checkoutWorkingGroupPrincipal({ id: item.id }).then(res => { - // // 不可操作则置否 - // if (res.success) { - // item.canOperate = true - // } else { - // item.canOperate = false - // } - // }).finally(() => { - // resolve(item) - // }) - // }) - // }, /** * 文件维护 * @param record @@ -229,25 +204,10 @@ export default { projectName: record.projectName, projectId: record.id, canOperate: true, - meetingType: MeetTypeEnums.safetyCenter.value + meetingType: MeetingTypeEnums.safetyCenter.value } }) }, - /** - * 复制 - * @param id - */ - handleCopy (id) { - copyDraftingGroup({ id: id }).then(res => { - if (res.success) { - this.$message.success(res.message) - } else { - this.$message.warn(res.message) - } - }).finally(() => { - this.loadData() - }) - }, /** * 成员维护 * @param record @@ -275,9 +235,10 @@ export default { * 在研项目 * @param record */ - sgoUnderStudyProject(record) { + goUnderStudyProject(record) { + console.log(record) this.$router.push({ - path: '/functionalSafetyCenter/FunctionalSafetyUnderStudyProject', + path: '/functionalSafetyCenter', query: { title: record.projectName, id: record.id diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue index d656cc3..4e78634 100644 --- a/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue +++ b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue @@ -139,7 +139,7 @@ import PublishRemindModal from '@views/projectManagement/modules/PublishRemindMo import UploadMeetFileModal from '@views/incomePayments/meetManage/modules/UploadMeetFileModal' import '@/assets/less/TableExpand.less' import PageHeaderTitle from '../../components/layouts/PageHeaderTitle' -import {MeetTypeEnums} from '@/enums/commonEnums' +import {MeetingTypeEnums} from '@/enums/commonEnums' export default { name: 'FunctionalSafetyCenterConferenceMaintenance', @@ -281,7 +281,7 @@ export default { path: '/incomePayments/meetManage/AddOrDetailMeet', query: { safetyCenterId: currentId, - meetingType: MeetTypeEnums.safetyCenter.value + meetingType: MeetingTypeEnums.safetyCenter.value } }) }, @@ -336,7 +336,7 @@ export default { query: { id: record.id, meetingName: record.meetingName, - meetingType: MeetTypeEnums.safetyCenter.value + meetingType: MeetingTypeEnums.safetyCenter.value } }) }, diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue b/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue index c321039..acdf6c2 100644 --- a/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue +++ b/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue @@ -5,7 +5,7 @@
项目信息
- +
- - - - - -
-
入会信息
-
- - - - {{ showSignUpHref }} - - - 报名二维码复制 - - - - + @@ -60,7 +41,7 @@ - @@ -92,10 +73,10 @@ v-if="canOperate"> 导入 - + 导出 - 下载模板 @@ -121,7 +102,7 @@ @change="handleTableChange" class="j-table-force-nowrap"> - + @@ -152,12 +133,11 @@ diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyUnderStudyProject.vue b/src/views/functionalSafetyCenter/FunctionalSafetyUnderStudyProject.vue deleted file mode 100644 index d9f5b7c..0000000 --- a/src/views/functionalSafetyCenter/FunctionalSafetyUnderStudyProject.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue b/src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue index c034711..6e3e9e4 100644 --- a/src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue +++ b/src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue @@ -10,32 +10,6 @@ cancelText="关闭"> - - @@ -49,13 +23,13 @@ @@ -138,7 +139,7 @@ import ProjectDetailModal from '../../components/ProjectDetailModal' import Vue from 'vue' import { ACCESS_TOKEN } from '@/store/mutation-types' import PreviewFile from '../../components/jero/PreviewFile' -import { ProjectTypeEnums } from '@/enums/commonEnums' +import {ProjectTypeEnums, SafetyCenterProjectTypeEnums} from '@/enums/commonEnums' import SafetyCenterMemberUnitModule from '@views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule' @@ -157,6 +158,10 @@ export default { computed: { importExcelUrl: function () { return `${ window._CONFIG['domianURL'] }/${ this.url.importExcelUrl }` + }, + // projectType是否功能安全中心， 1功能安全中心 2研究组 3项目组 + isSafetyCenter () { + return this.detail.projectType + '' === SafetyCenterProjectTypeEnums.safetyCenter.value } }, data() { diff --git a/src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue b/src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue index a6abf79..e67eefe 100644 --- a/src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue +++ b/src/views/functionalSafetyCenter/modules/SafetyCenterMemberUnitModule.vue @@ -17,6 +17,8 @@ v-decorator="['chargeCompany',validatorRules.chargeCompany]" :disabled="disabledCompany" @change="companyChange" + :customListUrl="isSafetyCenter ? '' : companyList" + :customListParams="isSafetyCenter ? {} : customListParams" :maxLength='50'> @@ -32,6 +34,8 @@ v-decorator="[`contactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]" :maxLength='50' :ref="`selectContacts${index}`" + :customListFn="isSafetyCenter ? null : getContactsByCompanyBySafetyCenter" + :customListParams="isSafetyCenter ? {} : customListParams" @ok="addContactsOneOk"> @@ -77,11 +81,20 @@ import SelectContacts from '@comp/company/SelectContacts' import {getAllDraftProjects} from '@api/incomePaymentsApi' import { addZero } from '@/utils/util' import { CalcAmountMixin } from '@/mixins/CalcAmountMixin' +import {getContactsByCompanyBySafetyCenter} from '@api/api' export default { name: 'SafetyCenterMemberUnitModule', components: { CompanySelect, SelectContacts }, mixins: [CalcAmountMixin], + props: { + // 是否安全中心，控制添加成员 只能选择上级的成员还是选择全部 + isSafetyCenter: { + type: Boolean, + default: false, + required: false, + } + }, data() { return { title: '操作', @@ -132,6 +145,12 @@ export default { add: '/SafetyCenterSubitem/add', edit: '/SafetyCenterSubitem/edit' }, + // 成员单位列表（只能选上级选过的） + companyList: '/company/payCompanyManagement/listSafetyCenter', + // 需要带上当前项目id + customListParams: { + projectId: this.$route.query.projectId + }, // 默认的联系人数据 defaultPayWorkingGroupSubItemContact: { contactsId: undefined, @@ -142,6 +161,7 @@ export default { }, methods: { addZero, + getContactsByCompanyBySafetyCenter, add() { this.edit({}) }, From caa5a4a27fb1fd16b5d40ec67d0b393c9b52d409 Mon Sep 17 00:00:00 2001 From: danshihao Date: Tue, 2 Jul 2024 14:05:29 +0800 Subject: [PATCH 06/30] =?UTF-8?q?[update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83]=20=E6=88=90=E5=91=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FunctionalSafetyMemberUnitMaintenance.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue b/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue index 55d94a0..cff4013 100644 --- a/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue +++ b/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue @@ -41,7 +41,7 @@ - From 53449cb8433e6bcfdfbe91ac10f21a863b86e7a4 Mon Sep 17 00:00:00 2001 From: danshihao Date: Tue, 2 Jul 2024 14:59:46 +0800 Subject: [PATCH 07/30] =?UTF-8?q?[update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E4=BC=9A=E8=AE=AE=E7=9B=B8=E5=85=B3?= =?UTF-8?q?]=20=E9=9C=80=E8=A6=81=E5=90=8E=E7=BB=AD=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meetManage/AddOrDetailMeet.vue | 12 ++++++-- .../incomePayments/meetManage/Attendance.vue | 30 +++++++++++++++++++ .../meetManage/SignUpInfoEdit.vue | 9 +++++- .../modules/UploadMeetFileModal.vue | 7 +++++ .../projectManagement/AllMeetingList.vue | 3 ++ 5 files changed, 57 insertions(+), 4 deletions(-) diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 2258347..2f31ba4 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, MeetTypeEnums} from '../../../enums/commonEnums' +import {LinkTopicsEnums, MeetingTypeEnums} from '../../../enums/commonEnums' export default { @@ -931,7 +931,7 @@ export default { this.newSignInTime = [this.model.startSignInTime, this.model.endSignInTime] // 起草组会议费用默认0 (功能安全中心同起草组) - if (this.meetingType === '7' || this.meetingType === MeetTypeEnums.safetyCenter.value) { + if (this.meetingType === '7' || this.meetingType === MeetingTypeEnums.safetyCenter.value) { this.model.meetingCosts = '0.00' this.QRcodeBool = false } @@ -1049,7 +1049,7 @@ export default { } // 如果是 应用安全中心 来的加上id和会议类型 if (this.isSafetyCenterId) { - formData.meetingType = MeetTypeEnums.safetyCenter.value + formData.meetingType = MeetingTypeEnums.safetyCenter.value formData.projectId = this.$route.query.safetyCenterId } // 转换召开时间 @@ -1413,6 +1413,12 @@ export default { add: '/meeting/draftGroupMeeting/add', edit: '/meeting/draftGroupMeeting/edit' } + // 功能安全中心会议 + case MeetingTypeEnums.safetyCenter.value: + return { + add: '', + edit: '' + } } }, /* diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 8f23fa8..fb2859a 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -437,6 +437,7 @@ import { downloadFile } from '../../../api/manage' import WasicTopicData from './modules/wasicStaticData' import { formatMoney } from '@/utils/formatMoney' import {getPayConfirmList} from '@api/incomePaymentsApi' +import {MeetingTypeEnums} from '@/enums/commonEnums' export default { @@ -656,6 +657,18 @@ export default { auditSignUpInfo: 'draftGroupMeetingSituation:auditSignUp', guestsUploadFileFlag: 'draftGroupMeetingSituation:guestsUploadFileFlag' }, + // 功能安全中心会议的参会情况的权限编码 + safetyCenterMeetingCode: { + search: 'safetyCenterMeetingSituation:search', + add: 'safetyCenterMeetingSituation:add', + export: 'safetyCenterMeetingSituation:export', + batchDel: 'safetyCenterMeetingSituation:batchDel', + edit: 'safetyCenterMeetingSituation:edit', + delete: 'safetyCenterMeetingSituation:delete', + auditRecord: 'safetyCenterMeetingSituation:auditCredentials', + auditSignUpInfo: 'safetyCenterMeetingSituation:auditSignUp', + guestsUploadFileFlag: 'safetyCenterMeetingSituation:guestsUploadFileFlag' + }, disableMixinCreated: true, // url: { // list: '/meeting/payMeetingSituation/page', @@ -720,6 +733,14 @@ export default { exportXlsUrl: '/meeting/draftGroupMeetingSituation/exportXls', importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel' }, + // 起草组会议的url + safetyCenterMeetingUrl: { + list: '/meeting/draftGroupMeetingSituation/page', + delete: '/meeting/draftGroupMeetingSituation/delete', + deleteBatch: '/meeting/draftGroupMeetingSituation/deleteBatch', + exportXlsUrl: '/meeting/draftGroupMeetingSituation/exportXls', + importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel' + }, // 当前的会议信息详情 currentMeetingInfo: {}, meetingType: '', @@ -832,6 +853,9 @@ export default { return this.councilMeetingUrl case '7': return this.draftGroupMeetingUrl + // 安全中心会议 + case MeetingTypeEnums.safetyCenter.value: + return this.safetyCenterMeetingUrl // 为了解决控制台报错写的 default:return this.workGroupMeetingUrl } @@ -1036,6 +1060,9 @@ export default { return '理事会会议' case '7': return '起草组会议' + // 功能安全中心会议 + case MeetingTypeEnums.safetyCenter.value: + return MeetingTypeEnums.safetyCenter.name default: return '其他会议' } @@ -1138,6 +1165,9 @@ export default { case '7': this.authorCode = Object.assign({}, this.draftGroupMeetingCode) break + // 功能安全中心会议 + case MeetingTypeEnums.safetyCenter.value: + this.authorCode = Object.assign({}, this.safetyCenterMeetingCode) } } } diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 32a6ffa..c6c27f9 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -169,7 +169,7 @@ import {httpAction} from '@api/manage' import pick from 'lodash.pick' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' import { queryCompanyInfoById } from '../../../api/api' -import { LinkTopicsEnums } from '../../../enums/commonEnums' +import {LinkTopicsEnums, MeetingTypeEnums} from '../../../enums/commonEnums' import WasicTopicData from './modules/wasicStaticData' export default { @@ -289,6 +289,11 @@ export default { add: '/meeting/draftGroupMeetingSituation/add', edit:'/meeting/draftGroupMeetingSituation/edit' }, + // 功能安全中心会议的url + safetyCenterMeetingUrl: { + add: '/meeting/draftGroupMeetingSituation/add', + edit:'/meeting/draftGroupMeetingSituation/edit' + }, title:'添加参会人', // 当前参会企业是否是内部企业 isInternalEnterprise: false, @@ -340,6 +345,8 @@ export default { return this.councilMeetingUrl case '7': return this.draftGroupMeetingUrl + case MeetingTypeEnums.safetyCenter.value: + return this.safetyCenterMeetingUrl } }, }, diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue index bc532d8..2736b8e 100644 --- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue +++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue @@ -61,6 +61,7 @@ import { ACCESS_TOKEN } from '../../../../store/mutation-types' import { Modal } from 'ant-design-vue' import store from '@/store' import { isExternalTerminal } from '../../../../utils/util' +import {MeetingTypeEnums} from '@/enums/commonEnums' const FILE_TYPE_ALL = 'all' const columns = [ @@ -208,6 +209,12 @@ export default { uploadFile: '/meeting/draftGroupMeeting/uploadFile', uploadCouncilFile: '/meeting/draftGroupMeeting/uploadCouncilFile', } + // 安全中心会议 + case MeetingTypeEnums.safetyCenter.value: + return { + uploadFile: '', + uploadCouncilFile: '' + } } }, handleOk() { diff --git a/src/views/projectManagement/AllMeetingList.vue b/src/views/projectManagement/AllMeetingList.vue index c2d331e..b77366e 100644 --- a/src/views/projectManagement/AllMeetingList.vue +++ b/src/views/projectManagement/AllMeetingList.vue @@ -151,6 +151,7 @@ import '@/assets/less/TableExpand.less' import JDate from '@comp/tools/JDate' import JDictSelectTag from '@comp/dict/JDictSelectTag' import moment from 'moment' +import {MeetingTypeEnums} from '@/enums/commonEnums' export default { name: 'AllMeetingList', @@ -296,6 +297,8 @@ export default { pathMap.set('5','/incomePayments/meetManage/AttendanceCommitteeMeeting') pathMap.set('6','/incomePayments/meetManage/AttendanceCouncilMeeting') pathMap.set('7','/incomePayments/meetManage/AttendanceDraftGroupMeeting') + // 功能安全中心会议 + pathMap.set(MeetingTypeEnums.safetyCenter.value,'/incomePayments/meetManage/AttendanceFunctionalSafetyCenter') this.$router.push({ path: pathMap.get(record.meetingType+''), query: { From d12ca7c8c11343ec4af32aa3fb6bc05e106ae20b Mon Sep 17 00:00:00 2001 From: danshihao Date: Tue, 2 Jul 2024 19:20:03 +0800 Subject: [PATCH 08/30] =?UTF-8?q?[update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83]=20=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FunctionalSafetyCenter.vue | 21 +++++++------- .../FunctionalSafetyConferenceMaintenance.vue | 28 +++++++++---------- .../FunctionalSafetyMemberUnitMaintenance.vue | 16 +++++------ .../modules/SafetyCenterModule.vue | 1 + 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue b/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue index 8a5305c..b2d4af7 100644 --- a/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue +++ b/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue @@ -20,7 +20,7 @@ 查询 + v-has="'safetyCenter:search'">查询 重置 @@ -31,8 +31,8 @@
- 新增 - 批量删除 + 新增 + 批量删除
@@ -66,13 +66,13 @@ - 在研项目 - 其他分发资料 - 项目会议 - - 基本信息维护 - 其他分发资料 + 项目会议 + + 基本信息维护 + 删除 @@ -136,7 +136,7 @@ export default { title: '负责人', align: 'center', width: 130, - dataIndex: 'principalName' + dataIndex: 'principalId_dictText' }, { title: '操作', dataIndex: 'action', @@ -153,6 +153,7 @@ export default { created () { // 如果有id展示项目组数据接口 if (this.$route.query.id) { + this.filters.parentId = this.$route.query.id this.url.list = '/SafetyCenter/projectGroupPage' } this.loadData() diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue index 4e78634..0e8d8ff 100644 --- a/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue +++ b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue @@ -63,7 +63,7 @@ 查询 + v-has="'safetyCenterMeeting:search'">查询 重置 @@ -74,15 +74,15 @@
- 新增 + 新增 - 导出 + 导出 - + 批量删除 - 发布 + 发布
@@ -114,11 +114,11 @@ - 会议纪要 - 上传文件 + 会议纪要 + 上传文件 - 编辑 - 删除 + 编辑 + 删除
@@ -248,10 +248,10 @@ export default { } ], url: { - list: '/meeting/draftGroupMeeting/page', - delete: '/meeting/draftGroupMeeting/delete', - deleteBatch: '/meeting/draftGroupMeeting/deleteBatch', - exportXlsUrl: '/meeting/draftGroupMeeting/exportXls' + list: '', + delete: '', + deleteBatch: '', + exportXlsUrl: '' }, canOperate: true // 是否可操作（负责人B不可操作） } diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue b/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue index cff4013..e4a4a79 100644 --- a/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue +++ b/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue @@ -54,7 +54,7 @@ 查询 + v-has="'safetyCenterMember:search'">查询 重置 @@ -65,21 +65,21 @@
- + 添加成员 导入 - + 导出 下载模板 + v-has="'safetyCenterMember:downTemplate'" v-if="canOperate">下载模板 - + 批量删除 @@ -118,8 +118,8 @@ - 编辑 - 删除 + 编辑 + 删除
diff --git a/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue b/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue index d042605..500f3be 100644 --- a/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue +++ b/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue @@ -174,6 +174,7 @@ export default { httpurl += urlObj.edit } const formData = Object.assign(this.model, values) + formData.parentId = this.$route.query.id console.log('表单提交数据', formData) httpAction(httpurl, formData, method).then((res) => { if (res.success) { From d0b10fcbfdb11fa6b0bae46ebb5d2b2025503ac2 Mon Sep 17 00:00:00 2001 From: danshihao Date: Wed, 3 Jul 2024 10:37:17 +0800 Subject: [PATCH 09/30] =?UTF-8?q?[update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E4=BC=9A=E8=AE=AE]=20=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/JeroListMixin.js | 8 +++--- .../FunctionalSafetyConferenceMaintenance.vue | 8 +++--- .../meetManage/AddOrDetailMeet.vue | 27 ++++++++++++++----- .../incomePayments/meetManage/Attendance.vue | 17 ++++++------ .../meetManage/SignUpInfoEdit.vue | 4 +-- .../meetManage/modules/AuditModal.vue | 7 +++++ .../modules/UploadMeetFileModal.vue | 4 +-- 7 files changed, 49 insertions(+), 26 deletions(-) diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js index 9902859..2b5406a 100644 --- a/src/mixins/JeroListMixin.js +++ b/src/mixins/JeroListMixin.js @@ -196,8 +196,8 @@ export const JeroListMixin = { onOk: function () { that.loading = true // 新增加的删除接口用post方式请求 - const method = that.postMethodDel ? 'POST' : 'GET' - httpAction(that.url.deleteBatch, {ids: ids}, method).then((res) => { + const actionFunc = that.postMethodDel ? postAction : getAction + actionFunc(that.url.deleteBatch, {ids: ids}).then((res) => { if (res.success) { that.$message.success(res.message) // 判断当前删除的数据是否是最后一页的全部数据，如果是的话页码减一 @@ -233,8 +233,8 @@ export const JeroListMixin = { content: '确定要删除此条数据吗?', onOk: function () { // 新增加的删除接口用post方式请求 - const method = that.postMethodDel ? 'POST' : 'GET' - httpAction(that.url.delete, {id: id}, method).then((res) => { + const actionFunc = that.postMethodDel ? postAction : getAction + actionFunc(that.url.delete, {id: id}).then((res) => { if (res.success) { that.$message.success(res.message) // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一 diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue index 0e8d8ff..59c5d31 100644 --- a/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue +++ b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue @@ -248,10 +248,10 @@ export default { } ], url: { - list: '', - delete: '', - deleteBatch: '', - exportXlsUrl: '' + list: '/meeting/safetyCenterMeeting/page', + delete: '/meeting/safetyCenterMeeting/delete', + deleteBatch: '/meeting/safetyCenterMeeting/deleteBatch', + exportXlsUrl: '/meeting/safetyCenterMeeting/exportXls' }, canOperate: true // 是否可操作（负责人B不可操作） } diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 2f31ba4..43f1ebb 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -404,12 +404,12 @@