DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!6 同步develop分支

Browse Source 
* sync -- 同步develop分支
This commit is contained in:
KonBAI
2022-01-18 13:16:15 +00:00
parent a649962696
commit 5676316380
338 changed files with 10957 additions and 9551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-ui/src/plugins/package/designer/plugins/descriptor/activitiDescriptor.json
View File

@@ -276,6 +276,11 @@
"isAttr": true,
"type": "String"
},
{
"name": "processCategory",
"isAttr": true,
"type": "String"
},
{
"name": "versionTag",
"isAttr": true,

5
ruoyi-ui/src/plugins/package/designer/plugins/descriptor/camundaDescriptor.json
View File

@@ -282,6 +282,11 @@
"isAttr": true,
"type": "String"
},
{
"name": "processCategory",
"isAttr": true,
"type": "String"
},
{
"name": "versionTag",
"isAttr": true,

5
ruoyi-ui/src/plugins/package/designer/plugins/descriptor/flowableDescriptor.json
View File

@@ -262,6 +262,11 @@
"isAttr": true,
"type": "String"
},
{
"name": "processCategory",
"isAttr": true,
"type": "String"
},
{
"name": "versionTag",
"isAttr": true,

15
ruoyi-ui/src/plugins/package/penal/base/ElementBaseInfo.vue
View File

@@ -14,6 +14,11 @@
</el-form-item>
<!--流程的基础属性-->
<template v-if="elementBaseInfo.$type === 'bpmn:Process'">
<el-form-item label="流程分类">
<el-select v-model="elementBaseInfo.processCategory" placeholder="请选择" clearable @change="updateBaseInfo('processCategory')">
<el-option v-for="item in categoryOptions" :key="item.categoryId" :label="item.categoryName" :value="item.code" />
</el-select>
</el-form-item>
<el-form-item label="版本标签">
<el-input v-model="elementBaseInfo.versionTag" clearable @change="updateBaseInfo('versionTag')" />
</el-form-item>
@@ -25,6 +30,8 @@
</div>
</template>
<script>
import { listCategory } from "@/api/workflow/category";
export default {
name: "ElementBaseInfo",
props: {
@@ -37,7 +44,8 @@ export default {
},
data() {
return {
elementBaseInfo: {}
elementBaseInfo: {},
categoryOptions: []
};
},
watch: {
@@ -50,6 +58,11 @@ export default {
}
}
},
created() {
listCategory().then(response => {
this.categoryOptions = response.rows
})
},
methods: {
resetBaseInfo() {
this.bpmnElement = window?.bpmnInstances?.bpmnElement;

73
ruoyi-ui/src/plugins/package/penal/task/task-components/TagSelect.vue Normal file
View File

@@ -0,0 +1,73 @@
<template>
<div class="tag-select">
<div class="tag-box">
<el-tag v-for="item in selectValues" :key="item.userId" effect="dark"
style="margin-right: 5px;" type="primary" size="mini" closable
@close="onDeleteTag(item)"
>
{{item.nickName}}
</el-tag>
</div>
<slot name="append" />
</div>
</template>
<script>
export default {
name: 'TagSelect',
props: {
value: {
type: [Object, Array]
}
},
data () {
return {
selectValues: []
}
},
methods: {
onDeleteTag (tag) {
let temp = this.selectValues.filter(item => {
return item !== tag;
});
if (Array.isArray(this.value)) {
this.$emit('input', temp);
} else {
this.$emit('input', temp.map(item => item.id).join(','));
}
}
},
watch: {
value: {
handler (newValue) {
if (newValue == null || newValue === '') {
this.selectValues = [];
} else {
if (Array.isArray(newValue)) {
this.selectValues = [...newValue];
} else {
this.selectValues = [{
userId: newValue.userId,
/* eslint-disable-next-line */
nickName: newValue.nickName === '${startUserName}' ? '流程发起人' : newValue.nickName
}]
}
}
},
immediate: true
}
}
}
</script>
<style scoped>
.tag-select {
border: 1px solid #DCDFE6;
border-radius: 4px;
display: flex;
}
.tag-box {
flex-grow: 1;
padding: 0px 5px;
}
</style>

242
ruoyi-ui/src/plugins/package/penal/task/task-components/UserTask.vue
View File

@@ -1,15 +1,33 @@
<template>
<div style="margin-top: 16px">
<el-form-item label="处理用户">
<el-select v-model="userTaskForm.assignee" @change="updateElementTask('assignee')">
<el-option v-for="userItem in userMockDate" :key="'ass-' + userItem.userId" :label="userItem.nickName" :value="userItem.userId.toString()" />
<el-form-item label="候选类型">
<!-- <el-select v-model="formData.groupType" placeholder="请选择分组类型" @change="onGroupTypeChange">-->
<el-select v-model="formData.groupType" placeholder="请选择分组类型">
<el-option label="固定用户" value="ASSIGNEE" />
<!-- <el-option label="候选用户" value="USERS" />-->
<!-- <el-option label="候选组" value="ROLE" />-->
</el-select>
</el-form-item>
<!-- <el-form-item label="候选用户">-->
<!-- <el-select v-model="userTaskForm.candidateUsers" multiple collapse-tags @change="updateElementTask('candidateUsers')">-->
<!-- <el-option v-for="uk in mockData" :key="'user-' + uk" :label="`用户${uk}`" :value="`user${uk}`" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="指定方式" v-if="formData.groupType === 'ASSIGNEE'">
<el-radio v-model="formData.assignType" label="1">固定</el-radio>
<el-radio v-model="formData.assignType" label="2">动态</el-radio>
</el-form-item>
<el-form-item label="处理用户" v-if="formData.groupType === 'ASSIGNEE'">
<tag-select v-if="formData.assignType === '1'" v-model="userTaskForm.assignee">
<el-button slot="append" class="append-add" type="default" icon="el-icon-plus" @click="onSelectAssignee()" />
</tag-select>
<el-select v-if="formData.assignType === '2'" v-model="userTaskForm.assignee" collapse-tags @change="updateElementTask('assignee')">
<el-option v-for="item in variableData" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
<span style="float: right; color: #8492a6;">{{ item.value }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="候选用户" v-if="formData.groupType === 'USERS'">
<tag-select v-model="userTaskForm.candidateUsers">
<el-button slot="append" class="append-add" type="default" icon="el-icon-plus" @click="onSelectAssignee()" />
</tag-select>
</el-form-item>
<!-- <el-form-item label="候选分组">-->
<!-- <el-select v-model="userTaskForm.candidateGroups" multiple collapse-tags @change="updateElementTask('candidateGroups')">-->
<!-- <el-option v-for="gk in mockData" :key="'ass-' + gk" :label="`分组${gk}`" :value="`group${gk}`" />-->
@@ -24,11 +42,86 @@
<el-form-item label="优先级">
<el-input v-model="userTaskForm.priority" clearable @change="updateElementTask('priority')" />
</el-form-item>
<!-- 候选用户弹窗 -->
<el-dialog title="候选用户" :visible.sync="candidateVisible" width="60%" append-to-body>
<el-row type="flex" :gutter="20">
<!--部门数据-->
<el-col :span="5">
<el-card shadow="never" style="height: 100%">
<div slot="header">
<span>部门列表</span>
</div>
<div class="head-container">
<el-input
v-model="deptName"
placeholder="请输入部门名称"
clearable
size="small"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
<el-tree
:data="deptOptions"
:props="deptProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
default-expand-all
@node-click="handleNodeClick"
/>
</div>
</el-card>
</el-col>
<el-col :span="14">
<el-table
ref="singleTable"
height="600"
:data="userList"
border
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="用户名" align="center" prop="nickName" />
<el-table-column label="部门" align="center" prop="dept.deptName" />
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col>
<el-col :span="5">
<el-card shadow="never" style="height: 100%">
<div slot="header">
<span>已选人员</span>
</div>
<el-tag
v-for="tag in selectedUserDate"
:key="tag.nickName"
closable
@close="handleClose(tag)">
{{tag.nickName}} {{tag.dept.deptName}}
</el-tag>
</el-card>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleTaskComplete">确 定</el-button>
<!-- <el-input style="width: 50%;margin-right: 34%" type="textarea" v-model="taskForm.comment"-->
<!-- placeholder="请输入处理意见"-->
<!-- />-->
<!-- <el-button @click="completeOpen = false">取 消</el-button>-->
</div>
</el-dialog>
</div>
</template>
<script>
import { listUser } from "@/api/system/user";
import { listUser, getUser } from "@/api/system/user";
import { treeselect } from '@/api/system/dept'
import TagSelect from "./TagSelect";
export default {
name: "UserTask",
@@ -36,6 +129,9 @@ export default {
id: String,
type: String
},
components: {
TagSelect
},
data() {
return {
defaultTaskForm: {
@@ -46,8 +142,30 @@ export default {
followUpDate: "",
priority: ""
},
formData: {
groupType: 'ASSIGNEE',
assignType: '1'
},
userTaskForm: {},
candidateVisible: false,
deptName: undefined,
deptOptions: [],
deptProps: {
children: "children",
label: "label"
},
// 查询参数
queryParams: {
deptId: undefined
},
userList: [],
total: 0,
selectedUserDate: [],
userMockDate: [],
variableData: [{
label: "流程发起人",
value: "${INITIATOR}"
}],
mockData: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
};
},
@@ -58,7 +176,17 @@ export default {
this.bpmnElement = window.bpmnInstances.bpmnElement;
this.$nextTick(() => this.resetTaskForm());
}
}
},
'userTaskForm.assignee': {
handler () {
this.updateElementTask('assignee');
}
},
'userTaskForm.candidateUsers': {
handler () {
this.updateElementTask('candidateUsers');
}
},
},
created() {
listUser().then(response => {
@@ -68,23 +196,100 @@ export default {
methods: {
resetTaskForm() {
for (let key in this.defaultTaskForm) {
let value;
if (key === "candidateUsers" || key === "candidateGroups") {
value = this.bpmnElement?.businessObject[key] ? this.bpmnElement.businessObject[key].split(",") : [];
} else {
value = this.bpmnElement?.businessObject[key] || this.defaultTaskForm[key];
let val = this.bpmnElement?.businessObject[key] ? this.bpmnElement.businessObject[key].split(",") : [];
// TODO 2022/01/10 添加候选组的设值 this.$set(this.userTaskForm, key, value);
} else if (key === "assignee") {
let val = this.bpmnElement?.businessObject[key] || this.defaultTaskForm[key];
// 判断是否为动态用户
if (val && val.startsWith('${') && val.endsWith('}')) {
this.formData.assignType = '2';
this.$set(this.userTaskForm, key, val);
} else {
this.formData.assignType = '1';
getUser(val).then(response => {
let user = response.data.user
this.$set(this.userTaskForm, key, user);
})
}
}
this.$set(this.userTaskForm, key, value);
}
},
updateElementTask(key) {
const taskAttr = Object.create(null);
if (key === "candidateUsers" || key === "candidateGroups") {
taskAttr[key] = this.userTaskForm[key] && this.userTaskForm[key].length ? this.userTaskForm[key].join() : null;
if (this.userTaskForm[key] && this.userTaskForm[key].length > 0) {
// TODO 2022/01/10 添加候选组的设值
// taskAttr[key] = this.userTaskForm[key]
}
// taskAttr[key] = this.userTaskForm[key] && this.userTaskForm[key].length ? this.userTaskForm[key].join() : null;
} else {
taskAttr[key] = this.userTaskForm[key] || null;
if (this.userTaskForm[key]) {
if (this.formData.assignType === '1') {
taskAttr[key] = this.userTaskForm[key].userId || null;
} else if (this.formData.assignType === '2') {
taskAttr[key] = this.userTaskForm[key] || null;
}
}
}
window.bpmnInstances.modeling.updateProperties(this.bpmnElement, taskAttr);
},
/**
* 查询部门下拉树结构
*/
getDeptTreeSelect() {
treeselect().then(response => {
this.deptOptions = response.data;
});
},
/** 查询用户列表 */
getList() {
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.userList = response.rows;
this.total = response.total;
}
);
},
// 筛选节点
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
// 节点单击事件
handleNodeClick(data) {
this.queryParams.deptId = data.id;
this.getList();
},
// 关闭标签
handleClose(tag) {
this.selectedUserDate.splice(this.selectedUserDate.indexOf(tag), 1);
},
// 多选框选中数据
handleSelectionChange(selection) {
this.selectedUserDate = selection;
},
handleTaskComplete() {
if (!this.selectedUserDate) {
this.userTaskForm.assignee = null;
this.userTaskForm.candidateUsers = null;
} else {
let val = null;
if (this.formData.groupType === 'ASSIGNEE') {
val = this.selectedUserDate[0];
this.userTaskForm.assignee = val;
// this.updateElementTask('assignee')
} else {
val = this.selectedUserDate;
this.userTaskForm.candidateUsers = val;
// this.updateElementTask('candidateUsers')
}
}
this.candidateVisible = false;
},
onSelectAssignee() {
this.getDeptTreeSelect()
this.candidateVisible = true;
}
},
beforeDestroy() {
@@ -92,3 +297,6 @@ export default {
}
};
</script>
<style scoped>
</style>