From 31afc15f49dcaa36f24e5ef39c6ca72fe007ebba Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 3 Jun 2024 18:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/supervision-boot/interfere/index.ts   |  12 +++
 .../supervision-boot/monitorpoint/index.ts    |   9 ++
 src/api/supervision-boot/plan/index.ts        |   9 +-
 src/components/table/header/index.vue         |   2 +-
 .../interferenceUserTable.vue                 |  12 ++-
 .../components/undocumented/addForm.vue       |  18 +++-
 .../components/undocumented/index.vue         |  85 ++++++++-------
 .../pqs/supervise/plan/components/addForm.vue |  59 ++++------
 .../pqs/supervise/plan/components/detail.vue  |   2 +
 src/views/pqs/supervise/plan/index.vue        | 101 ++++++------------
 .../components/monitorpoint/addForm.vue       |  18 +++-
 .../components/monitorpoint/index.vue         |  90 ++++++----------
 .../components/terminainal/index.vue          |  27 +++--
 src/views/system/bpm/task/done/index.vue      |   2 +-
 src/views/system/bpm/task/todo/index.vue      |   3 +-
 15 files changed, 223 insertions(+), 226 deletions(-)

diff --git a/src/api/supervision-boot/interfere/index.ts b/src/api/supervision-boot/interfere/index.ts
index 916c1fd1..f7dac756 100644
--- a/src/api/supervision-boot/interfere/index.ts
+++ b/src/api/supervision-boot/interfere/index.ts
@@ -15,6 +15,18 @@ export const submitFormData = (data: any) => {
     })
 }
 
