update 起草组完善

This commit is contained in:
danshihao
2024-01-10 11:53:02 +08:00
parent 6fc993c16b
commit a32c424f57
6 changed files with 25 additions and 13 deletions
@@ -332,7 +332,7 @@ export default {
* */ * */
toAttendance(record) { toAttendance(record) {
this.$router.push({ this.$router.push({
path: '/incomePayments/meetManage/AttendanceWorkGroupMeeting', path: '/incomePayments/meetManage/AttendanceDraftGroupMeeting',
query: { query: {
id: record.id, id: record.id,
meetingName: record.meetingName, meetingName: record.meetingName,
@@ -37,7 +37,7 @@
<div class="part-title-text">入会信息</div> <div class="part-title-text">入会信息</div>
</div> </div>
<a-spin :spinning="spinning"> <a-spin :spinning="spinning">
<a-row class="flex-col"> <a-row class="flex-col signUpInfo">
<a-col :xxl="8" :xl="12" :sm="24"> <a-col :xxl="8" :xl="12" :sm="24">
<label>报名链接</label><span>{{ signUpHerfUrl }}</span> <label>报名链接</label><span>{{ signUpHerfUrl }}</span>
</a-col> </a-col>
@@ -541,7 +541,7 @@ export default {
font-style: normal; font-style: normal;
cursor: pointer; cursor: pointer;
} }
.ant-row { .signUpInfo {
line-height: 3; line-height: 3;
.ant-col { .ant-col {
@@ -22,8 +22,15 @@
<label>姓名</label> <label>姓名</label>
<span>{{ item.contactsTemporaryName }}</span></a-col> <span>{{ item.contactsTemporaryName }}</span></a-col>
<a-col :span="12"> <a-col :span="12">
<label>手机号</label> <label>备注</label>
<span>{{ item.phone }}</span></a-col> <span>{{ item.remarks }}</span></a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<label>备注</label>
<span>{{ model.remarks }}</span>
</a-col>
</a-row> </a-row>
</section> </section>
@@ -35,10 +42,10 @@
<a-form-item label="审核" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="审核" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-decorator="['checkResult',validatorRules.checkResult]" placeholder="请选择审核结果" <a-radio-group v-decorator="['checkResult',validatorRules.checkResult]" placeholder="请选择审核结果"
@change="changeCheck"> @change="changeCheck">
<a-radio value="1"> <a-radio value="2">
通过 通过
</a-radio> </a-radio>
<a-radio value='2'> <a-radio value='3'>
驳回 驳回
</a-radio> </a-radio>
</a-radio-group> </a-radio-group>
@@ -167,9 +174,9 @@ export default {
changeCheck(e) { changeCheck(e) {
console.log(e) console.log(e)
// 审核结果选择拒绝 审核说明必填 // 审核结果选择拒绝 审核说明必填
if (e.target.value === '1') { if (e.target.value === '2') {
this.checkBool = false this.checkBool = false
} else if (e.target.value === '2') { } else if (e.target.value === '3') {
this.checkBool = true this.checkBool = true
} }
} }
@@ -192,9 +192,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' || currentMeetingInfo.meetingType === '6' "> v-show="['1', '5', '6', '7'].includes(currentMeetingInfo.meetingType)">
<a-form-item label="审核报名信息"> <a-form-item label="审核报名信息">
<j-dict-select-tag v-model="queryParam.registerCheckResult" placeholder="请选择" <j-dict-select-tag v-model="queryParam.registerCheckResult" placeholder="请选择"
dictCode="signup_status"/> dictCode="signup_status"/>
@@ -371,9 +371,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' || currentMeetingInfo.meetingType === '6') && record.registerCheckResult === 0 " v-show="(['1', '5', '6', '7'].includes(currentMeetingInfo.meetingType)) && record.registerCheckResult === 0 "
v-has:[authorCode.auditSignUpInfo]="'attendance:auditSignUp'">审核报名信息</a> v-has:[authorCode.auditSignUpInfo]="'attendance:auditSignUp'">审核报名信息</a>
<!-- 非成员报名被拒绝 无法编辑 --> <!-- 非成员报名被拒绝 无法编辑 -->
<a @click="handleEdit(record)" v-if="record.registerCheckResult !== 2" v-has:[authorCode.edit]="'attendance:edit'">编辑</a> <a @click="handleEdit(record)" v-if="record.registerCheckResult !== 2" v-has:[authorCode.edit]="'attendance:edit'">编辑</a>
@@ -35,6 +35,7 @@ const requestUrlObj = {
otherMeetingUrl: '/meeting/ohterMeetingSituation/setGuestsUploadFile', // 其他会议的url otherMeetingUrl: '/meeting/ohterMeetingSituation/setGuestsUploadFile', // 其他会议的url
committeeMeetingUrl: '/meeting/committeeMeetingSituation/setGuestsUploadFile', // 分标委会议的url committeeMeetingUrl: '/meeting/committeeMeetingSituation/setGuestsUploadFile', // 分标委会议的url
councilMeetingUrl: '/meeting/councilMeetingSituation/setGuestsUploadFile', // 理事会的url councilMeetingUrl: '/meeting/councilMeetingSituation/setGuestsUploadFile', // 理事会的url
draftGroupMeetingUrl: '/meeting/draftGroupMeetingSituation/setGuestsUploadFile', // 起草组
} }
export default { export default {
@@ -65,6 +66,8 @@ export default {
return requestUrlObj.committeeMeetingUrl return requestUrlObj.committeeMeetingUrl
case 6: case 6:
return requestUrlObj.councilMeetingUrl return requestUrlObj.councilMeetingUrl
case 7:
return requestUrlObj.draftGroupMeetingUrl
// 为了解决控制台报错写的 // 为了解决控制台报错写的
default:return requestUrlObj.workGroupMeetingUrl default:return requestUrlObj.workGroupMeetingUrl
} }
+2
View File
@@ -437,6 +437,8 @@ export default {
return '分标委会议' return '分标委会议'
case '6': case '6':
return '理事会会议' return '理事会会议'
case '7':
return '起草组会议'
} }
} else { } else {
return '' return ''