技术监督计划调整，增加监督类型

src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue

@@ -289,9 +289,6 @@ const open = (text: string, id: any) => {
         planEndTime: '',
         planName: '',
         substation: '', //关联电站
-        // fileList: [],
-        // checkComment: '',
-        // filePath: '',
         customSubstationFlag: 0 //电站类型
     })
     title.value = text

src/views/pqs/supervise/harmonicSurvey/components/testManage.vue

@@ -1,24 +1,24 @@
 <template>
-    <TableHeader area datePicker 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 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'>
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -39,6 +39,7 @@ import { getUserByRoleType } from '@/api/user-boot/user'
 const { push } = useRouter()
 const tableRef = ref()
 import { useDictData } from '@/stores/dictData'
+
 const dictData = useDictData()
 const supvTypeOptionList = dictData.getBasicData('supv_type')
 const statusSelect = dictData.statusSelect()
@@ -48,145 +49,146 @@ const TableHeaderRef = ref()
 const auditList: any = ref([])
 
 const tableStore = new TableStore({
-    url: '/supervision-boot/surveyTest/surveyTestPage',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
+  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: [
         {
-            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'
+          name: 'productSetting',
+          title: '测试填报',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          disabled: row => {
+            return row.status != 6
           },
-          replaceValue: {
-            0: '合格',
-            1: '存在问题',
-            null:'待测试'
+          click: row => {
+            add(row.id)
           }
         },
-        { 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: '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: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
+          name: 'edit',
+          title: '重新发起',
+          type: 'warning',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            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.id, false)
+          }
         },
         {
-            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 == 6 || row.status == 1 || row.status == 2
-                    },
-                    click: row => {
-                        // deviceQuitPopup.value.open('重新发起退运', row)
-                        planTestRef.value.open('重新发起计划', row.id)
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status == 6 || row.status == 2 || row.status == 3 || row.status == 4
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
+          name: 'cancel',
+          title: '取消',
+          type: 'danger',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || row.status == 6 || row.status == 2 || row.status == 3 || row.status == 4
+          },
+          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 = ''
@@ -194,67 +196,67 @@ 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
-        }
-    })
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+  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>