diff --git a/src/views/draftingGroup/ConferenceMaintenance.vue b/src/views/draftingGroup/ConferenceMaintenance.vue
index d6259da..e5e0f55 100644
--- a/src/views/draftingGroup/ConferenceMaintenance.vue
+++ b/src/views/draftingGroup/ConferenceMaintenance.vue
@@ -332,7 +332,7 @@ export default {
* */
toAttendance(record) {
this.$router.push({
- path: '/incomePayments/meetManage/AttendanceWorkGroupMeeting',
+ path: '/incomePayments/meetManage/AttendanceDraftGroupMeeting',
query: {
id: record.id,
meetingName: record.meetingName,
diff --git a/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue b/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
index ddf4540..20d5cd3 100644
--- a/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
+++ b/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
@@ -37,7 +37,7 @@
入会信息
-
+
{{ signUpHerfUrl }}
@@ -541,7 +541,7 @@ export default {
font-style: normal;
cursor: pointer;
}
-.ant-row {
+.signUpInfo {
line-height: 3;
.ant-col {
diff --git a/src/views/draftingGroup/modules/DraftingGroupMemberUnitCheckModule.vue b/src/views/draftingGroup/modules/DraftingGroupMemberUnitCheckModule.vue
index a8881df..178b6cb 100644
--- a/src/views/draftingGroup/modules/DraftingGroupMemberUnitCheckModule.vue
+++ b/src/views/draftingGroup/modules/DraftingGroupMemberUnitCheckModule.vue
@@ -22,8 +22,15 @@
{{ item.contactsTemporaryName }}
-
- {{ item.phone }}
+
+ {{ item.remarks }}
+
+
+
+
+
+ {{ model.remarks }}
+
@@ -35,10 +42,10 @@
-
+
通过
-
+
驳回
@@ -167,9 +174,9 @@ export default {
changeCheck(e) {
console.log(e)
// 审核结果选择拒绝 审核说明必填
- if (e.target.value === '1') {
+ if (e.target.value === '2') {
this.checkBool = false
- } else if (e.target.value === '2') {
+ } else if (e.target.value === '3') {
this.checkBool = true
}
}
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 477c6c5..ffc15a6 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -192,9 +192,9 @@
dictCode="signup_status"/>
-
+
+ v-show="['1', '5', '6', '7'].includes(currentMeetingInfo.meetingType)">
@@ -371,9 +371,9 @@
审核凭证
-
+
审核报名信息
编辑
diff --git a/src/views/incomePayments/meetManage/modules/SetGuessUploadFlagModal.vue b/src/views/incomePayments/meetManage/modules/SetGuessUploadFlagModal.vue
index c49185a..c66ae36 100644
--- a/src/views/incomePayments/meetManage/modules/SetGuessUploadFlagModal.vue
+++ b/src/views/incomePayments/meetManage/modules/SetGuessUploadFlagModal.vue
@@ -35,6 +35,7 @@ const requestUrlObj = {
otherMeetingUrl: '/meeting/ohterMeetingSituation/setGuestsUploadFile', // 其他会议的url
committeeMeetingUrl: '/meeting/committeeMeetingSituation/setGuestsUploadFile', // 分标委会议的url
councilMeetingUrl: '/meeting/councilMeetingSituation/setGuestsUploadFile', // 理事会的url
+ draftGroupMeetingUrl: '/meeting/draftGroupMeetingSituation/setGuestsUploadFile', // 起草组
}
export default {
@@ -65,6 +66,8 @@ export default {
return requestUrlObj.committeeMeetingUrl
case 6:
return requestUrlObj.councilMeetingUrl
+ case 7:
+ return requestUrlObj.draftGroupMeetingUrl
// 为了解决控制台报错写的
default:return requestUrlObj.workGroupMeetingUrl
}
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index c31867b..f8067c1 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -437,6 +437,8 @@ export default {
return '分标委会议'
case '6':
return '理事会会议'
+ case '7':
+ return '起草组会议'
}
} else {
return ''