p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of http://172.16.130.247:3000/kmk/cloud_approval into feature/bpm-back

This commit is contained in:
kemengkai 2022-05-18 10:23:14 +08:00
parent 870a0b4be5 3321d6d400
commit 62f82e0851
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
View File

@ -15,7 +15,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="表达式" v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'expression'" key="express"> <el-form-item label="表达式" v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'expression'" key="express">
<el-input v-model="flowConditionForm.body" clearable @change="updateFlowCondition" /> <el-input v-model="flowConditionForm.body" style="width:192px;" clearable @change="updateFlowCondition" />
</el-form-item> </el-form-item>
<template v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'script'"> <template v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'script'">
<el-form-item label="脚本语言" key="language"> <el-form-item label="脚本语言" key="language">

28
yudao-ui-admin/src/views/bpm/processInstance/detail.vue
View File

@ -60,7 +60,7 @@
审批人：{{ item.assigneeUser.nickname }} 审批人：{{ item.assigneeUser.nickname }}
<el-tag type="info" size="mini">{{ item.assigneeUser.deptName }}</el-tag> <el-tag type="info" size="mini">{{ item.assigneeUser.deptName }}</el-tag>
</label> </label>
<label style="font-weight: normal">创建时间：</label> <label style="font-weight: normal" v-if="item.createTime">创建时间：</label>
<label style="color:#8a909c; font-weight: normal">{{ parseTime(item.createTime) }}</label> <label style="color:#8a909c; font-weight: normal">{{ parseTime(item.createTime) }}</label>
<label v-if="item.endTime" style="margin-left: 30px;font-weight: normal">审批时间：</label> <label v-if="item.endTime" style="margin-left: 30px;font-weight: normal">审批时间：</label>
<label v-if="item.endTime" style="color:#8a909c;font-weight: normal"> {{ parseTime(item.endTime) }}</label> <label v-if="item.endTime" style="color:#8a909c;font-weight: normal"> {{ parseTime(item.endTime) }}</label>
@ -234,19 +234,19 @@ export default {
// 审批记录 // 审批记录
this.tasks = response.data; this.tasks = response.data;
// 排序，将未完成的排在前面，已完成的排在后面； // 排序，将未完成的排在前面，已完成的排在后面；
this.tasks.sort((a, b) => { // this.tasks.sort((a, b) => {
// 有已完成的情况，按照完成时间倒序 // // 有已完成的情况，按照完成时间倒序
if (a.endTime && b.endTime) { // if (a.endTime && b.endTime) {
return b.endTime - a.endTime; // return b.endTime - a.endTime;
} else if (a.endTime) { // } else if (a.endTime) {
return 1; // return 1;
} else if (b.endTime) { // } else if (b.endTime) {
return -1; // return -1;
// 都是未完成，按照创建时间倒序 // // 都是未完成，按照创建时间倒序
} else { // } else {
return b.createTime - a.createTime; // return b.createTime - a.createTime;
} // }
}); // });
// 需要审核的记录 // 需要审核的记录
const userId = store.getters.userId; const userId = store.getters.userId;