修改 查看详情 返回页面刷新

src/views/system/bpm/task/done/index.vue

@@ -17,7 +17,7 @@
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref } from 'vue'
+import { onMounted, provide, ref,watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { dateFormatter, formatPast2 } from '@/utils/formatTime'
 
@@ -25,8 +25,8 @@ defineOptions({
   name: 'businessUser'
 })
 
-const { push } = useRouter()
-
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
 const tableStore = new TableStore({
   url: '/bpm-boot/bpm/task/doneList',
   method: 'POST',
@@ -87,6 +87,7 @@ const tableStore = new TableStore({
           icon: 'el-icon-EditPen',
           render: 'basicButton',
           click: row => {
+            flag.value = true
             handleAudit(row.processInstance.id)
           }
         }
@@ -118,4 +119,17 @@ const handleAudit = (instanceId: any) => {
     }
   })
 }
+
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
 </script>

src/views/system/bpm/task/index.vue

@@ -22,7 +22,7 @@ import MyInstance from './myInstance/index.vue'
 import { mainHeight } from '@/utils/layout'
 
 defineOptions({
-  // name: 'bpm/task'
+  name: 'bpm/task'
 })
 const activeName = ref('1')
 

src/views/system/bpm/task/myInstance/index.vue

@@ -1,27 +1,23 @@
 <!--待办事项列表-->
 <template>
-  <div>
-    <TableHeader date-picker>
-      <template v-slot:select>
-        <el-form-item label='任务名称'>
-          <el-input
-              v-model='tableStore.table.params.searchValue'
-              placeholder='请输入任务名称'
-          ></el-input>
-        </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-input>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <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'
-import { onMounted, provide, ref } from 'vue'
+import { onMounted, provide, ref, watch } from 'vue'
 import { formatDate, formatPast2 } from '@/utils/formatTime'
 import { useRouter } from 'vue-router'
 import { useDictData } from '@/stores/dictData'
@@ -29,115 +25,134 @@ const dictData = useDictData()
 const categoryOptionList = dictData.getBasicData('flow_category')
 
 defineOptions({
-  name: 'businessUser'
+    name: 'businessUser'
 })
 
-const { push } = useRouter()
-
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
 
 const tableStore = new TableStore({
-  url: '/bpm-boot/bpm/processInstance/myPage',
-  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: 'name', minWidth: 130 },
-    { title: '流程分类', field: 'category', minWidth: 130 ,
-      formatter: (row: any) => {
-        return categoryOptionList.filter(item => item.id === row.cellValue)[0]?.name
-      }},
-    {
-      field: 'status',
-      title: '流程状态',
-      render: 'tag',
-      minWidth: 130,
-      custom: {
-        1: 'primary',
-        2: 'success',
-        3: 'danger',
-        4: 'warning'
-      },
-      replaceValue: {
-        1: '审批中',
-        2: '审批通过',
-        3: '审批不通过',
-        4: '已取消'
-      }
-    },
-    { title: '发起时间', field: 'startTime', minWidth: 140 },
-    { title: '结束时间', field: 'endTime', minWidth: 140 },
-    {
-      title: '耗时', field: 'durationInMillis', minWidth: 130,
-      formatter: (obj: any) => {
-        const millis = obj.row.durationInMillis
-        return millis > 0 ? formatPast2(millis) : ''
-      }
-    },
-    {
-      title: '当前审批任务', field: 'tasks', minWidth: 140,
-      formatter: (obj: any) => {
-        const tasks = obj.row.tasks
-        if (tasks) {
-          return tasks[0].name
-        } else {
-          return ''
-        }
-
-        // return millis > 0 ? formatPast2(millis) : '--'
-      }
-    },
-    {
-      title: '操作',
-      align: 'center',
-      minWidth: '180',
-      fixed: 'right',
-      render: 'buttons',
-      buttons: [
+    url: '/bpm-boot/bpm/processInstance/myPage',
+    method: 'POST',
+    publicHeight: 65,
+    column: [
         {
-          name: 'productSetting',
-          title: '流程详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            handleAudit(row.id)
-          }
-        }
-      ]
-    }
-  ],
-  beforeSearchFun: () => {
-    for (let key in tableStore.table.params) {
-      if (tableStore.table.params[key] === '') {
-        delete tableStore.table.params[key]
-      }
-    }
+            field: 'index',
+            title: '序号',
+            width: '60',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '任务名称', field: 'name', minWidth: 130 },
+        {
+            title: '流程分类',
+            field: 'category',
+            minWidth: 130,
+            formatter: (row: any) => {
+                return categoryOptionList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'status',
+            title: '流程状态',
+            render: 'tag',
+            minWidth: 130,
+            custom: {
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        { title: '发起时间', field: 'startTime', minWidth: 140 },
+        { title: '结束时间', field: 'endTime', minWidth: 140 },
+        {
+            title: '耗时',
+            field: 'durationInMillis',
+            minWidth: 130,
+            formatter: (obj: any) => {
+                const millis = obj.row.durationInMillis
+                return millis > 0 ? formatPast2(millis) : ''
+            }
+        },
+        {
+            title: '当前审批任务',
+            field: 'tasks',
+            minWidth: 140,
+            formatter: (obj: any) => {
+                const tasks = obj.row.tasks
+                if (tasks) {
+                    return tasks[0].name
+                } else {
+                    return ''
+                }
 
-  }
+                // return millis > 0 ? formatPast2(millis) : '--'
+            }
+        },
+        {
+            title: '操作',
+            align: 'center',
+            minWidth: '180',
+            fixed: 'right',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        flag.value = true
+                        handleAudit(row.id)
+                    }
+                }
+            ]
+        }
+    ],
+    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
+        }
+    })
 }
