流程分类优化

src/views/bpm/task/done.vue

@@ -2,42 +2,51 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+      <el-form-item label="流程编号" prop="processInstanceId">
+        <el-input v-model="queryParams.processInstanceId" :placeholder="$t('流程编号')" clearable
+                  @keyup.enter.native="handleQuery"/>
+      </el-form-item>
       <el-form-item :label="$t('任务名称')" prop="name">
-        <el-input v-model="queryParams.name" :placeholder="$t('请输入任务名称')" clearable @keyup.enter.native="handleQuery"/>
+        <el-input v-model="queryParams.name" :placeholder="$t('任务名称')" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item :label="$t('流程分类')" prop="category">
+        <el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('业务编号')" prop="businessNo">
+        <el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable
+                  @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <!-- <el-form-item :label="$t('流程编号')" prop="name">
-        缺少字段
-      </el-form-item> -->
-      <!-- <el-form-item :label="$t('流程分类')" prop="name">
-        缺少字段
-      </el-form-item> -->
 
       <el-form-item :label="$t('提交时间')">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')"
+                        :end-placeholder="$t('结束日期')"/>
       </el-form-item>
-      <!-- <el-form-item :label="$t('业务编号')" prop="name">
-         缺少字段
-      </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('任务编号')" align="center" prop="id" width="320" fixed />
-      <el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="200" />
-      <!-- <el-table-column :label="$t('业务编号')" align="center" prop="" width="200" >
-        缺少字段
-      </el-table-column> -->
-      <el-table-column :label="$t('流程分类')" align="center" prop="category" width="200" />
-      <el-table-column :label="$t('当前审批节点')" align="center" prop="name" width="200" />
+      <el-table-column :label="$t('任务编号')" align="center" prop="id" width="320" fixed/>
+      <el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="200"/>
+      <el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
+      <el-table-column :label="$t('流程分类')" align="center" prop="category" width="200">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category"/>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('当前审批节点')" align="center" prop="name" width="200"/>
       <!-- <el-table-column :label="$t('状态')" align="center" prop="" width="200" >
         缺少字段
       </el-table-column> -->
-      <el-table-column :label="$t('流程发起人')" align="center" prop="processInstance.startUserNickname" width="120" />
+      <el-table-column :label="$t('流程发起人')" align="center" prop="processInstance.startUserNickname" width="120"/>
       <el-table-column :label="$t('结果')" align="center" prop="result">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
@@ -56,7 +65,8 @@
       <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
-                     v-hasPermi="['bpm:task:query']">{{$t('详情')}}</el-button>
+                     v-hasPermi="['bpm:task:query']">{{ $t('详情') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -73,8 +83,7 @@ import {getDate} from "@/utils/dateUtils";
 
 export default {
   name: "Done",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -126,7 +135,7 @@ export default {
     },
     /** 处理审批按钮 */
     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.processInstance.id}});
     },
   }
 };

src/views/bpm/task/todo.vue

@@ -2,12 +2,13 @@
   <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="流程编号" prop="processInstanceId">
+        <el-input v-model="queryParams.processInstanceId" :placeholder="$t('流程编号')" clearable
+                  @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <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="编号" prop="name">
-        缺少字段
-      </el-form-item> -->
       <el-form-item :label="$t('流程分类')" prop="category">
         <el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
@@ -15,57 +16,63 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item :label="$t('业务编号')" prop="businessNo">
+        <el-input v-model="queryParams.businessNo" :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"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')"/>
+                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')"
+                        :end-placeholder="$t('结束日期')"/>
       </el-form-item>
 
-      <el-form-item :label="$t('业务编号')" prop="businessNo">
-        <el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('编号')" align="center" prop="id" width="320"/>
-      <el-table-column :label="$t('流程名称')" align="center" prop="processInstance.name" width="320"/>
+      <el-table-column :label="$t('任务编号')" align="center" prop="id" width="320"/>
+      <el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="320"/>
+      <el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
       <el-table-column :label="$t('流程分类')" align="center" prop="category">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category"/>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
+
 
       <el-table-column :label="$t('当前审批节点')" align="center" prop="name"/>
       <el-table-column :label="$t('状态')" align="center" prop="version" width="80">
         <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.suspensionState === 1">{{$t('激活')}}</el-tag>
-          <el-tag type="warning" v-if="scope.row.suspensionState === 2">{{$t('挂起')}}</el-tag>
+          <el-tag type="success" v-if="scope.row.suspensionState === 1">{{ $t('激活') }}</el-tag>
+          <el-tag type="warning" v-if="scope.row.suspensionState === 2">{{ $t('挂起') }}</el-tag>
         </template>
       </el-table-column>
 
-      <!-- <el-table-column :label="$t('结果')" align="center" prop="processInstance.startUserNickname">
-          缺少字段
-      </el-table-column> -->
+      <el-table-column :label="$t('结果')" align="center" prop="result">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('提交时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column :label="$t('结束时间')" align="center" prop="createTime" width="180">
+      <el-table-column :label="$t('结束时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          缺少字段
+          <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
-                     v-hasPermi="['bpm:task:update']">{{$t('审批')}}
+                     v-hasPermi="['bpm:task:update']">{{ $t('审批') }}
           </el-button>
         </template>
       </el-table-column>