From b5b79e4f812ec64073ada3a1e5bbeef5ce69b014 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Wed, 19 Jun 2024 09:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=80=E6=9C=AF=E7=9B=91?=
 =?UTF-8?q?=E7=9D=A3=20=E9=87=8D=E6=96=B0=E5=8F=91=E8=B5=B7=20=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panorama/components/mapL.vue              |   4 +-
 .../harmonicSurvey/components/planManage.vue  |   3 +-
 .../harmonicSurvey/components/testManage.vue  | 398 +++++++++---------
 src/views/pqs/supervise/plan/index.vue        |   3 +-
 .../components/cycleDetection/index.vue       |   2 +-
 5 files changed, 207 insertions(+), 203 deletions(-)

diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
index c2754e8f..ad22cec7 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
@@ -13,12 +13,12 @@
                     <div v-for="(item, i) in list" class="cardBox" :style="i == 1 ? 'flex:1.3' : ''">
                         <div class="card">
                             <span style="cursor: pointer" @click="GridDiagram(i)">{{ item.title }}：</span>
-                            <!-- <span
+                            <span
                                 :style="`color: ${item.color[0]}; cursor:pointer`"
                                 @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)"
                             >
                                 {{ item.list[4].numOne }}
-                            </span> -->
+                            </span>
                         </div>
                     </div>
                 </div>
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
index a498e787..4a19dfa4 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
@@ -159,8 +159,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return (row.createBy =
-                            adminInfo.$state.id || row.status == 3 || row.status == 2 || row.status == 4)
+                        return row.createBy != adminInfo.$state.id || row.status != 1
                     },
                     click: row => {
                         cancelLeave(row)
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
index e645c11f..32fbf610 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
@@ -1,26 +1,27 @@
+6T
 <template>
-  <TableHeader area datePicker nextFlag ref='TableHeaderRef'>
-    <template v-slot:select>
-      <el-form-item label='流程状态'>
-        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
-          <el-option
-              v-for='item in statusSelect'
-              :key='item.id'
-              :label='item.name'
-              :value='item.id'
-          ></el-option>
-        </el-select>
-      </el-form-item>
-    </template>
-    <template #operation>
-      <!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> -->
-    </template>
-  </TableHeader>
-  <Table ref='tableRef' />
-  <!-- 新增 -->
-  <planTest ref='planTestRef' @onsubmit='tableStore.index()' />
+    <TableHeader area datePicker nextFlag ref="TableHeaderRef">
+        <template v-slot:select>
+            <el-form-item label="流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-option
+                        v-for="item in statusSelect"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> -->
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+    <!-- 新增 -->
+    <planTest ref="planTestRef" @onsubmit="tableStore.index()" />
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
 import { useAdminInfo } from '@/stores/adminInfo'
 //获取登陆用户姓名和部门
@@ -49,145 +50,150 @@ const TableHeaderRef = ref()
 const auditList: any = ref([])
 
 const tableStore = new TableStore({
-  url: '/supervision-boot/surveyTest/surveyTestPage',
-  publicHeight: 65,
-  method: 'POST',
-  column: [
-    {
-      title: '序号',
-      width: 60,
-      formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    { field: 'planName', title: '计划名称', minWidth: 140 },
-    {
-      field: 'supvType',
-      title: '监督类型',
-      minWidth: 130,
-      formatter: (row: any) => {
-        return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
-      }
-    },
-    {
-      field: 'supvObjectName',
-      minWidth: 130,
-      title: '监督对象名称'
-    },
-    { field: 'substationName', title: '变电站', minWidth: 140 },
-    { field: 'planStartTime', title: '计划开始时间', minWidth: 140 },
-    { field: 'planEndTime', title: '计划结束时间', minWidth: 140 },
-    {
-      field: 'problemFlag', title: '是否存在问题', minWidth: 120,
-      render: 'tag',
-      custom: {
-        0: 'success',
-        1: 'danger',
-        null: 'primary'
-      },
-      replaceValue: {
-        0: '合格',
-        1: '存在问题',
-        null: '待测试'
-      }
-    },
-    { field: 'deptName', title: '负责单位', minWidth: 140 },
-    { field: 'completeBy', title: '计划负责人', minWidth: 130 },
-    { field: 'completeTime', title: '实际完成时间', minWidth: 140 },
-    {
-      field: 'status',
-      title: '流程状态',
-      render: 'tag',
-      minWidth: 140,
-      custom: {
-        6: 'primary',
-        1: 'primary',
-        2: 'success',
-        3: 'danger',
-        4: 'warning'
-      },
-      replaceValue: {
-        6: '新增',
-        1: '审批中',
-        2: '审批通过',
-        3: '审批不通过',
-        4: '已取消'
-      }
-    },
-    {
-      field: 'createBy',
-      title: '填报人',
-      minWidth: 80,
-      formatter: (row: any) => {
-        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-      }
-    },
-    {
-      title: '操作',
-      minWidth: 180,
-      render: 'buttons',
-      fixed: 'right',
-      buttons: [
+    url: '/supervision-boot/surveyTest/surveyTestPage',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
         {
-          name: 'productSetting',
-          title: '测试填报',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return row.status != 6
-          },
-          click: row => {
-            add(row.id)
-          }
+            title: '序号',
+            width: 60,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'planName', title: '计划名称', minWidth: 140 },
+        {
+            field: 'supvType',
+            title: '监督类型',
+            minWidth: 130,
+            formatter: (row: any) => {
+                return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
+            }
         },
         {
-          name: 'productSetting',
-          title: '流程详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return row.status == 6 || row.status == 4
-          },
-          click: row => {
-            // planTestRef.value.open('查看计划', row)
-            handleAudit(row.processInstanceId, row.historyInstanceId)
-          }
+            field: 'supvObjectName',
+            minWidth: 130,
+            title: '监督对象名称'
+        },
+        { field: 'substationName', title: '变电站', minWidth: 140 },
+        { field: 'planStartTime', title: '计划开始时间', minWidth: 140 },
+        { field: 'planEndTime', title: '计划结束时间', minWidth: 140 },
+        {
+            field: 'problemFlag',
+            title: '是否存在问题',
+            minWidth: 120,
+            render: 'tag',
+            custom: {
+                0: 'success',
+                1: 'danger',
+                null: 'primary'
+            },
+            replaceValue: {
+                0: '合格',
+                1: '存在问题',
+                null: '待测试'
+            }
+        },
+        { field: 'deptName', title: '负责单位', minWidth: 140 },
+        { field: 'completeBy', title: '计划负责人', minWidth: 130 },
+        { field: 'completeTime', title: '实际完成时间', minWidth: 140 },
+        {
+            field: 'status',
+            title: '流程状态',
+            render: 'tag',
+            minWidth: 140,
+            custom: {
+                6: 'primary',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                6: '新增',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
         },
         {
-          name: 'edit',
-          title: '重新发起',
-          type: 'warning',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4|| row.status == 6)
-          },
-          click: row => {
-            planTestRef.value.open('重新发起计划测试', row.id, false)
-          }
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
         },
         {
-          name: 'cancel',
-          title: '取消',
-          type: 'danger',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return !(row.createBy == adminInfo.$state.id|| row.status == 1 )
-          },
-          click: row => {
-            cancelLeave(row)
-          }
+            title: '操作',
+            minWidth: 180,
+            render: 'buttons',
+            fixed: 'right',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '测试填报',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status != 6
+                    },
+                    click: row => {
+                        add(row.id)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 6 || row.status == 4
+                    },
+                    click: row => {
+                        // planTestRef.value.open('查看计划', row)
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return (
+                            row.createBy != adminInfo.$state.id ||
+                            !(row.status == 3 || row.status == 4 )
+                        )
+                    },
+                    click: row => {
+                        planTestRef.value.open('重新发起计划测试', row.id, false)
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
         }
-      ]
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.currentPage = tableStore.table.params.pageNum
     }
-  ],
-  beforeSearchFun: () => {
-    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-    tableStore.table.params.currentPage = tableStore.table.params.pageNum
-  }
 })
 
 tableStore.table.params.status = ''
