org

src/components/customerOrg/customerOrgTree.vue

@@ -4,7 +4,7 @@
       <el-input  placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
     </div>
     <div>
-      <el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops" 
+      <el-tree :data="customerOrg.customerOrgTree" :props="treeprops" 
         node-key="id" :filter-node-method="filterNode" :style="'overflow: scroll;width:200px;height:' +(window.pageHeight < 600 ? 465 : window.pageHeight - 135) + 'px;'"
         :default-expanded-keys="customerOrg.defaultExpandedKeys" 
         @node-click="treeclick" highlight-current ref="customerOrgTree">
@@ -33,7 +33,13 @@ export default {
   components: {},
   data() {
     return {
-      filterText:''
+      filterText:'',
+      treeprops: {
+        label: "label",
+        value: "id",
+        id: "id",
+        children: "treeChildren",
+      }, //树形组件的数据结构
     };
   },
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>

src/components/menuPage/MenuPageTree.vue

@@ -3,27 +3,25 @@
     <!-- <div style="margin:2px 2px 2px 2px;">
       <el-input  placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
     </div> -->
-    <div :style="'overflow: scroll;height:' +(window.pageHeight < 600 ? 480 : window.pageHeight - 110) + 'px;background-color: #fff;margin-top: 10px;'">
-      <el-tree :data="dataTransOpts.tableM.menu_info" :props="customerOrg.treeprops" 
-        node-key="id" :filter-node-method="filterNode"
-        :default-expanded-keys="customerOrg.defaultExpandedKeys" 
-        @node-click="treeclick" highlight-current ref="customerOrgTree">
+    <div
+      :style="'overflow: scroll;height:' + (window.pageHeight < 600 ? 480 : window.pageHeight - 110) + 'px;background-color: #fff;margin-top: 10px;'">
+      <el-tree :data="dataTransOpts.tableM.menu_info" :props="customerOrg.treeprops" node-key="id" :filter-node-method="filterNode"
+        :default-expanded-keys="customerOrg.defaultExpandedKeys" @node-click="treeclick" highlight-current
+        ref="customerOrgTree">
         <span class="custom-tree-node" slot-scope="{ node, data }">
-                  <div>
-                    <span class="treeicons">
-                      <!-- <i
+          <div>
+            <span class="treeicons">
+              <!-- <i
                         class="el-icon-document-remove"
                         v-if="data.parentId == null"
                       ></i> -->
-                      <img style="width:20px;height:20px;vertical-align: sub;" src="@/assets/images/order.png" v-if="!data.parentId"/>
-                    </span>
-                    <span
-                      :class="!data.parentId ? 'maxtitle' : 'mintitle'"
-                      >{{ node.label }}</span
-                    >
-                  </div>
-                </span>
-        </el-tree>
+              <img style="width:20px;height:20px;vertical-align: sub;" src="@/assets/images/order.png"
+                v-if="!data.parentId" />
+            </span>
+            <span :class="!data.parentId ? 'maxtitle' : 'mintitle'">{{ node.label }}</span>
+          </div>
+        </span>
+      </el-tree>
     </div>
   </div>
 </template>
@@ -37,21 +35,21 @@ export default {
   components: {},
   data() {
     return {
-      filterText:''
+      filterText: '',      
     };
   },
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
   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);
     }
   },
- 
+
 };
 </script>
 <style scoped>
 @import "../../assets/css/global.css";
 @import "../../assets/css/global_tree.css";
-:deep .el-tree-node>.el-tree-node__children{
+
+:deep .el-tree-node>.el-tree-node__children {
   overflow: visible;
 }
 </style>

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;
         }
       });

src/components/patientRegister/customerOrgTreeAll.vue

@@ -5,7 +5,7 @@
     </div>
     <div>
       <el-tree :style="'overflow: scroll;height:' + (window.pageHeight < 600 ? 465 : window.pageHeight - 135) + 'px;width:200px;'"
-        :data="patientRegister.customerOrgTreeAll" :props="customerOrg.treeprops" node-key="id"
+        :data="patientRegister.customerOrgTreeAll" :props="treeprops" node-key="id"
         :filter-node-method="filterNode" @node-click="treeclick" highlight-current ref="customerOrgTree">
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <div>
@@ -34,6 +34,12 @@ export default {
   data() {
     return {
       filterText: '',
+      treeprops: {
+        label: "label",
+        value: "id",
+        id: "id",
+        children: "treeChildren",
+      }, //树形组件的数据结构
     };
   },
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>

src/components/report/CusOrgOCX.vue

@@ -6,7 +6,7 @@
       </div>
       <div>
         <el-tree style="overflow: scroll;width: 200px;height:480px;" :data="patientRegister.customerOrgTreeAll"
-          :props="customerOrg.treeprops" @node-click="handleNode" :filter-node-method="filterNode"
+          :props="treeprops" @node-click="handleNode" :filter-node-method="filterNode"
           ref="customerOrgTree">
           <span class="custom-tree-node" slot-scope="{ node, data }">
             <div>
@@ -133,6 +133,12 @@ export default {
         customerOrgGroupIds: [],  //已选分组
         customerOrgGroupList: [],  //可选的分组
       }],
+      treeprops: {
+        label: "label",
+        value: "id",
+        id: "id",
+        children: "treeChildren",
+      }, //树形组件的数据结构
     };
   },
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>

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",