From e3f4b6b4f60e3ca783f66a9358d841d5b1b666f2 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Sun, 26 Sep 2021 14:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/modules/AuditModal.vue              |  2 +-
 src/views/projectManagement/CommitteeMeeting.vue   | 12 ++++++------
 .../projectManagement/ConferenceMaintenance.vue    | 14 +++++++-------
 .../projectManagement/InternationalSeminar.vue     | 12 ++++++------
 src/views/projectManagement/OtherMeeting.vue       | 12 ++++++------
 src/views/signUp/SignUpPage.vue                    |  2 +-
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue
index 87da7b6..0b842a6 100644
--- a/src/views/incomePayments/meetManage/modules/AuditModal.vue
+++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue
@@ -70,7 +70,7 @@
                 <a-radio value="1">
                  通过
                 </a-radio>
-                <a-radio value='0'>
+                <a-radio value='2'>
                   驳回
                 </a-radio>
               </a-radio-group>
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index 7a960fd..9f20606 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -62,7 +62,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
-              <a-button type="primary" icon="search" @click="searchQuery" v-has="'committeeMeeting:search'">查询</a-button>
+              <a-button type="primary" icon="search" @click="searchQuery" v-has="'meeting:search'">查询</a-button>
               <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
             </span>
             </a-col>
@@ -74,10 +74,10 @@
       <!--    操作按钮区域-->
       <div class="table-operator">
         <a-button type="primary" icon="plus" @click="handleAdd" v-has="'meeting:add'">新增</a-button>
-        <a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')" v-has="'committeeMeeting:export'">导出</a-button>
+        <a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')" v-has="'meeting:export'">导出</a-button>
         <a-button type="danger" icon="delete" @click="batchDel" v-has="'committeeMeeting:batchDel'">批量删除</a-button>
         <!--只有工作会议与分标委会议才有-->
-        <a-button type="primary" @click="publishRemind" v-if="meetingType === '5' " v-has="'committeeMeeting:publish'">发布</a-button>
+        <a-button type="primary" @click="publishRemind" v-if="meetingType === '5' " v-has="'meeting:publish'">发布</a-button>
       </div>
       <!--    /操作按钮区域-end-->
 
@@ -108,10 +108,10 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-          <a @click="uploadFile(record)" v-has="'committeeMeeting:upload'">上传文件</a>
+          <a @click="uploadFile(record)" v-has="'meeting:upload'">上传文件</a>
             <!--          <a @click="applyMsg">报名信息</a>-->
-          <a @click="handleEdit(record)" v-has="'committeeMeeting:edit'">编辑</a>
-          <a @click="handleDelete(record.id)" v-has="'committeeMeeting:delete'">删除</a>
+          <a @click="handleEdit(record)" v-has="'meeting:edit'">编辑</a>
+          <a @click="handleDelete(record.id)" v-has="'meeting:delete'">删除</a>
         </span>
         </a-table>
       </div>
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index ffd4bee..ad1a75c 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -67,7 +67,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery"
-                        v-has="'workingGroupConference:search'">查询</a-button>
+                        v-has="'meeting:search'">查询</a-button>
               <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
             </span>
           </a-col>
@@ -80,10 +80,10 @@
     <div class="table-operator">
       <a-button type="primary" icon="plus" @click="handleAdd" v-has="'meeting:add'" v-if="canOperate">新增</a-button>
       <a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')"
-                v-has="'workingGroupConference:export'">导出
+                v-has="'meeting:export'">导出
       </a-button>
-      <a-button type="danger" icon="delete" @click="batchDel" v-has="'workingGroupConference:batchDel'" v-if="canOperate">批量删除</a-button>
-      <a-button type="primary" @click="publishRemind" v-has="'workingGroupConference:publish'" v-if="canOperate">发布</a-button>
+      <a-button type="danger" icon="delete" @click="batchDel" v-has="'meeting:batchDel'" v-if="canOperate">批量删除</a-button>
+      <a-button type="primary" @click="publishRemind" v-has="'meeting:publish'" v-if="canOperate">发布</a-button>
     </div>
     <!--    /操作按钮区域-end-->
 
@@ -114,10 +114,10 @@
         </template>
 
         <span slot="action" class="action-span-cell" slot-scope="text, record" v-if="canOperate">
-          <a @click="uploadFile(record)" v-has="'workingGroupConference:upload'">上传文件</a>
+          <a @click="uploadFile(record)" v-has="'meeting:upload'">上传文件</a>
           <!--          <a @click="applyMsg">报名信息</a>-->
