From ed9bce09b374fc0cbcc6895282ed880b7f5e3619 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Tue, 4 Jun 2024 15:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=80=E5=8C=97=E6=99=AE=E6=B5=8B=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/process-boot/generalTest.ts               |  8 ++++++++
 src/api/supervision-boot/survey/test.ts           | 11 +++++++++++
 .../harmonicSurvey/components/planTest.vue        |  9 +++++++--
 .../harmonicSurvey/components/testManage.vue      | 15 +++++++++------
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/api/process-boot/generalTest.ts b/src/api/process-boot/generalTest.ts
index ccd2e8ed..96fdcc9b 100644
--- a/src/api/process-boot/generalTest.ts
+++ b/src/api/process-boot/generalTest.ts
@@ -177,6 +177,14 @@ export function cancel(data: any) {
     })
 }
 
+export function cancelTest(data: any) {
+    return createAxios({
+        url: '/supervision-boot/surveyTest/cancel',
+        method: 'POST',
+        data
+    })
+}
+
 
 
 
diff --git a/src/api/supervision-boot/survey/test.ts b/src/api/supervision-boot/survey/test.ts
index 4664ffb9..685f7ba9 100644
--- a/src/api/supervision-boot/survey/test.ts
+++ b/src/api/supervision-boot/survey/test.ts
@@ -26,6 +26,17 @@ export const addSurveyTest = (data: any) => {
     })
 }
 
+/**
+ * 重新发起填报普测测试结果
+ */
+export const updateSurveyTest = (data: any) => {
+    return createAxios({
+        url: MAPPING_PATH + '/update',
+        method: 'POST',
+        data: data
+    })
+}
+
 /**
  * 针对有问题的现场测试发起告警单
  */
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
index fe391f7e..95e48160 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
@@ -76,7 +76,7 @@ import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删
 import { ElMessage, genFileId, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import { uploadFile, getFileNameAndFilePath } from '@/api/system-boot/file'
 import { useDictData } from '@/stores/dictData'
-import { addSurveyTest, getTestById } from '@/api/supervision-boot/survey/test'
+import { addSurveyTest,updateSurveyTest, getTestById } from '@/api/supervision-boot/survey/test'
 
 const tableStore = inject('tableStore') as TableStore
 let uploadName = ref('')
@@ -167,12 +167,17 @@ const submitFn = () => {
       }
       if(addFlagRef){
         //新增，则组装业务数据提交后台
-        //此时该告警单处于待反馈状态
         await addSurveyTest(form.value)
         //查询进线数据，避免一直处于loading状态
         ElMessage.success('申请成功')
         tableStore.index()
         planAddition.value = false
+      }else{
+          await updateSurveyTest(form.value)
+          //查询进线数据，避免一直处于loading状态
+          ElMessage.success('重新申请成功')
+          tableStore.index()
+          planAddition.value = false
       }
     }
   })
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
index 52d472ce..b29972e2 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
@@ -10,11 +10,14 @@
 </template>
 <script setup lang='ts'>
 import { ref, onMounted, provide, nextTick } from 'vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { cancel } from '@/api/process-boot/generalTest'
+import { cancelTest } from '@/api/process-boot/generalTest'
 import planTest from './planTest.vue'
 import { useRouter } from 'vue-router'
 
@@ -121,11 +124,11 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.status == 6 || row.status == 1 || row.status == 2
+                        return row.createBy != adminInfo.$state.id || row.status == 6 || row.status == 1 || row.status == 2
                     },
                     click: row => {
                         // deviceQuitPopup.value.open('重新发起退运', row)
-                        planTestRef.value.open('重新发起计划', row)
+                        planTestRef.value.open('重新发起计划', row.id)
                     }
                 },
                 {
@@ -135,7 +138,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.status == 6 || row.status == 2 || row.status == 3 || row.status == 4
+                        return row.createBy != adminInfo.$state.id || row.status == 6 || row.status == 2 || row.status == 3 || row.status == 4
                     },
                     click: row => {
                         cancelLeave(row)
@@ -188,11 +191,11 @@ const cancelLeave = async (row: any) => {
     })
     // 发起取消
     let data = {
-        id: row.planNo,
+        id: row.id,
         processInstanceId: row.processInstanceId,
         reason: value
     }
-    await cancel(data)
+    await cancelTest(data)
     ElMessage.success('取消成功')
     // 加载数据
     tableStore.index()