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

---
 src/api/incomePaymentsApi.js                 |  2 +-
 src/enums/commonEnum.js                      |  3 ++-
 src/permission.js                            |  2 +-
 src/views/MessagePage/MeetingDetailModal.vue |  3 ++-
 src/views/draftTeam/DraftTeamDetail.vue      | 17 -----------------
 src/views/draftTeam/SignUpDraftTeamPage.vue  |  2 +-
 6 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index acd67b3..4bb770b 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -22,7 +22,7 @@ const getCommitteeUnderStudyProject = (param) => getAction('/payResearchProject/
 // 工作组在研项目
 const getWorkingGroupUnderStudyProject = (param) => getAction('/payResearchProject/payResearchProject/list', param)
 // 起草组在研项目
-const getDraftingGroupUnderStudyProject = (param) => getAction('/drafting/payDraftingGroupResearchProject/list', param)
+const getDraftingGroupUnderStudyProject = (param) => getAction('/drafting/payDraftingGroupResearchProject/enterpriseQueryPageList', param)
 // 缴费凭证审核记录
 const getAuditProofRecords = (param) => getAction('/paymentCheck/payPaymentCheck/amountReceivedSubList', param)
 // 生成会议二维码
diff --git a/src/enums/commonEnum.js b/src/enums/commonEnum.js
index f482cfa..761ea75 100644
--- a/src/enums/commonEnum.js
+++ b/src/enums/commonEnum.js
@@ -39,7 +39,8 @@ export const MeetingTypeEnums = {
   internationalSeminar: { name: '国际研讨会', index: 3 },
   other: { name: '其他会议', index: 4 },
   committee: { name: '分标委会议', index: 5 },
-  council: { name: '理事会会议', index: 6 }
+  council: { name: '理事会会议', index: 6 },
+  draftGroup: { name: '起草会会议', index: 7 }
 }
 // 参会人员身份类型
 export const MeetIdentifyTypeEnums = {
diff --git a/src/permission.js b/src/permission.js
index 1a35453..1839a63 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@ import { generateIndexRouter } from '@/utils/util'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/user/login', '/user/manageLogin', '/user/register', '/user/register-result', '/user/member-register', '/user/member-register-result', '/user/alteration','/signupentrance','/signUpPage','/lookExpressInfo'] // no redirect whitelist
+const whiteList = ['/user/login', '/user/manageLogin', '/user/register', '/user/register-result', '/user/member-register', '/user/member-register-result', '/user/alteration','/signupentrance','/signUpPage','/lookExpressInfo', '/signUpDraftTeamEntrance' + '/signUpDraftTeamPage'] // no redirect whitelist
 
 const ThirdLoginFunc = (token) => {
   return new Promise(resolve => {
diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index 8e77773..79d3403 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -171,7 +171,8 @@
       </section>
       <!--会议信息end-->
       <!--开票邮寄信息begin-->
-      <section class="logistics-info">
+      <!--   起草组不显示开票邮寄信息   -->
+      <section class="logistics-info" v-if="Number(model.meetingType) !== MeetingTypeEnums.draftGroup.index">
         <h3 class="title">开票邮寄信息</h3>
         <div>
         <span class="collapse-span color-blue"
diff --git a/src/views/draftTeam/DraftTeamDetail.vue b/src/views/draftTeam/DraftTeamDetail.vue
index c026e71..40ade9c 100644
--- a/src/views/draftTeam/DraftTeamDetail.vue
+++ b/src/views/draftTeam/DraftTeamDetail.vue
@@ -11,23 +11,6 @@
               </a-col>
               <a-col :span="8" class="basic-info-item"><label>项目负责人：</label><span>{{ detail.principalName }}</span>
               </a-col>
-
-              <!--        合同-->
-              <a-col :span="8" class="basic-info-item" v-if="detail.chargeWay === 2">
-                <label>合同编号：</label>
-                <span>{{ detail.contractNum }}</span>
-              </a-col>
-              <!--        收费通知-->
-              <a-col :span="8" class="basic-info-item" v-if="detail.chargeWay === 3">
-                <label>收费通知号：</label>
-                <span>{{ detail.chargeNoticeNo }}</span>
-              </a-col>
-              <a-col :span="12" class="basic-info-item" v-if="detail.chargeWay === 3">
-                <label>收费通知：</label>
-                <span style="width: 100%;">
-                <preview-file style="width: 80%" :file-id="detail.chargeNoticeId"></preview-file>
-              </span>
-              </a-col>
               <a-col :span="24" class="basic-info-item">
                 <label>任务及目标：</label>
                 <span>{{ detail.missionAndObjectives }}</span>
diff --git a/src/views/draftTeam/SignUpDraftTeamPage.vue b/src/views/draftTeam/SignUpDraftTeamPage.vue
index e468d89..e73fde9 100644
--- a/src/views/draftTeam/SignUpDraftTeamPage.vue
+++ b/src/views/draftTeam/SignUpDraftTeamPage.vue
@@ -184,7 +184,7 @@ export default {
       // 起草组信息
       currentDraftTempInfo: {},
       url: {
-        add: '/drafting/payDraftingGroupSubitem/add',
+        add: '/drafting/payDraftingGroupSubitem/addByQRCode',
         info: '/drafting/payDraftingGroup/queryById'
       },
       // 默认的联系人数据