From 5de72c310f81227e70fa541fa8b377390e43b19e Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Fri, 31 May 2024 08:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E6=B5=8B=E8=AE=A1=E5=88=92=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../harmonicSurvey/components/planAdd.vue     |   7 +-
 .../harmonicSurvey/components/planManage.vue  |  96 +------
 .../harmonicSurvey/components/planTest.vue    | 260 +++++++++++++++++
 .../harmonicSurvey/components/testManage.vue  | 269 ++++++++++++++++++
 .../pqs/supervise/harmonicSurvey/detail.vue   |   1 -
 .../pqs/supervise/harmonicSurvey/index.vue    |  28 +-
 .../supervise/harmonicSurvey/plan/detail.vue  | 152 ++++++++++
 .../supervise/harmonicSurvey/test/detail.vue  | 152 ++++++++++
 8 files changed, 859 insertions(+), 106 deletions(-)
 create mode 100644 src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
 create mode 100644 src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
 create mode 100644 src/views/pqs/supervise/harmonicSurvey/plan/detail.vue
 create mode 100644 src/views/pqs/supervise/harmonicSurvey/test/detail.vue

diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
index 16162106..55225d81 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
@@ -2,14 +2,13 @@
     <el-dialog draggable :title="title" v-model="planAddition" width="65%" :before-close="cancelFn">
         <el-form
             :model="formdata"
-            :disabled="title == '查看计划' || title == '计划审核'"
             ref="formRef"
             :rules="rules"
             label-width="auto"
             class="form-two"
         >
              <el-form-item for="-" label="普测负责单位:">
-                <Area v-model="formdata.orgNo" disabled />
+                <Area v-model="formdata.orgNo"  />
             </el-form-item>
              <el-form-item for="-" label="计划名称:" prop="planName">
                 <el-input v-model="formdata.planName" placeholder="请输入计划名称"></el-input>
