From a940326e869f5401da164b611b95733848d3b12a Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 29 Feb 2024 17:43:51 +0800
Subject: [PATCH] seo

---
 src/assets/css/global_tree.css                |  5 ++++
 .../customerOrg/customerOrgGroupAsbitem.vue   | 10 +++----
 .../customerOrg/customerOrgTree.vue           |  1 +
 src/components/menuPage/MenuPageSet.vue       |  1 +
 src/components/menuPage/MenuPageTree.vue      |  1 +
 .../patientRegister/customerOrgTreeAll.vue    | 26 +++++++++++++++++--
 src/components/report/CusOrgOCX.vue           |  1 +
 src/views/Home.vue                            |  2 +-
 src/views/customerOrg/customerOrgGroup.vue    | 14 +++++-----
 .../customerOrg/patientRegisterImport.vue     |  6 ++---
 10 files changed, 50 insertions(+), 17 deletions(-)
 create mode 100644 src/assets/css/global_tree.css

diff --git a/src/assets/css/global_tree.css b/src/assets/css/global_tree.css
new file mode 100644
index 0000000..25100a3
--- /dev/null
+++ b/src/assets/css/global_tree.css
@@ -0,0 +1,5 @@
+/* 树节点高度 */
+.el-tree-node__content {
+  height: 30px;  /* 默认值 35px */
+  line-height: 30px; /* 默认值 35px */
+}
\ No newline at end of file
diff --git a/src/components/customerOrg/customerOrgGroupAsbitem.vue b/src/components/customerOrg/customerOrgGroupAsbitem.vue
index 72bade9..3c96981 100644
--- a/src/components/customerOrg/customerOrgGroupAsbitem.vue
+++ b/src/components/customerOrg/customerOrgGroupAsbitem.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="display: flex; margin-top:5px;">
-    <div :style="'display: flex;width:' + (window.pageWidth - 45 - 110) + 'px;font-size:14px;'">
+    <div :style="'display: flex;width:' + (window.pageWidth - 25 - 110) + 'px;font-size:14px;'">
       <!--未选组合项目-->
       <div style="display: block; width:230px;">
         <div>
@@ -12,7 +12,7 @@
         </div>
         <div class="box">
           <el-table :data="dict.asbItem" border size="small"  highlight-current-row
-            :height="window.pageHeight < 668 ? 195:(window.pageHeight - 110 - 363)"
+            :height="window.pageHeight < 640 ? 195:(window.pageHeight - 110 - 335)"
             @row-dblclick="dbClickChoosedAsb" row-key="id"
             @selection-change="selectLeft" :row-class-name="handleRowClassName" 
             @row-click="chooseAsbItem">
@@ -47,7 +47,7 @@
       </div>
 
       <!--已选组合项目-->
-      <div :style="'display: block; width:' + (window.pageWidth - 230 - 120 - 45 - 110) + 'px;'">
+      <div :style="'display: block; width:' + (window.pageWidth - 230 - 120 - 25 - 110) + 'px;'">
         <div style="height:32px;">
           <div v-show="checkPagePriv(pagePriv.privs,'快速选择')">
             <span>快速选择</span>
@@ -63,7 +63,7 @@
         <div class="box">
           <el-table :data="customerOrgGroupAsbitems" border size="small"
             @selection-change="selectRight" highlight-current-row 
-            :height="window.pageHeight < 668 ? 195:(window.pageHeight - 110 - 363)"
+            :height="window.pageHeight < 640 ? 195:(window.pageHeight - 110 - 335)"
             :summary-method="getSummaries" show-summary           
             :row-class-name="handleRowClassName" @row-dblclick="removeAbs" 
             @row-click="removeAsbItem" ref="tableCustomerOrgGroupAsbitems">
