Merge branch 'master' of http://pqmcc.com:3000/frontend/admin-sjzx

2024-06-19 10:21:27 +08:00
parent dc3e0d91c9 f73a3572b2
commit 71ce755919
10 changed files with 116 additions and 108 deletions
--- a/src/views/pqs/supervise/technology/components/alarm.vue
+++ b/src/views/pqs/supervise/technology/components/alarm.vue
@@ -77,7 +77,6 @@ const tableStore = new TableStore({
            }
        },
        { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
-
        { field: 'leafletName', title: '单据名称', minWidth: '150' },
        { field: 'issueDetail', title: '告警内容', minWidth: '150' },
        {
--- a/src/views/pqs/supervise/technology/components/earlyWarn.vue
+++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue
@@ -116,6 +116,7 @@ const tableStore = new TableStore({
                        return row.status !== 5
                    },
                    click: row => {
+
                        feedbackPopup.value.open('填报反馈单', row.id, row.status, row.issueDetail,row.problemPath)
                    }
                },
--- a/src/views/pqs/supervise/technology/feedbackPopup.vue
+++ b/src/views/pqs/supervise/technology/feedbackPopup.vue
@@ -116,7 +116,6 @@ const open = async (
 ) => {
    title.value = text
    resetForm()
-    console.log(66666, reportPath)
    if (takeStep) {
        form.value.takeStep = takeStep
    }
--- a/src/views/pqs/supervise/terminal/components/sensitiveUserPopup.vue
+++ b/src/views/pqs/supervise/terminal/components/sensitiveUserPopup.vue
@@ -97,7 +97,6 @@ const submit = async () => {
                let data = new FormData()
                data.append('file', form.file)
                await importSensitiveUserData(data).then((res: any) => {
-                    debugger
                    if(res.type === 'application/json'){
                        // 说明是普通对象数据，读取信息
                        const fileReader = new FileReader()
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
@@ -5,7 +5,7 @@
            <el-form-item label="搜索">
                <el-input
                    v-model="tableStore.table.params.searchValue"
-                    placeholder="输入变电站.终端.监测点名称"
+                    placeholder="输入变电站、终端、监测点名称"
                    clearable
                ></el-input>
            </el-form-item>
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
@@ -5,7 +5,7 @@
            <el-form-item label="搜索">
                <el-input
                    v-model="tableStore.table.params.searchValue"
-                    placeholder="输入变电站.终端.监测点名称"
+                    placeholder="输入变电站、终端、监测点名称"
                    clearable
                ></el-input>
            </el-form-item>
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -5,7 +5,7 @@
            <el-form-item label="搜索">
                <el-input
                    v-model="tableStore.table.params.searchValue"
-                    placeholder="输入变电站.终端.监测点名称"
+                    placeholder="输入变电站、终端、监测点名称"
                    clearable
                ></el-input>
            </el-form-item>
--- a/src/views/system/bpm/task/done/index.vue
+++ b/src/views/system/bpm/task/done/index.vue
@@ -1,125 +1,128 @@
 <!--待办事项列表-->
 <template>
-  <div>
-    <TableHeader date-picker>
-      <template v-slot:select>
-        <el-form-item label='任务名称'>
-          <el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称' />
-        </el-form-item>
-      </template>
-    </TableHeader>
-    <!--表格-->
-    <Table ref='tableRef'></Table>
-  </div>
+    <div>
+        <TableHeader date-picker>
+            <template v-slot:select>
+                <el-form-item label='任务名称'>
+                    <el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称' />
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref='tableRef'></Table>
+    </div>
 </template>

 <script setup lang='ts'>
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref,watch } from 'vue'
+import { onMounted, provide, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { dateFormatter, formatPast2 } from '@/utils/formatTime'

 defineOptions({
-  name: 'businessUser'
+    name: 'businessUser'
 })

 const { push, options, currentRoute } = useRouter()
 const flag = ref(false)
 const tableStore = new TableStore({
-  url: '/bpm-boot/bpm/task/doneList',
-  method: 'POST',
-  publicHeight: 65,
-  column: [
-    {
-      field: 'index',
-      title: '序号',
-      width: '60',
-      formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
-    { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
-    { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
-    { title: '当前任务', field: 'name', minWidth: 130 },
-    { title: '发起时间', field: 'createTime', minWidth: 170 },
-    { title: '结束时间', field: 'endTime', minWidth: 170 },
-    {
-      title: '审批状态',
-      field: 'status',
-      minWidth: 130,
-      render: 'tag',
-      custom: {
-        1: 'primary',
-        2: 'success',
-        3: 'danger',
-        4: 'warning'
-      },
-      replaceValue: {
-        1: '审批中',
-        2: '审批通过',
-        3: '审批不通过',
-        4: '已取消'
-      }
-    },
-    { title: '审批建议', field: 'reason', minWidth: 150 },
-    {
-      title: '耗时',
-      field: 'durationInMillis',
-      minWidth: 150,
-      formatter: (obj: any) => {
-        return formatPast2(obj.row.durationInMillis)
-      }
-    },
-    {
-      title: '操作',
-      align: 'center',
-      minWidth: '150',
-      fixed: 'right',
-      render: 'buttons',
-      buttons: [
+    url: '/bpm-boot/bpm/task/doneList',
+    method: 'POST',
+    publicHeight: 65,
+    column: [
        {
-          name: 'productSetting',
-          title: '流程详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            flag.value = true
-            handleAudit(row.processInstance.id)
-          }
+            field: 'index',
+            title: '序号',
+            width: '60',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
+        { title: '任务内容', field: 'instanceSign', minWidth: 170 },
+        { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
+        { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
+        { title: '当前任务', field: 'name', minWidth: 130 },
+        { title: '发起时间', field: 'createTime', minWidth: 170 },
+        { title: '结束时间', field: 'endTime', minWidth: 170 },
+        {
+            title: '审批状态',
+            field: 'status',
+            minWidth: 130,
+            render: 'tag',
+            custom: {
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        { title: '审批建议', field: 'reason', minWidth: 150 },
+        {
+            title: '耗时',
+            field: 'durationInMillis',
+            minWidth: 150,
+            formatter: (obj: any) => {
+                return formatPast2(obj.row.durationInMillis)
+            }
+        },
+        {
+            title: '操作',
+            align: 'center',
+            minWidth: '150',
+            fixed: 'right',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        flag.value = true
+                        handleAudit(row.processInstance.id, row.historyInstanceId)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        for (let key in tableStore.table.params) {
+            if (tableStore.table.params[key] === '') {
+                delete tableStore.table.params[key]
+            }
        }
-      ]
    }
-  ],
-  beforeSearchFun: () => {
-    for (let key in tableStore.table.params) {
-      if (tableStore.table.params[key] === '') {
-        delete tableStore.table.params[key]
-      }
-    }
-  }
 })

 onMounted(() => {
-  // 加载数据
-  tableStore.index()
+    // 加载数据
+    tableStore.index()
 })
 tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)

 /** 处理审批按钮 */
-const handleAudit = (instanceId: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    state: {
-      id: instanceId
-    }
-  })
+const handleAudit = (instanceId: string, historyInstanceId: string) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
 }

+
 watch(
    () => currentRoute.value.path,
    () => {
--- a/src/views/system/bpm/task/myInstance/index.vue
+++ b/src/views/system/bpm/task/myInstance/index.vue
@@ -45,6 +45,7 @@ const tableStore = new TableStore({
            }
        },
        { title: '任务名称', field: 'name', minWidth: 130 },
+        { title: '任务内容', field: 'instanceSign', minWidth: 170 },
        {
            title: '流程分类',
            field: 'category',
@@ -112,7 +113,7 @@ const tableStore = new TableStore({
                    render: 'basicButton',
                    click: row => {
                        flag.value = true
-                        handleAudit(row.id)
+                        handleAudit(row.id, row.historyInstanceId)
                    }
                }
            ]
@@ -135,14 +136,16 @@ tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)

 /** 处理审批按钮 */
-const handleAudit = (instanceId: any) => {
+const handleAudit = (instanceId: string, historyInstanceId: string) => {
    push({
        name: 'BpmProcessInstanceDetail',
        state: {
-            id: instanceId
+            id: instanceId,
+            historyInstanceId
        }
    })
 }
+
 watch(
    () => currentRoute.value.path,
    () => {
--- a/src/views/system/bpm/task/todo/index.vue
+++ b/src/views/system/bpm/task/todo/index.vue
@@ -3,17 +3,17 @@
    <div>
        <TableHeader>
            <template v-slot:select>
-                <el-form-item label="任务名称">
-                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称"></el-input>
+                <el-form-item label='任务名称'>
+                    <el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称'></el-input>
                </el-form-item>
            </template>
        </TableHeader>
        <!--表格-->
-        <Table ref="tableRef"></Table>
+        <Table ref='tableRef'></Table>
    </div>
 </template>

-<script setup lang="ts">
+<script setup lang='ts'>
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
@@ -41,6 +41,7 @@ const tableStore = new TableStore({
            }
        },
        { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
+        { title: '任务内容', field: 'instanceSign', minWidth: 170 },
        { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
        { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
        { title: '发起时间', field: 'createTime', minWidth: 170 },
@@ -59,7 +60,7 @@ const tableStore = new TableStore({
                    render: 'basicButton',
                    click: row => {
                        flag.value = true
-                        handleAudit(row.processInstance.id)
+                        handleAudit(row.processInstance.id, row.historyInstanceId)
                    }
                }
            ]
@@ -82,15 +83,18 @@ tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)

 /** 处理审批按钮 */
-const handleAudit = (instanceId: any) => {
+const handleAudit = (instanceId: string, historyInstanceId: string) => {
    push({
        name: 'BpmProcessInstanceDetail',
        state: {
            id: instanceId,
-            todo: 'todo'
+            todo: 'todo',
+            historyInstanceId
        }
    })
 }
+
+
 watch(
    () => currentRoute.value.path,
    () => {