clay
/
workflow-engine-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: clay:594a1feeafdab3b721d5513561bc2d4fcda81738
Branches Tags
clay:master
clay:pro
clay:DJ
clay:chatGPT
clay:master-back
clay:clay
..
compare: clay:7e7c52318ab6387fab9c6ff17b488fe2f04eb6c7
Branches Tags
clay:pro
clay:master
clay:DJ
clay:chatGPT
clay:master-back
clay:clay

No commits in common. "594a1feeafdab3b721d5513561bc2d4fcda81738" and "7e7c52318ab6387fab9c6ff17b488fe2f04eb6c7" have entirely different histories.
594a1feeaf ... 7e7c52318a

16 changed files with 262 additions and 419 deletions
Show Stats Expand all files Collapse all files

4
flowable-engine-web/src/App.vue
View File

@ -15,10 +15,8 @@
data() {
return {}
},
created() {
getToken()
},
mounted() {
getToken()
let beforeUrl = sessionStorage.getItem('router-path')
if(beforeUrl === undefined || beforeUrl === ''){
//this.$router.push("/workPanel")

7
flowable-engine-web/src/api/processInstance.js
View File

@ -12,10 +12,3 @@ export function startProcessInstance(param) {
data: param
})
}
export function getInitiatedInstanceList() {
return request({
url: "/flowable/process/instance/self",
method: "get",
})
}

11
flowable-engine-web/src/api/request.js
View File

@ -5,19 +5,16 @@ import { Notification, MessageBox, Message } from "element-ui";
// 第三方插件
import "element-ui/lib/theme-chalk/index.css";
import da from "element-ui/src/locale/lang/da";
import {getToken} from "../main";
import th from "element-ui/src/locale/lang/th";
Vue.prototype.$axios = axios;
// 字体图标
export function getBaseUrl(){
// return "http://gateway.mytwins.top"
return "http://localhost:8000"
}
const service = axios.create({
baseURL: getBaseUrl(),
// baseURL: "http://gateway.mytwins.top",
baseURL: "http://localhost:8000",
// baseURL: "http://security-react.mytwins.top",
// baseURL: "http://gateway.odliken.cn",
timeout: 50000
});

10
flowable-engine-web/src/api/task.js
View File

