From d0b10fcbfdb11fa6b0bae46ebb5d2b2025503ac2 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 3 Jul 2024 10:37:17 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BC=9A=E8=AE=AE]=20=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/JeroListMixin.js                   |  8 +++---
 .../FunctionalSafetyConferenceMaintenance.vue |  8 +++---
 .../meetManage/AddOrDetailMeet.vue            | 27 ++++++++++++++-----
 .../incomePayments/meetManage/Attendance.vue  | 17 ++++++------
 .../meetManage/SignUpInfoEdit.vue             |  4 +--
 .../meetManage/modules/AuditModal.vue         |  7 +++++
 .../modules/UploadMeetFileModal.vue           |  4 +--
 7 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index 9902859..2b5406a 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -196,8 +196,8 @@ export const JeroListMixin = {
           onOk: function () {
             that.loading = true
             // 新增加的删除接口用post方式请求
-            const method = that.postMethodDel ? 'POST' : 'GET'
-            httpAction(that.url.deleteBatch, {ids: ids}, method).then((res) => {
+            const actionFunc = that.postMethodDel ? postAction : getAction
+            actionFunc(that.url.deleteBatch, {ids: ids}).then((res) => {
               if (res.success) {
                 that.$message.success(res.message)
                 // 判断当前删除的数据是否是最后一页的全部数据，如果是的话页码减一
@@ -233,8 +233,8 @@ export const JeroListMixin = {
         content: '确定要删除此条数据吗?',
         onOk: function () {
           // 新增加的删除接口用post方式请求
-          const method = that.postMethodDel ? 'POST' : 'GET'
-          httpAction(that.url.delete, {id: id}, method).then((res) => {
+          const actionFunc = that.postMethodDel ? postAction : getAction
+          actionFunc(that.url.delete, {id: id}).then((res) => {
             if (res.success) {
               that.$message.success(res.message)
               // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一
diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue
index 0e8d8ff..59c5d31 100644
--- a/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue
+++ b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue
@@ -248,10 +248,10 @@ export default {
         }
       ],
       url: {
-        list: '',
-        delete: '',
-        deleteBatch: '',
-        exportXlsUrl: ''
+        list: '/meeting/safetyCenterMeeting/page',
+        delete: '/meeting/safetyCenterMeeting/delete',
+        deleteBatch: '/meeting/safetyCenterMeeting/deleteBatch',
+        exportXlsUrl: '/meeting/safetyCenterMeeting/exportXls'
       },
       canOperate: true // 是否可操作（负责人B不可操作）
     }
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 2f31ba4..43f1ebb 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -404,12 +404,12 @@
             <template v-if="!isWasic">
               <a-col :xxl="8" :xl="12" :sm="24">
                 <a-form-item label="会议费用" :labelCol="labelCol" :wrapperCol="{ xs: {span: 24},sm: {span: 16}}">
-                  <!-- 起草组会议费用默认0不可修改 -->
+                  <!-- 起草组会议、功能安全中心会议费用默认0不可修改 -->
                   <a-input placeholder="请输入会议费用"
                            :maxLength='50'
                            @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"
                            @blur="addZero"
-                           :disabled="meetingType === '7'"
+                           :disabled="disabledMeetingCosts"
                            v-decorator="[ 'meetingCosts',validateInviteCode.meetingCosts]"></a-input>
                   <span class="yuan">元/人</span>
                 </a-form-item>
@@ -763,6 +763,16 @@ export default {
     }
   },
   computed: {
+    // 禁用会议费用
+    disabledMeetingCosts () {
+      // 禁用的会议类型
+      const arr = [
+        MeetingTypeEnums.draftGroup.value, // 起草组会议
+        MeetingTypeEnums.overseas.value, // 海外会议
+        MeetingTypeEnums.safetyCenter.value, // 功能安全中心会议
+      ]
+      return arr.includes(this.meetingType)
+    },
     // 是否从工作组会议维护来的
     isWorkGroupMeetType() {
       if (this.$route.query.workingGroupProjectId) {
@@ -930,8 +940,13 @@ export default {
       // 后端需要的注册签到时间
       this.newSignInTime = [this.model.startSignInTime, this.model.endSignInTime]
 
-      // 起草组会议费用默认0 (功能安全中心同起草组)
-      if (this.meetingType === '7' || this.meetingType === MeetingTypeEnums.safetyCenter.value) {
+      // 部分会议费用默认0
+      const zeroCostscArr = [
+        MeetingTypeEnums.draftGroup.value, // 起草组会议
+        MeetingTypeEnums.overseas.value, // 海外会议
+        MeetingTypeEnums.safetyCenter.value, // 功能安全中心会议
+      ]
+      if (zeroCostscArr.includes(this.meetingType)) {
         this.model.meetingCosts = '0.00'
         this.QRcodeBool = false
       }
@@ -1416,8 +1431,8 @@ export default {
         // 功能安全中心会议
         case MeetingTypeEnums.safetyCenter.value:
           return {
-            add: '',
-            edit: ''
+            add: '/meeting/safetyCenterMeeting/add',
+            edit: '/meeting/safetyCenterMeeting/edit'
           }
       }
     },
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index fb2859a..6a9c6b1 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -384,9 +384,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="(['1', '5', '6', '7'].includes(currentMeetingInfo.meetingType)) && record.registerCheckResult === 0 "
+             v-show="(['1', '5', '6', '7', MeetingTypeEnums.safetyCenter.value].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>
@@ -459,6 +459,7 @@ export default {
   },
   data() {
     return {
+      MeetingTypeEnums,
       description: '参会情况',
       columns: [
         {
@@ -733,13 +734,13 @@ export default {
         exportXlsUrl: '/meeting/draftGroupMeetingSituation/exportXls',
         importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel'
       },
-      // 起草组会议的url
+      // 功能安全中心会议的url
       safetyCenterMeetingUrl: {
-        list: '/meeting/draftGroupMeetingSituation/page',
-        delete: '/meeting/draftGroupMeetingSituation/delete',
-        deleteBatch: '/meeting/draftGroupMeetingSituation/deleteBatch',
-        exportXlsUrl: '/meeting/draftGroupMeetingSituation/exportXls',
-        importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel'
+        list: '/meeting/safetyCenterMeeting/page',
+        delete: '/meeting/safetyCenterMeeting/delete',
+        deleteBatch: '/meeting/safetyCenterMeeting/deleteBatch',
+        exportXlsUrl: '/meeting/safetyCenterMeeting/exportXls',
+        importExcelUrl: '/meeting/safetyCenterMeeting/importExcel'
       },
       // 当前的会议信息详情
       currentMeetingInfo: {},
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index c6c27f9..33006f5 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -291,8 +291,8 @@ export default {
       },
       // 功能安全中心会议的url
       safetyCenterMeetingUrl: {
-        add: '/meeting/draftGroupMeetingSituation/add',
-        edit:'/meeting/draftGroupMeetingSituation/edit'
+        add: '/meeting/safetyCenterMeetingSituation/add',
+        edit:'/meeting/safetyCenterMeetingSituation/edit'
       },
       title:'添加参会人',
       // 当前参会企业是否是内部企业
diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue
index 3a07217..b8d62d8 100644
--- a/src/views/incomePayments/meetManage/modules/AuditModal.vue
+++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue
@@ -222,6 +222,13 @@ export default {
         // 审核报名信息
         checkSignUp: '/meeting/draftGroupMeetingSituation/checkRegister'
       },
+     // 功能安全中心会议url
+      safetyCenterMeetingUrl: {
+        // 审核凭证
+        check: '/meeting/safetyCenterMeetingSituation/check',
+        // 审核报名信息
+        checkSignUp: '/meeting/safetyCenterMeetingSituation/checkRegister'
+      },
       // 审核结果选择
       checkBool: false,
       // 是否是审核报名信息
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index 2736b8e..5776f97 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -212,8 +212,8 @@ export default {
         // 安全中心会议
         case MeetingTypeEnums.safetyCenter.value:
           return {
-            uploadFile: '',
-            uploadCouncilFile: ''
+            uploadFile: '/meeting/safetyCenterMeeting/uploadFile',
+            uploadCouncilFile: '/meeting/safetyCenterMeeting/uploadCouncilFile'
           }
       }
     },