diff --git a/src/utils/hasPermission.js b/src/utils/hasPermission.js
index b341310..81df262 100644
--- a/src/utils/hasPermission.js
+++ b/src/utils/hasPermission.js
@@ -5,10 +5,9 @@ const hasPermission = {
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( binding.value ,' binding.value =================')
}
// console.log("页面权限控制----");
//console.time()
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 3a844a0..5660559 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -160,7 +160,7 @@
- 查询
+ 查询
重置
@@ -173,16 +173,16 @@
-
添加参会人
-
导出
+ 添加参会人
+ 导出
- 批量删除
+ 批量删除
设置对接人
+ v-has="'internalMeetingSituation:batchSetDocker'">设置对接人
@@ -242,14 +242,14 @@
审核凭证
+ v-has:[authorCode.auditRecord]="'attendance:auditCredentials'">审核凭证
审核报名信息
- 编辑
+ v-has:[authorCode.auditSignUpInfo]="'attendance:auditSignUp'">审核报名信息
+ 编辑
- 删除
+ 删除
@@ -400,14 +400,112 @@ export default {
scopedSlots: {customRender: 'action'}
}
],
+ // 权限编码
+ authorCode:{
+
+ },
+ // 其他会议的参会情况的权限编码
+ otherMeetingCode:{
+ search:'otherMeetingSituation:search',
+ add:'otherMeetingSituation:add',
+ export:'otherMeetingSituation:export',
+ batchDel:'otherMeetingSituation:batchDel',
+ edit:'otherMeetingSituation:edit',
+ delete:'otherMeetingSituation:delete',
+ auditRecord:'otherMeetingSituation:auditCredentials',
+ auditSignUpInfo:'otherMeetingSituation:auditSignUp'
+ },
+ // 分标委会议的参会情况权限编码
+ committeeMeetingCode:{
+ search:'committeeMeetingSituation:search',
+ add:'committeeMeetingSituation:add',
+ export:'committeeMeetingSituation:export',
+ batchDel:'committeeMeetingSituation:batchDel',
+ edit:'committeeMeetingSituation:edit',
+ delete:'committeeMeetingSituation:delete',
+ auditRecord:'committeeMeetingSituation:auditCredentials',
+ auditSignUpInfo:'committeeMeetingSituation:auditSignUp'
+ },
+ // 工作组会议的参会情况的权限编码
+ workGroupMeetingCode:{
+ search:'workGroupMeetingSituationSituation:search',
+ add:'workGroupMeetingSituationSituation:add',
+ export:'workGroupMeetingSituationSituation:export',
+ batchDel:'workGroupMeetingSituationSituation:batchDel',
+ edit:'workGroupMeetingSituationSituation:edit',
+ delete:'workGroupMeetingSituationSituation:delete',
+ auditRecord:'workGroupMeetingSituationSituation:auditCredentials',
+ auditSignUpInfo:'workGroupMeetingSituationSituation:auditSignUp'
+ },
+ // 国际研讨会的参会情况的权限编码
+ internalMeetingCode:{
+ search:'internalMeetingSituation:search',
+ add:'internalMeetingSituation:add',
+ export:'internalMeetingSituation:export',
+ batchDel:'internalMeetingSituation:batchDel',
+ edit:'internalMeetingSituation:edit',
+ delete:'internalMeetingSituation:delete',
+ auditRecord:'internalMeetingSituation:auditCredentials',
+ auditSignUpInfo:'internalMeetingSituation:auditSignUp',
+ },
+ // 标协会议的参会情况的权限编码
+ standardsMeetingCode:{
+ search:'standardsMeetingSituation:search',
+ add:'standardsMeetingSituation:add',
+ export:'standardsMeetingSituation:export',
+ batchDel:'standardsMeetingSituation:batchDel',
+ edit:'standardsMeetingSituation:edit',
+ delete:'standardsMeetingSituation:delete',
+ auditRecord:'standardsMeetingSituation:auditCredentials',
+ auditSignUpInfo:'standardsMeetingSituation:auditSignUp'
+ },
disableMixinCreated: true,
- addPerson:'addPerson12',
- url: {
- list: '/meeting/payMeetingSituation/page',
- delete: '/meeting/payMeetingSituation/delete',
- deleteBatch: '/meeting/payMeetingSituation/deleteBatch',
- exportXlsUrl: '/meeting/payMeetingSituation/exportXls',
- importExcelUrl: '/meeting/payMeetingSituation/importExcel'
+ // url: {
+ // list: '/meeting/payMeetingSituation/page',
+ // delete: '/meeting/payMeetingSituation/delete',
+ // deleteBatch: '/meeting/payMeetingSituation/deleteBatch',
+ // exportXlsUrl: '/meeting/payMeetingSituation/exportXls',
+ // importExcelUrl: '/meeting/payMeetingSituation/importExcel'
+ // },
+ // 其他会议的url
+ otherMeetingUrl:{
+ list: '/meeting/ohterMeetingSituation/page',
+ delete: '/meeting/ohterMeetingSituation/delete',
+ deleteBatch: '/meeting/ohterMeetingSituation/deleteBatch',
+ exportXlsUrl: '/meeting/ohterMeetingSituation/exportXls',
+ importExcelUrl: '/meeting/ohterMeetingSituation/importExcel'
+ },
+ // 分标委会议的url
+ committeeMeetingUrl:{
+ list: '/meeting/committeeMeetingSituation/page',
+ delete: '/meeting/committeeMeetingSituation/delete',
+ deleteBatch: '/meeting/committeeMeetingSituation/deleteBatch',
+ exportXlsUrl: '/meeting/committeeMeetingSituation/exportXls',
+ importExcelUrl: '/meeting/committeeMeetingSituation/importExcel'
+ },
+ // 国际研讨会的url
+ internalMeetingUrl:{
+ list: '/meeting/internalMeetingSituation/page',
+ delete: '/meeting/internalMeetingSituation/delete',
+ deleteBatch: '/meeting/internalMeetingSituation/deleteBatch',
+ exportXlsUrl: '/meeting/internalMeetingSituation/exportXls',
+ importExcelUrl: '/meeting/internalMeetingSituation/importExcel'
+ },
+ // 标协会议的url
+ standardsMeetingUrl:{
+ list: '/meeting/standardsMeetingSituation/page',
+ delete: '/meeting/standardsMeetingSituation/delete',
+ deleteBatch: '/meeting/standardsMeetingSituation/deleteBatch',
+ exportXlsUrl: '/meeting/standardsMeetingSituation/exportXls',
+ importExcelUrl: '/meeting/standardsMeetingSituation/importExcel'
+ },
+ // 工作组会议的url
+ workGroupMeetingUrl:{
+ list: '/meeting/workGroupMeetingSituation/page',
+ delete: '/meeting/workGroupMeetingSituation/delete',
+ deleteBatch: '/meeting/workGroupMeetingSituation/deleteBatch',
+ exportXlsUrl: '/meeting/workGroupMeetingSituation/exportXls',
+ importExcelUrl: '/meeting/workGroupMeetingSituation/importExcel'
},
// 当前的会议信息详情
currentMeetingInfo: {},
@@ -423,6 +521,8 @@ export default {
}
},
created() {
+ // 为不同会议的参会情况去设置不同的权限编码
+ this.setCodeByMeetingType(this.$route.query.meetingType)
// 获取会议详情
const param = {
id: this.$route.query.id
@@ -488,6 +588,16 @@ export default {
return ''
}
},
+ // eslint-disable-next-line
+ url(){
+ switch (this.$route.query.meetingType){
+ case '1': return this.workGroupMeetingUrl
+ case '2': return this.standardsMeetingUrl
+ case '3': return this.internalMeetingUrl
+ case '4': return this.otherMeetingUrl
+ case '5': return this.committeeMeetingUrl
+ }
+ },
// 报名链接
signUpHerfUrl() {
return `${window._CONFIG['singUpQRCodeURL']}?id=${this.$route.query.id}`
@@ -616,6 +726,8 @@ export default {
return '国际研讨会'
case '4':
return '其他会议'
+ case '5':
+ return '分标委会议'
default:
return '其他会议'
}
@@ -669,6 +781,19 @@ export default {
newInput.remove()
this.$message.success('复制成功')
},
+ /*
+ * 通过会议类型设置权限编码
+ * type 会议类型
+ * */
+ setCodeByMeetingType(type){
+ switch (type){
+ case '1':this.authorCode = Object.assign({},this.workGroupMeetingCode);break
+ case '2':this.authorCode = Object.assign({},this.standardsMeetingCode);break
+ case '3':this.authorCode = Object.assign({},this.internalMeetingCode);break
+ case '4':this.authorCode = Object.assign({},this.otherMeetingCode);break
+ case '5':this.authorCode = Object.assign({},this.committeeMeetingCode);break
+ }
+ }
}
}
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index 7c434e7..647e7e9 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -293,6 +293,7 @@ export default {
caseCommitteeId(){
return this.$route.query.id ? this.$route.query.id : undefined
},
+ // eslint-disable-next-line
url() {
let meetingType = this.$route.query.meetingType + ''
// 标协会议
@@ -357,11 +358,13 @@ export default {
* 参会情况
* */
toAttendance(record) {
+ const that = this
this.$router.push({
path: '/incomePayments/meetManage/Attendance',
query: {
id: record.id,
- meetingName: record.meetingName
+ meetingName: record.meetingName,
+ meetingType:that.$route.query.meetingType + ''
}
})
},
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index 8955748..fe072e2 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -330,7 +330,8 @@ export default {
path: '/incomePayments/meetManage/Attendance',
query: {
id: record.id,
- meetingName: record.meetingName
+ meetingName: record.meetingName,
+ meetingType:'1'
}
})
},
diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue
index df3f1ee..f3ccb26 100644
--- a/src/views/projectManagement/InternationalSeminar.vue
+++ b/src/views/projectManagement/InternationalSeminar.vue
@@ -273,7 +273,8 @@ export default {
path: '/incomePayments/meetManage/Attendance',
query: {
id: record.id,
- meetingName: record.meetingName
+ meetingName: record.meetingName,
+ meetingType:'3'
}
})
},
diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue
index 0b52459..8941a55 100644
--- a/src/views/projectManagement/OtherMeeting.vue
+++ b/src/views/projectManagement/OtherMeeting.vue
@@ -278,7 +278,8 @@ name: 'OtherMeeting',
path: '/incomePayments/meetManage/Attendance',
query: {
id: record.id,
- meetingName: record.meetingName
+ meetingName: record.meetingName,
+ meetingType:'4'
}
})
},