From 368a7054d81b302b3b4bbd1fa2eb2faaa5018e8c Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Wed, 5 Jun 2024 19:28:50 +0800 Subject: [PATCH] org --- .../customerOrg/customerOrgTree.vue | 10 ++- src/components/menuPage/MenuPageTree.vue | 65 +++++++++---------- .../patientRegister/PatientRegisterEdit.vue | 4 +- .../patientRegister/customerOrgTreeAll.vue | 8 ++- src/components/report/CusOrgOCX.vue | 8 ++- src/store/index.js | 2 +- 6 files changed, 57 insertions(+), 40 deletions(-) diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue index 2ef873a..90c4523 100644 --- a/src/components/customerOrg/customerOrgTree.vue +++ b/src/components/customerOrg/customerOrgTree.vue @@ -4,7 +4,7 @@
- @@ -33,7 +33,13 @@ export default { components: {}, data() { return { - filterText:'' + filterText:'', + treeprops: { + label: "label", + value: "id", + id: "id", + children: "treeChildren", + }, //树形组件的数据结构 }; }, // diff --git a/src/components/menuPage/MenuPageTree.vue b/src/components/menuPage/MenuPageTree.vue index 80b6fac..88b3cb8 100644 --- a/src/components/menuPage/MenuPageTree.vue +++ b/src/components/menuPage/MenuPageTree.vue @@ -3,27 +3,25 @@ -
- +
+ -
- - - - - {{ node.label }} -
- - + + + {{ node.label }} +
+ +
@@ -37,21 +35,21 @@ export default { components: {}, data() { return { - filterText:'' + filterText: '', }; }, // computed: { - ...mapState(["window", "dataTransOpts", "customerOrg" ]), - - treeHeight(){ - let temp = this.window.pageHeaderHeight + this.window.pageMarginHeight + this.window.cardHeaderHeight + 32 + 20 - return this.window.pageHeight < 600 ? (600 - temp):(this.window.pageHeight - temp) + ...mapState(["window", "dataTransOpts", "customerOrg"]), + + treeHeight() { + let temp = this.window.pageHeaderHeight + this.window.pageMarginHeight + this.window.cardHeaderHeight + 32 + 20 + return this.window.pageHeight < 600 ? (600 - temp) : (this.window.pageHeight - temp) } }, //创建组件后 - created() { + created() { }, //挂载组件完成 @@ -64,9 +62,9 @@ export default { ...mapMutations(["setData"]), //获取体检单位列表树信息 - getMenuInfoTree() { + getMenuInfoTree() { getapi("/api/app/menuinfo/getmenuinfotreelist").then((res) => { - if(res.code != -1){ + if (res.code != -1) { this.dataTransOpts.tableM.menu_info = res.data tcdate(this.dataTransOpts.tableM.menu_info); } @@ -78,7 +76,7 @@ export default { this.dataTransOpts.tableS.menu_info.id = data.id; setTimeout(() => { this.dataTransOpts.refresh.menu_info.S++ - }, 20); + }, 20); }, //树过滤 @@ -90,26 +88,27 @@ export default { }, watch: { - "customerOrg.treeCurrentNodekey"(newVal,oldVal){ + "customerOrg.treeCurrentNodekey"(newVal, oldVal) { //console.log('watch:customerOrg.treeCurrentNodekey',newVal,oldVal) - if(newVal && newVal != oldVal){ + if (newVal && newVal != oldVal) { this.$nextTick(() => { this.$refs['customerOrgTree'].setCurrentKey(newVal); }) } - }, + }, - "filterText"(newVal,oldVal){ //过滤菜单 + "filterText"(newVal, oldVal) { //过滤菜单 this.$refs['customerOrgTree'].filter(newVal); } }, - + }; diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 6b678a6..61d7d58 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -977,14 +977,14 @@ export default { //体检类别 getapi("/api/app/medical-type/in-filter").then((res) => { - if (res.code == 1) { + if (res.code > -1) { this.dict.medicalType = res.data; } }); //人员类别 getapi("/api/app/personnel-type/in-filter").then((res) => { - if (res.code == 1) { + if (res.code > -1) { this.dict.personnelType = res.data; } }); diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue index a41cd7d..f8ac95d 100644 --- a/src/components/patientRegister/customerOrgTreeAll.vue +++ b/src/components/patientRegister/customerOrgTreeAll.vue @@ -5,7 +5,7 @@
@@ -34,6 +34,12 @@ export default { data() { return { filterText: '', + treeprops: { + label: "label", + value: "id", + id: "id", + children: "treeChildren", + }, //树形组件的数据结构 }; }, // diff --git a/src/components/report/CusOrgOCX.vue b/src/components/report/CusOrgOCX.vue index dbfcda9..1f6b59a 100644 --- a/src/components/report/CusOrgOCX.vue +++ b/src/components/report/CusOrgOCX.vue @@ -6,7 +6,7 @@
@@ -133,6 +133,12 @@ export default { customerOrgGroupIds: [], //已选分组 customerOrgGroupList: [], //可选的分组 }], + treeprops: { + label: "label", + value: "id", + id: "id", + children: "treeChildren", + }, //树形组件的数据结构 }; }, // diff --git a/src/store/index.js b/src/store/index.js index be292b5..3d31232 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -40,7 +40,7 @@ export default new Vuex.Store({ defaultExpandedKeys: [], //当前选中树的节点 treeCurrentNodekey: '', //当前选中树的节点 treeprops: { - label: "label", //displayName + label: "displayName", //displayName value: "id", id: "id", children: "treeChildren",