From 40ecf804bd4584d5d742918a7ea5c96e80f95149 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Fri, 24 May 2024 09:49:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pqs/supervise/electricalEnergy/index.vue  |   2 +-
 src/views/pqs/supervise/interfere/index.vue   |   7 +-
 .../supervise/technology/components/alarm.vue |  14 +-
 .../technology/components/earlyWarn.vue       | 136 ++++++++-------
 .../supervise/technology/feedbackPopup.vue    |   3 +-
 src/views/system/bpm/task/done/index.vue      | 163 +++++++++---------
 src/views/system/bpm/task/index.vue           |  36 ++++
 src/views/system/bpm/task/todo/index.vue      |   3 +-
 8 files changed, 213 insertions(+), 151 deletions(-)
 create mode 100644 src/views/system/bpm/task/index.vue

diff --git a/src/views/pqs/supervise/electricalEnergy/index.vue b/src/views/pqs/supervise/electricalEnergy/index.vue
index 03a549e3..9de50580 100644
--- a/src/views/pqs/supervise/electricalEnergy/index.vue
+++ b/src/views/pqs/supervise/electricalEnergy/index.vue
@@ -7,7 +7,7 @@
             <el-tab-pane label="用户投诉" name="2">
                 <complaints v-if="activeName == '2'" />
             </el-tab-pane>
-            <el-tab-pane label="现场测试问题" name="3">
+            <el-tab-pane label="普测问题" name="3">
                 <testQuestions v-if="activeName == '3'" />
             </el-tab-pane>
             <!-- <el-tabs v-model="activeName" type="border-card">
diff --git a/src/views/pqs/supervise/interfere/index.vue b/src/views/pqs/supervise/interfere/index.vue
index 0bf25be0..4425bcb1 100644
--- a/src/views/pqs/supervise/interfere/index.vue
+++ b/src/views/pqs/supervise/interfere/index.vue
@@ -1,17 +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">
                 <interferenceUserTable 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="5">
-              <terminalNetworkDetection v-if="activeName == '5'"></terminalNetworkDetection>
-            </el-tab-pane> -->
         </el-tabs>
     </div>
 </template>
diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue
index 806a6d57..d244f603 100644
--- a/src/views/pqs/supervise/technology/components/alarm.vue
+++ b/src/views/pqs/supervise/technology/components/alarm.vue
@@ -81,11 +81,22 @@ const tableStore = new TableStore({
         { field: 'createTime', title: '创建时间', minWidth: '150' },
         {
             title: '操作',
-            width: '180',
+            minWidth: '220',
             align: 'center',
             render: 'buttons',
             fixed: 'right',
             buttons: [
+                {
+                    name: 'productSetting',
+                    title: '发送督办单',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        // handleAudit(row.processInstanceId)
+                        ElMessage.warning("待打通生成管理系统接口！")
+                    }
+                },
                 {
                     name: 'productSetting',
                     title: '问题反馈',
@@ -99,6 +110,7 @@ const tableStore = new TableStore({
                         feedbackPopup.value.open('填报反馈单',row.id,row.status)
                     }
                 },
+
                 {
                     name: 'productSetting',
                     title: '流程详情',
diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue
index d23d851a..65bdd5d5 100644
--- a/src/views/pqs/supervise/technology/components/earlyWarn.vue
+++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue
@@ -1,15 +1,15 @@
 <template>
-    <TableHeader  datePicker ref="TableHeaderRef">
-<!--        <template #operation>-->
-<!--            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>-->
-<!--            <el-button icon="el-icon-Delete" type="primary">删除</el-button>-->
-<!--        </template>-->
+    <TableHeader datePicker ref='TableHeaderRef'>
+        <!--        <template #operation>-->
+        <!--            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>-->
+        <!--            <el-button icon="el-icon-Delete" type="primary">删除</el-button>-->
+        <!--        </template>-->
     </TableHeader>
-    <Table ref="tableRef" />
+    <Table ref='tableRef' />
     <!--弹框-->
     <feedback-popup ref='feedbackPopup' />
 </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'
@@ -17,6 +17,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import FeedbackPopup from '@/views/pqs/supervise/technology/feedbackPopup.vue'
 import { useRouter } from 'vue-router'
+
 const { push } = useRouter()
 const tableRef = ref()
 const TableHeaderRef = ref()
@@ -35,7 +36,8 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'problemType', title: '告警单问题来源', minWidth: '150',
+        {
+            field: 'problemType', title: '告警单问题来源', minWidth: '150',
             render: 'tag',
             custom: {
                 1: 'warning',
@@ -51,14 +53,15 @@ const tableStore = new TableStore({
             }
         },
         { field: 'leafletName', title: '单据名称', minWidth: '150' },
-        { field: 'status', title: '告警单状态', minWidth: '150',
+        {
+            field: 'status', title: '告警单状态', minWidth: '150',
             render: 'tag',
             custom: {
                 1: 'primary',
                 2: 'success',
                 3: 'danger',
                 4: 'warning',
-                5: 'primary',
+                5: 'primary'
             },
             replaceValue: {
                 1: '审批中',
@@ -71,63 +74,74 @@ const tableStore = new TableStore({
         { field: 'createTime', title: '创建时间', minWidth: '150' },
         {
             title: '操作',
-            width: '180',
+            minWidth: '220',
             align: 'center',
             render: 'buttons',
             fixed: 'right',
             buttons: [
+                {
+                    name: 'productSetting',
+                    title: '发送督办单',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        // handleAudit(row.processInstanceId)
+                        ElMessage.warning("待打通生成管理系统接口！")
+                    }
+                },
                 {
                     name: 'productSetting',
                     title: '问题反馈',
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
-                  disabled: row => {
-                    return row.status !== 5
-                  },
-                  click: row => {
-                    feedbackPopup.value.open('填报反馈单',row.id,row.status)
-                  }
+                    disabled: row => {
+                        return row.status !== 5
+                    },
+                    click: row => {
+                        feedbackPopup.value.open('填报反馈单', row.id, row.status)
+                    }
                 },
-              {
-                name: 'productSetting',
-                title: '流程详情',
-                type: 'primary',
-                icon: 'el-icon-EditPen',
-                render: 'basicButton',
-                disabled: row => {
-                  return row.status == 5
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 5
+                    },
+                    click: row => {
+                        handleAudit(row.processInstanceId)
+                    }
                 },
-                click: row => {
-                  handleAudit(row.processInstanceId)
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 1 || row.status == 2 || row.status == 4 || row.status == 5
+                    },
+                    click: row => {
+                        // deviceQuitPopup.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 || row.status == 5
+                    },
+                    click: row => {
+                        // cancelLeave(row)
+                    }
                 }
-              },
-              {
-                name: 'edit',
-                title: '重新发起',
-                type: 'warning',
-                icon: 'el-icon-Open',
-                render: 'basicButton',
-                disabled: row => {
-                  return row.status == 1 || row.status == 2 || row.status == 4 || row.status == 5
-                },
-                click: row => {
-                  // deviceQuitPopup.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 || row.status == 5
-                },
-                click: row => {
-                  // cancelLeave(row)
-                }
-              }
             ]
         }
     ],
@@ -145,13 +159,13 @@ onMounted(() => {
 
 /** 流程实例详情 */
 const handleAudit = (instanceId: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    query: {
-      id: instanceId
-    }
-  })
+    push({
+        name: 'BpmProcessInstanceDetail',
+        query: {
+            id: instanceId
+        }
+    })
 }
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang='scss'></style>
diff --git a/src/views/pqs/supervise/technology/feedbackPopup.vue b/src/views/pqs/supervise/technology/feedbackPopup.vue
index 2c6a8c6f..6637011b 100644
--- a/src/views/pqs/supervise/technology/feedbackPopup.vue
+++ b/src/views/pqs/supervise/technology/feedbackPopup.vue
@@ -15,10 +15,11 @@
               v-model='formData.takeStep'
               autocomplete='off'
               placeholder='请输入采取的措施'
+              type='textarea'
           />
         </el-form-item>
 
-        <el-form-item label='处理成效报告：' prop='reportPath'>
+        <el-form-item label='反馈报告：' prop='reportPath'>
           <el-upload
               ref='uploadRef'
               action=''
diff --git a/src/views/system/bpm/task/done/index.vue b/src/views/system/bpm/task/done/index.vue
index 7eee7340..e164cb52 100644
--- a/src/views/system/bpm/task/done/index.vue
+++ b/src/views/system/bpm/task/done/index.vue
@@ -1,21 +1,21 @@
 <!--待办事项列表-->
 <template>
-  <div class='default-main'>
-    <TableHeader date-picker>
-      <template v-slot:select>
-        <el-form-item label='任务名称'>
-          <el-input
-              v-model='tableStore.table.params.searchValue'
-              clearable
-              placeholder='请输入任务名称'
-          />
-        </el-form-item>
-      </template>
+    <div class='default-main'>
+        <TableHeader date-picker>
+            <template v-slot:select>
+                <el-form-item label='任务名称'>
+                    <el-input
+                        v-model='tableStore.table.params.searchValue'
+                        clearable
+                        placeholder='请输入任务名称'
+                    />
+                </el-form-item>
+            </template>
 
-    </TableHeader>
-    <!--表格-->
-    <Table ref='tableRef'></Table>
-  </div>
+        </TableHeader>
+        <!--表格-->
+        <Table ref='tableRef'></Table>
+    </div>
 </template>
 
 <script setup lang='ts'>
@@ -28,89 +28,92 @@ import { dateFormatter, formatPast2 } from '@/utils/formatTime'
 
 
 defineOptions({
-  name: 'businessUser'
+    name: 'businessUser'
 })
 
 const { push } = useRouter()
 
 
 const tableStore = new TableStore({
-  url: '/bpm-boot/bpm/task/doneList',
-  method: 'POST',
-  column: [
-    { title: '序号', type: 'seq', width: 80 },
-    { 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: [
+        { title: '序号', type: 'seq', width: 80 },
+        { 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 },
         {
-          name: 'productSetting',
-          title: '流程历史',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            handleAudit(row.processInstance.id)
-          }
+            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 => {
+                        handleAudit(row.processInstance.id)
+                    }
+                }
+            ]
+        }
+    ],
+    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',
-    query: {
-      id: instanceId
-    }
-  })
+    push({
+        name: 'BpmProcessInstanceDetail',
+        query: {
+            id: instanceId
+        }
+    })
 }
 
 </script>
diff --git a/src/views/system/bpm/task/index.vue b/src/views/system/bpm/task/index.vue
new file mode 100644
index 00000000..b8972160
--- /dev/null
+++ b/src/views/system/bpm/task/index.vue
@@ -0,0 +1,36 @@
+<template>
+    <div class="default-main">
+        <el-tabs v-model="activeName" type="border-card">
+            <el-tab-pane label="待办任务" name="1">
+                <TodoTask v-if="activeName == '1'" />
+            </el-tab-pane>
+            <el-tab-pane label="已办任务" name="2">
+                <DoneTask v-if="activeName == '2'" />
+            </el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import TodoTask from './todo/index.vue'
+import DoneTask from './done/index.vue'
+import { mainHeight } from '@/utils/layout'
+defineOptions({
+    name: 'bpm/task'
+})
+const activeName = ref('1')
+
+const layout = mainHeight(63) as any
+</script>
+
+<style lang="scss" scoped>
+.bars_w {
+    width: 100%;
+    height: 500px;
+}
+:deep(.el-tabs__content) {
+    height: v-bind('layout.height');
+    overflow-y: auto;
+}
+</style>
diff --git a/src/views/system/bpm/task/todo/index.vue b/src/views/system/bpm/task/todo/index.vue
index 5ec14d3e..03fd4a33 100644
--- a/src/views/system/bpm/task/todo/index.vue
+++ b/src/views/system/bpm/task/todo/index.vue
@@ -36,9 +36,10 @@ const { push } = useRouter()
 const tableStore = new TableStore({
     url: '/bpm-boot/bpm/task/todoList',
     method: 'POST',
+    publicHeight: 65,
     column: [
         { title: '序号', type: 'seq', width: 80 },
-        { title: '流程名称', field: 'processInstance.name', minWidth: 130 },
+        { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
         { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
         { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
         { title: '发起时间', field: 'createTime', minWidth: 170 },