-          <a @click="handleEdit(record)" v-has="'workingGroupConference:edit'">编辑</a>
-          <a @click="handleDelete(record.id)" v-has="'workingGroupConference:delete'">删除</a>
+          <a @click="handleEdit(record)" v-has="'meeting:edit'">编辑</a>
+          <a @click="handleDelete(record.id)" v-has="'meeting:delete'">删除</a>
         </span>
       </a-table>
     </div>
diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue
index 8578d37..8a06dcc 100644
--- a/src/views/projectManagement/InternationalSeminar.vue
+++ b/src/views/projectManagement/InternationalSeminar.vue
@@ -52,7 +52,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search" v-has="'internationalSeminar:search'">查询</a-button>
+              <a-button type="primary" @click="searchQuery" icon="search" v-has="'meeting:search'">查询</a-button>
               <a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
@@ -64,8 +64,8 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus" v-has="'meeting:add'">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('会议管理')" v-has="'internationalSeminar:export'">导出</a-button>
-      <a-button type="danger" icon="delete" @click="batchDel" v-has="'internationalSeminar:batchDel'">批量删除</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('参会人')" v-has="'meeting:export'">导出</a-button>
+      <a-button type="danger" icon="delete" @click="batchDel" v-has="'meeting:batchDel'">批量删除</a-button>
     </div>
 
     <!-- table区域-begin -->
@@ -96,10 +96,10 @@
         </template>
 
         <span slot="action" slot-scope="text, record" class="action-span-cell">
-          <a @click="handleUploadFile(record)" v-has="'internationalSeminar:upload'">上传文件</a>
+          <a @click="handleUploadFile(record)" v-has="'meeting:upload'">上传文件</a>
 <!--          <a @click="handleSignup(record)">报名信息</a>-->
-          <a @click="handleEdit(record)" v-has="'internationalSeminar:edit'">编辑</a>
-          <a @click="handleDelete(record.id)" v-has="'internationalSeminar:delete'">删除</a>
+          <a @click="handleEdit(record)" v-has="'meeting:edit'">编辑</a>
+          <a @click="handleDelete(record.id)" v-has="'meeting:delete'">删除</a>
         </span>
       </a-table>
     </div>
diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue
index 053e586..e305548 100644
--- a/src/views/projectManagement/OtherMeeting.vue
+++ b/src/views/projectManagement/OtherMeeting.vue
@@ -52,7 +52,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search" v-has="'otherMeeting:search'">查询</a-button>
+              <a-button type="primary" @click="searchQuery" icon="search" v-has="'meeting:search'">查询</a-button>
               <a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
             </span>
             </a-col>
@@ -64,8 +64,8 @@
       <!-- 操作按钮区域 -->
       <div class="table-operator">
         <a-button @click="handleAdd" type="primary" icon="plus" v-has="'meeting:add'">新增</a-button>
-        <a-button type="primary" icon="download" @click="handleExportXls('会议管理')" v-has="'otherMeeting:export'">导出</a-button>
-        <a-button type="danger" icon="delete" @click="batchDel" v-has="'otherMeeting:batchDel'">批量删除</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls('会议管理')" v-has="'meeting:export'">导出</a-button>
+        <a-button type="danger" icon="delete" @click="batchDel" v-has="'meeting:batchDel'">批量删除</a-button>
       </div>
 
       <!-- table区域-begin -->
@@ -94,10 +94,10 @@
             <span v-else></span>
           </template>
           <span slot="action" slot-scope="text, record" class="action-span-cell">
-          <a @click="handleUploadFile(record)" v-has="'otherMeeting:upload'">上传文件</a>
+          <a @click="handleUploadFile(record)" v-has="'meeting:upload'">上传文件</a>
 <!--          <a @click="handleSignup(record)">报名信息</a>-->
-          <a @click="handleEdit(record)" v-has="'otherMeeting:edit'">编辑</a>
-          <a @click="handleDelete(record.id)" v-has="'otherMeeting:delete'">删除</a>
+          <a @click="handleEdit(record)" v-has="'meeting:edit'">编辑</a>
+          <a @click="handleDelete(record.id)" v-has="'meeting:delete'">删除</a>
         </span>
         </a-table>
       </div>
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index 7c31795..c5884c1 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -153,7 +153,7 @@
                   </a-radio-group>
                 </a-form-item>
               </a-col>
-              <a-col :xxl="8" :xl="12" :sm="24">
+              <a-col :xxl="8" :xl="12" :sm="24" v-if="meetingType === '3' ">
                 <a-form-item label="是否有邀请码" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-radio-group v-decorator="['inviteCode',validatorRules.inviteCode]" @change="changeInviteCode">
                     <a-radio :value="1">是</a-radio>