From 7fefee00f94f1760c8827c9f69cc1401c1c1bf38 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Sat, 22 Jun 2024 23:17:07 +0800 Subject: [PATCH] forPregnantFlag --- .../patientRegister/customerOrgTreeAll.vue | 55 +- .../patientRegister/customerOrgTreeAllBak.vue | 193 ++++ src/components/report/BtnReport.vue | 2 +- src/views/fee-settings/Asbitem.vue | 874 +++++------------- 4 files changed, 455 insertions(+), 669 deletions(-) create mode 100644 src/components/patientRegister/customerOrgTreeAllBak.vue diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue index 6312ddb..985c52f 100644 --- a/src/components/patientRegister/customerOrgTreeAll.vue +++ b/src/components/patientRegister/customerOrgTreeAll.vue @@ -7,7 +7,7 @@ + @node-click="treeclick" highlight-current ref="customerOrgTree" :load="loadNode" lazy>
@@ -40,13 +40,14 @@ export default { value: "id", id: "id", children: "treeChildren", + isLeaf: "isLeaf" }, //树形组件的数据结构 LocalConfig: { patientRegister: { dispCustomerOrgCode: 'N', // 人员登记列表--单位树是否显示 customerOrgCode } }, - customerOrgTreeAll:[] + customerOrgTreeAll: [] }; }, // @@ -68,10 +69,36 @@ export default { //挂载组件完成 mounted() { //获取体检单位列表树信息 - this.getCustomerOrgTree(); + // this.getCustomerOrgTree(); + this.getCustomerOrgChild(null) + .then(res => { + this.customerOrgTreeAll = res + this.patientRegister.customerOrgTreeAll = res + // console.log('this.customerOrgTreeAll', this.customerOrgTreeAll) + }) }, methods: { + + getCustomerOrgChild(parentId) { + return new Promise((resolve, reject) => { + postapi('/api/app/CustomerOrg/GetCustomerOrgByParentId', { parentId }) + .then(res => { + if (res.code > -1) { + res.data.forEach(e => { + e.isLeaf = e.isChild == 'Y' ? false : true + }); + let treeData = reMadeOrgTree(deepCopy(res.data), this.LocalConfig.patientRegister.dispCustomerOrgCode); + resolve(treeData) + } + }) + .catch(err => { + reject(err) + }) + }) + + }, + //获取体检单位列表树信息 getCustomerOrgTree() { getapi("/api/app/customerorg/getbycodeall").then((res) => { @@ -97,10 +124,20 @@ export default { // } // }); // }, + loadNode(node, resolve) { + // console.log('node', node) + if (node && node.data && node.data.id) { + this.getCustomerOrgChild(node.data.id).then(res => { + resolve(res) + }).catch(err => { + resolve([]) + }) + } + }, // 节点右击事件 nodeContextmenu(event, data, node, ids) { - // console.log('event,data,node,ids', event, data, node, ids) + console.log('event,data,node,ids', event, data, node, ids) if (data.id == this.dict.personOrgId) return let items = [ @@ -132,6 +169,7 @@ export default { // 树节点排序 treeSort(data, sortType) { + console.log('data', data) // if (data.parentId) { // this.$message.warning({ showClose: true, message: "请选择一级单位" }) // return @@ -139,7 +177,14 @@ export default { // console.log('data,sortType',data,sortType) putapi(`/api/app/customerorg/updatemanysort?id=${data.id}&SortType=${sortType}`).then(res => { if (res.code > -1) { - this.getCustomerOrgTree() + // this.getCustomerOrgTree() + this.getCustomerOrgChild(data.parentId).then(res => { + data.treeChildren = res + if(data.parentId == null){ + this.customerOrgTreeAll = res + this.patientRegister.customerOrgTreeAll = res + } + }) } }) }, diff --git a/src/components/patientRegister/customerOrgTreeAllBak.vue b/src/components/patientRegister/customerOrgTreeAllBak.vue new file mode 100644 index 0000000..6312ddb --- /dev/null +++ b/src/components/patientRegister/customerOrgTreeAllBak.vue @@ -0,0 +1,193 @@ + + + diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue index 73c2f64..75e32d0 100644 --- a/src/components/report/BtnReport.vue +++ b/src/components/report/BtnReport.vue @@ -25,7 +25,7 @@
- diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue index 168288c..f3280ec 100644 --- a/src/views/fee-settings/Asbitem.vue +++ b/src/views/fee-settings/Asbitem.vue @@ -7,44 +7,21 @@ 组合项目
- - + +
-
+
- +
@@ -52,11 +29,8 @@ class="el-icon-document-remove" v-if="data.parentId == null" > --> - + {{ node.label @@ -69,50 +43,29 @@
-
- +
+ - + - +