Merge branch 'master' into 24年二季度其他

# Conflicts:
#	src/enums/commonEnums.js
#	src/views/projectManagement/modules/PublishRemindModal.vue

src/views/projectManagement/AllMeetingList.vue

@@ -297,7 +297,10 @@ export default {
       pathMap.set('5','/incomePayments/meetManage/AttendanceCommitteeMeeting')
       pathMap.set('6','/incomePayments/meetManage/AttendanceCouncilMeeting')
       pathMap.set('7','/incomePayments/meetManage/AttendanceDraftGroupMeeting')
+      // 海外会议
       pathMap.set(MeetingTypeEnums.overseas.value,'/incomePayments/meetManage/AttendanceOverseasMeeting')
+      // 功能安全中心会议
+      pathMap.set(MeetingTypeEnums.safetyCenter.value,'/incomePayments/meetManage/AttendanceFunctionalSafetyCenter')
       this.$router.push({
         path: pathMap.get(record.meetingType+''),
         query: {

src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue

@@ -57,7 +57,7 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record" v-if="canOperate">
-            <a @click="handleDistribute(record.id)" v-has="'fileMaintenance:distribute'">分发</a>
+            <a @click="handleDistribute(record)" v-has="'fileMaintenance:distribute'">分发</a>
             <a @click="handleDownload(record)" v-has="'fileMaintenance:download'">下载</a>
             <a @click="handleDelete(record.id)" v-has="'fileMaintenance:delete'">删除</a>
           </span>
@@ -79,6 +79,7 @@
       :project-type="projectType"
       :is-batch="isBatchDistribute"
       :record-id="dataId"
+      :file-id="fileId"
       @ok="modalFormOk"></work-group-distribute-module>
   </div>
 </template>
@@ -158,6 +159,7 @@ export default {
       distributeModalVisible: false,
       isBatchDistribute: false,
       dataId: '', // 资料id，传给分发
+      fileId: '', // 文件id, 单个分发时查询用
       canOperate: true // 是否可操作（负责人B不可操作）
     }
   },
@@ -184,6 +186,11 @@ export default {
       this.canOperate = this.$route.query.canOperate === 'true'
       this.projectType = 4
       this.filters.projectType = 4
+    } else if (this.$route.query.hasOwnProperty.call(this.$route.query, 'safetyCenterId')) {
+      // 功能安全中心
+      this.filters.projectId = this.$route.query.safetyCenterId
+      this.projectType = 5
+      this.filters.projectType = 5
     }
     this.projectId = this.filters.projectId
     this.loadData()
@@ -204,8 +211,9 @@ export default {
     /**
      * 分发
      */
-    handleDistribute(id) {
-      this.dataId = id
+    handleDistribute(record) {
+      this.fileId = record.fileId
+      this.dataId = record.id
       this.distributeModalVisible = true
       this.isBatchDistribute = false
     },

src/views/projectManagement/modules/PublishRemindModal.vue

@@ -98,6 +98,7 @@ import {
 import EmailErrorMsgModal from '@views/projectManagement/modules/EmailErrorMsgModal'
 import { judgeEmailStatus } from '../../../api/incomePaymentsApi'
 import { getAction } from "../../../api/manage";
+import {MeetingTypeEnums} from '@/enums/commonEnums'
 
 
 export default {
@@ -237,6 +238,47 @@ export default {
           // scopedSlots: {customRender: 'text'}
         },
       ],
+      // 功能安全中心发布提醒 表头
+      safetyCenterColumns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '成员单位',
+          align: 'center',
+          width: 200,
+          dataIndex: 'companyName',
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '企业联系人',
+          align: 'center',
+          width: 200,
+          dataIndex: 'contactsName',
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '是否提醒',
+          align: 'center',
+          width: 200,
+          dataIndex: 'remind_dictText',
+          // scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '邮件提醒',
+          align: 'center',
+          width: 200,
+          dataIndex: 'mailRemind_dictText',
+          // scopedSlots: {customRender: 'text'}
+        },
+      ],
       model: {},
       labelCol: {
         xs: {span: 24},
@@ -289,6 +331,12 @@ export default {
         this.filters.draftingGroupId = this.$route.query.draftingGroupProjectId
         this.newColumns = [...this.columns]
         this.remindType = 4
+      } else if (this.$route.query.meetingType === MeetingTypeEnums.safetyCenter.value) {
+        // 功能安全中心
+        this.url.list = '/SafetyCenterSubitem/publishReminderList'
+        this.filters.projectId = this.$route.query.projectId
+        this.newColumns = [...this.safetyCenterColumns]
+        this.remindType = 5
       } else {
         // 列表需要工作组id参数
         this.filters.workingGroupId = this.$route.query.workingGroupProjectId
@@ -344,6 +392,10 @@ export default {
           // 起草组用起草组的发布提醒
           param.draftingGroupId = this.$route.query.draftingGroupProjectId
           requestFun = draftGroupPublishRemind
+        } else if (this.$route.query.meetingType === MeetingTypeEnums.safetyCenter.value) {
+          // 功能安全中心的发布提醒
+          param.safetyCenterId = this.$route.query.projectId
+          requestFun = draftGroupPublishRemind
         } else {
           // 工作组
           param.workingGroupId = this.$route.query.workingGroupProjectId

src/views/projectManagement/modules/WorkGroupDistributeModule.vue

@@ -207,6 +207,12 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    // 单个分发时的文件Id
+    fileId: {
+      type: String,
+      required: false,
+      default: null
     }
   },
   watch: {
@@ -265,7 +271,7 @@ export default {
       }
       // 非批量上传的时候传当前选中的文件id
       if(!this.isBatch) {
-        param.fileId = this.recordId
+        param.fileId = this.fileId
       }
       distributeMemberList(param).then(res => {
         if (res.success) {