@@ -125,9 +124,7 @@ const formdata: any = ref({
     orgNo: dictData.state.area[0].id,
     planStartTime: '',
     planEndTime: '',
-    planComplateTime: '',
     planName: '',
-    leader: '',
     rgeneralSurveyPlanDetailAddParm: [],
     subCount: '',
     busCount: '',
@@ -219,9 +216,7 @@ const open = (text: string, row?: any) => {
         orgNo: dictData.state.area[0].id,
         planStartTime: '',
         planEndTime: '',
-        planComplateTime: '',
         planName: '',
-        leader: '',
         rgeneralSurveyPlanDetailAddParm: [],
         subCount: '',
         busCount: '',
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
index eeaa1ef6..cdadc4d3 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
@@ -5,25 +5,11 @@
             <el-button icon="el-icon-Plus" type="primary" @click="add">新增计划</el-button>
             <!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> -->
         </template>
-    </TableHeader >
+    </TableHeader>
     <Table ref="tableRef" />
     <!-- 新增 -->
     <planAdd ref="planAddRef" @onsubmit="tableStore.index()" />
 
-    <!-- 选择审核人 -->
-    <el-dialog draggable v-model="dialogVisible" title="审核" width="300" :before-close="handleClose">
-        选择审核人: <el-select v-model="auditUser" clearable placeholder="请选择计划状态">
-                    <el-option v-for="item in auditList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button type="primary" @click="planReviewFn">确定</el-button>
-                <el-button @click="handleClose">取消</el-button>
-
-            </span>
-        </template>
-    </el-dialog>
-
 
 
 </template>
@@ -33,14 +19,12 @@ 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 { submitAuditUser,cancel } from '@/api/process-boot/generalTest'
+import { cancel } from '@/api/process-boot/generalTest'
 import planAdd from './planAdd.vue'
 import { useRouter } from 'vue-router'
-import { useDictData } from '@/stores/dictData'
 
 import { queryPlan,removeSurvey } from '@/api/process-boot/generalTest'
 import { getUserByRoleType } from '@/api/user-boot/user'
-const dictData = useDictData()
 const { push } = useRouter()
 const dialogVisible=ref(false)
 const tableRef = ref()
@@ -51,23 +35,26 @@ const TableHeaderRef = ref()
 const auditList:any = ref([])
 const auditUser = ref('')
 
-const ruleFormRef = ref()
 const tableStore = new TableStore({
-    url: '/supervision-boot/generalSurvey/getSurvey',
+    url: '/supervision-boot/surveyPlan/surveyPlanPage',
     publicHeight: 65,
     method: 'POST',
     column: [
-        { width: '60', type: 'checkbox' },
-        { field: 'orgName', title: '单位' },
+        {
+            title: '序号',
+            width: 60,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'deptName', title: '普测负责单位' },
         {
             field: 'planName',
             title: '普测计划名称'
         },
-        { field: 'leader', title: '计划负责人' },
-
+        { field: 'substation', title: '变电站' },
         { field: 'planStartTime', title: '计划开始时间' },
         { field: 'planEndTime', title: '计划结束时间' },
-       
         {
             field: 'status',
             title: '计划状态',
@@ -85,7 +72,6 @@ const tableStore = new TableStore({
                 4: '已取消'
             }
         },
-
         {
             title: '操作',
             width: '180',
@@ -129,41 +115,6 @@ const tableStore = new TableStore({
                         cancelLeave(row)
                     }
                 }
-                // {
-                //     name: 'edit',
-                //     title: '编辑',
-                //     type: '',
-                //     disabled: row => {
-                //         return !(row.status == 0 || row.status == 3|| row.status == 4)
-                //     },
-                //     icon: 'el-icon-Plus',
-                //     render: 'basicButton',
-                //     click: async row => {
-                //         planAddRef.value.open('编辑计划', row)
-                //     }
-                // },
-                // {
-                //     name: 'del',
-                //     title: '删除',
-                //     type: 'danger',
-                //     icon: 'el-icon-Delete',
-                //     render: 'confirmButton',
-                //     disabled: row => {
-                //         return !(row.status == 0 || row.status == 3|| row.status == 4)
-                //     },
-                //     popconfirm: {
-                //         confirmButtonText: '确认',
-                //         cancelButtonText: '取消',
-                //         confirmButtonType: 'danger',
-                //         title: '确定删除吗？'
-                //     },
-                //     click: row => {
-                //         removeSurvey([row.planNo]).then(res => {
-                //             ElMessage.success('删除成功')
-                //             tableStore.index()
-                //         })
-                //     }
-                // }
             ]
         }
     ],
@@ -182,27 +133,6 @@ const add = () => {
     planAddRef.value.open('普测计划新增')
 }
 
-// 提交审核
-const planReviewFn = () => {
-    if(auditUser.value == ''){
-        return ElMessage.warning('请选择审核人')
-    }
-    let planNo: any = []
-    tableStore.table.selection.forEach(item => {
-        if (item.status == 0 || item.status == 2) {
-            planNo.push(item.planNo)
-        } 
-    })
-        submitAuditUser({
-            auditUser: auditUser.value,
-        planIds: planNo
-        }).then(res => {
-            dialogVisible.value = false
-            ElMessage.success('提交成功!')
-            tableStore.index()
-        })
-   
-}
 const exportFn = () => {
     let form = JSON.parse(JSON.stringify(tableStore.table.params))
     form.pageNum = 1
@@ -232,7 +162,7 @@ const cancelLeave = async (row: any) => {
     })
     // 发起取消
     let data = {
-        id: row.planNo,
+        id: row.id,
         processInstanceId: row.processInstanceId,
         reason: value
     }
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
new file mode 100644
index 00000000..b3e02476
--- /dev/null
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
@@ -0,0 +1,260 @@
+<template>
+    <el-dialog draggable :title="title" v-model="planAddition" width="65%" :before-close="cancelFn">
+        <el-form
+            :model="formdata"
+            :disabled="title == '查看计划' || title == '计划审核'"
+            ref="formRef"
+            :rules="rules"
+            label-width="auto"
+            class="form-two"
+        >
+             <el-form-item for="-" label="普测负责单位:">
+                <Area v-model="formdata.orgNo" disabled />
+            </el-form-item>
+             <el-form-item for="-" label="计划名称:" prop="planName">
+                <el-input v-model="formdata.planName" placeholder="请输入计划名称"></el-input>
+            </el-form-item>
+             <el-form-item for="-" label="计划开始时间:" prop="planStartTime">
+                <el-date-picker
+                    v-model="formdata.planStartTime"
+                    type="date"
+                    placeholder="选择计划开始时间"
+                    value-format="YYYY-MM-DD"
+                ></el-date-picker>
+            </el-form-item>
+             <el-form-item for="-" label="计划结束时间:" prop="planEndTime">
+                <el-date-picker
+                    v-model="formdata.planEndTime"
+                    type="date"
+                    placeholder="选择计划结束时间"
+                    value-format="YYYY-MM-DD"
+                ></el-date-picker>
+            </el-form-item>
+             <el-form-item for="-" label="实际完成时间:" prop="planComplateTime">
+                <el-date-picker
+                    v-model="formdata.planComplateTime"
+                    type="date"
+                    placeholder="选择实际完成时间"
+                    value-format="YYYY-MM-DD"
+                ></el-date-picker>
+            </el-form-item>
+             <el-form-item for="-" label="测试负责人:" prop="leader">
+                <el-input v-model="formdata.leader" placeholder="请输入测试负责人"></el-input>
+            </el-form-item>
+             <el-form-item for="-" label="关联电站:" prop="subIds" style="display: flex;align-items: center;">
+                <el-cascader v-model="formdata.subIds" :options="treeList" :props="defaultProps" clearable filterable />
+                <!-- <el-tree-select
+                    accordion
+                    ref="treeRef"
+                    :default-expand-all="false"
+                    show-checkbox
+                    check-strictly
+                    :highlight-current="true"
+                    readonly
+                    node-key="id"
+                    :props="defaultProps"
+                    v-model="formdata.subIds"
+                    :data="treeList"
+                    :render-after-expand="false"
+                /> -->
+            </el-form-item>
+            <!-- <el-form :model="formdata" label-width="auto"> -->
+             <el-form-item for="-" class="uploadFile" label="普测报告:" prop="fileList">
+                <el-upload
+                    v-model:file-list="formdata.fileList"
+                    ref="upload"
+                    action=""
+                    :limit="5"
+                    :on-exceed="handleExceed"
+                    :auto-upload="false"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+            <!-- </el-form> -->
+        </el-form>
+        <!-- <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">添加电站</el-divider> -->
+        <!-- <generalTestTree ref="treeRef" /> -->
+        <!-- <div
+            v-if="
+                (title == '查看计划' || title == '计划审核') &&
+                (title == '计划审核' || formdata.status == 1 || formdata.status == 3 || formdata.status == 4)
+            "
+        >
+            <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">审核意见</el-divider>
+            <el-input
+                :disabled="title != '计划审核'"
+                type="textarea"
+                :autosize="{ minRows: 2, maxRows: 4 }"
+                v-model="formdata.checkComment"
+            ></el-input>
+        </div> -->
+        <template #footer v-if="title != '查看计划'">
+            <div class="dialog-footer">
+                <el-button @click="cancelFn">取消</el-button>
+                <el-button type="primary" @click="submitFn">确定</el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import generalTestTree from '@/components/tree/pqs/generalTestTree.vue'
+import { ref, reactive, nextTick } from 'vue'
+import { addSurvey, auditSurvey } from '@/api/process-boot/generalTest'
+import Area from '@/components/form/area/index.vue'
+import { ElMessage, UploadProps } from 'element-plus'
+import { uploadFile, getFileNameAndFilePath } from '@/api/system-boot/file'
+import { useDictData } from '@/stores/dictData'
+import { initDetpStataionTree } from '@/api/process-boot/generalTest'
+const emit = defineEmits(['onsubmit'])
+const dictData = useDictData()
+const title = ref('')
+const planAddition = ref(false)
+const defaultProps = ref({
+    label: 'name',
+    value: 'id',
+    checkStrictly: true,
+    emitPath: false,
+    expandTrigger: 'hover' as const,
+})
+const formdata: any = ref({
+    orgName: '',
+    orgNo: dictData.state.area[0].id,
+    planStartTime: '',
+    planEndTime: '',
+    planComplateTime: '',
+    planName: '',
+    leader: '',
+    rgeneralSurveyPlanDetailAddParm: [],
+    subCount: '',
+    busCount: '',
+    subIds: '',
+    fileList: [],
+    checkComment: '',
+    filePath: ''
+})
+const props = {
+    expandTrigger: 'hover' as const
+}
+const formRef = ref()
+const treeRef = ref()
+const rules = {
+    planStartTime: [{ required: true, message: '选择计划开始时间', trigger: 'change' }],
+    planEndTime: [{ required: true, message: '选择计划结束时间', trigger: 'change' }],
+    planComplateTime: [{ required: true, message: '选择实际完成时间	', trigger: 'change' }],
+    planName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
+    leader: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
+    subIds: [{ required: true, message: '请选择关联电站', trigger: 'change' }],
+    fileList: [{ required: true, message: '请上传文件', trigger: 'change' }]
+}
+const cancelFn = () => {
+    formRef.value.resetFields()
+    // treeRef.value.setKey([])
+    planAddition.value = false
+}
+const treeList = ref()
+const loadData = () => {
+    initDetpStataionTree({ orgId: dictData.state.area[0].id }).then(res => {
+        treeList.value = res.data
+        console.log(treeList.value)
+    })
+}
+loadData()
+// 提交
+const submitFn = () => {
+    formRef.value.validate(async (valid: any) => {
+        if (valid) {
+            let filePath = ''
+            // formdata.value.subIds = treeRef.value.treeRef.getCheckedKeys(false)
+            formdata.value.subIds= typeof(formdata.value.subIds)=='string'?[formdata.value.subIds]:formdata.value.subIds
+            if (formdata.value.fileList.length == 0) {
+                audit(filePath)
+            } else {
+                for (let i = 0; i < formdata.value.fileList.length; i++) {
+                    if (formdata.value.fileList[i].raw) {
+                        await uploadFile(formdata.value.fileList[i].raw, 'supervision/').then(res => {
+                            filePath = filePath + res.data.name + ','
+                        })
+                    } else {
+                        filePath = filePath + formdata.value.fileList[i].supervision + ','
+                    }
+                    if (i == formdata.value.fileList.length - 1) {
+                        audit(filePath)
+                    }
+                }
+            }
+        }
+    })
+}
+const audit = (filePath: any) => {
+    if (title.value == '普测计划新增') {
+        addSurvey({ ...formdata.value, filePath: filePath }).then((res: any) => {
+            ElMessage.success('新增成功!')
+            cancelFn()
+            emit('onsubmit')
+        })
+    } else if (title.value == '重新发起计划') {
+        auditSurvey({ ...formdata.value, filePath: filePath }).then((res: any) => {
+            ElMessage.success('重新发起计划成功!')
+            cancelFn()
+            emit('onsubmit')
+        })
+    }
+}
+// 上传文件
+// 文件数超出提示
+const handleExceed: UploadProps['onExceed'] = (): void => {
+    ElMessage.error(`上传文件数量不能超过5个!`)
+}
+const open = (text: string, row?: any) => {
+    formdata.value = Object.assign({
+        orgName: '',
+        orgNo: dictData.state.area[0].id,
+        planStartTime: '',
+        planEndTime: '',
+        planComplateTime: '',
+        planName: '',
+        leader: '',
+        rgeneralSurveyPlanDetailAddParm: [],
+        subCount: '',
+        busCount: '',
+        subIds: [],
+        checkComment: '',
+        fileList: [],
+        filePath: []
+    })
+    title.value = text
+    planAddition.value = true
+    formRef.value?.resetFields()
+    // if (row) {
+    //     formdata.value = JSON.parse(JSON.stringify(row))
+    //     nextTick(() => {
+    //         formdata.value.fileList = []
+    //         treeRef.value.loadData()
+    //         treeRef.value.setKey(row.subIds || [], text)
+    //         let arr = row.filePath.split(',')
+    //         arr.slice(0, -1).forEach((item: any) => {
+    //             getFileNameAndFilePath({ filePath: item }).then((res: any) => {
+    //                 formdata.value.fileList.push({
+    //                     name: res.data.fileName,
+    //                     supervision: res.data.name,
+    //                     url: res.data.url
+    //                 })
+    //             })
+    //         })
+    //     })
+    // } else {
+    //     nextTick(() => {
+    //         treeRef.value.loadData()
+    //     })
+    // }
+}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+// :deep(.el-upload-list__item-info) {
+//     width: 250px;
+// }
+</style>
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
new file mode 100644
index 00000000..42c1eab3
--- /dev/null
+++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
@@ -0,0 +1,269 @@
+<template>
+    <TableHeader area datePicker ref="TableHeaderRef">
+        
+        <template #operation>
+            <el-button icon="el-icon-Plus" type="primary" @click="add">新增计划</el-button>
+            <!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> -->
+        </template>
+    </TableHeader ref="tableRef">
+    <Table ref="tableRef" />
+    <!-- 新增 -->
+    <planAdd ref="planAddRef" @onsubmit="tableStore.index()" />
+
+    <!-- 选择审核人 -->
+    <el-dialog draggable v-model="dialogVisible" title="审核" width="300" :before-close="handleClose">
+        选择审核人: <el-select v-model="auditUser" clearable placeholder="请选择计划状态">
+                    <el-option v-for="item in auditList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button type="primary" @click="planReviewFn">确定</el-button>
+                <el-button @click="handleClose">取消</el-button>
+
+            </span>
+        </template>
+    </el-dialog>
+
+
+
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+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 { submitAuditUser,cancel } from '@/api/process-boot/generalTest'
+import planAdd from './planAdd.vue'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+
+import { queryPlan,removeSurvey } from '@/api/process-boot/generalTest'
+import { getUserByRoleType } from '@/api/user-boot/user'
+const dictData = useDictData()
+const { push } = useRouter()
+const dialogVisible=ref(false)
+const tableRef = ref()
+
+
+const planAddRef = ref()
+const TableHeaderRef = ref()
+const auditList:any = ref([])
+const auditUser = ref('')
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/supervision-boot/generalSurvey/getSurvey',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        { width: '60', type: 'checkbox' },
+        { field: 'orgName', title: '单位' },
+        {
+            field: 'planName',
+            title: '普测计划名称'
+        },
+        { field: 'leader', title: '计划负责人' },
+
+        { field: 'planStartTime', title: '计划开始时间' },
+        { field: 'planEndTime', title: '计划结束时间' },
+       
+        {
+            field: 'status',
+            title: '计划状态',
+            render: 'tag',
+            custom: {
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+
+        {
+            title: '操作',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        // planAddRef.value.open('查看计划', row)
+                        handleAudit(row.processInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 1 || row.status == 2
+                    },
+                    click: row => {
+                        // deviceQuitPopup.value.open('重新发起退运', row)
+                        planAddRef.value.open('重新发起计划', 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: '',
+                //     disabled: row => {
+                //         return !(row.status == 0 || row.status == 3|| row.status == 4)
+                //     },
+                //     icon: 'el-icon-Plus',
+                //     render: 'basicButton',
+                //     click: async row => {
+                //         planAddRef.value.open('编辑计划', row)
+                //     }
+                // },
+                // {
+                //     name: 'del',
+                //     title: '删除',
+                //     type: 'danger',
+                //     icon: 'el-icon-Delete',
+                //     render: 'confirmButton',
+                //     disabled: row => {
+                //         return !(row.status == 0 || row.status == 3|| row.status == 4)
+                //     },
+                //     popconfirm: {
+                //         confirmButtonText: '确认',
+                //         cancelButtonText: '取消',
+                //         confirmButtonType: 'danger',
+                //         title: '确定删除吗？'
+                //     },
+                //     click: row => {
+                //         removeSurvey([row.planNo]).then(res => {
+                //             ElMessage.success('删除成功')
+                //             tableStore.index()
+                //         })
+                //     }
+                // }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.currentPage = tableStore.table.params.pageNum
+    }
+})
+
+tableStore.table.params.status = ''
+
+provide('tableStore', tableStore)
+// 新增计划
+const add = () => {
+    // title.value = '普测计划新增'
+    planAddRef.value.open('普测计划新增')
+}
+
+// 提交审核
+const planReviewFn = () => {
+    if(auditUser.value == ''){
+        return ElMessage.warning('请选择审核人')
+    }
+    let planNo: any = []
+    tableStore.table.selection.forEach(item => {
+        if (item.status == 0 || item.status == 2) {
+            planNo.push(item.planNo)
+        } 
+    })
+        submitAuditUser({
+            auditUser: auditUser.value,
+        planIds: planNo
+        }).then(res => {
+            dialogVisible.value = false
+            ElMessage.success('提交成功!')
+            tableStore.index()
+        })
+   
+}
+const exportFn = () => {
+    let form = JSON.parse(JSON.stringify(tableStore.table.params))
+    form.pageNum = 1
+    form.pageSize = tableStore.table.total
+    queryPlan(form).then(res => {
+        tableRef.value.getRef().exportData({
+            filename: '普测计划', // 文件名字
+            sheetName: 'Sheet1',
+            type: 'xlsx', //导出文件类型 xlsx 和 csv
+            useStyle: true,
+            data: res.data.records, // 数据源 // 过滤那个字段导出
+            columnFilterMethod: function (column: any) {
+                return !(column.$columnIndex === 0)
+            }
+        })
+    })
+}
+
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.planNo,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancel(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+
+const handleClose = () => {
+    dialogVisible.value = false
+    auditUser.value = ''
+}
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        query: {
+            id: instanceId
+        }
+    })
+}
+// 取消
+
+onMounted(() => {
+    tableStore.index()
+    getUserByRoleType(3).then(res => {
+        auditList.value = res.data
+    })
+})
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/supervise/harmonicSurvey/detail.vue b/src/views/pqs/supervise/harmonicSurvey/detail.vue
index 91eb1de2..a319a7a2 100644
--- a/src/views/pqs/supervise/harmonicSurvey/detail.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/detail.vue
@@ -1,5 +1,4 @@
 <template>
-    <!--工作流view的路径：/pqs/supervise/retire/detail-->
     <div class="default-main">
         <!--        <h1>详细信息回显</h1>-->
         <el-descriptions :column="2" border>
diff --git a/src/views/pqs/supervise/harmonicSurvey/index.vue b/src/views/pqs/supervise/harmonicSurvey/index.vue
index a9ee4577..a3549cc6 100644
--- a/src/views/pqs/supervise/harmonicSurvey/index.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/index.vue
@@ -1,40 +1,36 @@
 <template>
-    <div class="default-main">
-        <el-tabs v-model="activeName" type="border-card">
-            <el-tab-pane label="普测计划管理" name="1">
-                <planManage v-if="activeName == '1'" />
+    <div class='default-main'>
+        <el-tabs v-model='activeName' type='border-card'>
+            <el-tab-pane label='普测计划管理' name='1'>
+                <plan-manage v-if="activeName == '1'" />
+            </el-tab-pane>
+            <el-tab-pane label='普测测试管理' name='2'>
+                <test-manage v-if="activeName == '2'" />
             </el-tab-pane>
-            <!-- <el-tab-pane label="普测计划审批" name="2">
-                <planAudits  v-if="activeName == '2'"/>
-            </el-tab-pane> -->
-            <!-- <el-tab-pane label="普测结果管理" name="3"><outcome v-if="activeName == '3'"/></el-tab-pane>
-            <el-tab-pane label="普测计划占比配置" name="4"><occupancy v-if="activeName == '4'"/></el-tab-pane> -->
         </el-tabs>
     </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang='ts'>
 import { onMounted, reactive, ref, provide } from 'vue'
-import occupancy from './components/occupancy.vue'
-import outcome from './components/outcome.vue'
-import planAudits from './components/planAudits.vue'
 import planManage from './components/planManage.vue'
+import testManage from './components/testManage.vue'
 import { mainHeight } from '@/utils/layout'
+
 defineOptions({
     name: 'supervision/harmonicmanagement'
 })
 const activeName = ref('1')
-const Statistics = ref()
-const compatibility = ref()
 
 const layout = mainHeight(63) as any
 </script>
 
-<style lang="scss" scoped>
+<style lang='scss' scoped>
 .bars_w {
     width: 100%;
     height: 500px;
 }
+
 :deep(.el-tabs__content) {
     height: v-bind('layout.height');
     overflow-y: auto;
diff --git a/src/views/pqs/supervise/harmonicSurvey/plan/detail.vue b/src/views/pqs/supervise/harmonicSurvey/plan/detail.vue
new file mode 100644
index 00000000..a319a7a2
--- /dev/null
+++ b/src/views/pqs/supervise/harmonicSurvey/plan/detail.vue
@@ -0,0 +1,152 @@
+<template>
+    <div class="default-main">
+        <!--        <h1>详细信息回显</h1>-->
+        <el-descriptions :column="2" border>
+            <el-descriptions-item label="普测计划名称">
+                {{ detailData?.planName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="计划负责人">
+                {{ detailData?.leader }}
+            </el-descriptions-item>
+            <el-descriptions-item label="计划开始时间">
+                {{ detailData?.planStartTime }}
+            </el-descriptions-item>
+            <el-descriptions-item label="计划结束时间">
+                {{ detailData?.planEndTime }}
+            </el-descriptions-item>
+            <el-descriptions-item label="审核状态">
+                <el-tag :type="getDeviceStatusType(detailData?.status)">
+                    {{ getDeviceStatus(detailData?.status) }}
+                </el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item label="文件">
+                <div v-for="(item, index) in aList">
+                    <el-icon>
+                        <Link />
+                    </el-icon>
+                    <a :href="item.url">
+                        {{ item.fileName }}
+                    </a>
+                    <!-- <el-button type="primary" link @click="downloadFile(item.url, item.fileName)">
+                        {{ item.fileName }}
+                    </el-button> -->
+                </div>
+            </el-descriptions-item>
+        </el-descriptions>
+        <div style="height: 300px">
+            <vxe-table
+                v-bind="defaultAttribute"
+                ref="vxeRef"
+                class="mt10"
+                height="auto"
+                :data="detailData?.supervisionGeneralSurveyPlanDetailPOS"
+            >
+                <vxe-column field="subName" title="变电站名称"></vxe-column>
+                <vxe-column field="voltageLevel" title="变电站电压等级" :formatter="formatter"></vxe-column>
+                <vxe-column field="measurementPointId" title="在线监测点ID">
+                    <template #default="{ row }">{{ row.measurementPointId ? row.measurementPointId : '/' }}</template>
+                </vxe-column>
+
+                <vxe-column field="isSurvey" title="是否实现监测">
+                    <template #default="{ row }">{{ row.isSurvey === 1 ? '是' : '否' }}</template>
+                </vxe-column>
+            </vxe-table>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+
+defineOptions({ name: 'QuitRunningDeviceDetail' })
+import { propTypes } from '@/utils/propTypes'
+import { querySurveyDetail } from '@/api/process-boot/generalTest'
+import { getFileNameAndFilePath } from '@/api/system-boot/file'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { useDictData } from '@/stores/dictData'
+import { Link } from '@element-plus/icons-vue'
+const { query } = useRoute() // 查询参数
+
+const props = defineProps({
+    id: propTypes.string.def(undefined)
+})
+const dictData = useDictData()
+const detailLoading = ref(false) // 表单的加载中
+const detailData: any = ref({}) // 详情数据
+const levelList = dictData.getBasicData('Dev_Voltage_Stand')
+const aList: any = ref([]) // 详情数据
+const queryId = query.id // 从 URL 传递过来的 id 编号
+
+/** 获得数据 */
+const getInfo = async () => {
+    detailLoading.value = true
+    try {
+        await querySurveyDetail({ id: props.id || queryId }).then(res => {
+            detailData.value = res.data
+            aList.value = []
+            let arr = res.data.filePath.split(',')
+
+            arr.slice(0, -1).forEach((item: any) => {
+                getFileNameAndFilePath({ filePath: item }).then((res: any) => {
+                    aList.value.push(res.data)
+                })
+            })
+        })
+    } finally {
+        detailLoading.value = false
+    }
+}
+// 下载文件
+const downloadFile = (url: string, fileName: string) => {
+    const link = document.createElement('a')
+    link.href = url
+    link.download = fileName
+    document.body.appendChild(link)
+    link.click()
+    document.body.removeChild(link)
+}
+const getDeviceStatus = (status: number) => {
+    if (status === 1) {
+        return '审批中'
+    }
+    if (status === 2) {
+        return '审批通过'
+    }
+    if (status === 3) {
+        return '审批不通过'
+    }
+    if (status === 4) {
+        return '已取消'
+    }
+    return '审批通过'
+}
+
+const getDeviceStatusType = (status: number) => {
+    if (status === 1) {
+        return 'primary'
+    }
+    if (status === 2) {
+        return 'success'
+    }
+    if (status === 3) {
+        return 'danger'
+    }
+    if (status === 4) {
+        return 'warning'
+    }
+    return 'success'
+}
+// 过滤数据
+const formatter = (row: any) => {
+    if (row.column.field == 'voltageLevel') {
+        return levelList.filter(item => item.id == row.cellValue)[0].name
+    } else {
+        return row.cellValue
+    }
+}
+defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
+
+/** 初始化 **/
+onMounted(() => {
+    getInfo()
+})
+</script>
diff --git a/src/views/pqs/supervise/harmonicSurvey/test/detail.vue b/src/views/pqs/supervise/harmonicSurvey/test/detail.vue
new file mode 100644
index 00000000..a319a7a2
--- /dev/null
+++ b/src/views/pqs/supervise/harmonicSurvey/test/detail.vue
@@ -0,0 +1,152 @@
+<template>
+    <div class="default-main">
+        <!--        <h1>详细信息回显</h1>-->
+        <el-descriptions :column="2" border>
+            <el-descriptions-item label="普测计划名称">
+                {{ detailData?.planName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="计划负责人">
+                {{ detailData?.leader }}
+            </el-descriptions-item>
+            <el-descriptions-item label="计划开始时间">
+                {{ detailData?.planStartTime }}
+            </el-descriptions-item>
+            <el-descriptions-item label="计划结束时间">
+                {{ detailData?.planEndTime }}
+            </el-descriptions-item>
+            <el-descriptions-item label="审核状态">
+                <el-tag :type="getDeviceStatusType(detailData?.status)">
+                    {{ getDeviceStatus(detailData?.status) }}
+                </el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item label="文件">
+                <div v-for="(item, index) in aList">
+                    <el-icon>
+                        <Link />
+                    </el-icon>
+                    <a :href="item.url">
+                        {{ item.fileName }}
+                    </a>
+                    <!-- <el-button type="primary" link @click="downloadFile(item.url, item.fileName)">
+                        {{ item.fileName }}
+                    </el-button> -->
+                </div>
+            </el-descriptions-item>
+        </el-descriptions>
+        <div style="height: 300px">
+            <vxe-table
+                v-bind="defaultAttribute"
+                ref="vxeRef"
+                class="mt10"
+                height="auto"
+                :data="detailData?.supervisionGeneralSurveyPlanDetailPOS"
+            >
+                <vxe-column field="subName" title="变电站名称"></vxe-column>
+                <vxe-column field="voltageLevel" title="变电站电压等级" :formatter="formatter"></vxe-column>
+                <vxe-column field="measurementPointId" title="在线监测点ID">
+                    <template #default="{ row }">{{ row.measurementPointId ? row.measurementPointId : '/' }}</template>
+                </vxe-column>
+
+                <vxe-column field="isSurvey" title="是否实现监测">
+                    <template #default="{ row }">{{ row.isSurvey === 1 ? '是' : '否' }}</template>
+                </vxe-column>
+            </vxe-table>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+
+defineOptions({ name: 'QuitRunningDeviceDetail' })
+import { propTypes } from '@/utils/propTypes'
+import { querySurveyDetail } from '@/api/process-boot/generalTest'
+import { getFileNameAndFilePath } from '@/api/system-boot/file'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { useDictData } from '@/stores/dictData'
+import { Link } from '@element-plus/icons-vue'
+const { query } = useRoute() // 查询参数
+
+const props = defineProps({
+    id: propTypes.string.def(undefined)
+})
+const dictData = useDictData()
+const detailLoading = ref(false) // 表单的加载中
+const detailData: any = ref({}) // 详情数据
+const levelList = dictData.getBasicData('Dev_Voltage_Stand')
+const aList: any = ref([]) // 详情数据
+const queryId = query.id // 从 URL 传递过来的 id 编号
+
+/** 获得数据 */
+const getInfo = async () => {
+    detailLoading.value = true
+    try {
+        await querySurveyDetail({ id: props.id || queryId }).then(res => {
+            detailData.value = res.data
+            aList.value = []
+            let arr = res.data.filePath.split(',')
+
+            arr.slice(0, -1).forEach((item: any) => {
+                getFileNameAndFilePath({ filePath: item }).then((res: any) => {
+                    aList.value.push(res.data)
+                })
+            })
+        })
+    } finally {
+        detailLoading.value = false
+    }
+}
+// 下载文件
+const downloadFile = (url: string, fileName: string) => {
+    const link = document.createElement('a')
+    link.href = url
+    link.download = fileName
+    document.body.appendChild(link)
+    link.click()
+    document.body.removeChild(link)
+}
+const getDeviceStatus = (status: number) => {
+    if (status === 1) {
+        return '审批中'
+    }
+    if (status === 2) {
+        return '审批通过'
+    }
+    if (status === 3) {
+        return '审批不通过'
+    }
+    if (status === 4) {
+        return '已取消'
+    }
+    return '审批通过'
+}
+
+const getDeviceStatusType = (status: number) => {
+    if (status === 1) {
+        return 'primary'
+    }
+    if (status === 2) {
+        return 'success'
+    }
+    if (status === 3) {
+        return 'danger'
+    }
+    if (status === 4) {
+        return 'warning'
+    }
+    return 'success'
+}
+// 过滤数据
+const formatter = (row: any) => {
+    if (row.column.field == 'voltageLevel') {
+        return levelList.filter(item => item.id == row.cellValue)[0].name
+    } else {
+        return row.cellValue
+    }
+}
+defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
+
+/** 初始化 **/
+onMounted(() => {
+    getInfo()
+})
+</script>