seo

src/components/common/LocalConfig.vue

@@ -49,11 +49,16 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item label="启用人名查重">
                 <el-checkbox v-model="LocalConfig.patientRegister.findPatientByName" size="small" />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="单位树显示编码">
+                <el-checkbox v-model="LocalConfig.patientRegister.dispCustomerOrgCode" true-label="Y" false-label="N" size="small" />
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
       </el-tab-pane>
@@ -108,6 +113,7 @@ export default {
           immediateToHisCharge: true,  // 人员登记保存后，立即发送收费申请
           findPatientByName:true, // 人员登记，启有人名查询
           printGuideLabel: ["guide", "pacs", "lis"], // 保存后打印指引单与条码
+          dispCustomerOrgCode:'N', // 人员登记列表--单位树是否显示 customerOrgCode
         },
         lisLabel: { // 检验条码打印
           MarginTop: 56, //

src/components/customerOrg/customerOrgEdit.vue

@@ -20,8 +20,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="简称/别名" prop="shortName">
-              <el-input class="enterToTab" v-model="form.shortName" placeholder="请输入单位简称/别名"
+            <el-form-item label="单位简称" prop="shortName">
+              <el-input class="enterToTab" v-model="form.shortName" placeholder="请输入单位简称"
                 :disabled="customerOrg.oprStatus ? false : true" />
             </el-form-item>
           </el-col>
@@ -344,7 +344,7 @@ export default {
           let node = {
             id: body.id,
             displayName: body.displayName,
-            label:(body.shortName ? body.shortName + '--':'') + body.displayName,
+            label:(body.customerOrgCode ? body.customerOrgCode + ' ':'') + body.displayName,
             parentId: body.parentId,
           };
 
@@ -380,7 +380,7 @@ export default {
             body.id
           );
           node2.displayName = body.displayName;
-          node2.label = (body.shortName ? body.shortName + '--':'') + body.displayName
+          node2.label = (body.customerOrgCode ? body.customerOrgCode + ' ':'') + body.displayName
           break;
 
         case "delete":

src/components/customerOrg/customerOrgTree.vue

@@ -4,18 +4,17 @@
       <el-input placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
     </div>
     <div>
-      <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" 
+      <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-contextmenu="nodeContextmenu"
         @node-click="treeclick" highlight-current ref="customerOrgTree">
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <div>
             <span class="treeicons">
-              <img style="width:20px;height:20px;vertical-align: sub;" src="@/assets/images/order.png" v-if="!data.parentId"/>
+              <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 :class="!data.parentId ? 'maxtitle' : 'mintitle'">{{ node.label }}
             </span>
           </div>
         </span>
@@ -35,7 +34,7 @@ export default {
     return {
       filterText: '',
       treeprops: {
-        label: "label",
+        label: "displayName",  // label/displayName
         value: "id",
         id: "id",
         children: "treeChildren",
@@ -117,6 +116,12 @@ export default {
 
     },
 
+    // 节点右击事件
+    nodeContextmenu(event, data, node, ids) {
+      console.log('event,data,node,ids', event, data, node, ids)
+      
+    },
+
     //树过滤
     filterNode(value, data) {
       //console.log(value,data)
@@ -145,10 +150,12 @@ export default {
 <style scoped>
 @import "../../assets/css/global.css";
 @import "../../assets/css/global_tree.css";
+
 .treeicons {
   font-size: 20px;
   margin-right: 5px;
 }
+
 :deep .el-tree-node>.el-tree-node__children {
   overflow: visible;
 }

src/components/patientRegister/customerOrgTreeAll.vue

@@ -40,6 +40,11 @@ export default {
         id: "id",
         children: "treeChildren",
       }, //树形组件的数据结构
+      LocalConfig: {
+        patientRegister: {
+          dispCustomerOrgCode:'N', // 人员登记列表--单位树是否显示 customerOrgCode
+        }
+      }
     };
   },
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
@@ -47,7 +52,16 @@ export default {
     ...mapState(["window", "dict","dataTransOpts","customerOrg", "patientRegister"]),
   },
   //创建组件后
-  created() { },
+  created() {
+    try {
+      let LocalConfig = JSON.parse(window.localStorage.getItem('LocalConfig'))
+      if (LocalConfig && LocalConfig.patientRegister) {
+        if (LocalConfig.patientRegister.dispCustomerOrgCode) this.LocalConfig.patientRegister.dispCustomerOrgCode = LocalConfig.patientRegister.dispCustomerOrgCode       
+      }
+    } catch (error) {
+      console.log("window.localStorage.getItem('LocalConfig')", error)
+    }
+  },
 
   //挂载组件完成
   mounted() {
@@ -61,10 +75,9 @@ export default {
       getapi("/api/app/customerorg/getbycodeall").then((res) => {
         // console.log("res.data", res.data);
         if (res.code > -1){
-          this.patientRegister.customerOrgTreeAll = reMadeOrgTree(deepCopy(res.data));
+          this.patientRegister.customerOrgTreeAll = reMadeOrgTree(deepCopy(res.data),this.LocalConfig.patientRegister.dispCustomerOrgCode);
           // tcdate(this.patientRegister.customerOrgTreeAll)
         }        
-        
       });
     },
 
@@ -86,7 +99,9 @@ export default {
     filterNode(value, data) {
       //console.log(value,data)
       if (!value) return true;
-      return data['displayName'].indexOf(value) !== -1 || data['simpleCode'].indexOf(value.toUpperCase()) !== -1;
+      return data['displayName'].indexOf(value) > -1 || data['simpleCode'].indexOf(value.toUpperCase()) > -1
+      || data['shortName'].indexOf(value.toUpperCase()) > -1 || data['customerOrgCode'].indexOf(value.toUpperCase()) > -1
+      ;
     },
     
     //点击树节点

src/components/report/CusOrgOCX.vue

@@ -134,7 +134,7 @@ export default {
         customerOrgGroupList: [],  //可选的分组
       }],
       treeprops: {
-        label: "label",
+        label: "displayName",  // label/displayName
         value: "id",
         id: "id",
         children: "treeChildren",

src/utlis/proFunc.js

@@ -12,9 +12,13 @@ function tcdate(date) {
 exports.tcdate = tcdate;
 
 // 单位树节点，重新组装
-function reMadeOrgTree(treeData){
+function reMadeOrgTree(treeData,dispCustomerOrgCode){
   treeData.forEach(e => {
-    e.label = (e.shortName ? e.shortName + '--':'') + e.displayName        
+    if(dispCustomerOrgCode == 'Y'){
+      e.label = (e.customerOrgCode ? e.customerOrgCode + '--':'') + e.displayName
+    }else{
+      e.label = e.displayName
+    }            
     if (e.treeChildren.length == 0) {
       delete e.treeChildren
     }else{