非线性用户建档列表管理

src/views/bpm/oa/leave/detail.vue

@@ -1,50 +0,0 @@
-<template>
-  <ContentWrap>
-    <el-descriptions :column="1" border>
-      <el-descriptions-item label="请假类型">
-      </el-descriptions-item>
-      <el-descriptions-item label="开始时间">
-        {{ formatDate(detailData.startTime, 'YYYY-MM-DD') }}
-      </el-descriptions-item>
-      <el-descriptions-item label="结束时间">
-        {{ formatDate(detailData.endTime, 'YYYY-MM-DD') }}
-      </el-descriptions-item>
-      <el-descriptions-item label="原因">
-        {{ detailData.reason }}
-      </el-descriptions-item>
-    </el-descriptions>
-  </ContentWrap>
-</template>
-<script lang="ts" setup>
-import { onMounted, provide, ref, getCurrentInstance, reactive, watch, unref, nextTick } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
-import { formatDate } from '@/utils/formatTime'
-import { propTypes } from '@/utils/propTypes'
-
-defineOptions({ name: 'BpmOALeaveDetail' })
-
-const { query } = useRoute() // 查询参数
-
-const props = defineProps({
-  id: propTypes.number.def(undefined)
-})
-const detailLoading = ref(false) // 表单的加载中
-const detailData = ref<any>({}) // 详情数据
-const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编号
-
-/** 获得数据 */
-const getInfo = async () => {
-  detailLoading.value = true
-  try {
-    // detailData.value = await LeaveApi.getLeave(props.id || queryId)
-  } finally {
-    detailLoading.value = false
-  }
-}
-defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
-
-/** 初始化 **/
-onMounted(() => {
-  getInfo()
-})
-</script>

src/views/pqs/supervise/interfere/components/undocumented/detail.vue

@@ -76,7 +76,7 @@ import { formatDate } from '@/utils/formatTime'
 import { propTypes } from '@/utils/propTypes'
 import { getUserReportById } from '@/api/supervision-boot/userReport/form'
 
-defineOptions({ name: 'BpmOALeaveDetail' })
+defineOptions({ name: 'BpmUserReportDetail' })
 
 const { query } = useRoute() // 查询参数
 
