Merge branch 'master' of http://git.dgtis.com/sunlupeng/yudao-ui-saas

src/views/bpm/processInstance/index.vue

@@ -5,7 +5,7 @@
       <el-form-item label="流程名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入流程名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-   
+
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
                         range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
@@ -17,7 +17,7 @@
     </el-form>
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list" @row-click="handleAudit">
-      <el-table-column label="任务编号" align="center" prop="id"/>
+      <el-table-column label="流程编号" align="center" prop="id"/>
       <el-table-column label="流程名称" align="center" prop="name" />
       <el-table-column label="创建时间" align="center" prop="startTime" width="180">
         <template v-slot="scope">

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

@@ -20,7 +20,7 @@
       <el-table-column label="任务编号" align="center" prop="id"/>
       <el-table-column label="流程名称" align="center" prop="processInstance.name" />
       <el-table-column label="流程发起人" align="center" prop="processInstance.startUser.nickname" />
-      <el-table-column label="当前节点" align="center" prop="name" />
+      <el-table-column label="任务节点" align="center" prop="name" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>