新增单独审批项的页面，修改跳转

oa-ui/src/assets/styles/element-reset.scss

@@ -33,4 +33,9 @@
 }
 ::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
   border-color: #fff;
+}
+
+// 描述框
+::v-deep .el-descriptions-item__label.is-bordered-label{
+  color: #686a6e;
 }

oa-ui/src/router/index.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-26 17:07:38
+ * @LastEditTime: 2024-04-28 16:17:01
  */
 /*
  * @Author: ysh
@@ -243,7 +243,35 @@ export const constantRoutes = [
         path: '',
         component: () => import('@/views/flowable/task/todo/applyForm/borrowIndex'),
         name: 'borrow',
-        meta: { title: '借款申请', icon: '' }
+        meta: { title: '借款审批', icon: '' }
+
+      }
+    ]
+  },
+  {
+    path: '/applyForm/carApply',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/flowable/task/todo/applyForm/carIndex'),
+        name: 'carApply',
+        meta: { title: '用车审批', icon: '' }
+
+      }
+    ]
+  },
+  {
+    path: '/applyForm/deviceApply',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/flowable/task/todo/applyForm/deviceIndex'),
+        name: 'deviceApply',
+        meta: { title: '设备审批', icon: '' }
 
       }
     ]

oa-ui/src/views/flowable/form/borrow/borrowData.vue

@@ -2,11 +2,20 @@
  * @Author: ysh
  * @Date: 2024-04-25 17:17:53
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-26 17:20:15
+ * @LastEditTime: 2024-04-28 17:45:52
 -->
 <template>
   <div class="mt20">
-    <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus" @click="addBorrowFlow">新增借款</el-button>
+    <div class="nav-btn">
+      <div>
+        <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus"
+          @click="addBorrowFlow">新增借款</el-button>
+      </div>
+      <div>
+        <el-button icon="el-icon-refresh" circle size="mini" @click="getBorrowData()"></el-button>
+      </div>
+    </div>
+
     <el-table :data="borrowList" style="width: 100%">
       <el-table-column type="index" label="序号" width="50" />
       <el-table-column label="申请状态" width="100">
@@ -19,7 +28,7 @@
       <el-table-column prop="borrowUsage" label="申请类型" width="100">
         <template slot-scope="scope">
           <el-tag :type="scope.row.borrowUsage === '0' ? 'primary' : 'info'">{{ scope.row.borrowUsage === '0' ?
-      '项目借款' : '非项目借款' }}</el-tag>
+            '项目借款' : '非项目借款' }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="applyAmount" label="申请金额" />
@@ -29,24 +38,24 @@
       <el-table-column prop="applyDate" label="申请时间" width="110" />
       <el-table-column prop="deptComment" label="部门审核意见" show-overflow-tooltip width="100">
         <template slot-scope="scope">
-          {{ scope.deptComment == null ? '待审' : scope.deptComment }}
+          {{ scope.row.deptComment == null ? '待审' : scope.row.deptComment }}
         </template>
       </el-table-column>
       <el-table-column prop="managerComment" label="分管审核意见" show-overflow-tooltip width="100">
         <template slot-scope="scope">
-          {{ scope.managerComment == null ? '待审' : scope.managerComment }}
+          {{ scope.row.managerComment == null ? '待审' : scope.row.managerComment }}
         </template>
       </el-table-column>
       <el-table-column prop="zjlComment" label="总经理审核意见" show-overflow-tooltip width="120">
         <template slot-scope="scope">
-          {{ scope.zjlComment == null ? '待审' : scope.zjlComment }}
+          {{ scope.row.zjlComment == null ? '待审' : scope.row.zjlComment }}
         </template>
       </el-table-column>
-      <el-table-column prop="deptComment" label="财务经办人" show-overflow-tooltip width="100">
+      <el-table-column prop="CwUserId" label="财务经办人" show-overflow-tooltip width="100">
       </el-table-column>
       <el-table-column prop="lendTime" label="支付时间">
       </el-table-column>
-      <el-table-column label="操作" fixed="right">
+      <el-table-column label="操作" fixed="right" header-align="center">
         <template slot-scope="scope">
           <el-button icon="el-icon-view" type="text" size="mini" @click="handleLook(scope.row)">查看明细</el-button>
         </template>
@@ -83,6 +92,7 @@ import { getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
 import { todoList } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
+import { MessageBox } from 'element-ui'
 export default {
   props: {
     taskForm: {
@@ -108,7 +118,6 @@ export default {
       listBorrow({ projectId: this.taskForm.formId }).then(res => {
         if (res.code == 200) {
           this.borrowList = res.rows
-          console.log(res);
         }
       })
     },
@@ -116,7 +125,6 @@ export default {
       getBorrowDetail(borrowId).then(res => {
         if (res.data.length != 0) {
           this.detailList = res.data
-          console.log(res);
         }
       });
     },
@@ -134,32 +142,35 @@ export default {
         const formData = {};
         formData.formId = formId
         if (row.id) {
-          variables.variables = formData;
-          // 启动流程并将表单数据加入流程变量
-          definitionStart(row.id, JSON.stringify(variables)).then(res => {
-            this.$modal.msgSuccess(res.msg);
-            let procInstanceId = res.data;
-            todoList({
-              pageNum: 1,
-              pageSize: 99999999,
-              processInsId: procInstanceId
-            }).then(toDoRes => {
-              let records = toDoRes.data.records;
-              if (records.length == 1) {
-                records = records[0]
-              }
-              this.$router.push({
-                path: '/applyForm/borrow',
-                query: {
-                  procInsId: records.procInsId,
-                  executionId: records.executionId,
-                  deployId: records.deployId,
-                  taskId: records.taskId,
-                  taskName: records.taskName,
-                  startUser: records.startUserName + '-' + records.startDeptName,
-                  formId: formData.formId,
-                  procDefName: records.procDefName
+          MessageBox.confirm('是否发起借款申请？', '系统提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
+            variables.variables = formData;
+            // 启动流程并将表单数据加入流程变量
+            definitionStart(row.id, JSON.stringify(variables)).then(res => {
+              this.$modal.msgSuccess(res.msg);
+              let procInstanceId = res.data;
+              todoList({
+                pageNum: 1,
+                pageSize: 99999999,
+                processInsId: procInstanceId
+              }).then(toDoRes => {
+                let records = toDoRes.data.records;
+                if (records.length == 1) {
+                  records = records[0]
                 }
+                this.$router.push({
+                  path: '/applyForm/borrow',
+                  query: {
+                    procInsId: records.procInsId,
+                    executionId: records.executionId,
+                    deployId: records.deployId,
+                    taskId: records.taskId,
+                    taskName: records.taskName,
+                    startUser: records.startUserName + '--' + records.startDeptName,
+                    formId: formData.formId,
+                    procDefName: records.procDefName,
+                    projectId: this.taskForm.formId
+                  }
+                })
               })
             })
           })
@@ -173,11 +184,15 @@ export default {
         name: '借款审批'
       }).then(response => {
         this.definitionList = response.data.records;
-        console.log(this.definitionList);
       });
     },
   }
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.nav-btn {
+  display: flex;
+  justify-content: space-between;
+}
+</style>

oa-ui/src/views/flowable/form/borrowForm.vue

@@ -355,6 +355,16 @@ export default {
     this.form.dept.deptName = this.$store.getters.deptName;
     this.deptId = this.$store.getters.deptId;
     this.getProjectList();
+    if (this.$route.query.projectId) {
+      getProject(this.$route.query.projectId).then(res=>{
+        if(res.data){
+          this.form.projectId = res.data.projectId;
+          this.handleSelectProject(res.data.projectId)
+        }
+      })
+    }else{
+      this.handleSelectProject(this.form.projectId)
+    }
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
     })
@@ -377,7 +387,8 @@ export default {
         else {
           this.formTotal = 1;
           this.form = res.data;
-          this.hanldeChangeType()
+          this.hanldeChangeType();
+          this.handleSelectProject(res.data.projectId)
         }
         this.loading = false;
       })

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-25 14:32:14
+ * @LastEditTime: 2024-04-28 17:14:47
 -->
 <template>
   <div class="app-container">
@@ -311,6 +311,7 @@ export default {
           formData.formId = formId
           if (row.id) {
             variables.variables = formData;
+            let routePath = this.getRoutePath(row);
             // 启动流程并将表单数据加入流程变量
             definitionStart(row.id, JSON.stringify(variables)).then(res => {
               this.$modal.msgSuccess(res.msg);
@@ -324,7 +325,7 @@ export default {
                   records = records[0]
                 }
                 this.$router.push({
-                  path: '/flowable/task/todo/detail/index',
+                  path: routePath,
                   query: {
                     procInsId: records.procInsId,
                     executionId: records.executionId,
@@ -355,6 +356,19 @@ export default {
       // }
 
     },
+    getRoutePath(row) {
+      let path;
+      if (row.name == '借款审批') {
+        path = '/applyForm/borrow'
+      }else if (row.name == '用车审批'){
+        path = '/applyForm/carApply'
+      }else if (row.name == '设备审批'){
+        path = '/applyForm/deviceApply'
+      } else {
+        path = '/flowable/task/todo/detail/index'
+      }
+      return path
+    },
     /**  取消流程申请 */
     handleStop(row) {
       const params = {
@@ -434,9 +448,12 @@ export default {
     },
     // 子流程不可以删除
     beDeleted(row) {
-      if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底' || row.finishTime != null) {
+      console.log(row);
+      if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底'  || row.finishTime != null) {
         return true
-      } else {
+      }else if (row.procDefName == '项目流转' && row.taskName != '项目登记') {
+        return true
+      }else {
         return false
       }
     },

oa-ui/src/views/flowable/task/todo/applyForm/borrowIndex.vue

@@ -2,21 +2,104 @@
  * @Author: ysh
  * @Date: 2024-04-26 17:01:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-26 17:12:03
+ * @LastEditTime: 2024-04-28 14:30:48
 -->
 <template>
   <div class="app-container">
-    <nav-header></nav-header>
+    <nav-header :taskForm="taskForm" :taskName="taskName" :startUser="startUser"
+      :flowRecordList="flowRecordList"></nav-header>
+    <borrow-form :taskForm="taskForm" :taskName="taskName" @goBack="goBack"></borrow-form>
   </div>
 </template>
 
 <script>
-import navHeader from './components/header.vue'
+import { flowRecord } from "@/api/flowable/finished";
+import { getProcessVariables, flowXmlAndNode, definitionStart } from "@/api/flowable/definition";
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
+import BorrowForm from '@/views/flowable/form/borrowForm.vue';
+import navHeader from './components/navHeader.vue'
 export default {
   components: {
-    navHeader
+    navHeader,
+    BorrowForm
   },
-  
+  data() {
+    return {
+      taskForm: {
+        returnTaskShow: false, // 是否展示回退表单
+        delegateTaskShow: false, // 是否展示回退表单
+        defaultTaskShow: true, // 默认处理
+        comment: "", // 意见内容
+        procInsId: "", // 流程实例编号
+        instanceId: "", // 流程实例编号
+        deployId: "",  // 流程定义编号
+        taskId: "",// 流程任务编号
+        procDefId: "",  // 流程编号
+        targetKey: "",
+        variables: {
+          variables: {}
+        },
+      },
+      startUser: null, // 发起人信息,
+      taskName: null, // 任务节点
+      flowRecordList: []
+    }
+  },
+  created() {
+    if (this.$route.query) {
+      this.taskName = this.$route.query.taskName;
+      this.startUser = this.$route.query.startUser;
+      this.taskForm.deployId = this.$route.query.deployId;
+      this.taskForm.taskId = this.$route.query.taskId;
+      this.taskForm.procInsId = this.$route.query.procInsId;
+      this.taskForm.executionId = this.$route.query.executionId;
+      this.taskForm.instanceId = this.$route.query.procInsId;
+      this.taskForm.formId = this.$route.query.formId;
+      this.taskForm.procDefName = this.$route.query.procDefName;
+      // 流程任务获取变量信息
+      if (this.taskForm.taskId) {
+        this.processVariables(this.taskForm.taskId)
+        this.getFlowTaskForm(this.taskForm.taskId)
+      }
+      this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
+    }
+  },
+  methods: {
+    /** 获取流程变量内容 */
+    processVariables(taskId) {
+      if (taskId) {
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
+        getProcessVariables(taskId).then(res => {
+        });
+      }
+    },
+    /** 流程节点表单 */
+    getFlowTaskForm(taskId) {
+      if (taskId) {
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
+        flowTaskForm({ taskId: taskId }).then(res => {
+          this.taskForm.variables = res.data.formData;
+        });
+      }
+    },
+    /** 流程流转记录 */
+    getFlowRecordList(procInsId, deployId) {
+      const that = this
+      const params = { procInsId: procInsId, deployId: deployId }
+      flowRecord(params).then(res => {
+        that.flowRecordList = res.data.flowList;
+      }).catch(res => {
+        this.goBack();
+      })
+    },
+    goBack() {
+      // 关闭当前标签页并返回上个页面
+      const obj = this.$route;
+      this.$tab.closeOpenPage(obj);
+      this.$router.go(-1);
+    }
+  }
+
 }
 </script>
 

oa-ui/src/views/flowable/task/todo/applyForm/components/header.vue → oa-ui/src/views/flowable/task/todo/applyForm/carIndex.vue

@@ -1,8 +1,14 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-28 15:38:55
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-28 16:36:27
+-->
 <template>
-  <div slot="header" class="clearfix">
-    <span class="el-icon-document">任务标题：{{ this.$route.meta.title }}</span>
-    <el-tag style="margin-left:10px">发起人:{{ startUser }}</el-tag>
-    <el-tag>任务节点:{{ taskName }}</el-tag>
+  <div class="app-container">
+    <nav-header :taskForm="taskForm" :taskName="taskName" :startUser="startUser"
+      :flowRecordList="flowRecordList"></nav-header>
+    <car-form :taskForm="taskForm" :taskName="taskName" @goBack="goBack"></car-form>
   </div>
 </template>
 
@@ -10,9 +16,12 @@
 import { flowRecord } from "@/api/flowable/finished";
 import { getProcessVariables, flowXmlAndNode, definitionStart } from "@/api/flowable/definition";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
+import navHeader from './components/navHeader.vue'
+import CarForm from '@/views/flowable/form/carForm.vue';
 export default {
-  props: {
-
+  components: {
+    navHeader,
+    CarForm
   },
   data() {
     return {
@@ -33,7 +42,7 @@ export default {
       },
       startUser: null, // 发起人信息,
       taskName: null, // 任务节点
-      flowRecordList:[]
+      flowRecordList: []
     }
   },
   created() {
@@ -83,7 +92,14 @@ export default {
         this.goBack();
       })
     },
+    goBack() {
+      // 关闭当前标签页并返回上个页面
+      const obj = this.$route;
+      this.$tab.closeOpenPage(obj);
+      this.$router.go(-1);
+    }
   }
+
 }
 </script>
 

