From a32c424f57b44c9b656be903e45aac55c211ca5d Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 10 Jan 2024 11:53:02 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B5=B7=E8=8D=89=E7=BB=84=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../draftingGroup/ConferenceMaintenance.vue   |  2 +-
 .../DraftingGroupMemberUnitMaintenance.vue    |  4 ++--
 .../DraftingGroupMemberUnitCheckModule.vue    | 19 +++++++++++++------
 .../incomePayments/meetManage/Attendance.vue  |  8 ++++----
 .../modules/SetGuessUploadFlagModal.vue       |  3 +++
 src/views/signUp/SignUpPage.vue               |  2 ++
 6 files changed, 25 insertions(+), 13 deletions(-)

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 @@
         <div class="part-title-text">入会信息</div>
       </div>
       <a-spin :spinning="spinning">
-        <a-row class="flex-col">
+        <a-row class="flex-col signUpInfo">
           <a-col :xxl="8" :xl="12" :sm="24">
             <label>报名链接：</label><span>{{ signUpHerfUrl }}</span>
           </a-col>
@@ -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 @@
             <label>姓名：</label>
             <span>{{ item.contactsTemporaryName }}</span></a-col>
           <a-col :span="12">
-            <label>手机号：</label>
-            <span>{{ item.phone }}</span></a-col>
+            <label>备注：</label>
+            <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>
       </section>
 
@@ -35,10 +42,10 @@
             <a-form-item label="审核" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-radio-group v-decorator="['checkResult',validatorRules.checkResult]" placeholder="请选择审核结果"
                              @change="changeCheck">
-                <a-radio value="1">
+                <a-radio value="2">
                   通过
                 </a-radio>
-                <a-radio value='2'>
+                <a-radio value='3'>
                   驳回
                 </a-radio>
               </a-radio-group>
@@ -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"/>
               </a-form-item>
             </a-col>
-            <!--            只有工作组会议与分标委会议 理事会会议审核信息-->
+            <!--            只有工作组会议与分标委会议 理事会会议 起草组会议审核信息-->
             <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="审核报名信息">
                 <j-dict-select-tag v-model="queryParam.registerCheckResult" placeholder="请选择"
                                    dictCode="signup_status"/>
@@ -371,9 +371,9 @@
             <!-- 只有缴费方式为汇款并且上传了汇款凭证的的才会有审核按钮 审核报名信息通过后才能审核凭证 审核通过后不显示 审核凭证按钮 -->
           <a @click="handleAudit(record)" v-if="(record.payMode === 1 || record.payMode === 2 ) && record.paymentRecord && record.checkResult !== 1"
              v-has:[authorCode.auditRecord]="'attendance:auditCredentials'">审核凭证</a>
-            <!-- 只有工作组会议与分标委会议理事会会议 才有审核报名信息-->
+            <!-- 只有工作组会议与分标委会议理事会会议、起草组会议 才有审核报名信息-->
           <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>
 <!--            非成员报名被拒绝 无法编辑 -->
           <a @click="handleEdit(record)" v-if="record.registerCheckResult !== 2" v-has:[authorCode.edit]="'attendance:edit'">编辑</a>
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 ''