@@ -195,68 +201,66 @@ tableStore.table.params.status = ''
 provide('tableStore', tableStore)
 // 新增计划
 const add = (id: string) => {
-  planTestRef.value.open('计划测试填报', id, true)
+    planTestRef.value.open('计划测试填报', id, true)
 }
 
-
 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)
-      }
+    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.id,
-    processInstanceId: row.processInstanceId,
-    reason: value
-  }
-  await cancelTest(data)
-  ElMessage.success('取消成功')
-  // 加载数据
-  tableStore.index()
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelTest(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
 }
 
-
 /** 处理审批按钮 */
 const handleAudit = (instanceId: any, historyInstanceId: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    state: {
-      id: instanceId,
-      historyInstanceId
-    }
-  })
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
 }
 // 取消
 
 onMounted(() => {
-  tableStore.index()
-  getUserByRoleType(3).then(res => {
-    auditList.value = res.data
-  })
+    tableStore.index()
+    getUserByRoleType(3).then(res => {
+        auditList.value = res.data
+    })
 })
 </script>
 
-<style scoped lang='scss'></style>
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue
index 37d4afea..85153d03 100644
--- a/src/views/pqs/supervise/plan/index.vue
+++ b/src/views/pqs/supervise/plan/index.vue
@@ -237,7 +237,8 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1 || !row.processInstanceId
+                        // return row.createBy != adminInfo.$state.id || row.status != 1 || !row.processInstanceId
+                        return row.createBy != adminInfo.$state.id || row.status != 1
                     },
                     click: row => {
                         cancelLeave(row)
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
index e4117480..ddb3d5a3 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
@@ -146,7 +146,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.status != 1
+                        return row.createBy != adminInfo.$state.id || row.status != 1
                     },
                     click: async row => {
                         // cancelLeave(row)