@@ -85,7 +85,7 @@ const props = defineProps({
 })
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref<any>({}) // 详情数据
-const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编号
+const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
 
 /** 获得数据 */
 const getInfo = async () => {

src/views/pqs/supervise/interfere/components/undocumented/index.vue

@@ -1,46 +1,48 @@
 <template>
-    <TableHeader ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="工程名称">
-                <el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
-            </el-form-item>
-            <el-form-item label="所属地市">
-                <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择所属地市">
-                    <el-option
-                        v-for="item in areaOptionList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </template>
-        <template #operation>
-            <!-- <el-button icon="el-icon-Plus" type="primary" @click="addList">新增</el-button> -->
-            <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
-            <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button>
-        </template>
-    </TableHeader>
-    <Table ref="tableRef" />
-    <!-- 新增 -->
-    <Add ref="addRef" @onSubmit="tableStore.index()" />
-    <!-- 上传 -->
-    <Audit ref="AuditRef" @onSubmit="tableStore.index()" />
-    <!-- 查看详情 detail 新增/修改 create-->
-    <addForm ref="addForms" openType="create"></addForm>
+  <TableHeader ref='TableHeaderRef'>
+    <template #select>
+      <el-form-item label='工程名称'>
+        <el-input v-model='tableStore.table.params.searchValue' clearable></el-input>
+      </el-form-item>
+      <el-form-item label='所属地市'>
+        <el-select v-model='tableStore.table.params.loadType' clearable placeholder='请选择所属地市'>
+          <el-option
+              v-for='item in areaOptionList'
+              :key='item.id'
+              :label='item.name'
+              :value='item.id'
+          ></el-option>
+        </el-select>
+      </el-form-item>
+    </template>
+    <template #operation>
+      <!-- <el-button icon="el-icon-Plus" type="primary" @click="addList">新增</el-button> -->
+      <el-button icon='el-icon-Plus' type='primary' @click='addFormModel'>新增</el-button>
+      <el-button icon='el-icon-Download' @click='exportEvent' type='primary'>导出</el-button>
+    </template>
+  </TableHeader>
+  <Table ref='tableRef' />
+  <!-- 新增 -->
+  <Add ref='addRef' @onSubmit='tableStore.index()' />
+  <!-- 上传 -->
+  <Audit ref='AuditRef' @onSubmit='tableStore.index()' />
+  <!-- 查看详情 detail 新增/修改 create-->
+  <addForm ref='addForms' openType='create'></addForm>
 </template>
-<script setup lang="ts">
+<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 { mainHeight } from '@/utils/layout'
+import { useRouter } from 'vue-router'
 import Add from './add.vue'
 import Audit from './audit.vue'
 import addForm from './addForm.vue'
 import { useDictData } from '@/stores/dictData'
 import { getLoadTypeUserList } from '@/api/process-boot/interference'
+
 const dictData = useDictData()
+const { push } = useRouter()
 
 const TableHeaderRef = ref()
 const tableRef = ref()
@@ -54,88 +56,79 @@ const AuditRef = ref()
 const ruleFormRef = ref()
 const fileList = ref([])
 const tableStore = new TableStore({
-    url: '/supervision-boot/userReport/getUserReport',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        { title: '序号', type: 'seq', width: 80 },
-        { field: 'orgName', title: '所属单位' },
+  url: '/supervision-boot/userReport/getUserReport',
+  publicHeight: 65,
+  method: 'POST',
+  column: [
+    { title: '序号', type: 'seq', width: 80 },
+    { field: 'projectName', title: '工程名称', minWidth: 170 },
+    {
+      field: 'userType', title: '用户性质', minWidth: 150,
+      formatter: (obj: any) => {
+        const userType = obj.row.userType
+        return getUserTypeName(userType)
+      }
+    },
+    { field: 'city', title: '所属地市', minWidth: 80 },
+    { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
+    {
+      field: 'userStatus', title: '用户状态', minWidth: 100,
+      render: 'tag',
+      custom: {
+        0: 'primary',
+        1: 'primary',
+        2: 'success',
+        3: 'warning'
+      },
+      replaceValue: {
+        0: '可研',
+        1: '建设',
+        2: '运行',
+        3: '退运'
+      }
+    },
+    { field: 'substation', title: '变电站', minWidth: 100 },
+    {
+      field: 'status', title: '审核状态', minWidth: 100,
+      render: 'tag',
+      custom: {
+        1: 'primary',
+        2: 'success',
+        3: 'danger',
+        4: 'warning'
+      },
+      replaceValue: {
+        1: '审批中',
+        2: '审批通过',
+        3: '审批不通过',
+        4: '已取消'
+      }
+    },
+    { field: 'createTime', title: '开始时间', minWidth: 170 },
+    {
+      title: '操作',
+      minWidth: 150,
+      fixed: 'right',
+      render: 'buttons',
+      buttons: [
         {
-            field: 'loadType',
-            title: '干扰源类型',
-            formatter: row => {
-                return interferenceType.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        { field: 'userName', title: '干扰源用户名称' },
-        { field: 'recordTime', title: '建档时间' },
-        {
-            field: 'iisFileUpload',
-            title: '是否上传报告',
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'success'
-            },
-            replaceValue: {
-                0: '否',
-                1: '是'
-            }
-        },
-        {
-            field: 'istatus',
-            title: '入网评估报告状态',
-            formatter: row => {
-                return istatusList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '审核',
-                    type: 'primary',
-                    disabled: row => {
-                        return !(
-                            row.istatus == null ||
-                            istatusList.filter(item => item.code == 'Newly')[0]?.id == row.istatus ||
-                            istatusList.filter(item => item.code == 'Failed')[0]?.id == row.istatus
-                        )
-                        // ||
-                        // istatusList.filter(item => item.code == 'Failed')[0]?.id == row.istatus
-                    },
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        AuditRef.value.open('未建档干扰源用户入网报告结论上传', row)
-                    }
-                },
-
-                {
-                    name: 'edit',
-                    text: '查看',
-                    type: 'primary',
-                    disabled: row => {
-                        return row.istatus == null
-                    },
-                    icon: 'el-icon-Delete',
-                    render: 'basicButton',
-                    click: row => {
-                        AuditRef.value.open('未建档干扰源用户详情', row)
-                    }
-                }
-            ]
+          name: 'productSetting',
+          title: '流程详情',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: row => {
+            handleAudit(row.processInstanceId)
+          }
         }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.relationUserName = tableStore.table.params.userName
+      ]
     }
+  ],
+
+  beforeSearchFun: () => {
+    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+    tableStore.table.params.relationUserName = tableStore.table.params.userName
+  }
 })
 
 tableStore.table.params.loadType = ''
@@ -145,46 +138,83 @@ tableStore.table.params.fileUploadflag = ''
 provide('tableStore', tableStore)
 // 新增
 const addList = () => {
-    addRef.value.open()
+  addRef.value.open()
 }
 
 //三个表单
 const addForms = ref()
 const formVisibile = ref(false)
 const addFormModel = () => {
-    console.log( addForms.value,"00000");
-    addForms.value.open()
-    formVisibile.value = true
+  console.log(addForms.value, '00000')
+  addForms.value.open()
+  formVisibile.value = true
 }
 
 // 导出
 const exportEvent = () => {
-    let form = JSON.parse(JSON.stringify(tableStore.table.params))
-    form.pageNum = 1
-    form.pageSize = tableStore.table.total
-    getLoadTypeUserList(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
+  getLoadTypeUserList(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)
+      }
     })
