Skip to content

P
pica.cloud.web-education-admin
提交 c1ac002e 编写于 作者: zhentian.jia's avatar zhentian.jia
浏览文件
操作

机构 人员后端实时变化

上级 437495b8
显示空白字符变更
内嵌 并排
正在显示 包含 87 行增加 和 78 行删除
src/views/education/edit-manager.vue
浏览文件 @ c1ac002e
...@@ -256,6 +256,7 @@ ...@@ -256,6 +256,7 @@
:load="loadNode" :load="loadNode"
lazy lazy
default-expand-all default-expand-all
@check-change="checkUpdate"
--> -->
<el-tree <el-tree
default-expand-all default-expand-all
...@@ -266,7 +267,6 @@ ...@@ -266,7 +267,6 @@
highlight-current highlight-current
:props="defaultProps" :props="defaultProps"
@check="onChecked" @check="onChecked"
@check-change="checkUpdate"
> >
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ node.label }}</span> <span>{{ node.label }}</span>
...@@ -365,22 +365,24 @@ ...@@ -365,22 +365,24 @@
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!--
:row-key="getRowKeys"
:reserve-selection="true"
@selection-change="selectionChangeOrganization"
-->
<el-table <el-table
class="rim" class="rim"
ref="multipleOrganization" ref="multipleOrganization"
:data="tableOrganization" :data="tableOrganization"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
@selection-change="selectionChangeOrganization"
@select-all="selectAllOrganization" @select-all="selectAllOrganization"
@select="selectOrganization" @select="selectOrganization"
:row-key="getRowKeys"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
:selectable="selectableTableList" :selectable="selectableTableList"
:reserve-selection="true"
></el-table-column> ></el-table-column>
<el-table-column prop="name" label="医院名称" min-width="100" align="center"></el-table-column> <el-table-column prop="name" label="医院名称" min-width="100" align="center"></el-table-column>
<el-table-column prop="hospitalLevelName" label="医院级别" align="center"></el-table-column> <el-table-column prop="hospitalLevelName" label="医院级别" align="center"></el-table-column>
...@@ -413,17 +415,26 @@ ...@@ -413,17 +415,26 @@
<el-table <el-table
class="department" class="department"
ref="multipleDepartment" ref="multipleDepartment"
:data="tableDepartment" :data="tableDepartment.filter(data => !searchName || data.name.toLowerCase().includes(searchName.toLowerCase()))"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
@selection-change="selectionChangeDepartment" @selection-change="selectionChangeDepartment"
:row-key="getRowKeysDepartment"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
:reserve-selection="true"
:selectable="selectableTableList" :selectable="selectableTableList"
></el-table-column> ></el-table-column>
<el-table-column prop="name" label="科室名称" align="center"></el-table-column> <el-table-column prop="name" label="科室名称" align="center">
<template slot="header" slot-scope="scope">
<el-input
v-model="searchName"
size="mini"
placeholder="输入科室名称"/>
</template>
</el-table-column>
<div slot="empty"> <div slot="empty">
<div class="table-empty"> <div class="table-empty">
<img src="../../assets/image/no-content1.png"> <img src="../../assets/image/no-content1.png">
...@@ -1008,6 +1019,10 @@ export default { ...@@ -1008,6 +1019,10 @@ export default {
administrativeValue: '', administrativeValue: '',
optionsRegion: [], optionsRegion: [],
dialogUpload: false, dialogUpload: false,
searchName: '',
getRowKeysDepartment(row) {
return row.id;
},
props: { props: {
lazy: true, lazy: true,
lazyLoad(node, resolve) { lazyLoad(node, resolve) {
...@@ -2119,7 +2134,8 @@ export default { ...@@ -2119,7 +2134,8 @@ export default {
getCheckedKeys() { getCheckedKeys() {
console.log(this.$refs.tree.getCheckedKeys()); console.log(this.$refs.tree.getCheckedKeys());
}, },
onChecked() { onChecked(node,data) {
vm.checkUpdate(node,data);
//重构归并树 //重构归并树
let checkedTree = operationData.getSimpleCheckedNodes(this.$refs.tree.store); let checkedTree = operationData.getSimpleCheckedNodes(this.$refs.tree.store);
let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys() let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys()
...@@ -2588,30 +2604,29 @@ export default { ...@@ -2588,30 +2604,29 @@ export default {
this.tableOrganization = res.data.organizationList; this.tableOrganization = res.data.organizationList;
this.totalOrganization = res.data.total; this.totalOrganization = res.data.total;
let idList = operationData.getIdList(this.tableOrganization); vm.initOrganizationStatus();
let intersect = operationData.getIntersect( // 教培v2.2.0二期不需要前端记录状态
idList, // let idList = operationData.getIdList(this.tableOrganization);
this.changedOrganization // let intersect = operationData.getIntersect(
); // idList,
this.lookedOrganization = operationData.getUnion( // this.changedOrganization
this.lookedOrganization, // );
idList // this.lookedOrganization = operationData.getUnion(
); // this.lookedOrganization,
// idList
//console.log('全部看过的：',this.lookedOrganization); // );
if (vm.checkTableState.multipleOrganization === "") { // //console.log('全部看过的：',this.lookedOrganization);
this.initOrganizationChoose(); // if (vm.checkTableState.multipleOrganization === "") {
} else if (vm.checkTableState.multipleOrganization === true) { // this.initOrganizationChoose();
let intersect2 = operationData.getIntersect( // } else if (vm.checkTableState.multipleOrganization === true) {
idList, // let intersect2 = operationData.getIntersect(
this.changedOrganization // idList,
); // this.changedOrganization
// console.log('intersect2',intersect2); // );
if (intersect2.length == 0) { // if (intersect2.length == 0) {
this.$refs.multipleOrganization.toggleAllSelection(); // this.$refs.multipleOrganization.toggleAllSelection();
} // }
} // }
} }
}); });
}, },
...@@ -2631,49 +2646,36 @@ export default { ...@@ -2631,49 +2646,36 @@ export default {
vm.POST("portal/scope/v1/organization", req).then(res => { vm.POST("portal/scope/v1/organization", req).then(res => {
closeLoading(vm); closeLoading(vm);
if (res.code == "000000") { if (res.code == "000000") {
//console.log(res.data);
this.tableOrganization = res.data.organizationList; this.tableOrganization = res.data.organizationList;
this.totalOrganization = res.data.total; this.totalOrganization = res.data.total;
//console.log("changedOrganization", this.changedOrganization); vm.initOrganizationStatus();
let idList = operationData.getIdList(this.tableOrganization);
let intersect = operationData.getIntersect( // let idList = operationData.getIdList(this.tableOrganization);
idList, // let intersect = operationData.getIntersect(
this.changedOrganization // idList,
);
this.lookedOrganization = operationData.getUnion(
this.lookedOrganization,
idList
);
// this.changedOrganization2 = operationData.getDifference(
// this.lookedOrganization,
// this.changedOrganization // this.changedOrganization
// ); // );
let difference = operationData.getDifference( // this.lookedOrganization = operationData.getUnion(
idList,
this.changedOrganization2
);
// debugger;
//console.log('全部看过的：',this.lookedOrganization);
if (vm.checkTableState.multipleOrganization === "") {
// if (intersect.length == 0 && difference.length > 0) {
// this.initOrganizationStatus();
// }
this.initOrganizationChoose();
} else if (vm.checkTableState.multipleOrganization === true) {
let intersect2 = operationData.getIntersect(
idList,
this.changedOrganization
);
// console.log('intersect2',intersect2);
if (intersect2.length == 0) {
this.$refs.multipleOrganization.toggleAllSelection();
}
}
// this.changedOrganization2 = operationData.getDifference(
// this.lookedOrganization, // this.lookedOrganization,
// idList
// );
// let difference = operationData.getDifference(
// idList,
// this.changedOrganization2
// );
// if (vm.checkTableState.multipleOrganization === "") {
// this.initOrganizationChoose();
// } else if (vm.checkTableState.multipleOrganization === true) {
// let intersect2 = operationData.getIntersect(
// idList,
// this.changedOrganization // this.changedOrganization
// ); // );
// if (intersect2.length == 0) {
// this.$refs.multipleOrganization.toggleAllSelection();
// }
// }
} }
}); });
}, },
...@@ -3449,10 +3451,12 @@ export default { ...@@ -3449,10 +3451,12 @@ export default {
}); });
}, },
//v2.2教培更新 //v2.2教培更新
checkUpdate(data,flag) { checkUpdate(node,data) {
if(vm.status4Flag == 1 && flag == true) { let flag = -1;
console.log(data,flag,vm.status4Flag); flag = data.checkedKeys.indexOf(node.id);
vm.nowCheck = data; if(vm.status4Flag == 1 && flag >= 0) {
console.log(node,data,flag,vm.status4Flag);
vm.nowCheck = node;
vm.warnType = 0; vm.warnType = 0;
vm.dialogWarn = true; vm.dialogWarn = true;
// this.$refs.tree.setChecked(data,false) // this.$refs.tree.setChecked(data,false)
...@@ -3460,12 +3464,13 @@ export default { ...@@ -3460,12 +3464,13 @@ export default {
}, },
closeCheck() { closeCheck() {
vm.dialogWarn = false; vm.dialogWarn = false;
this.$refs.tree.setChecked(vm.nowCheck,false); this.$refs.tree.setChecked(vm.nowCheck,false,true);
for(let i=0;i<vm.tagsRegion.length;i++) { vm.initCheckList(vm.getTreeCheck());
if(vm.tagsRegion[i].key == vm.nowCheck.id) { // for(let i=0;i<vm.tagsRegion.length;i++) {
vm.tagsRegion.splice(i,1); // if(vm.tagsRegion[i].key == vm.nowCheck.id) {
} // vm.tagsRegion.splice(i,1);
} // }
// }
}, },
uploadOrganization(file) { uploadOrganization(file) {
console.log(file); console.log(file);
...@@ -3534,6 +3539,10 @@ export default { ...@@ -3534,6 +3539,10 @@ export default {
}, },
selectOrganization(selection, row) { selectOrganization(selection, row) {
console.log('select',selection,row) console.log('select',selection,row)
let flag = false;
for(let i=0;i<selection.length;i++) {
}
}, },
} }
}; };
......
src/views/system/item-role.vue
浏览文件 @ c1ac002e
...@@ -494,7 +494,7 @@ export default { ...@@ -494,7 +494,7 @@ export default {
let req = {}; let req = {};
req = this.formInline; req = this.formInline;
openLoading(vm); openLoading(vm);
vm.GET("portal/portalProjectOrRole/queryRoleList", req).then(res => { vm.GET("portal/v2/role/queryRoleList", req).then(res => {
closeLoading(vm); closeLoading(vm);
if (res.code == "000000") { if (res.code == "000000") {
vm.tableData = res.data.projectRoleInfoModels; vm.tableData = res.data.projectRoleInfoModels;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或