From d12ca7c8c11343ec4af32aa3fb6bc05e106ae20b Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Tue, 2 Jul 2024 19:20:03 +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]=20=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionalSafetyCenter.vue                | 21 +++++++-------
 .../FunctionalSafetyConferenceMaintenance.vue | 28 +++++++++----------
 .../FunctionalSafetyMemberUnitMaintenance.vue | 16 +++++------
 .../modules/SafetyCenterModule.vue            |  1 +
 4 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue b/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue
index 8a5305c..b2d4af7 100644
--- a/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue
+++ b/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue
@@ -20,7 +20,7 @@
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" icon="search" @click="searchQuery"
-                          v-has="'draftingGroup:search'">查询</a-button>
+                          v-has="'safetyCenter:search'">查询</a-button>
                 <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
               </span>
             </a-col>
@@ -31,8 +31,8 @@
 
       <!--    操作按钮区域-->
       <div class="table-operator">
-        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'draftingGroup:add'">新增</a-button>
-        <a-button type="danger" icon="delete" @click="batchDel" v-has="'draftingGroup:batchDel'">批量删除</a-button>
+        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'safetyCenter:add'">新增</a-button>
+        <a-button type="danger" icon="delete" @click="batchDel" v-has="'safetyCenter:batchDel'">批量删除</a-button>
       </div>
       <!--    /操作按钮区域-end-->
 
@@ -66,13 +66,13 @@
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
             <!-- 研究组可以点击在研项目显示项目组的信息 -->
-            <a @click="goUnderStudyProject(record)" v-has="'draftingGroup:underStudyProject'"
+            <a @click="goUnderStudyProject(record)" v-has="'safetyCenter:underStudyProject'"
                v-if="record.projectType + '' === SafetyCenterProjectTypeEnums.studyGroup.value">在研项目</a>
-            <a @click="goFilesMaintenance(record)" v-has="'draftingGroup:fileMaintenance'">其他分发资料</a>
-            <a @click="goConferenceMaintenance(record)" v-has="'draftingGroup:meetingMaintenance'">项目会议</a>
-            <!--<a @click="handleCopy(record.id)" v-has="'draftingGroup:copy'">复制</a>-->
-            <a @click="handleEdit(record)" v-has="'draftingGroup:edit'">基本信息维护</a>
-            <a @click="handleDelete(record.id)" v-has="'draftingGroup:delete'"
+            <a @click="goFilesMaintenance(record)" v-has="'safetyCenter:fileMaintenance'">其他分发资料</a>
+            <a @click="goConferenceMaintenance(record)" v-has="'safetyCenter:meetingMaintenance'">项目会议</a>
+            <!--<a @click="handleCopy(record.id)" v-has="'safetyCenter:copy'">复制</a>-->
+            <a @click="handleEdit(record)" v-has="'safetyCenter:edit'">基本信息维护</a>
+            <a @click="handleDelete(record.id)" v-has="'safetyCenter:delete'"
                v-if="record.projectType + '' === SafetyCenterProjectTypeEnums.projectGroup.value">删除</a>
           </span>
         </a-table>
