Merge remote-tracking branch 'origin/dev' into dev

src/views/bpm/task/copy.vue

@@ -11,8 +11,8 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="流程名称" prop="processName">
-        <el-input v-model="queryParams.processName" placeholder="请输入流程名称" clearable/>
+      <el-form-item label="任务名称" prop="processName">
+        <el-input v-model="queryParams.processName" placeholder="请输入任务名称" clearable/>
       </el-form-item>
       <el-form-item :label="$t('创建时间')">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
@@ -32,7 +32,7 @@
           <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.categoryId" />
         </template>
       </el-table-column>
-      <el-table-column label="流程名称" align="center" prop="processName"/>
+      <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">

src/views/bpm/task/done.vue

@@ -2,8 +2,8 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('流程名')" prop="name">
-        <el-input v-model="queryParams.name" :placeholder="$t('请输入流程名')" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item :label="$t('任务名称')" prop="name">
+        <el-input v-model="queryParams.name" :placeholder="$t('请输入任务名称')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('创建时间')">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"