oa-ui/src/views/flowable/task/todo/applyForm/components/flowNote.vue

@@ -0,0 +1,66 @@
+<template>
+  <div>
+    <div class="block" style="padding-right: 20px;">
+      <el-timeline>
+        <el-timeline-item v-for="(item, index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
+          :color="setColor(item.finishTime)">
+          <p style="font-weight: 700">{{ item.taskName }}</p>
+          <el-card :body-style="{ padding: '10px' }">
+            <el-descriptions class="margin-top" :column="1" size="small" border>
+              <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
+                <template slot="label"><i class="el-icon-user"></i>办理人</template>
+                {{ item.assigneeName }}
+                <el-tag type="info" size="mini">{{ item.deptName }}</el-tag>
+              </el-descriptions-item>
+              <el-descriptions-item v-if="item.candidate" label-class-name="my-label">
+                <template slot="label"><i class="el-icon-user"></i>候选办理</template>
+                {{ item.candidate }}
+              </el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label">
+                <template slot="label"><i class="el-icon-date"></i>接收时间</template>
+                {{ item.createTime }}
+              </el-descriptions-item>
+              <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
+                <template slot="label"><i class="el-icon-date"></i>处理时间</template>
+                {{ item.finishTime }}
+              </el-descriptions-item>
+              <el-descriptions-item v-if="item.duration" label-class-name="my-label">
+                <template slot="label"><i class="el-icon-time"></i>耗时</template>
+                {{ item.duration }}
+              </el-descriptions-item>
+            </el-descriptions>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    flowRecordList: {
+      type: Array,
+      require: true
+    }
+  },
+  methods: {
+    setIcon(val) {
+      if (val) {
+        return "el-icon-check";
+      } else {
+        return "el-icon-time";
+      }
+    },
+    setColor(val) {
+      if (val) {
+        return "#2bc418";
+      } else {
+        return "#b3bdbb";
+      }
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/flowable/task/todo/applyForm/components/navHeader.vue

@@ -0,0 +1,62 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-26 17:08:19
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-28 16:59:42
+-->
+<template>
+  <div>
+    <div slot="header" class="nav-item">
+      <div>
+        <span class="el-icon-document"> 任务标题：{{ this.$route.meta.title }}</span>
+        <el-tag style="margin-left:10px">发起人:{{ startUser }}</el-tag>
+        <el-tag class="ml20">任务节点:{{ taskName }}</el-tag>
+      </div>
+      <div>
+        <el-button type="primary" @click="drawer = true" size="mini" icon="el-icon-search">查看流转记录</el-button>
+      </div>
+    </div>
+    <el-divider></el-divider>
+    <el-drawer title="流转记录" :visible.sync="drawer" direction="rtl">
+      <flow-note :flowRecordList="flowRecordList"></flow-note>
+    </el-drawer>
+  </div>
+
+</template>
+
+<script>
+import flowNote from './flowNote.vue';
+export default {
+  components: { flowNote },
+  props: {
+    taskForm: {
+      type: Object,
+      require: true
+    },
+    taskName: {
+      type: String,
+      require: true
+    },
+    startUser: {
+      type: String,
+      require: true
+    },
+    flowRecordList: {
+      type: Array,
+      require: true
+    }
+  },
+  data() {
+    return {
+      drawer: false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.nav-item {
+  display: flex;
+  justify-content: space-between;
+}
+</style>

oa-ui/src/views/flowable/task/todo/applyForm/deviceIndex.vue

@@ -0,0 +1,112 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-28 15:38:55
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-28 16:34:45
+-->
+<template>
+  <div class="app-container">
+    <nav-header :taskForm="taskForm" :taskName="taskName" :startUser="startUser"
+      :flowRecordList="flowRecordList"></nav-header>
+    <device-form :taskForm="taskForm" :taskName="taskName" @goBack="goBack"></device-form>
+  </div>
+</template>
+
+<script>
+import { flowRecord } from "@/api/flowable/finished";
+import { getProcessVariables, flowXmlAndNode, definitionStart, getFlowViewer } from "@/api/flowable/definition";
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
+import navHeader from './components/navHeader.vue'
+import DeviceForm from '@/views/flowable/form/deviceForm.vue';
+export default {
+  components: {
+    navHeader,
+    DeviceForm
+  },
+  data() {
+    return {
+      taskForm: {
+        returnTaskShow: false, // 是否展示回退表单
+        delegateTaskShow: false, // 是否展示回退表单
+        defaultTaskShow: true, // 默认处理
+        comment: "", // 意见内容
+        procInsId: "", // 流程实例编号
+        instanceId: "", // 流程实例编号
+        deployId: "",  // 流程定义编号
+        taskId: "",// 流程任务编号
+        procDefId: "",  // 流程编号
+        targetKey: "",
+        variables: {
+          variables: {}
+        },
+      },
+      startUser: null, // 发起人信息,
+      taskName: null, // 任务节点
+      flowRecordList: []
+    }
+  },
+  created() {
+    if (this.$route.query) {
+      this.taskName = this.$route.query.taskName;
+      this.startUser = this.$route.query.startUser;
+      this.taskForm.deployId = this.$route.query.deployId;
+      this.taskForm.taskId = this.$route.query.taskId;
+      this.taskForm.procInsId = this.$route.query.procInsId;
+      this.taskForm.executionId = this.$route.query.executionId;
+      this.taskForm.instanceId = this.$route.query.procInsId;
+      this.taskForm.formId = this.$route.query.formId;
+      this.taskForm.procDefName = this.$route.query.procDefName;
+      // 流程任务获取变量信息
+      if (this.taskForm.taskId) {
+        this.processVariables(this.taskForm.taskId)
+        this.getFlowTaskForm(this.taskForm.taskId)
+      }
+      this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
+      this.getFlowViewer(this.taskForm.procInsId,this.taskForm.executionId);
+    }
+  },
+  methods: {
+    /** 获取流程变量内容 */
+    processVariables(taskId) {
+      if (taskId) {
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
+        getProcessVariables(taskId).then(res => {
+        });
+      }
+    },
+    /** 流程节点表单 */
+    getFlowTaskForm(taskId) {
+      if (taskId) {
+        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
+        flowTaskForm({ taskId: taskId }).then(res => {
+          this.taskForm.variables = res.data.formData;
+        });
+      }
+    },
+    /** 流程流转记录 */
+    getFlowRecordList(procInsId, deployId) {
+      const that = this
+      const params = { procInsId: procInsId, deployId: deployId }
+      flowRecord(params).then(res => {
+        that.flowRecordList = res.data.flowList;
+      }).catch(res => {
+        this.goBack();
+      })
+    },
+    getFlowViewer(procInsId,executionId) {
+      getFlowViewer(procInsId,executionId).then(res => {
+        console.log(res.data);
+      })
+    },
+    goBack() {
+      // 关闭当前标签页并返回上个页面
+      const obj = this.$route;
+      this.$tab.closeOpenPage(obj);
+      this.$router.go(-1);
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/flowable/task/todo/index.vue

@@ -34,11 +34,11 @@
         <template slot-scope="scope">
           <el-tag size="medium">v{{ scope.row.procDefVersion }}</el-tag>
         </template>
-      </el-table-column> -->
+</el-table-column> -->
       <el-table-column label="流程发起人" align="center">
         <template slot-scope="scope">
           <label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName
-          }}</el-tag></label>
+              }}</el-tag></label>
         </template>
       </el-table-column>
       <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
@@ -118,9 +118,10 @@ export default {
     },
     // 跳转到处理页面
     handleProcess(row) {
+      let path = this.getRoutePath(row);
       getProcessVariables(row.taskId).then(res => {
         this.$router.push({
-          path: '/flowable/task/todo/detail/index',
+          path: path,
           query: {
             procInsId: row.procInsId,
             executionId: row.executionId,
@@ -135,6 +136,19 @@ export default {
       })
 
     },
+    getRoutePath(row) {
+      let path;
+      if (row.procDefName == '借款审批') {
+        path = '/applyForm/borrow'
+      } else if (row.procDefName == '用车审批') {
+        path = '/applyForm/carApply'
+      } else if (row.procDefName == '设备审批') {
+        path = '/applyForm/deviceApply'
+      } else {
+        path = '/flowable/task/todo/detail/index'
+      }
+      return path
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -189,4 +203,3 @@ export default {
   }
 };
 </script>
-