master #20

Merged
clay merged 11 commits from master into pro 2023-02-20 10:24:51 +00:00
2 changed files with 3 additions and 7 deletions
Showing only changes of commit 4bc906d350 - Show all commits

View File

@ -101,7 +101,7 @@ export default {
// const jsonb = jsona.replace(/"value"/g, '"deptId"') // // const jsonb = jsona.replace(/"value"/g, '"deptId"') //
// const jsonc = jsonb.replace(/"label"/g, '"deptName"') // const jsonc = jsonb.replace(/"label"/g, '"deptName"')
this.deptList = res.data this.deptList = res.data
console.log("获取部门信息===========", this.deptList); // console.log("===========", this.deptList);
}); });
}, },
// //
@ -119,7 +119,6 @@ export default {
* @param checked 是否选中 * @param checked 是否选中
*/ */
handleCheckChange(data, checked) { handleCheckChange(data, checked) {
// if (data.children === undefined) {
// //
if (this.showCheckbox) { if (this.showCheckbox) {
// + // +
@ -135,13 +134,11 @@ export default {
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 {// +
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) {
@ -159,7 +156,6 @@ export default {
} }
} }
} }
// }
this._value = this.selectList this._value = this.selectList
}, },

View File

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