@@ -136,7 +136,7 @@ export default {
           title: '负责人',
           align: 'center',
           width: 130,
-          dataIndex: 'principalName'
+          dataIndex: 'principalId_dictText'
         }, {
           title: '操作',
           dataIndex: 'action',
@@ -153,6 +153,7 @@ export default {
   created () {
     // 如果有id展示项目组数据接口
     if (this.$route.query.id) {
+      this.filters.parentId = this.$route.query.id
       this.url.list = '/SafetyCenter/projectGroupPage'
     }
     this.loadData()
diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue
index 4e78634..0e8d8ff 100644
--- a/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue
+++ b/src/views/functionalSafetyCenter/FunctionalSafetyConferenceMaintenance.vue
@@ -63,7 +63,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="'draftGroupMeeting:search'">查询</a-button>
+                        v-has="'safetyCenterMeeting:search'">查询</a-button>
               <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
             </span>
             </a-col>
@@ -74,15 +74,15 @@
 
       <!--    操作按钮区域-->
       <div class="table-operator">
-        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'draftGroupMeeting:add'" v-if="canOperate">新增
+        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'safetyCenterMeeting:add'" v-if="canOperate">新增
         </a-button>
-        <a-button type="primary" icon="export" @click="handleExportXls('工作组会议')"
-                  v-has="'draftGroupMeeting:export'">导出
+        <a-button type="primary" icon="export" @click="handleExportXls('功能安全中心会议')"
+                  v-has="'safetyCenterMeeting:export'">导出
         </a-button>
-        <a-button type="danger" icon="delete" @click="batchDel" v-has="'draftGroupMeeting:batchDel'" v-if="canOperate">
+        <a-button type="danger" icon="delete" @click="batchDel" v-has="'safetyCenterMeeting:batchDel'" v-if="canOperate">
           批量删除
         </a-button>
-        <a-button type="primary" @click="publishRemind" v-has="'draftGroupMeeting:publish'" v-if="canOperate">发布
+        <a-button type="primary" @click="publishRemind" v-has="'safetyCenterMeeting:publish'" v-if="canOperate">发布
         </a-button>
       </div>
       <!--    /操作按钮区域-end-->
@@ -114,11 +114,11 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record" v-if="canOperate">
-               <a @click="uploadFile(record,'1')" v-has="'draftGroupMeeting:uploadCouncil'">会议纪要</a>
-          <a @click="uploadFile(record,'2')" v-has="'draftGroupMeeting:upload'">上传文件</a>
+               <a @click="uploadFile(record,'1')" v-has="'safetyCenterMeeting:uploadCouncil'">会议纪要</a>
+          <a @click="uploadFile(record,'2')" v-has="'safetyCenterMeeting:upload'">上传文件</a>
             <!--          <a @click="applyMsg">报名信息</a>-->
-          <a @click="handleEdit(record)" v-has="'draftGroupMeeting:edit'">编辑</a>
-          <a @click="handleDelete(record.id)" v-has="'draftGroupMeeting:delete'">删除</a>
+          <a @click="handleEdit(record)" v-has="'safetyCenterMeeting:edit'">编辑</a>
+          <a @click="handleDelete(record.id)" v-has="'safetyCenterMeeting:delete'">删除</a>
         </span>
         </a-table>
       </div>
@@ -248,10 +248,10 @@ export default {
         }
       ],
       url: {
-        list: '/meeting/draftGroupMeeting/page',
-        delete: '/meeting/draftGroupMeeting/delete',
-        deleteBatch: '/meeting/draftGroupMeeting/deleteBatch',
-        exportXlsUrl: '/meeting/draftGroupMeeting/exportXls'
+        list: '',
+        delete: '',
+        deleteBatch: '',
+        exportXlsUrl: ''
       },
       canOperate: true // 是否可操作（负责人B不可操作）
     }
diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue b/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue
index cff4013..e4a4a79 100644
--- a/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue
+++ b/src/views/functionalSafetyCenter/FunctionalSafetyMemberUnitMaintenance.vue
@@ -54,7 +54,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="'draftingGroupMember:search'">查询</a-button>
+                        v-has="'safetyCenterMember:search'">查询</a-button>
               <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
             </span>
             </a-col>
@@ -65,21 +65,21 @@
 
       <!--    操作按钮区域-->
       <div class="table-operator">
-        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'draftingGroupMember:add'" v-if="canOperate">
+        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'safetyCenterMember:add'" v-if="canOperate">
           添加成员
         </a-button>
         <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :data="importParam"
-                  :action="importExcelUrl" @change="handleImportExcel" v-has="'draftingGroupMember:import'"
+                  :action="importExcelUrl" @change="handleImportExcel" v-has="'safetyCenterMember:import'"
                   v-if="canOperate">
           <a-button type="primary" icon="import">导入</a-button>
         </a-upload>
-        <a-button type="primary" icon="export" @click="handleExportXls('功能安全中心成员')" v-has="'draftingGroupMember:export'">
+        <a-button type="primary" icon="export" @click="handleExportXls('功能安全中心成员')" v-has="'safetyCenterMember:export'">
           导出
         </a-button>
         <a-button type="primary" icon="download" @click="downTemplate('功能安全中心成员导入模板')"
-                  v-has="'draftingGroupMember:downTemplate'" v-if="canOperate">下载模板
+                  v-has="'safetyCenterMember:downTemplate'" v-if="canOperate">下载模板
         </a-button>
-        <a-button type="danger" icon="delete" @click="batchDel" v-has="'draftingGroupMember:batchDel'" v-if="canOperate">
+        <a-button type="danger" icon="delete" @click="batchDel" v-has="'safetyCenterMember:batchDel'" v-if="canOperate">
           批量删除
         </a-button>
         <!--<a-button type="primary" @click="setLabel" v-has="'workingGroupMember:setLabel'">设置标签</a-button>-->
@@ -118,8 +118,8 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record" v-if="canOperate">
-            <a @click="handleEdit(record)" v-has="'draftingGroupMember:edit'">编辑</a>
-            <a @click="handleDelete(record.id)" v-has="'draftingGroupMember:delete'">删除</a>
+            <a @click="handleEdit(record)" v-has="'safetyCenterMember:edit'">编辑</a>
+            <a @click="handleDelete(record.id)" v-has="'safetyCenterMember:delete'">删除</a>
           </span>
         </a-table>
       </div>
diff --git a/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue b/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue
index d042605..500f3be 100644
--- a/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue
+++ b/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue
@@ -174,6 +174,7 @@ export default {
             httpurl += urlObj.edit
           }
           const formData = Object.assign(this.model, values)
+          formData.parentId = this.$route.query.id
           console.log('表单提交数据', formData)
           httpAction(httpurl, formData, method).then((res) => {
             if (res.success) {