@ -8,7 +8,6 @@ export function getTaskList() {
method: "get",
})
}
export function getTaskInfo(taskId) {
return request({
url: "/flowable/process/task/"+taskId,
@ -22,12 +21,3 @@ export function completeTask(params) {
data: params
})
}
export function addComment(params) {
return request({
url: "/flowable/process/task/comment",
method: "post",
data: params
})
}

111
flowable-engine-web/src/components/common/Comment.vue
View File

@ -1,5 +1,5 @@
<template>
<w-dialog :border="false" closeFree width="500px" :title="title" v-model="visible" @ok="selectConfirm">
<w-dialog :border="false" closeFree width="500px" :title="title" v-model="visible">
<div class="el-textarea">
<el-input
type="textarea"
@ -7,18 +7,18 @@
maxlength="255"
show-word-limit
placeholder="评论内容"
v-model="context">
v-model="textarea">
</el-input>
</div>
<div style="margin: 20px 0">
<el-upload :file-list="imageList" action="#"
:limit="imageSize" with-credentials
:multiple="imageSize > 0"
<el-upload :file-list="fileList" action="#"
:limit="maxSize" with-credentials
:multiple="maxSize > 0"
:data="uploadParams"
list-type="picture-card"
:action="uploadFileUrl"
:headers="headers"
:auto-upload="true"
:auto-upload="false"
:on-success="handleUploadSuccess"
:before-upload="beforeUpload">
<i slot="default" class="el-icon-plus"></i>
@ -41,9 +41,9 @@
:multiple="attachmentMaxSize > 0"
:action="uploadFileUrl"
:headers="headers"
:auto-upload="true"
:on-success="handleAttachmentUploadSuccess"
:before-upload="beforeAttachmentUpload"
:auto-upload="false"
:on-success="handleUploadSuccess"
:before-upload="beforeUpload"
>
<el-button size="small" round>
<i class="el-icon-paperclip"></i>
@ -56,18 +56,17 @@
<script>
import {deleteFile} from "@/api/common";
import {getBaseUrl} from "../../api/request";
export default {
name: "Comment",
props: {
// value: {
// type: Array,
// default: () => {
// return [];
// }
// },
imageSize: {
value: {
type: Array,
default: () => {
return [];
}
},
maxSize: {
type: Number,
default: 10
},
@ -78,65 +77,51 @@ export default {
},
computed: {
sizeTip() {
return this.imageSize > 0 ? `| 每张图不超过${this.imageSize}MB` : "";
return this.maxSize > 0 ? `| 每张图不超过${this.maxSize}MB` : "";
},
attachmentTip() {
return this.attachmentMaxSize > 0 ? `| 单个附件不超过${this.attachmentMaxSize}MB` : "";
}
},
created() {
this.fileList = this._value;
console.log(this.value, "images");
},
data() {
return {
visible: false,
title: "添加评论",
imageList: [],
fileList: [],
attachmentList: [],
disabled: false,
uploadParams: {},
uploadFileUrl: getBaseUrl() + "/flowable/process/file",
uploadFileUrl: "http://security-react.mytwins.top/flowable/process/file",
headers: {
authorization: localStorage.getItem("token")
},
context: null
textarea:''
};
},
methods: {
show() {
this.visible = true
},
handleChange(file, imageList) {
this.imageList = imageList.slice(-3);
handleChange(file, fileList) {
this.fileList = fileList.slice(-3);
},
handleUploadSuccess(res, file) {
if (res.code !== 1000) {
this.$message.error("上传失败");
}
let data = res.data;
this.imageList.push(data);
},
handleAttachmentUploadSuccess(res, file) {
if (res.code !== 1000) {
this.$message.error("上传失败");
}
let data = res.data;
this.attachmentList.push(data);
},
beforeAttachmentUpload(file) {
if (this.attachmentMaxSize > 0 && file.size / 1024 / 1024 > this.attachmentMaxSize) {
this.$message.warning(`单张图片最大不超过 ${this.attachmentMaxSize}MB`);
return false;
} else {
return true;
}
this.fileList.push(data);
this.$emit("input", this.fileList);
console.log(res, file, this.fileList);
},
beforeUpload(file) {
const alows = ["image/jpeg", "image/png", "image/gif", "image/jpg"];
if (alows.indexOf(file.type) === -1) {
this.$message.warning("存在不支持的图片格式");
} else if (this.imageSize > 0 && file.size / 1024 / 1024 > this.imageSize) {
this.$message.warning(`单张图片最大不超过 ${this.imageSize}MB`);
} else if (this.maxSize > 0 && file.size / 1024 / 1024 > this.maxSize) {
this.$message.warning(`单张图片最大不超过 ${this.maxSize}MB`);
} else {
return true;
}
@ -148,39 +133,10 @@ export default {
handleDownload(file) {
console.log(file);
},
handleRemove(file, imageList) {
handleRemove(file, fileList) {
deleteFile(file.id).then(res => {
this.$message.success("删除成功");
});
},
selectConfirm() {
let fileList = []
this.attachmentList.forEach((attachment) => {
fileList.push({
id: attachment.id,
name:attachment.name,
isImage: attachment.isImage,
size: attachment.size,
url: attachment.url
})
})
this.imageList.forEach((image) => {
fileList.push({
id: image.id,
name:image.name,
isImage: image.isImage,
size: image.size,
url: image.url
})
})
let data = {
context: this.context,
attachments:fileList
}
console.log(this.attachmentList, this.imageList)
this.$emit("ok", data)
this.visible = false;
}
}
};
@ -192,11 +148,10 @@ export default {
height: 65px;
line-height: 70px;
}
/deep/ .el-upload-list--picture-card {
/deep/ .el-upload-list--picture-card{
.is-ready {
width: 65px !important;
height: 65px !important;
width: 65px!important;
height: 65px!important;
}
}

70
flowable-engine-web/src/components/common/DeptPicker.vue
View File

@ -10,10 +10,10 @@
<!-- 部门 -->
<el-empty :image-size="100" description="似乎没有数据" v-show="deptList.length === 0"/>
<el-scrollbar style="height:350px">
<el-tree :data="deptList" ref="tree" :props="deptProps" empty-text="" node-key="deptId" default-expand-all
<el-tree :data="deptList" ref="tree" empty-text="" node-key="value" default-expand-all
:show-checkbox="showCheckbox" check-strictly highlight-current
@check-change="handleCheckChange" @node-click="(node,check)=>handle(node,check)" :filter-node-method="filterNode">
<div class="custom-tree-node" slot-scope="{ node }" style="width: 100%">
<div class="custom-tree-node" slot-scope="{ node, data }" style="width: 100%">
<i class="el-icon-folder-opened" style="margin-right: 5px"></i>{{ node.label }}
</div>
</el-tree>
@ -29,7 +29,7 @@
<el-empty :image-size="100" description="请点击左侧列表选择数据" v-show="selectList.length === 0"/>
<div v-for="(selectItem, selectIndex) in selectList" :key="selectIndex" class="org-item">
<i class="el-icon-folder-opened"></i>
<span>{{ selectItem.deptName }}</span>
<span>{{ selectItem.label }}</span>
<i class="el-icon-close" @click="noSelected(selectItem)" v-if="showCheckbox===false"></i>
</div>
</div>
@ -67,12 +67,43 @@ export default {
title: "请选择",
selectList: [],
filterText: "",
deptList: [],
deptProps:{
value:'deptId',
label: 'deptName',
children: 'children'
deptList: [
{
value: 1,
label: '一级 1',
children: [{
value: 4,
label: '二级 1-1',
children: [{
value: 9,
label: '31'
}, {
value: 10,
label: '三级 1-1-2'
}]
}]
}, {
value: 2,
label: '一级 2',
children: [{
value: 5,
label: '二级 2-1'
}, {
value: 6,
label: '二级 2-2'
}]
}, {
value: 3,
label: '一级 3',
children: [{
value: 7,
label: '二级 3-1'
}, {
value: 8,
label: '二级 3-2'
}]
}
]
};
},
watch: {
@ -97,19 +128,16 @@ export default {
//获取部门信息
getDepartmentTree() {
getDepartmentTree().then(res => {
const jsona = JSON.stringify(res.data) // 把接口返回的res.data数据转成字符串
const jsonb = jsona.replace(/"value"/g, '"deptId"') // 修改成你要的字段
const jsonc = jsonb.replace(/"label"/g, '"deptName"')
this.deptList=JSON.parse(jsonc)
console.log("获取部门信息===========", this.deptList);
console.log("获取部门信息", res);
this.deptList = res.data;
});
},
//通过关键字过滤树节点
filterNode(value, data) {
if (!value) return true;
return data.deptName.indexOf(value) !== -1;
return data.label.indexOf(value) !== -1;
},
//用于弹开部门选择
//用于部门选择
showDeptPicker() {
this.visible = true;
},
@ -125,7 +153,7 @@ export default {
if (this.multiple) {
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].deptId === data.deptId) {
if (this.selectList[i].value === data.value) {
this.selectList.splice(i, 1);
break;
}
@ -139,7 +167,7 @@ export default {
} else {// 左侧有选择框 + 单选
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].deptId === data.deptId) {
if (this.selectList[i].value === data.value) {
this.selectList.splice(i, 1);
break;
}
@ -158,7 +186,7 @@ export default {
//左侧没有选择框时,点击tree-item
/**
* 可以点击树节点deptName,进行选择
* 可以点击树节点label,进行选择
* @param node 选择的每个节点item
* @param check checked(checkbox选择框)是否选中
*/
@ -166,7 +194,7 @@ export default {
if(this.multiple){
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].deptId === node.deptId) {
if (this.selectList[i].value === node.value) {
this.selectList.splice(i, 1);
break;
}
@ -181,7 +209,7 @@ export default {
//左侧无选择框时,右侧显示×
noSelected(selectItem) {
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].deptId === selectItem.deptId) {
if (this.selectList[i].value === selectItem.value) {
this.selectList.splice(i, 1);
this.$refs.tree.setCheckedKeys(i);
break;
@ -209,7 +237,7 @@ export default {
},
//确定按钮
selectConfirm() {
this.$emit("input", this.selectList)
// this.$emit("input", this.selectList)
// this.$emit("dengjie")
}
}

88
flowable-engine-web/src/components/common/RolePicker.vue
View File

@ -12,7 +12,7 @@
@click="selectChange(roleItem)">
<el-checkbox v-model="roleItem.selected" v-if="showCheckbox" @change="selectChange(roleItem)"></el-checkbox>
<i class="el-icon-user-solid" style="margin-left: 5px"></i>
<span>{{ roleItem.roleName }}</span>
<span>{{ roleItem.label }}</span>
</div>
</div>
</div>
@ -24,10 +24,10 @@
</div>
<div class="org-items">
<el-empty :image-size="100" description="请点击左侧列表选择数据" v-show="selectList.length === 0"/>
<div v-for="(selectItem, selectIndex) in selectList" :key="selectIndex" class="org-role-item">
<div v-for="(org, index) in selectList" :key="index" class="org-role-item">
<i class="el-icon-user-solid"></i>
<span>{{ selectItem.roleName }}</span>
<i class="el-icon-close" @click="noSelected(selectItem)"></i>
<span>{{ org.label }}</span>
<i class="el-icon-close" @click="noSelected(org)"></i>
</div>
</div>
</div>
@ -46,24 +46,6 @@ export default {
return [];
},
type: Array
},
multiple: { //是否多选
default: true,
type: Boolean
},
showCheckbox: { //是否显示左侧选择框
default: true,
type: Boolean
}
},
computed: {
_value: {
get() {
return this.value
},
set(val) {
this.$emit("input", val)
}
}
},
data() {
@ -71,7 +53,34 @@ export default {
visible: false,
loading: false,
title: "请选择",
roleList: [],
multiple: true,//是否多选
showCheckbox: true,//是否显示左侧选择框
roleList: [
// {
// value: 1,
// label: "超级管理员"
// },
// {
// value: 2,
// label: "普通角色"
// },
// {
// value: 100,
// label: "前端开发人员"
// },
// {
// value: 101,
// label: "图片文件管理员"
// },
// {
// value: 102,
// label: "附件管理员"
// },
// {
// value: 103,
// label: "权限测试角色"
// }
],
selectList: []
};
},
@ -82,16 +91,9 @@ export default {
//获取角色信息
getRole() {
getRole().then(res => {
console.log('系统角色',res.data);
this.roleList= res.data.map(function (val){
return {roleId:val.value,roleName:val.label}
})
this.roleList = res.data;
});
},
//用于弹出角色选择器
showRolePicker() {
this.visible = true;
},
//选中角色
selectChange(roleItem) {
// 左侧有选择框
@ -99,7 +101,7 @@ export default {
// 左侧有选择框 + 多选
if (this.multiple) {
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].roleId === roleItem.roleId) {
if (this.selectList[i].value === roleItem.value) {
this.selectList.splice(i, 1);
break;
}
@ -110,7 +112,7 @@ export default {
} else {// 左侧有选择框 + 单选
//用于左侧选择框选中取消,引起右侧数据变化
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].roleId === roleItem.roleId) {
if (this.selectList[i].value === roleItem.value) {
this.selectList.splice(i, 1);
break;
}
@ -120,7 +122,7 @@ export default {
}
for (let i = 0; i < this.roleList.length; i++) {
for (let j = 0; j < this.selectList.length; j++) {
if (this.roleList[i].roleId !== this.selectList[j].roleId) {
if (this.roleList[i].value !== this.selectList[j].value) {
this.roleList[i].selected = false;
}
}
@ -130,7 +132,7 @@ export default {
// 左侧没有选择框 + 多选
if (this.multiple) {
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].roleId === roleItem.roleId) {
if (this.selectList[i].value === roleItem.value) {
this.selectList.splice(i, 1);
break;
}
@ -140,17 +142,16 @@ export default {
this.selectList = [roleItem];
}
}
this._value = this.selectList
},
//右侧的×
noSelected(selectItem) {
noSelected(org) {
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].roleId === selectItem.roleId) {
if (this.selectList[i].value === org.value) {
this.selectList.splice(i, 1);
break;
}
}
selectItem.selected = false;
org.selected = false;
},
//清空
clearSelected() {
@ -169,9 +170,14 @@ export default {
},
//确定按钮
selectConfirm() {
this.$emit("ok", this.selectList);
this.visible = false;
// this.$emit("ok", Object.assign([], this.select.map(v => {
// v.avatar = undefined;
// return v;
// })));
// this.visible = false;
// this.recover();
}
}
};
</script>

69
flowable-engine-web/src/components/common/Test.vue
View File

@ -10,10 +10,10 @@
<!-- 部门 -->
<el-empty :image-size="100" description="似乎没有数据" v-show="deptList.length === 0"/>
<el-scrollbar style="height:350px">
<el-tree :data="deptList" ref="tree" :props="deptProps" empty-text="" node-key="deptId" default-expand-all
<el-tree :data="deptList" ref="tree" empty-text="" node-key="value" default-expand-all
:show-checkbox="showCheckbox" check-strictly highlight-current
@check-change="handleCheckChange" @node-click="(node,check)=>handle(node,check)" :filter-node-method="filterNode">
<div class="custom-tree-node" slot-scope="{ node }" style="width: 100%">
<div class="custom-tree-node" slot-scope="{ node, data }" style="width: 100%">
<i class="el-icon-folder-opened" style="margin-right: 5px"></i>{{ node.label }}
</div>
</el-tree>
@ -29,7 +29,7 @@
<el-empty :image-size="100" description="请点击左侧列表选择数据" v-show="selectList.length === 0"/>
<div v-for="(selectItem, selectIndex) in selectList" :key="selectIndex" class="org-item">
<i class="el-icon-folder-opened"></i>
<span>{{ selectItem.deptName }}</span>
<span>{{ selectItem.label }}</span>
<i class="el-icon-close" @click="noSelected(selectItem)" v-if="showCheckbox===false"></i>
</div>
</div>
@ -67,12 +67,43 @@ export default {
title: "请选择",
selectList: [],
filterText: "",
deptList: [],
deptProps:{
value:'deptId',
label: 'deptName',
children: 'children'
deptList: [
{
value: 1,
label: '一级 1',
children: [{
value: 4,
label: '二级 1-1',
children: [{
value: 9,
label: '31'
}, {
value: 10,
label: '三级 1-1-2'
}]
}]
}, {
value: 2,
label: '一级 2',
children: [{
value: 5,
label: '二级 2-1'
}, {
value: 6,
label: '二级 2-2'
}]
}, {
value: 3,
label: '一级 3',
children: [{
value: 7,
label: '二级 3-1'
}, {
value: 8,
label: '二级 3-2'
}]
}
]
};
},
watch: {
@ -97,18 +128,14 @@ export default {
//获取部门信息
getDepartmentTree() {
getDepartmentTree().then(res => {
const jsona = JSON.stringify(res.data) // 把接口返回的res.data数据转成字符串
const jsonb = jsona.replace(/"value"/g, '"deptId"') // 修改成你要的字段
const jsonc = jsonb.replace(/"label"/g, '"deptName"')
const endjson = JSON.parse(jsonc)
this.deptList=endjson
console.log("获取部门信息===========", this.deptList);
console.log("获取部门信息", res);
this.deptList = res.data;
});
},
//通过关键字过滤树节点
filterNode(value, data) {
if (!value) return true;
return data.deptName.indexOf(value) !== -1;
return data.label.indexOf(value) !== -1;
},
//用于部门选择
showDeptPicker() {
@ -126,7 +153,7 @@ export default {
if (this.multiple) {
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].deptId === data.deptId) {
if (this.selectList[i].value === data.value) {
this.selectList.splice(i, 1);
break;
}
@ -140,7 +167,7 @@ export default {
} else {// 左侧有选择框 + 单选
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].deptId === data.deptId) {
if (this.selectList[i].value === data.value) {
this.selectList.splice(i, 1);
break;
}
@ -159,7 +186,7 @@ export default {
//左侧没有选择框时,点击tree-item
/**
* 可以点击树节点deptName,进行选择
* 可以点击树节点label,进行选择
* @param node 选择的每个节点item
* @param check checked(checkbox选择框)是否选中
*/
@ -167,7 +194,7 @@ export default {
if(this.multiple){
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].deptId === node.deptId) {
if (this.selectList[i].value === node.value) {
this.selectList.splice(i, 1);
break;
}
@ -182,7 +209,7 @@ export default {
//左侧无选择框时,右侧显示×
noSelected(selectItem) {
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].deptId === selectItem.deptId) {
if (this.selectList[i].value === selectItem.value) {
this.selectList.splice(i, 1);
this.$refs.tree.setCheckedKeys(i);
break;
@ -210,7 +237,7 @@ export default {
},
//确定按钮
selectConfirm() {
this.$emit("input", this.selectList)
// this.$emit("input", this.selectList)
// this.$emit("dengjie")
}
}

6
flowable-engine-web/src/main.js
View File

@ -16,7 +16,6 @@ import Ellipsis from '@/components/common/Ellipsis'
import WDialog from '@/components/common/WDialog'
import Tip from '@/components/common/Tip'
import axios from "axios";
import {getBaseUrl} from "./api/request";
Vue.use(ElementUI);
Vue.use(Ellipsis);
@ -55,9 +54,8 @@ export function getToken() {
// }
axios.post(
// "http://security-react.mytwins.top/auth/login",
// getBaseUrl()+"/auth/login",
"http://gateway.mytwins.top/auth/login",
// "http://localhost:8000/auth/login",
// "http://gateway.odliken.cn/auth/login",
"http://localhost:8000/auth/login",
{
code: "string",
password: "926425",

2
flowable-engine-web/src/utils/CustomUtil.js
View File

@ -23,5 +23,3 @@ Array.prototype.toMap = function (key) {
}

8
flowable-engine-web/src/views/common/form/components/DeptPicker.vue
View File

@ -6,8 +6,8 @@
</template>
<template v-else>
<template v-if="perm === 'E'">
<el-button icon="iconfont icon-map-site" type="primary" size="mini" round @click="selectDept"> 选择部门</el-button>
<org-picker type="dept" :multiple="multiple" ref="deptPicker" :selected="_value" @ok="selected"/>
<el-button icon="iconfont icon-map-site" type="primary" size="mini" round @click="$refs.orgPicker.show()"> 选择部门</el-button>
<org-picker type="dept" :multiple="multiple" ref="orgPicker" :selected="_value" @ok="selected"/>
<span class="placeholder"> {{placeholder}}</span>
<div style="margin-top: 5px">
<el-tag size="mini" style="margin: 5px" closable v-for="(dept, i) in _value" :key="i" @close="delDept(i)">{{dept.name}}</el-tag>
@ -54,10 +54,6 @@ export default {
}
},
methods: {
//弹出部门选择器,选择部门
selectDept() {
this.$refs.deptPicker.showDeptPicker()
},
selected(values){
this.showOrgSelect = false
this._value = values

3
flowable-engine-web/src/views/common/form/components/ImageUpload.vue
View File

@ -48,7 +48,6 @@
<script>
import componentMinxins from '../ComponentMinxins'
import {deleteFile} from "../../../../api/common";
import {getBaseUrl} from "../../../../api/request";
export default {
mixins: [componentMinxins],
@ -91,7 +90,7 @@ export default {
return {
fileList:[],
disabled: false,
uploadFileUrl: getBaseUrl()+"/flowable/process/file",
uploadFileUrl: "http://security-react.mytwins.top/flowable/process/file",
headers: {
authorization: localStorage.getItem("token")
},

105
flowable-engine-web/src/views/common/process/config/ApprovalNodeConfig.vue
View File

@ -119,38 +119,40 @@
<el-form-item label="🙅‍ 如果审批被驳回 👇">
<el-radio-group v-model="nodeProps.refuse.type">
<el-radio label="TO_END">直接结束流程</el-radio>
<!-- <el-radio label="TO_BEFORE">驳回到上级审批节点</el-radio>-->
<!-- <el-radio label="TO_NODE">驳回到指定节点</el-radio>-->
<!-- <el-radio label="TO_BEFORE">驳回到上级审批节点</el-radio>-->
<!-- <el-radio label="TO_NODE">驳回到指定节点</el-radio>-->
</el-radio-group>
<div v-if="nodeProps.refuse.type === 'TO_NODE'">
<span>指定节点:</span>
<el-select style="margin-left: 10px; width: 150px;" placeholder="选择跳转步骤" size="small"
v-model="nodeProps.refuse.target">
<el-select style="margin-left: 10px; width: 150px;" placeholder="选择跳转步骤" size="small" v-model="nodeProps.refuse.target">
<el-option v-for="(node, i) in nodeOptions" :key="i" :label="node.name" :value="node.id"></el-option>
</el-select>
</div>
</el-form-item>
</el-form>
<!-- <org-picker :title="pickerTitle" multiple :type="orgPickerType" ref="orgPicker" :selected="orgPickerSelected"-->
<!-- @ok="selected"/>-->
<role-picker :title="pickerTitle" multiple ref="rolePicker" :v-model="select" @ok="selectedRole"/>
<role-picker-me :title="pickerTitle" multiple ref="rolePicker" :selected="rolePickerSelected" @ok="selectedRole"/>
</div>
</template>
<script>
import RolePicker from "@/components/common/RolePicker";
import OrgPicker from "@/components/common/Test";
import RolePickerMe from "../../../../components/common/RolePickerMe";
import RoleItems from "../RoleItems";
import OrgItems from "../OrgItems";
export default {
name: "ApprovalNodeConfig",
components: {RoleItems, OrgItems, RolePicker},
components: {RoleItems, OrgPicker, OrgItems,RolePickerMe},
props: {
config: {
type: Object,
default: () => {
return {};
return {}
}
}
},
@ -158,52 +160,54 @@ export default {
return {
showOrgSelect: false,
orgPickerSelected: [],
orgPickerType: "user",
showRoleSelect: false,
rolePickerSelected: [],
orgPickerType: 'user',
approvalTypes: [
{name: "指定人员", type: "ASSIGN_USER"},
{name: "发起人自选", type: "SELF_SELECT"},
{name: "连续多级主管", type: "LEADER_TOP"},
{name: "主管", type: "LEADER"},
{name: "角色", type: "ROLE"},
{name: "发起人自己", type: "SELF"},
{name: "表单内联系人", type: "FORM_USER"}
{name: '指定人员', type: 'ASSIGN_USER'},
{name: '发起人自选', type: 'SELF_SELECT'},
{name: '连续多级主管', type: 'LEADER_TOP'},
{name: '主管', type: 'LEADER'},
{name: '角色', type: 'ROLE'},
{name: '发起人自己', type: 'SELF'},
{name: '表单内联系人', type: 'FORM_USER'}
]
};
}
},
computed: {
nodeProps() {
return this.$store.state.selectedNode.props;
return this.$store.state.selectedNode.props
},
select() {
return this.config.assignedUser || [];
return this.config.assignedUser || []
},
roleList() {
return this.config.roleList || [];
return this.config.roleList || []
},
forms() {
return this.$store.state.design.formItems.filter(f => {
return f.name === "UserPicker";
});
return f.name === 'UserPicker'
})
},
pickerTitle() {
switch (this.orgPickerType) {
case "user":
return "请选择人员";
case "role":
return "请选择系统角色";
case 'user':
return '请选择人员';
case 'role':
return '请选择系统角色';
default:
return null;
}
},
nodeOptions() {
let values = [];
const excType = ["ROOT", "EMPTY", "CONDITION", "CONDITIONS", "CONCURRENT", "CONCURRENTS"];
let values = []
const excType = ['ROOT', 'EMPTY', "CONDITION", "CONDITIONS", "CONCURRENT", "CONCURRENTS"]
this.$store.state.nodeMap.forEach((v) => {
if (excType.indexOf(v.type) === -1) {
values.push({id: v.id, name: v.name});
values.push({id: v.id, name: v.name})
}
});
return values;
})
return values
},
showMode() {
switch (this.nodeProps.assignedType) {
@ -212,7 +216,7 @@ export default {
case "SELF_SELECT":
return this.nodeProps.selfSelect.multiple;
case "LEADER_TOP":
return this.nodeProps.formUser !== "";
return this.nodeProps.formUser !== '';
case "FORM_USER":
return true;
case "ROLE":
@ -224,36 +228,33 @@ export default {
},
methods: {
selectUser() {
this.orgPickerSelected = this.select;
this.orgPickerType = "user";
this.$refs.orgPicker.show();
this.orgPickerSelected = this.select
this.orgPickerType = 'user'
this.$refs.orgPicker.show()
},
selectNoSetUser() {
this.orgPickerSelected = this.config.nobody.assignedUser;
this.orgPickerType = "user";
this.$refs.orgPicker.show();
this.orgPickerSelected = this.config.nobody.assignedUser
this.orgPickerType = 'user'
this.$refs.orgPicker.show()
},
//弹出角色选择器,选择系统角色
selectRole() {
this.orgPickerType = "role";
this.$refs.rolePicker.showRolePicker();
this.showRoleSelect = null
this.rolePickerSelected = this.roleList
this.$refs.rolePicker.show()
},
selected(select) {
},
selectedRole(select) {
select.forEach(val => {
for (let i = 0; i < this.roleList.length; i++) {
if (this.roleList[i].roleId === val.roleId) {
this.roleList.splice(i, 1);
break;
}
}
this.roleList.push(val);
});
console.log(select)
this.rolePickerSelected.length = 0
select.forEach(val => this.rolePickerSelected.push(val))
},
removeOrgItem(index) {
this.select.splice(index, 1);
this.select.splice(index, 1)
}
}
};
}
</script>
<style lang="less" scoped>

49
flowable-engine-web/src/views/workspace/DisposalTask.vue
View File

@ -26,13 +26,10 @@
label="任务到达时间">
</el-table-column>
<el-table-column
prop="state"
prop="status"
label="状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.state == 1" >待处理</el-tag>
<el-tag v-if="scope.row.state == 4" type="success">已同意</el-tag>
<el-tag v-if="scope.row.state == 3" type="danger">已拒绝</el-tag>
<el-tag v-if="scope.row.state == 2" type="warning">已退回</el-tag>
<el-tag type="success">{{ scope.row.status }}</el-tag>
</template>
</el-table-column>
</el-table>
@ -41,33 +38,27 @@
size="50%"
:visible.sync="approveOpen"
direction="rtl">
<div v-loading="loading">
<form-render-view ref="taskViewForm" :form-items="taskData.formItems"
v-model="taskData.formData"/>
<!-- <process-diagram-viewer/>-->
<process-diagram-viewer/>
<el-button type="success" @click="submitTask()">通过</el-button>
<el-button type="success" @click="$refs.comment.show()">评论</el-button>
</div>
</el-drawer>
<comment ref="comment" :max-size="5" :attachment-max-size="10" @ok="commentConfirm"/>
</div>
</template>
<script>
import Comment from "../../components/common/Comment";
import FormRenderView from '@/views/common/form/FormRender'
import ProcessDiagramViewer from "../admin/layout/ProcessDiagramViewer";
import {addComment, completeTask, getTaskInfo, getTaskList} from "../../api/task";
import {completeTask, getTaskInfo, getTaskList} from "../../api/task";
export default {
name: "DisposalTask",
components: {Comment, FormRenderView, ProcessDiagramViewer},
components: {FormRenderView,ProcessDiagramViewer},
data() {
return {
approveOpen: false,
selectTask: {},
tableData: [],
loading: false,
taskData: {
formData: {},
formItems: [],
@ -90,48 +81,28 @@ export default {
this.tableData = data.rows
})
},
init() {
this.taskData = {
formData: {},
formItems: [],
processList: [],
}
this.loading = true
this.$store.state.design = this.taskData
this.$store.state.runningList = []
this.$store.state.endList = []
this.$store.state.noTakeList = []
this.$store.state.diagramMode = 'viewer'
this.$store.state.preview = false;
},
loadProcessTask(taskId) {
let that = this
this.init()
getTaskInfo(taskId).then(res => {
this.$store.state.preview = 'viewer'
this.$store.state.preview = false;
that.taskData = res.data
that.$store.state.design = that.taskData
that.$store.state.runningList = that.taskData.runningList
that.$store.state.endList = that.taskData.endList
that.$store.state.noTakeList = that.taskData.noTakeList
this.loading = false
})
},
submitTask() {
submitTask(){
let params = {
taskId: this.selectTask.taskId,
formData: JSON.stringify(this.taskData.formData)
formData : JSON.stringify(this.taskData.formData)
}
completeTask(params).then(res => {
completeTask(params).then(res =>{
this.approveOpen = false
this.getList()
this.$message.success(res.msg)
})
},
commentConfirm(data) {
this.$set(data, "taskId", this.selectTask.taskId)
addComment(data).then(res => {
this.$message.success(res.msg)
})
}
}
};

113
flowable-engine-web/src/views/workspace/InitiatedInstance.vue
View File

@ -1,113 +0,0 @@
<template>
<div>
<el-table :data="tableData"
@row-click="clickRow"
style="width: 100%">
<el-table-column
prop="deploymentName"
label="审批类型"
width="180"/>
<el-table-column
prop="approveName"
label="审批人"
width="180"/>
<el-table-column
prop="submitTime"
label="提交时间"/>
<el-table-column
prop="endTime"
label="结束时间"/>
<el-table-column
prop="taskName"
label="当前节点"/>
<el-table-column
label="处理耗时">
<template slot-scope="scope">
{{ getTimeConsuming(scope.row) }}
</template>
</el-table-column>
<el-table-column
prop="state"
label="状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.state == 1" >进行中</el-tag>
<el-tag v-if="scope.row.state == 4" type="success">审批通过</el-tag>
<el-tag v-if="scope.row.state == 3" type="danger">审批驳回</el-tag>
<el-tag v-if="scope.row.state == 2" type="info">已撤销</el-tag>
</template>
</el-table-column>
<el-table-column
label="操作">
<template slot-scope="scope">
<el-button size="min" type="text" icon="el-icon-thumb">再次提交</el-button>
</template>
</el-table-column>
</el-table>
<el-drawer
title="审批详情"
size="50%"
:visible.sync="approveOpen"
direction="rtl">
<div v-loading="loading">
<form-render-view ref="taskViewForm" :form-items="taskData.formItems"
v-model="taskData.formData"/>
<process-diagram-viewer/>
<el-button type="success" @click="submitTask()">通过</el-button>
<el-button type="success" @click="$refs.comment.show()">评论</el-button>
</div>
</el-drawer>
<comment ref="comment" :max-size="5" :attachment-max-size="10" @ok="commentConfirm"/>
</div>
</template>
<script>
import Comment from "../../components/common/Comment";
import FormRenderView from '@/views/common/form/FormRender'
import ProcessDiagramViewer from "../admin/layout/ProcessDiagramViewer";
import {getInitiatedInstanceList} from "../../api/processInstance";
export default {
name: "InitiatedInstance",
components: {Comment, FormRenderView, ProcessDiagramViewer},
data() {
return {
approveOpen: false,
selectTask: {},
tableData: [],
loading: false,
taskData: {
formData: {},
formItems: [],
processList: [],
}
};
},
created() {
this.getList();
},
methods: {
clickRow(row) {
this.approveOpen = true;
// this.loadProcessTask(row.taskId)
this.selectTask = row
},
getList() {
getInitiatedInstanceList().then(res => {
let data = res.data
this.tableData = data.rows
})
},
getTimeConsuming(instance) {
if (instance.state != 1) {
let submitTime = new Date(instance.submitTime)
let endTime = new Date(instance.endTime)
return endTime - submitTime;
}
}
}
}
</script>
<style scoped>
</style>

7
flowable-engine-web/src/views/workspace/WorkSpace.vue
View File

@ -41,10 +41,10 @@
</div>
</el-tab-pane>
<el-tab-pane label="待我处理(3)" name="disposalTask">
<disposal-task v-if="active == 'disposalTask'" ref="disposalTask"/>
<disposal-task ref="disposalTask"/>
</el-tab-pane>
<el-tab-pane label="我发起的" name="initiated">
<initiated-instance v-if="active == 'initiated'" ref="InitiatedInstance"/>
<div class="no-data">暂无数据 😀</div>
</el-tab-pane>
<el-tab-pane label="关于我的" name="aboutMe">
<div class="no-data">暂无数据 😀</div>
@ -63,14 +63,13 @@
<script>
import InitiateProcess from "./InitiateProcess";
import InitiatedInstance from "./InitiatedInstance";
import DisposalTask from "./DisposalTask";
import {getProcessDefinitionList} from "../../api/processDefinition";
import {startProcessInstance} from "../../api/processInstance";
export default {
name: "workSpace",
components: {InitiateProcess,DisposalTask,InitiatedInstance},
components: {InitiateProcess,DisposalTask},
data() {
return {
active: 'disposalTask',