工作台页面

package-lock.json

@@ -1961,6 +1961,75 @@
         "webpack-chain": "^6.4.0",
         "webpack-dev-server": "^3.11.0",
         "webpack-merge": "^4.2.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
+        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -14794,75 +14863,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-print-nb": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/vue-print-nb/-/vue-print-nb-1.7.5.tgz",

src/views/modules/flowable/task/ApplyList.vue

@@ -108,6 +108,16 @@
   import TaskService from '@/api/flowable/TaskService'
   import ProcessService from '@/api/flowable/ProcessService'
   export default {
+    props: {
+      index: {
+        type: String,
+        default: ''
+      },
+      i: {
+        type: String,
+        default: ''
+      }
+    },
     data () {
       return {
         searchForm: {
@@ -159,10 +169,11 @@
     created () {
       this.proccessService = new ProcessService()
       this.taskService = new TaskService()
-    },
-    activated () {
       this.refreshList()
     },
+    // activated () {
+    //   this.refreshList()
+    // },
     components: {
       UrgeForm
       // FlowChart
@@ -176,6 +187,11 @@
           this.searchForm.beginDate = ''
           this.searchForm.endDate = ''
         }
+      },
+      index (index) {
+        if (index === this.i) {
+          this.refreshList()
+        }
       }
     },
     methods: {
@@ -252,4 +268,4 @@
       }
     }
   }
-</script>
+</script>

src/views/modules/flowable/task/HistoryList.vue

@@ -44,7 +44,7 @@
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column  title="任务" field="name" >
                     <template slot-scope="scope">
-                      {{scope.row.name}} 
+                      {{scope.row.name}}
                       <el-button v-if="scope.row.back" type="warning" size="mini" @click="callback(scope.row)">撤销</el-button>
                     </template>
                 </vxe-column>