@@ -992,7 +992,7 @@ export default {
 
 .box {  
   margin-top: 5px;
-  border: 1px solid #000;
+  /* border: 1px solid #000; */
 }
 
 .btnClass {
diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue
index aa16104..d65f5cf 100644
--- a/src/components/customerOrg/customerOrgTree.vue
+++ b/src/components/customerOrg/customerOrgTree.vue
@@ -180,6 +180,7 @@ export default {
 </script>
 <style scoped>
 @import "../../assets/css/global.css";
+@import "../../assets/css/global_tree.css";
 .treeicons {
   font-size: 20px;
   margin-right: 5px;
diff --git a/src/components/menuPage/MenuPageSet.vue b/src/components/menuPage/MenuPageSet.vue
index a63c33f..ec28178 100644
--- a/src/components/menuPage/MenuPageSet.vue
+++ b/src/components/menuPage/MenuPageSet.vue
@@ -243,5 +243,6 @@ export default {
 <style scoped>
 @import "../../assets/css/global.css";
 @import "../../assets/css/global_table.css";
+@import "../../assets/css/global_tree.css";
 
 </style>
diff --git a/src/components/menuPage/MenuPageTree.vue b/src/components/menuPage/MenuPageTree.vue
index 6279d8b..46f69d5 100644
--- a/src/components/menuPage/MenuPageTree.vue
+++ b/src/components/menuPage/MenuPageTree.vue
@@ -87,4 +87,5 @@ export default {
 </script>
 <style scoped>
 @import "../../assets/css/global.css";
+@import "../../assets/css/global_tree.css";
 </style>
diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue
index 166e0bc..8a59858 100644
--- a/src/components/patientRegister/customerOrgTreeAll.vue
+++ b/src/components/patientRegister/customerOrgTreeAll.vue
@@ -6,7 +6,23 @@
     <div :style="'overflow: scroll;height:' +(window.pageHeight < 600 ? 430 : window.pageHeight - 170) + 'px;'">
       <el-tree :data="patientRegister.customerOrgTreeAll" :props="customerOrg.treeprops" 
         node-key="id" :filter-node-method="filterNode"        
-        @node-click="treeclick" highlight-current ref="customerOrgTree"/>
+        @node-click="treeclick" highlight-current ref="customerOrgTree">
+        <span class="custom-tree-node" slot-scope="{ node, data }">
+          <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 == null"/>
+            </span>
+            <span
+              :class="data.parentId == null ? 'maxtitle' : 'mintitle'"
+              >{{ node.label }}
+            </span>
+          </div>
+        </span>
+      </el-tree>
     </div>
   </div>
 </template>
@@ -82,4 +98,10 @@ export default {
   },
 };
 </script>
-<style></style>
+<style scoped>
+@import "../../assets/css/global_tree.css";
+.treeicons {
+  font-size: 20px;
+  margin-right: 5px;
+}
+</style>
diff --git a/src/components/report/CusOrgOCX.vue b/src/components/report/CusOrgOCX.vue
index ce55cf9..3a30221 100644
--- a/src/components/report/CusOrgOCX.vue
+++ b/src/components/report/CusOrgOCX.vue
@@ -405,5 +405,6 @@ export default {
 @import "../../assets/css/global_table.css";
 @import "../../assets/css/global_input.css";
 @import "../../assets/css/global.css";
+@import "../../assets/css/global_tree.css";
 
 </style>
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 975d9d7..3715942 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -18,7 +18,7 @@
             <div v-for="menu in menuPriv" :key="menu.id"          
               :class="className == menu.displayName ? `actived ${menu.displayName}`:menu.displayName">
               <el-dropdown @command="handleCommand">
-                <span class="el-dropdown-link" style="margin-left: 10px">{{ menu.displayName }}</span>
+                <span class="el-dropdown-link" style="margin:0 5px;">{{ menu.displayName }}</span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item v-for="page in menu.treeChildren" :key="page.id"
                     :command="beforeHandleCommand(menu.displayName, page.routeUrl)" class="dropdownmain">
diff --git a/src/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue
index 5c9a7fd..316e09b 100644
--- a/src/views/customerOrg/customerOrgGroup.vue
+++ b/src/views/customerOrg/customerOrgGroup.vue
@@ -4,7 +4,7 @@
       <div slot="header">单位分组</div>
       <!--分组信息-->
       <div style="display: flex;font-size:14px;">
-        <div :style="'display: block;width:' + (window.pageWidth - 45 - 110) + 'px;'">
+        <div :style="'display: block;width:' + (window.pageWidth - 25 - 110) + 'px;'">
           <div style="display: flex">
             <div>
               <span>体检单位：</span>
@@ -112,14 +112,14 @@
                   }}
                 </template>
               </el-table-column>
-              <el-table-column label="操作">
+              <el-table-column label="操作" align="center">
                 <template>
                   <el-tag
                     class="move"
-                    style="cursor: move; margin-left: 15px"
+                    style="cursor: move;"
                     draggable="true"
                   >
-                    <i class="el-icon-d-caret" style="width: 1rem; height: 1rem"></i>
+                    <i class="el-icon-d-caret"></i>
                   </el-tag>
                 </template>
               </el-table-column>
@@ -232,7 +232,7 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button @click="dialogVisible = false">关闭</el-button>
         <!--
         <el-button type="success" @click="computePrice">同比折算组合项目价格</el-button>
         -->
@@ -646,7 +646,9 @@ export default {
               console.log('this.formOri.price != this.form.price',this.formOri.price,this.form.price)
               if(this.formOri.price != this.form.price){                
                 return getapi(`/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${customerOrgGroupId}`)
-              }              
+              }else{
+                this.dialogVisible = false;
+              }             
             }            
           }).then(res =>{
             if(res && res.code != -1){              
diff --git a/src/views/customerOrg/patientRegisterImport.vue b/src/views/customerOrg/patientRegisterImport.vue
index 807f909..f821e41 100644
--- a/src/views/customerOrg/patientRegisterImport.vue
+++ b/src/views/customerOrg/patientRegisterImport.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card>
       <div slot="header">批量预登记</div>
-      <div style="display: flex;margin-bottom: 10px;justify-content:space-between;">
+      <div style="display: flex;margin-bottom: 5px;justify-content:space-between;">
         <div></div>
         <div style="display: flex;">
           <div v-show="checkPagePriv(pagePriv.privs,'下载导入模版')" >
@@ -18,7 +18,7 @@
       </div>
       <div id="tableData">
         <el-table :data="tableData" border  v-if="mode=='10'" :row-class-name="importRowClassName"
-          :height="window.pageHeight < 600 ? 405 : (window.pageHeight - 195)"
+          :height="window.pageHeight < 600 ? 440 : (window.pageHeight - 160)"
           highlight-current-row size="small" :summary-method="getSummaries" show-summary>
           <el-table-column type="index" label="序号" width="40" align="center"/>
           <el-table-column prop="importState" label="导入状态" min-width="80" sortable/>          
@@ -27,7 +27,7 @@
             :label="item.dataLabel || item.dispLabel" min-width="100"/>
         </el-table>
         <el-table :data="tableData" border  v-if="mode=='20'" :row-class-name="importRowClassName"
-          :height="window.pageHeight < 600 ? 405 : (window.pageHeight - 195)"
+          :height="window.pageHeight < 600 ? 440 : (window.pageHeight - 160)"
           highlight-current-row size="small" >
           <el-table-column type="index" label="序号" width="40" align="center"/>
           <el-table-column prop="importState" label="导入状态" min-width="80" sortable/>