+  })
 }
 onMounted(() => {
-    tableStore.index()
+  tableStore.index()
 })
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any) => {
+  push({
+    name: 'BpmProcessInstanceDetail',
+    query: {
+      id: instanceId
+    }
+  })
+}
+
+/**获取用户性质*/
+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">
+<style scoped lang='scss'>
 :deep(.el-upload-list__item) {
-    width: 400px;
+  width: 400px;
 }
-::v-deep .el-input__wrapper{
-    width:200px !important;
+
+::v-deep .el-input__wrapper {
+  width: 200px !important;
 }
 </style>

src/views/pqs/supervise/interfere/index.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
-            <el-tab-pane label="未建档非线性用户录入及查询" name="1">
+            <el-tab-pane label="干扰源用户建档管理" name="1">
                 <undocumented v-if="activeName == '1'" />
             </el-tab-pane>
-            <el-tab-pane label="入网评估报告审核" name="2"><network v-if="activeName == '2'" /></el-tab-pane>
-            <el-tab-pane label="干扰源用户常态化管理" name="3"><normal v-if="activeName == '3'" /></el-tab-pane>
-            <el-tab-pane label="实测报告审核" name="4"><report v-if="activeName == '4'" /></el-tab-pane>
+<!--            <el-tab-pane label="入网评估报告审核" name="2"><network v-if="activeName == '2'" /></el-tab-pane>-->
+            <el-tab-pane label="常态化干扰源用户" name="3"><normal v-if="activeName == '3'" /></el-tab-pane>
+<!--            <el-tab-pane label="实测报告审核" name="4"><report v-if="activeName == '4'" /></el-tab-pane>-->
         </el-tabs>
     </div>
 </template>

src/views/system/bpm/processInstance/detail/dialog/TaskSignList.vue

@@ -27,7 +27,7 @@
       </el-table-column>
       <el-table-column label="审批状态" prop="status" width="120">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.BPM_TASK_STATUS" :value="scope.row.status" />
+<!--          <dict-tag :type="DICT_TYPE.BPM_TASK_STATUS" :value="scope.row.status" />-->
         </template>
       </el-table-column>
       <el-table-column

src/views/system/bpm/processInstance/detail/index.vue

@@ -187,7 +187,7 @@ const userId = JSON.parse(window.localStorage.getItem('adminInfo')).id// 当前
 const id = query.id as unknown as string // 流程实例的编号
 const todo = query.todo// 是否存在待办事项
 const processInstanceLoading = ref(false) // 流程实例的加载中
-const processInstance = ref<any>({}) // 流程实例
+const processInstance = ref({}) // 流程实例
 const bpmnXml = ref('') // BPMN XML
 const tasksLoad = ref(true) // 任务的加载中
 const tasks = ref<any[]>([]) // 任务列表