@@ -84,6 +84,16 @@
   import pick from 'lodash.pick'
   import TaskService from '@/api/flowable/TaskService'
   export default {
+    props: {
+      index: {
+        type: String,
+        default: ''
+      },
+      i: {
+        type: String,
+        default: ''
+      }
+    },
     data () {
       return {
         searchForm: {
@@ -132,10 +142,10 @@
     taskService: null,
     created () {
       this.taskService = new TaskService()
-    },
-    activated () {
       this.refreshList()
     },
+    // activated () {
+    // },
     watch: {
       searchDates () {
         if (this.searchDates) {
@@ -145,6 +155,11 @@
           this.searchForm.beginDate = ''
           this.searchForm.endDate = ''
         }
+      },
+      index (index) {
+        if (index === this.i) {
+          this.refreshList()
+        }
       }
     },
     methods: {

src/views/modules/flowable/task/TaskForm.vue

@@ -354,6 +354,8 @@
       },
       // 自定义按钮提交
       commit (vars) {
+        var num = this.$route.query.num
+        console.log(num)
         if (this.formType === '2') { // 外置表单
           this.$refs.form.saveForm((businessTable, businessId, inputForm) => {
             vars = {...vars, ...inputForm}
@@ -368,15 +370,35 @@
             }).then(({data}) => {
               this.$message.success('提交成功')
               this.$store.dispatch('tagsView/delView', {fullPath: this.$route.fullPath})
-              this.$router.push('/flowable/task/TodoList')
-              this.cc(data)
+              // this.$router.push('/flowable/task/TodoList')
+              // this.cc(data)
+              if (num === '2') {
+                this.$router.push('/sys/dashboard/workBench/Pending')
+                this.cc(data)
+              } else if (num === '3') {
+                this.$router.push('/sys/dashboard/workBench/PendingList')
+                this.cc(data)
+              } else {
+                this.$router.push('/flowable/task/TodoList')
+                this.cc(data)
+              }
             })
           })
         } else { // 动态表单
           this.$refs.form.submitTaskFormData(vars, this.procInsId, this.taskId, this.auditForm.assignee, this.auditForm, (data) => {
             this.$store.dispatch('tagsView/delView', {fullPath: this.$route.fullPath})
-            this.$router.push('/flowable/task/TodoList')
-            this.cc(data)
+            // this.$router.push('/flowable/task/TodoList')
+            // this.cc(data)
+            if (num === '2') {
+              this.$router.push('/sys/dashboard/workBench/Pending')
+              this.cc(data)
+            } else if (num === '3') {
+              this.$router.push('/sys/dashboard/workBench/PendingList')
+              this.cc(data)
+            } else {
+              this.$router.push('/flowable/task/TodoList')
+              this.cc(data)
+            }
           })
         }
       },
@@ -437,6 +459,8 @@
       }
     },
     data () {
+      var num = this.$route.query.num
+      console.log(num)
       return {
         form: null,
         formType: '',

src/views/modules/flowable/task/TodoList.vue

@@ -97,8 +97,23 @@
   import UserSelect from '@/components/userSelect/UserSelectDialog'
   import TaskService from '@/api/flowable/TaskService'
   export default {
+    props: {
+      index: {
+        type: String,
+        default: ''
+      },
+      i: {
+        type: String,
+        default: ''
+      },
+      num: {
+        type: String,
+        default: ''
+      }
+    },
     data () {
       return {
+        mySum: this.num,
         searchForm: {
           beginDate: '',
           endDate: ''
@@ -164,6 +179,11 @@
           this.searchForm.beginDate = ''
           this.searchForm.endDate = ''
         }
+      },
+      index (index) {
+        if (index === this.i) {
+          this.refreshList()
+        }
       }
     },
     methods: {
@@ -188,6 +208,9 @@
         this.refreshList()
       },
       todo (row) {
+        // eslint-disable-next-line no-unused-vars
+        var sum = this.mySum
+        console.log(sum)
         this.taskService.getTaskDef({
           taskId: row.task.id,
           taskName: row.task.name,
@@ -199,7 +222,7 @@
         }).then(({data}) => {
           this.$router.push({
             path: '/flowable/task/TaskForm',
-            query: {formTitle: `${row.vars.title}`, title: `审批【${row.task.name || ''}】`, ...pick(data, 'formType', 'formReadOnly', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId')}
+            query: {formTitle: `${row.vars.title}`, title: `审批【${row.task.name || ''}】`, ...pick(data, 'formType', 'formReadOnly', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId'), num: sum}
           })
         })
       },

src/views/modules/notify/MyNotifyList.vue

@@ -40,7 +40,7 @@
                  <el-link  type="primary" :underline="false" @click="view(scope.row.id)">{{scope.row.title}}</el-link>
               </template>
             </vxe-column>
-            <vxe-column  title="类型" field="type" sortable> 
+            <vxe-column  title="类型" field="type" sortable>
                 <template slot-scope="scope">
                   {{ $dictUtils.getDictLabel("oa_notify_type", scope.row.type, '-') }}
                 </template>
@@ -154,4 +154,4 @@
       }
     }
   }
-</script>
+</script>

src/views/modules/sys/dashboard/workBench/Pending.vue

@@ -0,0 +1,388 @@
+<template>
+  <div>
+    <el-row :gutter="30">
+      <el-col :span="12">
+        <div class="page" style="height: 600px">
+          <!--<el-form size="small" :inline="true"  class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+            <el-form-item label="创建时间" prop="searchDates">
+              <el-date-picker
+                v-model="searchDates"
+                type="daterange"
+                size="small"
+                align="right"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :picker-options="pickerOptions">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button  type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
+              <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+            </el-form-item>
+          </el-form>-->
+          <div class="top bg-white">
+            <!--      <vxe-toolbar :refresh="{query: refreshList}" export print custom></vxe-toolbar>-->
+            <span>我的待办({{tablePage.total}})
+              <a @click="toPendingList()">
+              <span style="margin-left: 450px">更多</span>
+                <i class="fa fa-angle-right">
+                </i>
+              </a>
+            </span>
+            <div style="height: calc(100% - 80px);margin-top: 15px">
+              <vxe-table
+                border="inner"
+                auto-resize
+                resizable
+                height="auto"
+                :loading="loading"
+                size="small"
+                ref="todoTable"
+                show-header-overflow
+                show-overflow
+                highlight-hover-row
+                :menu-config="{}"
+                :print-config="{}"
+                :import-config="{}"
+                :export-config="{}"
+                :data="dataList"
+                header-align="center"
+                :checkbox-config="{}">
+                <!--<vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="checkbox"  width="40px"></vxe-column>-->
+                <vxe-column title="实例标题" field="vars.title">
+                  <template slot-scope="scope">
+                    <el-link type="primary" :underline="false" v-if="scope.row.status === 'todo'"
+                             @click="todo(scope.row)">{{scope.row.vars.title}}
+                    </el-link>
+                    <span v-else>{{scope.row.vars.title}}</span>
+                  </template>
+                </vxe-column>
+                <vxe-column title="流程名称" field="processDefinitionName"></vxe-column>
+                <vxe-column title="当前环节" field="task.name">
+                  <template slot-scope="scope">
+                    <el-tag>{{scope.row.task.name}}</el-tag>
+                  </template>
+                </vxe-column>
+                <vxe-column title="流程发起人" field="vars.userName"></vxe-column>
+                <vxe-column
+                  field="task.createTime"
+                  title="创建时间">
+                </vxe-column>
+                <vxe-column title="操作" width="200px" fixed="right" align="center">
+                  <template slot-scope="scope">
+                    <el-button type="text" size="small" @click="todo(scope.row)">办理</el-button>
+                                  <el-button  type="text" size="small" @click="trace(scope.row)">进度</el-button>
+                  </template>
+                </vxe-column>
+              </vxe-table>
+              <vxe-pager
+                background
+                size="small"
+                :current-page="tablePage.currentPage"
+                :page-size="tablePage.pageSize"
+                :total="tablePage.total"
+                :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+                :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+                @page-change="currentChangeHandle">
+              </vxe-pager>
+            </div>
+          </div>
+          <el-dialog
+            title="查看进度"
+            :close-on-click-modal="true"
+            :visible.sync="visible"
+            v-dialogDrag
+            width="70%"
+            height="600px">
+            <flow-chart ref="preview" :processInstanceId="processInstanceId"></flow-chart>
+          </el-dialog>
+              <user-select ref="userSelect" :limit="1" @doSubmit="selectUsersToTransferTask"></user-select>
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <div class="page" style="height: 600px">
+          <!--<el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+            &lt;!&ndash; 搜索框&ndash;&gt;
+            <el-form-item prop="title">
+              <el-input size="small" v-model="searchForm.title" placeholder="标题" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button  type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
+              <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+            </el-form-item>
+          </el-form>-->
+          <div class="top bg-white">
+            <span>我的通告({{noticePage.total}})
+              <a @click="toNotice()">
+              <span style="margin-left: 450px">更多</span>
+                <i class="fa fa-angle-right">
+                </i>
+              </a>
+
+            </span>
+<!--            <vxe-toolbar :refresh="{query: refreshList}" export print custom></vxe-toolbar>-->
+            <div style="height: calc(100% - 80px);margin-top: 15px">
+              <vxe-table
+                border="inner"
+                auto-resize
+                resizable
+                height="auto"
+                :loading="loading"
+                size="small"
+                ref="notifyTable"
+                show-header-overflow
+                show-overflow
+                highlight-hover-row
+                :menu-config="{}"
+                :print-config="{}"
+                :import-config="{}"
+                :export-config="{}"
+                @sort-change="sortChangeHandle"
+                :sort-config="{remote:true}"
+                :data="dataLists"
+                :checkbox-config="{}">
+                <!--<vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="checkbox"  width="40px"></vxe-column>-->
+                <vxe-column  title="标题" field="title">
+                  <template slot-scope="scope">
+                    <el-link  type="primary" :underline="false" @click="view(scope.row.id)">{{scope.row.title}}</el-link>
+                  </template>
+                </vxe-column>
+                <vxe-column  title="类型" field="type">
+                  <template slot-scope="scope">
+                    {{ $dictUtils.getDictLabel("oa_notify_type", scope.row.type, '-') }}
+                  </template>
+                </vxe-column>
+                <vxe-column  title="内容" field="content"></vxe-column>
+                <vxe-column  title="附件" field="files">
+                  <template slot-scope="scope">
+                    <a :href="item" target="_blank" :key="index" v-for="(item, index) in (scope.row.files || '').split('|')">
+                      {{decodeURIComponent(item.substring(item.lastIndexOf("/")+1))}}
+                    </a>
+                  </template>
+                </vxe-column>
+
+                <vxe-column  title="查阅状态" field="status">
+                  <template slot-scope="scope">
+                    <el-tag type="success" v-if="scope.row.readFlag === '1'"> {{ $dictUtils.getDictLabel("oa_notify_read", scope.row.readFlag, '-') }}</el-tag>
+                    <el-tag type="danger" v-if="scope.row.readFlag === '0'"> {{ $dictUtils.getDictLabel("oa_notify_read", scope.row.readFlag, '-') }}</el-tag>
+                  </template>
+                </vxe-column>
+                <vxe-column  title="发布者" field="createBy.name"></vxe-column>
+                <vxe-column title="操作" width="200px" fixed="right" align="center">
+                  <template  slot-scope="scope">
+                    <el-button  type="text" icon="el-icon-view" size="mini" @click="view(scope.row.id)">查看</el-button>
+                  </template>
+                </vxe-column>
+              </vxe-table>
+              <vxe-pager
+                background
+                size="small"
+                :current-page="noticePage.currentPage"
+                :page-size="noticePage.pageSize"
+                :total="noticePage.total"
+                :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+                :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+                @page-change="currentChangeHandle">
+              </vxe-pager>
+            </div>
+            <!-- 弹窗, 新增 / 修改 -->
+            <NotifyForm  ref="notifyForm" @refreshDataList="refreshList"></NotifyForm>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import UserSelect from '@/components/userSelect/UserSelectDialog'
+  import TaskService from '@/api/flowable/TaskService'
+  // import NotifyForm from './NotifyForm'
+  import NotifyForm from '@/views/modules/notify/NotifyForm'
+  import NotifyService from '@/api/notify/NotifyService'
+
+  export default {
+    data () {
+      return {
+        searchForm: {
+          beginDate: '',
+          endDate: ''
+        },
+        dataList: [],
+        dataLists: [],
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        noticePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        loading: false,
+        visible: false,
+        currentTask: null,
+        processInstanceId: ''
+        // pickerOptions: {
+        //   shortcuts: [{
+        //     text: '最近一周',
+        //     onClick (picker) {
+        //       const end = new Date()
+        //       const start = new Date()
+        //       start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+        //       picker.$emit('pick', [start, end])
+        //     }
+        //   }, {
+        //     text: '最近一个月',
+        //     onClick (picker) {
+        //       const end = new Date()
+        //       const start = new Date()
+        //       start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+        //       picker.$emit('pick', [start, end])
+        //     }
+        //   }, {
+        //     text: '最近三个月',
+        //     onClick (picker) {
+        //       const end = new Date()
+        //       const start = new Date()
+        //       start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+        //       picker.$emit('pick', [start, end])
+        //     }
+        //   }]
+        // }
+      }
+    },
+    taskService: null,
+    notifyService: null,
+    created () {
+      this.taskService = new TaskService()
+      this.notifyService = new NotifyService()
+    },
+    activated () {
+      this.refreshList()
+    },
+    components: {
+      UserSelect,
+      // FlowChart
+      NotifyForm
+    },
+    // watch: {
+    // },
+    methods: {
+      toNotice () {
+        this.$router.push('/notify/MyNotifyList')
+      },
+      toPendingList () {
+        // this.$router.push('./PendingList')
+        this.$router.push({
+          path: './PendingList',
+          query: {
+            num: 3
+          }
+        })
+      },
+      // 获取数据列表
+      refreshList () {
+        this.loading = true
+        this.taskService.todoList({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+        this.notifyService.list({
+          'current': this.noticePage.currentPage,
+          'size': this.noticePage.pageSize,
+          'orders': this.noticePage.orders,
+          isSelf: true,
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataLists = data.records
+          this.noticePage.total = data.total
+          this.loading = false
+        })
+      },
+      // 排序
+      sortChangeHandle (column) {
+        this.noticePage.orders = []
+        if (column.order != null) {
+          this.noticePage.orders.push({column: this.$utils.toLine(column.property), asc: column.order === 'asc'})
+        }
+        this.refreshList()
+      },
+      // 当前页
+      currentChangeHandle ({ currentPage, pageSize }) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.noticePage.currentPage = currentPage
+        this.noticePage.pageSize = pageSize
+        this.refreshList()
+      },
+      todo (row) {
+        this.taskService.getTaskDef({
+          taskId: row.task.id,
+          taskName: row.task.name,
+          taskDefKey: row.task.taskDefinitionKey,
+          procInsId: row.task.processInstanceId,
+          procDefId: row.task.processDefinitionId,
+          procDefKey: row.task.processDefKey,
+          status: row.status
+        }).then(({data}) => {
+          this.$router.push({
+            path: '/flowable/task/TaskForm',
+            query: {
+              formTitle: `${row.vars.title}`,
+              num: 2,
+              title: `审批【${row.task.name || ''}】`,
+              ...pick(data, 'formType', 'formReadOnly', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId')
+            }
+          })
+        })
+      },
+      trace (row) {
+        this.processInstanceId = row.task.processInstanceId
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs.preview.init()
+        })
+      },
+      transferTask (row) {
+        this.currentTask = row.task
+        this.$refs.userSelect.init()
+      },
+      selectUsersToTransferTask (user) {
+        this.taskService.delegate(this.currentTask.id, user[0].id).then(({data}) => {
+          this.$message.success(data)
+          this.refreshList()
+        })
+      },
+      // 查看
+      view (id) {
+        this.$refs.notifyForm.init('read', id)
+      }
+      // resetSearch () {
+      //   this.$refs.searchForm.resetFields()
+      //   this.$nextTick(() => {
+      //     this.refreshList()
+      //   })
+      // }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/modules/sys/dashboard/workBench/PendingList.vue

@@ -0,0 +1,54 @@
+<template>
+  <div class="el-scrollbar__wrap wrap-white padding-20">
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="待办事项" name="todoList"style="height: calc(100vh - 210px)" lazy>
+        <todo-list
+          i="todoList"
+          :index="activeName"
+          :num="num"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="已办" name="historyList" style="height: calc(100vh - 210px)" lazy>
+        <history-list
+          i="historyList"
+          :index="activeName"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="我发起的" name="applyList" style="height: calc(100vh - 210px)" lazy>
+        <apply-list
+          i="applyList"
+          :index="activeName"
+        />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+<script>
+  import todoList from '../../../flowable/task/TodoList'
+  import historyList from '../../../flowable/task/HistoryList'
+  import applyList from '../../../flowable/task/ApplyList'
+
+  export default {
+    components: {
+      todoList,
+      historyList,
+      applyList
+    },
+    data () {
+      // eslint-disable-next-line no-unused-expressions,no-unused-vars
+      var num = this.$route.query.num
+      console.log(num)
+      return {
+        activeName: 'todoList',
+        num: num
+      }
+    },
+    created () {
+      if (this.$route.query.activeName) {
+        this.activeName = this.$route.query.activeName
+      }
+    },
+    methods: {
+    }
+  }
+</script>