From 8dc8cd83a04da7a79181412d9ae2caa0b974d355 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Mon, 1 Jul 2024 10:58:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B8=B8=E6=80=81?=
 =?UTF-8?q?=E5=8C=96=E5=B9=B2=E6=89=B0=E6=BA=90=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E7=BC=96=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../harmonicSurvey/components/testManage.vue  |  6 ++--
 .../components/undocumented/addForm.vue       | 30 +++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
index 6100408d..d2594db9 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
@@ -114,7 +114,7 @@ const tableStore = new TableStore({
             minWidth: 140,
             custom: {
                 0: 'warning',
-                
+
                 1: 'primary',
                 2: 'success',
                 3: 'danger',
@@ -122,7 +122,7 @@ const tableStore = new TableStore({
             },
             replaceValue: {
                 0: '待提交审批',
-         
+
                 1: '审批中',
                 2: '审批通过',
                 3: '审批不通过',
@@ -177,7 +177,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     showDisabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 0)
+                        return row.deptId != adminInfo.$state.deptId || !(row.status == 0)
                     },
                     disabled: row => {
                         return !(row.status == 0)
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index 795d2a44..b21ad83f 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -523,7 +523,7 @@ import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { queryByAllCode } from '@/api/system-boot/dictTree'
 import { uploadFile } from '@/api/system-boot/file'
-import { submitFormData, getById, updateFormData, addEditor,resend } from '@/api/supervision-boot/interfere/index'
+import { submitFormData, getById, updateFormData, addEditor, resend } from '@/api/supervision-boot/interfere/index'
 import { getUserReportUpdateById } from '@/api/supervision-boot/userReport/form'
 const props = defineProps({
     openType: {
@@ -1362,15 +1362,27 @@ const confirmForm = (flag: boolean) => {
                 } else {
                     confirmFormData.id = resendId.value
                     if (props.normalizedControl) {
-                        resend(confirmFormData).then(res => {
-                            ElMessage({
-                                message: '重新发起成功',
-                                type: 'success'
+                        if (title.value == '编辑') {
+                            addEditor(confirmFormData).then(res => {
+                                ElMessage({
+                                    message: '发起成功',
+                                    type: 'success'
+                                })
+                                ruleFormRef.value.resetFields()
+                                resetForm()
+                                close()
                             })
-                            ruleFormRef.value.resetFields()
-                            resetForm()
-                            close()
-                        })
+                        } else {
+                            resend(confirmFormData).then(res => {
+                                ElMessage({
+                                    message: '重新发起成功',
+                                    type: 'success'
+                                })
+                                ruleFormRef.value.resetFields()
+                                resetForm()
+                                close()
+                            })
+                        }
                     } else {
                         updateFormData(confirmFormData).then(res => {
                             ElMessage({