【开发】 理事会的参会情况

This commit is contained in:
fengachen
2021-12-15 11:53:34 +08:00
parent 89d2fc1811
commit 8d9ff8d6f4
6 changed files with 47 additions and 5 deletions
@@ -133,9 +133,9 @@
dictCode="signup_status"/> dictCode="signup_status"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 只有工作组会议与分标委会议才有审核信息--> <!-- 只有工作组会议与分标委会议 理事会会议审核信息-->
<a-col :xl="6" :lg="7" :md="8" :sm="24" <a-col :xl="6" :lg="7" :md="8" :sm="24"
v-show="currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5' "> v-show="currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5' || currentMeetingInfo.meetingType === '6' ">
<a-form-item label="审核报名信息"> <a-form-item label="审核报名信息">
<j-dict-select-tag v-model="queryParam.checkSingInResult" placeholder="请选择" <j-dict-select-tag v-model="queryParam.checkSingInResult" placeholder="请选择"
dictCode="signup_status"/> dictCode="signup_status"/>
@@ -257,9 +257,9 @@
<!-- 只有缴费方式为汇款并且上传了汇款凭证的的才会有审核按钮 审核报名信息通过后才能审核凭证 审核通过后不显示 审核凭证按钮 --> <!-- 只有缴费方式为汇款并且上传了汇款凭证的的才会有审核按钮 审核报名信息通过后才能审核凭证 审核通过后不显示 审核凭证按钮 -->
<a @click="handleAudit(record)" v-if="(record.payMode === 1 || record.payMode === 2 ) && record.paymentRecord && record.checkResult !== 1" <a @click="handleAudit(record)" v-if="(record.payMode === 1 || record.payMode === 2 ) && record.paymentRecord && record.checkResult !== 1"
v-has:[authorCode.auditRecord]="'attendance:auditCredentials'">审核凭证</a> v-has:[authorCode.auditRecord]="'attendance:auditCredentials'">审核凭证</a>
<!-- 只有工作组会议与分标委会议才有审核报名信息--> <!-- 只有工作组会议与分标委会议理事会会议才有审核报名信息-->
<a @click="handleAuditSignUp(record)" <a @click="handleAuditSignUp(record)"
v-show="(currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5') && record.registerCheckResult === 0 " v-show="(currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5' || currentMeetingInfo.meetingType === '6') && record.registerCheckResult === 0 "
v-has:[authorCode.auditSignUpInfo]="'attendance:auditSignUp'">审核报名信息</a> v-has:[authorCode.auditSignUpInfo]="'attendance:auditSignUp'">审核报名信息</a>
<a @click="handleEdit(record)" v-has:[authorCode.edit]="'attendance:edit'">编辑</a> <a @click="handleEdit(record)" v-has:[authorCode.edit]="'attendance:edit'">编辑</a>
<!--删除参会人需要判断改参会人是否与合同关联--> <!--删除参会人需要判断改参会人是否与合同关联-->
@@ -471,6 +471,17 @@ export default {
auditRecord: 'standardsMeetingSituation:auditCredentials', auditRecord: 'standardsMeetingSituation:auditCredentials',
auditSignUpInfo: 'standardsMeetingSituation:auditSignUp' auditSignUpInfo: 'standardsMeetingSituation:auditSignUp'
}, },
// 理事会的参会情况的权限编码
councilMeetingCode: {
search: 'councilMeetingSituation:search',
add: 'councilMeetingSituation:add',
export: 'councilMeetingSituation:export',
batchDel: 'councilMeetingSituation:batchDel',
edit: 'councilMeetingSituation:edit',
delete: 'councilMeetingSituation:delete',
auditRecord: 'councilMeetingSituation:auditCredentials',
auditSignUpInfo: 'councilMeetingSituation:auditSignUp'
},
disableMixinCreated: true, disableMixinCreated: true,
// url: { // url: {
// list: '/meeting/payMeetingSituation/page', // list: '/meeting/payMeetingSituation/page',
@@ -519,6 +530,14 @@ export default {
exportXlsUrl: '/meeting/workGroupMeetingSituation/exportXls', exportXlsUrl: '/meeting/workGroupMeetingSituation/exportXls',
importExcelUrl: '/meeting/workGroupMeetingSituation/importExcel' importExcelUrl: '/meeting/workGroupMeetingSituation/importExcel'
}, },
// 理事会的url
councilMeetingUrl: {
list: '/meeting/councilMeetingSituation/page',
delete: '/meeting/councilMeetingSituation/delete',
deleteBatch: '/meeting/councilMeetingSituation/deleteBatch',
exportXlsUrl: '/meeting/councilMeetingSituation/exportXls',
importExcelUrl: '/meeting/councilMeetingSituation/importExcel'
},
// 当前的会议信息详情 // 当前的会议信息详情
currentMeetingInfo: {}, currentMeetingInfo: {},
meetingType: '', meetingType: '',
@@ -762,6 +781,8 @@ export default {
return '其他会议' return '其他会议'
case '5': case '5':
return '分标委会议' return '分标委会议'
case '6':
return '理事会会议'
default: default:
return '其他会议' return '其他会议'
} }
@@ -836,6 +857,9 @@ export default {
case '5': case '5':
this.authorCode = Object.assign({}, this.committeeMeetingCode) this.authorCode = Object.assign({}, this.committeeMeetingCode)
break break
case '6':
this.authorCode = Object.assign({}, this.councilMeetingCode)
break
} }
} }
} }
@@ -237,6 +237,11 @@ export default {
add: '/meeting/workGroupMeetingSituation/add', add: '/meeting/workGroupMeetingSituation/add',
edit:'/meeting/workGroupMeetingSituation/edit' edit:'/meeting/workGroupMeetingSituation/edit'
}, },
// 理事会会议
councilMeetingUrl:{
add: '/meeting/councilMeetingSituation/add',
edit:'/meeting/councilMeetingSituation/edit'
},
title:'添加参会人', title:'添加参会人',
} }
}, },
@@ -196,6 +196,13 @@ export default {
// 审核报名信息 // 审核报名信息
checkSignUp: '/meeting/standardsMeetingSituation/checkRegister' checkSignUp: '/meeting/standardsMeetingSituation/checkRegister'
}, },
// 理事会会议url
councilMeetingUrl: {
// 审核凭证
check: '/meeting/councilMeetingSituation/check',
// 审核报名信息
checkSignUp: '/meeting/councilMeetingSituation/checkRegister'
},
// 审核结果选择 // 审核结果选择
checkBool: false, checkBool: false,
// 是否是审核报名信息 // 是否是审核报名信息
@@ -289,6 +296,8 @@ export default {
return this.otherMeetingUrl return this.otherMeetingUrl
case '5': case '5':
return this.committeeMeetingUrl return this.committeeMeetingUrl
case '6':
return this.councilMeetingUrl
} }
} }
} }
@@ -331,7 +331,7 @@ export default {
* */ * */
toAttendance(record) { toAttendance(record) {
this.$router.push({ this.$router.push({
path: '/incomePayments/meetManage/AttendanceWorkGroupMeeting', path: '/incomePayments/meetManage/AttendanceCouncilMeeting',
query: { query: {
id: record.id, id: record.id,
meetingName: record.meetingName, meetingName: record.meetingName,
+2
View File
@@ -217,6 +217,8 @@ export default {
return '其他会议' return '其他会议'
case '5': case '5':
return '分标委会议' return '分标委会议'
case '6':
return '理事会会议'
} }
} else { } else {
return '' return ''
+2
View File
@@ -420,6 +420,8 @@ export default {
return '其他会议' return '其他会议'
case '5': case '5':
return '分标委会议' return '分标委会议'
case '6':
return '理事会会议'
} }
} else { } else {
return '' return ''