diff --git a/src/utils/hasPermission.js b/src/utils/hasPermission.js index d70591f..b341310 100644 --- a/src/utils/hasPermission.js +++ b/src/utils/hasPermission.js @@ -4,6 +4,12 @@ const hasPermission = { install (Vue, options) { Vue.directive('has', { inserted: (el, binding, vnode)=>{ + // console.log('binding=====',binding.value) + // console.log('binding=====args',binding) + if(binding.arg){ + binding.value = binding.arg + console.log( binding.value ,' binding.value =================') + } // console.log("页面权限控制----"); //console.time() //节点权限处理，如果命中则不进行全局权限处理 @@ -67,7 +73,6 @@ export function filterNodePermission(el, binding, vnode) { */ export function filterGlobalPermission(el, binding, vnode) { console.log('全局页面权限--Global--') - let permissionList = [] let allPermissionList = [] diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 53ce57e..3a844a0 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -173,8 +173,8 @@
- 添加参会人 - 导出 + 添加参会人 + 导出 批量删除 @@ -401,6 +401,7 @@ export default { } ], disableMixinCreated: true, + addPerson:'addPerson12', url: { list: '/meeting/payMeetingSituation/page', delete: '/meeting/payMeetingSituation/delete', diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue index 819be82..7c434e7 100644 --- a/src/views/projectManagement/CommitteeMeeting.vue +++ b/src/views/projectManagement/CommitteeMeeting.vue @@ -62,7 +62,7 @@ - 查询 + 查询 重置 @@ -73,11 +73,11 @@
- 新增 - 导出 - 批量删除 + 新增 + 导出 + 批量删除 - 发布 + 发布
@@ -108,10 +108,10 @@ - 上传文件 + 上传文件 - 编辑 - 删除 + 编辑 + 删除
@@ -234,21 +234,44 @@ export default { scopedSlots: {customRender: 'action'} }, ], - url: { - list: '/meeting/payMeeting/page', - delete: '/meeting/payMeeting/delete', - deleteBatch: '/meeting/payMeeting/deleteBatch', - exportXlsUrl: '/meeting/payMeeting/exportXls', - }, + // 权限编码 + authorCode:{ + }, + // 分标委的权限编码 + committeeMeetingAuthorCode:{ + add:'committeeMeeting:add', + search:'committeeMeeting:search', + export:'committeeMeeting:export', + batchDel:'committeeMeeting:batchDel', + upload:'committeeMeeting:upload', + edit:'committeeMeeting:edit', + delete:'committeeMeeting:delete' + }, + // 标协会议的权限编码 + standardsMeetingAuthorCode:{ + add:' standardsMeeting:add', + search:' standardsMeeting:search', + export:' standardsMeeting:export', + batchDel:' standardsMeeting:batchDel', + upload:' standardsMeeting:upload', + edit:' standardsMeeting:edit', + delete:' standardsMeeting:delete' + } } }, created() { this.filters.meetingType = this.meetingType // 分标委会议需要加上分标委id if(this.meetingType === '5'){ + // 在这改变v-has 的值 用分标委的会议权限 + this.authorCode = Object.assign({},this.committeeMeetingAuthorCode) this.filters.caseCommitteeId = this.caseCommitteeId } + // 如果是标协会议 用标协会议权限 + if(this.meetingType === '2'){ + this.authorCode = Object.assign({},this.standardsMeetingAuthorCode) + } this.loadData(1) // 不是分标委会议去掉提醒字段 if (this.meetingType !== 5) { @@ -269,6 +292,26 @@ export default { // 分标委id caseCommitteeId(){ return this.$route.query.id ? this.$route.query.id : undefined + }, + url() { + let meetingType = this.$route.query.meetingType + '' + // 标协会议 + if(meetingType === '2'){ + return { + list: '/meeting/standardsMeeting/page', + delete: '/meeting/standardsMeeting/delete', + deleteBatch: '/meeting/standardsMeeting/deleteBatch', + exportXlsUrl: '/meeting/standardsMeeting/exportXls', + } + }else if(meetingType === '5') { + // 分标委会议 + return { + list: '/meeting/committeeMeeting/page', + delete: '/meeting/committeeMeeting/delete', + deleteBatch: '/meeting/committeeMeeting/deleteBatch', + exportXlsUrl: '/meeting/committeeMeeting/exportXls', + } + } } }, methods: { diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue index ad1a75c..8955748 100644 --- a/src/views/projectManagement/ConferenceMaintenance.vue +++ b/src/views/projectManagement/ConferenceMaintenance.vue @@ -67,7 +67,7 @@ 查询 + v-has="'workGroupMeeting:search'">查询 重置 @@ -78,12 +78,12 @@
- 新增 + 新增 导出 + v-has="'workGroupMeeting:export'">导出 - 批量删除 - 发布 + 批量删除 + 发布
@@ -114,10 +114,10 @@ - 上传文件 + 上传文件 - 编辑 - 删除 + 编辑 + 删除 @@ -243,10 +243,10 @@ export default { }, ], url: { - list: '/meeting/payMeeting/page', - delete: '/meeting/payMeeting/delete', - deleteBatch: '/meeting/payMeeting/deleteBatch', - exportXlsUrl: '/meeting/payMeeting/exportXls', + list: '/meeting/workGroupMeeting/page', + delete: '//meeting/workGroupMeeting/delete', + deleteBatch: '/meeting/workGroupMeeting/deleteBatch', + exportXlsUrl: '/meeting/workGroupMeeting/exportXls', }, canOperate: true, // 是否可操作（负责人B不可操作） } diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue index 8a06dcc..df3f1ee 100644 --- a/src/views/projectManagement/InternationalSeminar.vue +++ b/src/views/projectManagement/InternationalSeminar.vue @@ -52,7 +52,7 @@ - 查询 + 查询 重置 @@ -63,9 +63,9 @@
- 新增 - 导出 - 批量删除 + 新增 + 导出 + 批量删除
@@ -96,10 +96,10 @@ - 上传文件 + 上传文件 - 编辑 - 删除 + 编辑 + 删除 @@ -206,11 +206,11 @@ export default { endKey: 'meetingEndTime' }, url: { - list: '/meeting/payMeeting/page', - delete: '/meeting/payMeeting/delete', - deleteBatch: '/meeting/payMeeting/deleteBatch', - exportXlsUrl: '/meeting/payMeeting/exportXls', - importExcelUrl: 'meeting/payMeeting/importExcel', + list: '/meeting/internalMeeting/page', + delete: '/meeting/internalMeeting/delete', + deleteBatch: '/meeting/internalMeeting/deleteBatch', + exportXlsUrl: '/meeting/internalMeeting/exportXls', + importExcelUrl: '/meeting/internalMeeting/importExcel', }, disableMixinCreated:true } diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue index e305548..0b52459 100644 --- a/src/views/projectManagement/OtherMeeting.vue +++ b/src/views/projectManagement/OtherMeeting.vue @@ -52,7 +52,7 @@ - 查询 + 查询 重置 @@ -63,9 +63,9 @@
- 新增 - 导出 - 批量删除 + 新增 + 导出 + 批量删除
@@ -94,10 +94,10 @@ - 上传文件 + 上传文件 - 编辑 - 删除 + 编辑 + 删除 @@ -203,11 +203,11 @@ name: 'OtherMeeting', endKey: 'meetingEndTime' }, url: { - list: '/meeting/payMeeting/page', - delete: '/meeting/payMeeting/delete', - deleteBatch: '/meeting/payMeeting/deleteBatch', - exportXlsUrl: '/meeting/payMeeting/exportXls', - importExcelUrl: 'meeting/payMeeting/importExcel', + list: '/meeting/otherMeeting/page', + delete: '/meeting/otherMeeting/page/delete', + deleteBatch: '/meeting/otherMeeting/page/deleteBatch', + exportXlsUrl: '/meeting/otherMeeting/page/exportXls', + importExcelUrl: '/meeting/otherMeeting/page/importExcel', }, disableMixinCreated:true }