init

src/components/WorkFlow/index.vue

@@ -61,8 +61,11 @@ export default {
         actionCode: '',
         actionRemark: '', // 说明
         groupIdTo: undefined,
+        groupNameTo: undefined,
         positionIdTo: undefined,
+        positionNameTo: undefined,
         accountIdTo: undefined, // 执行人
+        accountNameTo: undefined,
         attachList: []
       },
       rules: {
@@ -241,8 +244,11 @@ export default {
     // 用户选择
     handleSelectUser(item) {
       this.formData.accountIdTo = item.accountId
+      this.formData.accountNameTo = item.accountName
       this.formData.groupIdTo = item.groupId
+      this.formData.groupNameTo = item.groupNameTo
       this.formData.positionIdTo = item.positionId
+      this.formData.positionNameTo = item.positionNameTo
     },
 
     // 重置

src/views/system/task/components/TaskList.vue

@@ -29,24 +29,27 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="taskCatTitle" label="分类" header-align="center" align="center" width="100" />
+        <el-table-column prop="taskCatTitle" label="分类" header-align="center" align="center" width="100">
+          <template v-slot="{row}">
+            <span style="margin-left: 5px">{{ row.taskCatTitle }}</span>
+          </template>
+        </el-table-column>
 
-        <el-table-column prop="accountName" label="当前执行人员" header-align="center" align="center" width="120">
+        <el-table-column prop="taskPriority" label="类型" header-align="center" align="center" width="100">
           <template v-slot="{row}">
-            <el-popover v-if="row.status===0" trigger="hover" placement="top">
-              <p>部门: {{ row.curGroupName }}</p>
-              <p>岗位: {{ row.curPositionName }}</p>
-              <div slot="reference" class="name-wrapper">
-                <i class="el-icon-user" /> {{ row.curAccountName }}
-              </div>
-            </el-popover>
-            <span v-else>-</span>
+            <span><el-tag type="success" effect="plain" color="rgb(38 69 90)">{{ row.taskTypeId|taskTypeFilter }}</el-tag></span>
           </template>
         </el-table-column>
 
-        <el-table-column prop="status" label="当前关卡" header-align="center" align="center" width="100">
+        <el-table-column prop="handleAccountName" label="当前执行人员" header-align="center" align="center" width="120">
           <template v-slot="{row}">
-            <span v-if="row.status===0"><el-tag type="success" effect="plain" color="rgb(38 69 90)">{{ row.curActivityTitle }}</el-tag></span>
+            <el-popover v-if="row.status===0" trigger="hover" placement="top">
+              <p>部门: {{ row.handleGroupName }}</p>
+              <p>岗位: {{ row.handlePositionName }}</p>
+              <div slot="reference" class="name-wrapper">
+                <i class="el-icon-user" /> {{ row.handleAccountName }}
+              </div>
+            </el-popover>
             <span v-else>-</span>
           </template>
         </el-table-column>
@@ -59,18 +62,18 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="expectedEndTime" label="截止时间" header-align="center" align="center" width="160">
+        <el-table-column prop="expectedEndTime" label="截止时间" header-align="center" align="center" width="170">
           <template v-slot="{row}">
             <i class="el-icon-time" />
             <span style="margin-left: 5px">{{ row.expectedEndTime }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" header-align="center" align="center" width="210">
+        <el-table-column label="操作" header-align="center" align="center" width="200">
           <template v-slot="{row}">
             <el-button type="primary" size="mini" @click="handleDetail(row)">详情</el-button>
 
-            <template v-if="row.status===0 && row.curAccountId===userData.userId && isPermitted">
+            <template v-if="row.status===0 && row.handleAccountId===userData.userId">
               <el-button type="warning" size="mini" @click="handleTask(row)">处理</el-button>
               <el-button type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
             </template>
@@ -134,7 +137,6 @@ export default {
         keywords: '',
         status: undefined,
         launchAccountId: undefined,
-        curAccountId: undefined,
         handleAccountId: undefined,
         startDate: undefined,
         endDate: undefined,
@@ -157,7 +159,6 @@ export default {
     resetConditions() {
       this.conditions.keywords = ''
       this.conditions.status = undefined
-      this.conditions.curAccountId = undefined
       this.conditions.launchAccountId = undefined
       this.conditions.handleAccountId = undefined
       this.conditions.handleGroupId = undefined
@@ -179,7 +180,7 @@ export default {
           this.title = '我的待处理任务'
           this.resetConditions()
           this.conditions.status = 0
-          this.conditions.curAccountId = userId
+          this.conditions.handleAccountId = userId
           break
 
         case 'MyCompleted':
@@ -239,8 +240,11 @@ export default {
 
     // 流程处理
     handleTask(data) {
-      const { curActivityCode, taskId } = data
-      this.$refs[curActivityCode].showModel(taskId)
+      const taskTypeId = data.taskTypeId
+      if (taskTypeId === 2) {
+        const { curActivityCode, taskId } = data
+        this.$refs[curActivityCode].showModel(taskId)
+      }
     },
 
     // 撤消流程

src/views/system/todo/activity/handle.vue

@@ -143,8 +143,11 @@ export default {
         taskId: undefined,
         status: 0,
         handleGroupId: undefined,
+        handleGroupName: undefined,
         handlePositionId: undefined,
-        handleAccountId: undefined
+        handlePositionName: undefined,
+        handleAccountId: undefined,
+        handleAccountName: undefined
       },
       rules: {}
     }
@@ -176,8 +179,11 @@ export default {
         todoId: undefined,
         handleRemark: '',
         handleGroupId: undefined,
+        handleGroupName: undefined,
         handlePositionId: undefined,
-        handleAccountId: undefined
+        handlePositionName: undefined,
+        handleAccountId: undefined,
+        handleAccountName: undefined
       }
     },
 

src/views/system/todo/activity/launch.vue

@@ -98,8 +98,11 @@ export default {
         expectedStartTime: undefined,
         expectedEndTime: undefined,
         handleGroupId: undefined,
+        handleGroupName: undefined,
         handlePositionId: undefined,
-        handleAccountId: undefined
+        handlePositionName: undefined,
+        handleAccountId: undefined,
+        handleAccountName: undefined
       },
 
       rules: {
@@ -168,8 +171,11 @@ export default {
         expectedStartTime: undefined,
         expectedEndTime: undefined,
         handleGroupId: undefined,
+        handleGroupName: undefined,
         handlePositionId: undefined,
-        handleAccountId: undefined
+        handlePositionName: undefined,
+        handleAccountId: undefined,
+        handleAccountName: undefined
       }
     },
 
@@ -194,8 +200,11 @@ export default {
     // 提交
     handleCommand(flow) {
       this.formData.handleGroupId = flow.curGroupId
+      this.formData.handleGroupName = flow.curGroupName
       this.formData.handlePositionId = flow.curPositionId
+      this.formData.handlePositionName = flow.curPositionName
       this.formData.handleAccountId = flow.curAccountId
+      this.formData.handleAccountName = flow.curAccountName
       this.formData.status = flow.status
 
       handleTotoTask(this.formData).then((resp) => {