Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/bpm/task/copy.vue

@@ -4,8 +4,8 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="流程名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="流程名" prop="processName">
+        <el-input v-model="queryParams.processName" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
@@ -19,21 +19,15 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="任务编号" align="center" prop="id" width="320" />
-      <el-table-column label="任务名称" align="center" prop="name" />
-      <el-table-column label="所属流程" align="center" prop="processInstance.name" />
-      <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" />
+      <el-table-column label="任务编号" align="center" prop="taskId" width="320" />
+      <el-table-column label="任务名称" align="center" prop="title" />
+      <el-table-column label="所属流程" align="center" prop="processName" />
+      <el-table-column label="流程发起人" align="center" prop="originatorName" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="version" width="80">
-        <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.suspensionState === 1">激活</el-tag>
-          <el-tag type="warning" v-if="scope.row.suspensionState === 2">挂起</el-tag>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
@@ -102,7 +96,7 @@ export default {
       this.handleQuery();
     },
     handleAudit(row) {
-      this.$router.push({ path: "/bpm/process-instance/detail", query: { id: row.processInstance.id}});
+      this.$router.push({ path: "/bpm/process-instance/detail", query: { id: row.instanceId}});
     },
   }
 };