From 6e720684ab681b8ba58d4cb54a3ca2a6ea948042 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Tue, 2 Jul 2024 09:50:26 +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=E5=8C=BA=E5=88=86=E7=A0=94=E7=A9=B6?=
 =?UTF-8?q?=E7=BB=84=E9=A1=B9=E7=9B=AE=E7=BB=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionalSafetyCenter.vue                |  8 +++++++
 .../modules/SafetyCenterModule.vue            | 23 ++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue b/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue
index 7ca590b..c8a179c 100644
--- a/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue
+++ b/src/views/functionalSafetyCenter/FunctionalSafetyCenter.vue
@@ -99,6 +99,7 @@ export default {
   mixins: [JeroListMixin],
   data() {
     return {
+      disableMixinCreated: true,
       // 混入post请求删除接口
       postMethodDel: true,
       SafetyCenterProjectTypeEnums,
@@ -149,6 +150,13 @@ export default {
       lastQueryParam: {}
     }
   },
+  created () {
+    // 如果有id展示项目组数据接口
+    if (this.$route.query.id) {
+      this.url.list = '/SafetyCenter/projectGroupPage'
+    }
+    this.loadData()
+  },
   methods: {
     loadData(arg) {
       if (!this.url.list) {
diff --git a/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue b/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue
index 66805c2..d042605 100644
--- a/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue
+++ b/src/views/functionalSafetyCenter/modules/SafetyCenterModule.vue
@@ -63,6 +63,7 @@ import pick from 'lodash.pick'
 import { httpAction } from '@api/manage'
 import SelectPrincipal from '@comp/company/SelectPrincipal'
 import { addZero } from '@/utils/util'
+import {SafetyCenterProjectTypeEnums} from '@/enums/commonEnums'
 
 export default {
   name: 'SafetyCenterModule',
@@ -109,10 +110,18 @@ export default {
           validateTrigger: 'blur'
         }
       },
+      // 研究组的接口
       url: {
         add: '/SafetyCenter/add',
         edit: '/SafetyCenter/edit'
-      }
+      },
+      // 项目组的接口
+      projectUrl: {
+        add: '/SafetyCenter/addProjectGroup',
+        edit: '/SafetyCenter/editProjectGroup'
+      },
+      // 项目类型，默认是研究组
+      projectType: SafetyCenterProjectTypeEnums.studyGroup.value
     }
   },
   methods: {
@@ -121,6 +130,12 @@ export default {
       this.edit({})
     },
     edit(record) {
+      // 有id就是项目组
+      if (this.$route.query.id) {
+        this.projectType = SafetyCenterProjectTypeEnums.projectGroup.value
+      } else {
+        this.projectType = SafetyCenterProjectTypeEnums.studyGroup.value
+      }
       this.form.resetFields()
       // 防止下拉选项出现问题
       record.principalId = record.principalId || undefined
@@ -151,10 +166,12 @@ export default {
           that.confirmLoading = true
           let httpurl = ''
           let method = 'post'
+          // 研究组用url，项目组用projectUrl
+          const urlObj = this.projectType === SafetyCenterProjectTypeEnums.studyGroup.value ? this.url : this.projectUrl
           if (!this.model.id) {
-            httpurl += this.url.add
+            httpurl += urlObj.add
           } else {
-            httpurl += this.url.edit
+            httpurl += urlObj.edit
           }
           const formData = Object.assign(this.model, values)
           console.log('表单提交数据', formData)