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

master #33

Merged
clay merged 4 commits from master into pro 2023-03-03 18:06:36 +00:00
Conversation 0 Commits 4 Files Changed 18 +21 -20
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dabdc0551e - Show all commits

32
flowable-engine-web/src/components/common/UserPicker.vue
View File

@ -179,21 +179,21 @@ export default {
// 左侧有选择框 + 多选 // 左侧有选择框 + 多选
if (this.multiple) { if (this.multiple) {
// console.log('左侧有选择框 + 多选') // console.log('左侧有选择框 + 多选')
// //不添加重复的数据到右边 //不添加重复的数据到右边
// for (let i = 0; i < this.selectList.length; i++) { for (let i = 0; i < this.selectList.length; i++) {
// if (this.selectList[i].value === data.value) { if (this.selectList[i].value === data.value) {
// this.selectList.splice(i, 1); this.selectList.splice(i, 1);
// break; break;
// } }
// } }
// if (checked) { if (checked) {
// // if (data.children === undefined) { // if (data.children === undefined) {
// this.selectList.push(data); this.selectList.push(data);
// // } // }
// } else if (data === '1') { } else if (data === '1') {
// this.$refs.tree.setCheckedKeys([]); this.$refs.tree.setCheckedKeys([]);
// this.selectList = []; this.selectList = [];
// } }
} else {// 左侧有选择框 + 单选 } else {// 左侧有选择框 + 单选
//不添加重复的数据到右边 //不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) { for (let i = 0; i < this.selectList.length; i++) {
@ -205,7 +205,7 @@ export default {
if (checked) { if (checked) {
console.log('this.$refs.tree',this.$refs.tree) console.log('this.$refs.tree',this.$refs.tree)
// if(data.type==0){ // if(data.type==0){
// this.$refs.tree.setCheckedNodes([data]); this.$refs.tree.setCheckedNodes([data]);
this.selectList = [data]; this.selectList = [data];
// } // }
} else if (data === "1") { } else if (data === "1") {

9
flowable-engine-web/src/views/common/form/components/UserPicker.vue
View File

@ -9,15 +9,16 @@
<el-button icon="el-icon-user" type="primary" size="mini" round @click="$refs.userPicker.showUserPicker()">选择人员</el-button> <el-button icon="el-icon-user" type="primary" size="mini" round @click="$refs.userPicker.showUserPicker()">选择人员</el-button>
<user-select type="user" :multiple="multiple" ref="userPicker" :selected="_value" @ok="selected"/> <user-select type="user" :multiple="multiple" ref="userPicker" :selected="_value" @ok="selected"/>
<span class="placeholder"> {{placeholder}}</span> <span class="placeholder"> {{placeholder}}</span>
<div style="margin-top: 5px"> <div style="margin-top: 5px;display: flex;flex-direction: column;position:relative;" v-for="(user, i) in _value" :key="i">
<el-tag size="mini" style="margin: 5px" closable v-for="(user, i) in _value" :key="i" @close="delDept(i)"> <!-- <el-tag closable @close="delDept(i)">-->
<span style="position:absolute;right: 0">×</span>
<el-avatar :src="user.avatar"/> <el-avatar :src="user.avatar"/>
{{user.name}} <span>{{user.name}}</span>
</el-tag>
</div> </div>
</template> </template>
<template v-else-if="perm === 'R'"> <template v-else-if="perm === 'R'">
<div v-for="(user, i) in _value" :key="i"> <div v-for="(user, i) in _value" :key="i">
<el-avatar :src="user.avatar"/>
{{user.label}} {{user.label}}
</div> </div>
</template> </template>