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

Compare commits

base: clay:348de04db7c4e4cd828024565ccb6e1f9b27dd5d
Branches Tags
clay:master
clay:pro
clay:DJ
clay:chatGPT
clay:master-back
clay:clay
..
compare: clay:e78241c7105a305a033d42568082c1c794ac974d
Branches Tags
clay:pro
clay:master
clay:DJ
clay:chatGPT
clay:master-back
clay:clay

No commits in common. "348de04db7c4e4cd828024565ccb6e1f9b27dd5d" and "e78241c7105a305a033d42568082c1c794ac974d" have entirely different histories.
348de04db7 ... e78241c710

2 changed files with 59 additions and 64 deletions
Show Stats Expand all files Collapse all files

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

@ -7,11 +7,11 @@
<el-input v-model="filterText" style="width: 100%;" size="small"
clearable placeholder="输入关键字进行过滤" prefix-icon="el-icon-search"/>
</div>
<!-- 部门 check-strictly-->
<!-- 部门 -->
<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="value" default-expand-all
:show-checkbox="showCheckbox" highlight-current :check-strictly="multiple===false"
<el-tree :data="deptList" ref="tree" :props="deptProps" empty-text="" node-key="deptId" 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%">
@ -20,6 +20,7 @@
</el-tree>
</el-scrollbar>
</div>
<div class="selected">
<div class="count">
<span>已选 {{ selectList.length }} 项</span>
@ -101,7 +102,7 @@ export default {
// const jsonb = jsona.replace(/"value"/g, '"deptId"') // 修改成你要的字段
// const jsonc = jsonb.replace(/"label"/g, '"deptName"')
this.deptList = res.data
// console.log("获取部门信息===========", this.deptList);
console.log("获取部门信息===========", this.deptList);
});
},
//通过关键字过滤树节点
@ -119,43 +120,40 @@ export default {
* @param checked 是否选中
*/
handleCheckChange(data, checked) {
// 左侧有选择框
if (this.showCheckbox) {
// 左侧有选择框 + 多选
if (this.multiple ) {
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].value === data.value) {
this.selectList.splice(i, 1);
break;
}
}
if (checked) {
if(data.children === undefined){
this.selectList.push(data);
}
} else if (data === '1') {
this.$refs.tree.setCheckedKeys([]);
this.selectList = [];
}
} else {// 左侧有选择框 + 单选
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].value === data.value) {
this.selectList.splice(i, 1);
break;
}
}
if (checked) {
this.$refs.tree.setCheckedNodes([data]);
// this.$refs.tree.setCheckedKeys([]);
this.selectList = [data];
} else if (data === '1') {
this.selectList = [];
this.$refs.tree.setCheckedKeys([]);
// 左侧有选择框
if (this.showCheckbox) {
// 左侧有选择框 + 多选
if (this.multiple) {
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].value === data.value) {
this.selectList.splice(i, 1);
break;
}
}
if (checked) {
this.selectList.push(data);
} else if (data === '1') {
this.$refs.tree.setCheckedKeys([]);
this.selectList = [];
}
} else {// 左侧有选择框 + 单选
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].value === data.value) {
this.selectList.splice(i, 1);
break;
}
}
if (checked) {
this.$refs.tree.setCheckedNodes([data]);
this.selectList = [data];
} else if (data === '1') {
this.$refs.tree.setCheckedKeys([]);
this.selectList = [];
}
}
}
this._value = this.selectList
},
@ -166,21 +164,19 @@ export default {
* @param check checked(checkbox选择框)是否选中
*/
handle(node, check) {
if (check.isLeaf !== false) {
if (this.multiple) {
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].value === node.value) {
this.selectList.splice(i, 1);
break;
}
if (this.multiple) {
//不添加重复的数据到右边
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList[i].value === node.value) {
this.selectList.splice(i, 1);
break;
}
check.checked = true
this.selectList.push(node);
} else {
check.checked = true
this.selectList = [node];
}
check.checked = true
this.selectList.push(node);
} else {
check.checked = true
this.selectList = [node];
}
this._value = this.selectList
},
@ -207,10 +203,9 @@ export default {
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.handleCheckChange("1");
if (!this.showCheckbox) {
this.selectList = []
}else {
this.handleCheckChange("1");
}
});
},
@ -226,15 +221,15 @@ export default {
<style lang="less" scoped>
@containWidth: 278px;
///deep/ .el-tree-node {
// .is-leaf + .el-checkbox .el-checkbox__inner {
// display: inline-block;
// }
//
// .el-checkbox .el-checkbox__inner {
// display: none;
// }
//}
/deep/ .el-tree-node {
.is-leaf + .el-checkbox .el-checkbox__inner {
display: inline-block;
}
.el-checkbox .el-checkbox__inner {
display: none;
}
}
/deep/ .el-dialog__body {
padding: 10px 20px;

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

@ -10,12 +10,12 @@
<org-picker type="dept" :multiple="multiple" ref="deptPicker" :v-model="select" :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.label}}</el-tag>
<el-tag size="mini" style="margin: 5px" closable v-for="(dept, i) in _value" :key="i" @close="delDept(i)">{{dept.deptName}}</el-tag>
</div>
</template>
<template v-else-if="perm === 'R'">
<div v-for="(dept, i) in _value" :key="i">
{{dept.label}}
{{dept.deptName}}
</div>
</template>
</template>