提交代码
姜玉琦
parent
4aa6dd07a3
commit
3e026402b3
|
|
@ -31,6 +31,8 @@
|
|||
<where>
|
||||
<if test="procDefName != null and procDefName != ''"> and fa.procDefName like concat('%', #{procDefName}, '%')</if>
|
||||
<if test="businessKey != null and businessKey != ''"> and fa.businessKey = #{businessKey}</if>
|
||||
<if test="startDeptName != null and startDeptName != ''"> and fa.startDeptName like concat('%', #{startDeptName}, '%')</if>
|
||||
<if test="startUserName != null and startUserName != ''"> and fa.startUserName like concat('%', #{startUserName}, '%')</if>
|
||||
<if test="businessKeyName != null and businessKeyName != ''"> and fa.businessKeyName like concat('%', #{businessKeyName}, '%')</if>
|
||||
<if test="category != null and category != ''"> and fa.category = #{category}</if>
|
||||
<if test="params.beginDate != null and params.beginDate != '' and params.endDate != null and params.endDate != ''"> and fa.createTime between #{params.beginDate} and #{params.endDate}</if>
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
v-hasPermi="['system:deployment:add']"
|
||||
>新增流程</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
@click="handleDelete"
|
||||
v-hasPermi="['system:deployment:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick">
|
||||
|
|
@ -331,7 +331,7 @@ export default {
|
|||
},
|
||||
/** 统计 */
|
||||
queryCount(params){
|
||||
queryCount(this.queryParams).then(response => {
|
||||
queryCount(params).then(response => {
|
||||
this.tabs.await = "进行中（"+response.data.await+"）";
|
||||
this.tabs.finished = "已完成（"+response.data.finished+"）";
|
||||
this.tabs.all = "全部申请（"+(parseInt(response.data.await)+parseInt(response.data.finished))+"）";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,289 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="流程名称" prop="procDefName">
|
||||
<el-input
|
||||
v-model="queryParams.procDefName"
|
||||
placeholder="请输入流程名称"
|
||||
clearable
|
||||
size="small"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="申请单位" prop="startDeptName" v-if="showPro">
|
||||
<el-input
|
||||
v-model="queryParams.startDeptName"
|
||||
placeholder="请输入申请单位名称"
|
||||
clearable
|
||||
size="small"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属项目" prop="businessKey" v-if="showPro">
|
||||
<el-select
|
||||
v-model="queryParams.businessKey"
|
||||
placeholder="请选择所属项目"
|
||||
filterable
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in projectOptions"
|
||||
:key="index"
|
||||
:label="item.projectName"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="流程类型" prop="category">
|
||||
<el-select
|
||||
v-model="queryParams.category"
|
||||
@keyup.enter.native="handleQuery"
|
||||
placeholder="请选择流程类型"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_process_category"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="申请人" prop="startUserName" v-if="showPro">
|
||||
<el-input
|
||||
v-model="queryParams.startUserName"
|
||||
placeholder="请输入申请人名称"
|
||||
clearable
|
||||
size="small"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="申请时间">
|
||||
<el-date-picker
|
||||
v-model="daterangeTime"
|
||||
style="width: 240px"
|
||||
value-format="yyyy-MM-dd"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick">
|
||||
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
|
||||
<el-tab-pane :label="tabs.await" name="await"></el-tab-pane>
|
||||
<el-tab-pane :label="tabs.finished" name="finished"></el-tab-pane>
|
||||
</el-tabs>
|
||||
<el-table v-loading="loading" :data="myProcessList" @selection-change="handleSelectionChange">
|
||||
<el-table-column label="项目名称" align="center" prop="businessKeyName" fixed="left" width="160" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="流程编号" align="center" prop="procInsId" width="120" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="流程名称" align="center" prop="procDefName" width="120" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="流程类别" align="center" prop="category" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag
|
||||
:options="dict.type.sys_process_category"
|
||||
:value="scope.row.category"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="流程状态" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.finishTime == null" size="mini">进行中</el-tag>
|
||||
<el-tag type="success" v-if="scope.row.finishTime != null && scope.row.assigneeId != null" size="mini">已完成</el-tag>
|
||||
<el-tag type="danger" v-if="scope.row.finishTime != null && scope.row.assigneeId == null" size="mini">已撤销</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="当前节点" align="center" prop="taskName">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.finishTime == null">{{ scope.row.taskName }}</div>
|
||||
<div v-if="scope.row.finishTime != null">结束</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="申请人" align="center" width="200">
|
||||
<template slot-scope="scope">
|
||||
<label v-if="scope.row.startUserName">{{scope.row.startUserName}} <el-tag type="info" size="mini">{{scope.row.startDeptName}}</el-tag></label>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="申请时间" align="center" prop="createTime" width="180"/>
|
||||
<el-table-column label="处理耗时" align="center" prop="duration" width="150">
|
||||
<template slot-scope="scope">
|
||||
{{getDurationDate(scope.row)}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="办结时间" align="center" prop="finishTime" width="180"/>
|
||||
<el-table-column label="操作" width="150" align="center" fixed="right" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button @click="handleFlowRecord(scope.row)" type="text" size="small" icon="el-icon-finished">查看详情</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
<detailDrawer ref="detailDrawer"></detailDrawer>
|
||||
<detailLeaveDrawer ref="detailLeaveDrawer"></detailLeaveDrawer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {allList,queryCount} from "@/api/flowable/businessKey";
|
||||
import detailDrawer from "../myProcess/detail/detailDrawer.vue";
|
||||
import detailLeaveDrawer from "../myProcess/detail/detailLeaveDrawer.vue";
|
||||
export default {
|
||||
name: "projectTask",
|
||||
components: {
|
||||
detailDrawer,
|
||||
detailLeaveDrawer
|
||||
},
|
||||
dicts: ["sys_process_category"],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 我发起的流程列表数据
|
||||
myProcessList: [],
|
||||
src: "",
|
||||
definitionList:[],
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
procDefName: null,
|
||||
category: null,
|
||||
params: null,
|
||||
businessKey:null,
|
||||
taskName:null,
|
||||
startUserName:null,
|
||||
startDeptName:null,
|
||||
businessDeptId:null,
|
||||
activeName:null,
|
||||
},
|
||||
daterangeTime:[],
|
||||
tabs:{
|
||||
all:"全部（0）",
|
||||
await:"进行中（0）",
|
||||
finished:"已完成（0）",
|
||||
},
|
||||
activeName:"await",
|
||||
showPro:false,
|
||||
projectOptions: null,
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.queryParams.activeName = this.activeName;
|
||||
this.getList();
|
||||
this.initMyProject();
|
||||
},
|
||||
methods: {
|
||||
/** 查询流程定义列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
this.queryParams.params = {};
|
||||
if (null != this.daterangeTime && "" != this.daterangeTime) {
|
||||
this.queryParams.params["beginDate"] = this.daterangeTime[0];
|
||||
this.queryParams.params["endDate"] = this.daterangeTime[1];
|
||||
}
|
||||
this.queryCount(this.queryParams);
|
||||
allList(this.queryParams).then(response => {
|
||||
this.myProcessList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
/** 统计 */
|
||||
queryCount(params){
|
||||
queryCount(params).then(response => {
|
||||
this.tabs.await = "进行中（"+response.data.await+"）";
|
||||
this.tabs.finished = "已完成（"+response.data.finished+"）";
|
||||
this.tabs.all = "全部申请（"+(parseInt(response.data.await)+parseInt(response.data.finished))+"）";
|
||||
});
|
||||
},
|
||||
// 查询和我相关的项目信息
|
||||
initMyProject() {
|
||||
// 获取项目列表的接口
|
||||
this.$api.publics.getMyProjectList({}).then((response) => {
|
||||
this.projectOptions = response.rows;
|
||||
if (response.rows.length > 1) {
|
||||
this.showPro = true;
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.daterangeTime=[];
|
||||
this.handleQuery();
|
||||
},
|
||||
/** 流程流转记录 */
|
||||
handleFlowRecord(row){
|
||||
//根据不同业务跳转不同表单
|
||||
if(row.procDefKey=="flow_xmglzdl_qjspb"){
|
||||
this.$refs.detailLeaveDrawer.show(row);
|
||||
}else{
|
||||
this.$refs.detailDrawer.show(row);
|
||||
}
|
||||
},
|
||||
// 页签点击
|
||||
handleClick() {
|
||||
this.queryParams.activeName = this.activeName;
|
||||
this.getList();
|
||||
},
|
||||
getDurationDate(row){
|
||||
let day=0;
|
||||
let hours=0;
|
||||
let min = row.duration;
|
||||
if(min>1440){
|
||||
day = parseInt(min/1440);
|
||||
min = min % 1440;
|
||||
if(min>60){
|
||||
hours = parseInt(min/60);
|
||||
min = min % 60;
|
||||
}
|
||||
}else if(min>60){
|
||||
hours = parseInt(min/60);
|
||||
min = min % 60;
|
||||
}
|
||||
if(day>0){
|
||||
if(day<10) day="0"+day;
|
||||
if(hours<10) hours="0"+hours;
|
||||
if(min<10) min="0"+min;
|
||||
return day+"天"+hours+"小时"+min+"分钟";
|
||||
}
|
||||
if(hours>0){
|
||||
if(hours<10) hours="0"+hours;
|
||||
if(min<10) min="0"+min;
|
||||
return hours+"小时"+min+"分钟";
|
||||
}
|
||||
if(min>0){
|
||||
if(min<10) min="0"+min;
|
||||
return min+"分钟";
|
||||
}
|
||||
if(min==0){
|
||||
return "1分钟";
|
||||
}
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
Loading…
Reference in New Issue