-
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
 </script>

src/views/system/bpm/task/todo/index.vue

@@ -1,100 +1,106 @@
 <!--待办事项列表-->
 <template>
-  <div>
-    <TableHeader>
-      <template v-slot:select>
-        <el-form-item label='任务名称'>
-          <el-input
-              v-model='tableStore.table.params.searchValue'
-              placeholder='请输入任务名称'
-          ></el-input>
-        </el-form-item>
-      </template>
-
-    </TableHeader>
-    <!--表格-->
-    <Table ref='tableRef'></Table>
-  </div>
+    <div>
+        <TableHeader>
+            <template v-slot:select>
+                <el-form-item label="任务名称">
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称"></el-input>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <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'
-import { onMounted, provide, ref } from 'vue'
+import { onMounted, provide, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
-
 defineOptions({
-  name: 'businessUser'
+    name: 'businessUser'
 })
 
-const { push } = useRouter()
-
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
 
 const tableStore = new TableStore({
-  url: '/bpm-boot/bpm/task/todoList',
-  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: 'createTime', minWidth: 170 },
-    { title: '当前任务', field: 'name', minWidth: 130 },
-    {
-      title: '操作',
-      align: 'center',
-      width: '230',
-      render: 'buttons',
-      buttons: [
+    url: '/bpm-boot/bpm/task/todoList',
+    method: 'POST',
+    publicHeight: 65,
+    column: [
         {
-          name: 'productSetting',
-          title: '办理',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            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: 'processInstance.startUser.name', minWidth: 130 },
+        { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
+        { title: '发起时间', field: 'createTime', minWidth: 170 },
+        { title: '当前任务', field: 'name', minWidth: 130 },
+        {
+            title: '操作',
+            align: 'center',
+            width: '230',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '办理',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        flag.value = true
+                        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,
-      todo: 'todo'
-    }
-  })
+    push({
+        name: 'BpmProcessInstanceDetail',
+        query: {
+            id: instanceId,
+            todo: 'todo'
+        }
+    })
 }
-
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
 </script>