+/**
+ * 重新发起表单数据(编辑)
+ */
+export const updateFormData = (data: any) => {
+    return createAxios({
+        url: '/supervision-boot/userReport/update',
+        method: 'POST',
+        data: data
+    })
+}
+
+
 export const submitGoNet = (data: any) => {
     return createAxios({
         url: '/supervision-boot/userReportNormal/addUserReportNormal',
diff --git a/src/api/supervision-boot/monitorpoint/index.ts b/src/api/supervision-boot/monitorpoint/index.ts
index d7c91fc7..3908f9d4 100644
--- a/src/api/supervision-boot/monitorpoint/index.ts
+++ b/src/api/supervision-boot/monitorpoint/index.ts
@@ -15,6 +15,15 @@ export const addMointorPointFormData = (data: any) => {
     })
 }
 
+//重新发起监测点信息
+export const updateMointorPointFormData = (data: any) => {
+    return createAxios({
+        url: '/supervision-boot/tempLine/update',
+        method: 'POST',
+        data: data
+    })
+}
+
 
 /**
  * 查询干扰源列表数据
diff --git a/src/api/supervision-boot/plan/index.ts b/src/api/supervision-boot/plan/index.ts
index f11079f8..333b690e 100644
--- a/src/api/supervision-boot/plan/index.ts
+++ b/src/api/supervision-boot/plan/index.ts
@@ -15,7 +15,14 @@ export const addPlanFormData = (data: any) => {
     })
 }
 
-
+//重新发起技术监督计划表单数据
+export const updatePlanFormData = (data: any) => {
+    return createAxios({
+        url: '/supervision-boot/superPlan/updatePlan',
+        method: 'POST',
+        data: data
+    })
+}
 
 /**
  * 根据当前登陆用户的部门id查询人员
diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index 65240aa9..36e6595f 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -9,7 +9,7 @@
                 label-position="left"
                 :inline="true"
             >
-                <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 610px;">
+                <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 600px;">
                     <DatePicker ref="datePickerRef"></DatePicker>
                 </el-form-item>
 
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
index 9e340856..67b2191c 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
@@ -3,7 +3,7 @@
         <TableHeader ref="TableHeaderRef">
             <template #select>
                 <el-form-item label="用户名称">
-                    <el-input v-model="tableStore.table.params.projectName" clearable></el-input>
+                    <el-input v-model="tableStore.table.params.projectName" placeholder="请输入用户名称"></el-input>
                 </el-form-item>
                 <el-form-item label="所属地市">
                     <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所属地市">
@@ -86,7 +86,15 @@ const tableStore = new TableStore({
                 3: '退运'
             }
         },
-        { field: 'substation', title: '变电站', minWidth: 100 },
+        {
+            field: 'substation',
+            title: '变电站',
+            minWidth: 100,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
         {
             title: '详细信息',
             minWidth: 100,
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index 4472c280..c6cb8e39 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -507,7 +507,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 } from '@/api/supervision-boot/interfere/index'
+import { submitFormData, getById ,updateFormData} from '@/api/supervision-boot/interfere/index'
 defineProps({
     openType: {
         type: String,
@@ -904,14 +904,14 @@ watch(
         deep: true
     }
 )
+const resendId=ref('')
 const open = async (row: any) => {
     title.value = row.title
     dialogFormVisible.value = true
-
     if (row.row) {
+        resendId.value=row.row.id
         await getById({ id: row.row.id }).then(res => {
             // form.value.userType = res.data.userType
-
             if (res.data.userReportProjectPO != null) {
                 // userType 0 1
                 form.value = { ...res.data, ...res.data.userReportProjectPO }
@@ -1232,6 +1232,18 @@ const confirmForm = () => {
                 })
             } else {
                 console.log(confirmFormData)
+                confirmFormData.id=resendId.value
+                updateFormData(confirmFormData).then(res => {
+                    if (res.code == 'A0000') {
+                        ElMessage({
+                            message: '重新发起成功',
+                            type: 'success'
+                        })
+                        ruleFormRef.value.resetFields()
+                        resetForm()
+                        close()
+                    }
+                })
             }
         } else {
             console.log('表单验证失败')
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
index 5a4e5547..e63343f2 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
@@ -2,7 +2,10 @@
     <TableHeader ref="TableHeaderRef">
         <template #select>
             <el-form-item label="用户名称">
-                <el-input v-model="tableStore.table.params.projectName" clearable></el-input>
+                <el-input
+                    v-model="tableStore.table.params.projectName"
+                    placeholder="请输入用户名称"
+                ></el-input>
             </el-form-item>
             <el-form-item label="所属地市">
                 <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所属地市">
@@ -59,7 +62,15 @@ const tableStore = new TableStore({
         { title: '序号', type: 'seq', width: 80 },
         // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
         { field: 'city', title: '所属地市', minWidth: 80 },
-        { field: 'substation', title: '变电站', minWidth: 100 },
+        {
+            field: 'substation',
+            title: '变电站',
+            minWidth: 100,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
         { field: 'projectName', title: '用户名称', minWidth: 170 },
         {
             field: 'userType',
@@ -120,37 +131,36 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        handleAudit(row.processInstanceId)
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
                     }
                 },
-                // {
-                //     name: 'edit',
-                //     title: '重新发起',
-                //     type: 'warning',
-                //     icon: 'el-icon-Open',
-                //     render: 'basicButton',
-                //     disabled: row => {
-                //         return row.status == 1 || row.status == 2
-                //     },
-                //     click: row => {
-                //         addForms.value.open({
-                //             title: '重新发起',
-                //             row: row
-                //         })
-                //     }
-                // },
-                // {
-                //     name: 'cancel',
-                //     title: '取消',
-                //     type: 'danger',
-                //     icon: 'el-icon-Open',
-                //     render: 'basicButton',
-                //     disabled: row => {
-                //         return row.status == 3 || row.status == 2 || row.status == 4
-                //     },
-                //     click: row => {
-                //     }
-                // }
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 1 || row.status == 2
+                    },
+                    click: row => {
+                        addForms.value.open({
+                            title: '重新发起',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 3 || row.status == 2 || row.status == 4
+                    },
+                    click: row => {}
+                }
             ]
         }
     ],
@@ -205,11 +215,12 @@ onMounted(() => {
 })
 
 /** 处理审批按钮 */
-const handleAudit = (instanceId: any) => {
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
     push({
         name: 'BpmProcessInstanceDetail',
-        query: {
-            id: instanceId
+        state: {
+            id: instanceId,
+            historyInstanceId
         }
     })
 }
@@ -242,11 +253,5 @@ const getUserTypeName = (userType: any) => {
 </script>
 
 <style scoped lang="scss">
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
 
-::v-deep .el-input__wrapper {
-    width: 200px !important;
-}
 </style>
diff --git a/src/views/pqs/supervise/plan/components/addForm.vue b/src/views/pqs/supervise/plan/components/addForm.vue
index 081a688f..54ca3022 100644
--- a/src/views/pqs/supervise/plan/components/addForm.vue
+++ b/src/views/pqs/supervise/plan/components/addForm.vue
@@ -362,7 +362,7 @@ import { genFileId, ElMessage } from 'element-plus'
 import { useDictData } from '@/stores/dictData'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { uploadFile } from '@/api/system-boot/file'
-import { addPlanFormData, getUserByDeptId, getPlanDetailsById } from '@/api/supervision-boot/plan/index'
+import { addPlanFormData, getUserByDeptId, getPlanDetailsById,updatePlanFormData } from '@/api/supervision-boot/plan/index'
 import Area from '@/components/form/area/index.vue'
 const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
@@ -557,11 +557,13 @@ watch(
         immediate: true
     }
 )
+const resendId=ref('')
 const open = (row: any) => {
-    title.value = row.title
-    dialogFormVisible.value = true
+    title.value = row.title;
+    dialogFormVisible.value = true;
+    resendId.value=row.row.planId;
     if (row.row) {
-        getPlanDetailsById({ id: '861efbc90d1fae8e276f477081dd85fe' }).then(res => {
+        getPlanDetailsById({ id: row.row.planId}).then(res => {
             form.value = res.data
         })
     }
@@ -641,43 +643,6 @@ const confirmForm = () => {
         if (valid) {
             form.value.planUserId = adminInfo.$state.id
             let confirmFormData = JSON.parse(JSON.stringify(form.value))
-            //1.判断是否上传
-            // if (!sealReport.value) {
-            //     return ElMessage({
-            //         message: '请上传盖章报告',
-            //         type: 'warning'
-            //     })
-            // }
-            // if (!evidenceMaterials.value) {
-            //     return ElMessage({
-            //         message: '请上传佐证材料',
-            //         type: 'warning'
-            //     })
-            // }
-            // if (!planChangeMaterials.value) {
-            //     return ElMessage({
-            //         message: '请上传计划变更材料',
-            //         type: 'warning'
-            //     })
-            // }
-            // if (!alarmMaterials.value) {
-            //     return ElMessage({
-            //         message: '请上传告预警单材料',
-            //         type: 'warning'
-            //     })
-            // }
-            // if (!alarmFeedbackMaterials.value) {
-            //     return ElMessage({
-            //         message: '请上传告预警单反馈材料',
-            //         type: 'warning'
-            //     })
-            // }
-            // if (!assessReport.value) {
-            //     return ElMessage({
-            //         message: '请上传评估报告',
-            //         type: 'warning'
-            //     })
-            // }
             //提交终端信息
             // confirmFormData = {
             //     ...confirmFormData,
@@ -702,6 +667,18 @@ const confirmForm = () => {
                 })
             } else {
                 console.log(confirmFormData)
+                confirmFormData.id=resendId.value;
+                updatePlanFormData(confirmFormData).then(res => {
+                    if (res.code == 'A0000') {
+                        ElMessage({
+                            message: '新建技术监督计划成功',
+                            type: 'success'
+                        })
+                        ruleFormRef.value.resetFields()
+                        resetForm()
+                        close()
+                    }
+                })
             }
         } else {
             console.log('表单验证失败')
diff --git a/src/views/pqs/supervise/plan/components/detail.vue b/src/views/pqs/supervise/plan/components/detail.vue
index 5bbb06db..f4e107a8 100644
--- a/src/views/pqs/supervise/plan/components/detail.vue
+++ b/src/views/pqs/supervise/plan/components/detail.vue
@@ -160,6 +160,7 @@ const { query } = useRoute() // 查询参数
 const props = defineProps({
     id: propTypes.string.def(undefined)
 })
+console.log(propTypes.string.def(undefined),"999999999999传参");
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref<any>({}) // 详情数据
 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
@@ -198,6 +199,7 @@ getEffectUserList()
 /** 获得数据 */
 const getInfo = async () => {
     detailLoading.value = true
+    console.log(props.id , queryId ,"流程详情内部的id");
     try {
         await getPlanDetailsById({ id: props.id || queryId }).then(res => {
             detailData.value = res.data
diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue
index 3fd2e778..16f48d79 100644
--- a/src/views/pqs/supervise/plan/index.vue
+++ b/src/views/pqs/supervise/plan/index.vue
@@ -169,28 +169,29 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
+                        console.log(row.processInstanceId,"000000000");
                         handleDetails(row.processInstanceId)
                     },
                     disabled: row => {
                         return !row.processInstanceId
                     }
                 },
-                // {
-                //     name: 'edit',
-                //     title: '重新发起',
-                //     type: 'warning',
-                //     icon: 'el-icon-Open',
-                //     render: 'basicButton',
-                //     disabled: row => {
-                //         return row.status == 1 || row.status == 2
-                //     },
-                //     click: row => {
-                //         addForms.value.open({
-                //             title: '重新发起',
-                //             row: row
-                //         })
-                //     }
-                // },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 1 || row.status == 2
+                    },
+                    click: row => {
+                        addForms.value.open({
+                            title: '重新发起',
+                            row: row
+                        })
+                    }
+                },
 
                 {
                     name: 'productSetting',
@@ -216,19 +217,19 @@ const tableStore = new TableStore({
                     }
                 },
 
-                // {
-                //     name: 'cancel',
-                //     title: '取消',
-                //     type: 'danger',
-                //     icon: 'el-icon-Open',
-                //     render: 'basicButton',
-                //     disabled: row => {
-                //         return row.status == 3 || row.status == 2 || row.status == 4
-                //     },
-                //     click: row => {
-                //         // cancelLeave(row)
-                //     }
-                // },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 3 || row.status == 2 || row.status == 4
+                    },
+                    click: row => {
+                        // cancelLeave(row)
+                    }
+                },
                 {
                     name: 'productSetting',
                     title: '发起告警单',
@@ -332,45 +333,5 @@ const handleEffectProblem = (row: any) => {
         }
     })
 }
-/**获取用户性质*/
-const getUserTypeName = (userType: any) => {
-    if (userType === 0) {
-        return '新建电网工程'
-    }
-    if (userType === 1) {
-        return '扩建电网工程'
-    }
-    if (userType === 2) {
-        return '新建非线性负荷用户'
-    }
-    if (userType === 3) {
-        return '扩建非线性负荷用户'
-    }
-    if (userType === 4) {
-        return '新建新能源发电站'
-    }
-    if (userType === 5) {
-        return '扩建新能源发电站'
-    }
-    if (userType === 6) {
-        return '敏感及重要用户'
-    }
-    return '新建电网工程'
-}
+
 </script>
-<style scoped lang="scss">
-// :deep(.el-upload-list__item) {
-//     width: 400px;
-// }
-// ::v-deep .el-input__wrapper {
-//     // width: 200px !important;
-// }
-// .bars_w {
-//     width: 100%;
-//     height: 500px;
-// }
-// :deep(.el-tabs__content) {
-//     height: v-bind('layout.height');
-//     overflow-y: auto;
-// }
-</style>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
index 41b467b9..c94a4085 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
@@ -356,7 +356,7 @@ import { useAdminInfo } from '@/stores/adminInfo'
 import { uploadFile } from '@/api/system-boot/file'
 import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index'
 import { getDeviceList } from '@/api/supervision-boot/terminal/index'
-import { addMointorPointFormData, getList } from '@/api/supervision-boot/monitorpoint/index'
+import { addMointorPointFormData, getList, updateMointorPointFormData } from '@/api/supervision-boot/monitorpoint/index'
 import { queryByAllCode } from '@/api/system-boot/dictTree'
 import { object } from 'vue-types'
 const emits = defineEmits(['onSubmit'])
@@ -364,7 +364,7 @@ const dictData = useDictData()
 const dialogFormVisible = ref(false)
 const form: any = ref({})
 const title = ref('')
-const ruleFormRef:any = ref(null)
+const ruleFormRef: any = ref(null)
 // acceptType .doc,.docx,.xlsx,.xls,.pdf
 const acceptType = ''
 //字典获取所属地市
@@ -875,6 +875,7 @@ watch(
         immediate: true
     }
 )
+const resendId = ref('')
 const open = (row: any) => {
     dialogFormVisible.value = true
     //初始化数据
@@ -882,6 +883,7 @@ const open = (row: any) => {
     title.value = row.title
     nextTick(() => {
         if (row.row) {
+            resendId.value = row.row.id
             getTempLineDetailsById({ id: row.row.id }).then(res => {
                 form.value = res.data
                 form.value.loadType = loadTypeList.value.filter((item: any) => item.name == res.data.loadType)[0]?.id
@@ -982,6 +984,18 @@ const confirmForm = () => {
                     close()
                 })
             } else {
+                confirmFormData.id = resendId.value
+                updateMointorPointFormData(confirmFormData).then(res => {
+                    if (res.code == 'A0000') {
+                        ElMessage({
+                            message: '重新发起成功',
+                            type: 'success'
+                        })
+                        ruleFormRef.value.resetFields()
+                        resetForm()
+                        close()
+                    }
+                })
             }
         } else {
             console.log('表单验证失败')
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
index 5e0f4085..27565bfa 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
@@ -94,38 +94,38 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        handleAudit(row.processInstanceId)
+                        handleAudit(row.processInstanceId,row.historyInstanceId)
                     }
                 },
-                // {
-                //     name: 'edit',
-                //     title: '重新发起',
-                //     type: 'warning',
-                //     icon: 'el-icon-Open',
-                //     render: 'basicButton',
-                //     disabled: row => {
-                //         return row.status == 1 || row.status == 2
-                //     },
-                //     click: row => {
-                //         addForms.value.open({
-                //             title: '重新发起',
-                //             row: row
-                //         })
-                //     }
-                // },
-                // {
-                //     name: 'cancel',
-                //     title: '取消',
-                //     type: 'danger',
-                //     icon: 'el-icon-Open',
-                //     render: 'basicButton',
-                //     disabled: row => {
-                //         return row.status == 3 || row.status == 2 || row.status == 4
-                //     },
-                //     click: row => {
-                //         // cancelLeave(row)
-                //     }
-                // }
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 1 || row.status == 2
+                    },
+                    click: row => {
+                        addForms.value.open({
+                            title: '重新发起',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 3 || row.status == 2 || row.status == 4
+                    },
+                    click: row => {
+                        // cancelLeave(row)
+                    }
+                }
             ]
         }
     ],
@@ -173,40 +173,16 @@ onMounted(() => {
 })
 
 /** 处理审批按钮 */
-const handleAudit = (instanceId: any) => {
+const handleAudit = (instanceId: any,historyInstanceId:any) => {
     push({
         name: 'BpmProcessInstanceDetail',
         query: {
-            id: instanceId
+            id: instanceId,
+            historyInstanceId
         }
     })
 }
 
-/**获取用户性质*/
-const getUserTypeName = (userType: any) => {
-    if (userType === 0) {
-        return '新建电网工程'
-    }
-    if (userType === 1) {
-        return '扩建电网工程'
-    }
-    if (userType === 2) {
-        return '新建非线性负荷用户'
-    }
-    if (userType === 3) {
-        return '扩建非线性负荷用户'
-    }
-    if (userType === 4) {
-        return '新建新能源发电站'
-    }
-    if (userType === 5) {
-        return '扩建新能源发电站'
-    }
-    if (userType === 6) {
-        return '敏感及重要用户'
-    }
-    return '新建电网工程'
-}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
index 256f5448..8e27b1b9 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -34,8 +34,24 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
-        { field: 'orgName', title: '填报部门名称', minWidth: 170 },
-        { field: 'substationName', title: '所属变电站', minWidth: 170 },
+        {
+            field: 'orgName',
+            title: '填报部门名称',
+            minWidth: 170,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : ''
+                return row.cellValue
+            }
+        },
+        {
+            field: 'substationName',
+            title: '所属变电站',
+            minWidth: 170,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
         { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
         { field: 'monitoringTerminalCode', title: '设备编号', minWidth: 170 },
         { field: 'reportDate', title: '填报日期', minWidth: 170 },
@@ -108,7 +124,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        handleAudit(row.processInstanceId,row.historyInstanceId)
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
                     }
                 },
                 {
@@ -186,16 +202,15 @@ onMounted(() => {
 })
 
 /** 处理审批按钮 */
-const handleAudit = (instanceId: any,historyInstanceId:any) => {
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
     push({
         name: 'BpmProcessInstanceDetail',
-        query: {
+        state: {
             id: instanceId,
             historyInstanceId
         }
     })
 }
-
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/system/bpm/task/done/index.vue b/src/views/system/bpm/task/done/index.vue
index 4ea437f5..3a453a97 100644
--- a/src/views/system/bpm/task/done/index.vue
+++ b/src/views/system/bpm/task/done/index.vue
@@ -4,7 +4,7 @@
         <TableHeader date-picker>
             <template v-slot:select>
                 <el-form-item label="任务名称">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入任务名称" />
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称" />
                 </el-form-item>
             </template>
         </TableHeader>
diff --git a/src/views/system/bpm/task/todo/index.vue b/src/views/system/bpm/task/todo/index.vue
index b1a707db..a5c7775f 100644
--- a/src/views/system/bpm/task/todo/index.vue
+++ b/src/views/system/bpm/task/todo/index.vue
@@ -6,9 +6,8 @@
                 <el-form-item label='任务名称'>
                     <el-input
                         v-model='tableStore.table.params.searchValue'
-                        clearable
                         placeholder='请输入任务名称'
-                    />
+                    ></el-input>
                 </el-form-item>
             </template>