Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/views/Home.vue

@@ -5,10 +5,8 @@
         <div class="navs">
           <!-- <div class="maintitle">神豚医疗信息系统</div> -->
           <div style="">
-            <el-dropdown  >
-              <span class="el-dropdown-link">
-                用户权限管理
-              </span>
+            <el-dropdown>
+              <span class="el-dropdown-link"> 用户权限管理 </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item
                   @click.native="$router.push({ path: '/role' })"
@@ -30,11 +28,9 @@
             </el-dropdown>
           </div>
           <!-- 基础字典 -->
-          <div style="margin-left: 15px" class="basicdictionany" >
+          <div style="margin-left: 15px" class="basicdictionany">
             <el-dropdown>
-              <span class="el-dropdown-link">
-                基础字典
-              </span>
+              <span class="el-dropdown-link"> 基础字典 </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item
                   @click.native="$router.push({ path: '/guide-type' })"
@@ -125,11 +121,9 @@
             </el-dropdown>
           </div>
           <!-- 收费设置 -->
-          <div class="feesettings" style="margin-left:20px">
+          <div class="feesettings" style="margin-left: 20px">
             <el-dropdown>
-              <span class="el-dropdown-link">
-                收费设置
-              </span>
+              <span class="el-dropdown-link"> 收费设置 </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item
                   @click.native="$router.push({ path: '/invoice-item-type' })"
@@ -143,11 +137,9 @@
             </el-dropdown>
           </div>
           <!--常用设置  -->
-          <div class="commonsettings" style="margin-left:20px">
+          <div class="commonsettings" style="margin-left: 20px">
             <el-dropdown>
-              <span class="el-dropdown-link">
-                常用设置
-              </span>
+              <span class="el-dropdown-link"> 常用设置 </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item
                   @click.native="$router.push({ path: '/item-type' })"
@@ -209,11 +201,9 @@
             </el-dropdown>
           </div>
           <!-- 体检登记 -->
-          <div class="examinationregistration" style="margin-left: 15px;">
+          <div class="examinationregistration" style="margin-left: 15px">
             <el-dropdown>
-              <span class="el-dropdown-link">
-                体检登记
-              </span>
+              <span class="el-dropdown-link"> 体检登记 </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item
                   @click.native="$router.push({ path: '/customerOrg' })"
@@ -247,11 +237,9 @@
             </el-dropdown>
           </div>
           <!-- 体检 -->
-          <div class="physicalexamination" style="margin-left: 15px;">
+          <div class="physicalexamination" style="margin-left: 15px">
             <el-dropdown>
-              <span class="el-dropdown-link">
-                体检
-              </span>
+              <span class="el-dropdown-link"> 体检 </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item
                   @click.native="$router.push({ path: '/doctorCheck' })"
@@ -266,10 +254,10 @@
           </div>
           <div class="btn">
             当前用户{{ user }}
-             <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
+            <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
             <el-dropdown>
               <span class="el-dropdown-link">
-                操作  <i class="el-icon-arrow-down el-icon--right"></i>
+                操作 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="logout"
@@ -526,7 +514,25 @@ export default {
 };
 </script>
 <style scoped>
-.el-dropdown-link{
+::v-deep .el-dropdown-menu{
+  overflow: scroll;
+  max-height: 200px;
+  overflow-x: hidden;
+}
+.el-header {
+  position: fixed;
+  /* top:0;
+  left: 0; */
+  width: 100%;
+  overflow: hidden;
+  overflow: auto;
+  z-index: 999;
+}
+.el-container {
+  /* position: fixed; */
+  width: 100%;
+}
+.el-dropdown-link {
   width: 100%;
   display: block;
   position: relative;
@@ -566,6 +572,7 @@ export default {
 }
 
 .el-main {
+  margin-top: 60px;
   height: calc(100vh, -70px);
 }
 
@@ -578,7 +585,7 @@ export default {
   /* margin-left: 60%; */
   /* position: relative;
   right: -70%; */
- margin-left:auto;
+  margin-left: auto;
 }
 
 .collapseandunfoled {

src/views/basic-dictionary/DiagnosisLevel.vue

@@ -136,7 +136,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 10%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <el-button
         type="primary"

src/views/basic-dictionary/ItemDefaultResult.vue

@@ -127,7 +127,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 10%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <el-button
         type="primary"

src/views/basic-dictionary/SampleContainer.vue

@@ -137,7 +137,7 @@
       </el-card>
     </div>
     <!-- //ann按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 10%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <el-button
         type="primary"

src/views/fee-settings/Diagnosis.vue

@@ -48,7 +48,7 @@
           </el-table-column>
         </el-table>
         <!--  -->
-        <span style="margin-top: 10px; padding: 5px; margin-left: 25.8%"
+        <span style="margin-top: 10px; padding: 5px; margin-left: 28.5%"
           >项目类别</span
         >
         <el-select

src/views/fee-settings/DiagnosisTemplate.vue

@@ -48,7 +48,7 @@
           </el-table-column>
         </el-table>
         <!--  -->
-        <span style="margin-top: 10px; padding: 5px; margin-left: 19.8%"
+        <span style="margin-top: 10px; padding: 5px; margin-left: 28.8%"
           >项目类别</span
         >
         <el-select
@@ -148,6 +148,7 @@
                 <el-input
                   v-model="form.displayName"
                   style="width: 100%"
+                  maxlength="1"
                 ></el-input> </el-form-item
             ></el-col>
           </el-row>
@@ -159,7 +160,7 @@
       </el-dialog>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 5%">
+    <div style="margin-left: 10px; margin-top: 3.5%">
       <el-button type="primary" @click="add">新增</el-button>
       <div style="margin-top: 10px">
         <el-button type="primary" @click="edit">编辑</el-button>
@@ -568,10 +569,12 @@ export default {
         }
       });
       //诊断模板包含的诊断
-      getapi(`/api/app/diagnosis-template-detail/diagnosis-template-in-diagnosis?DiagnosisTemplateId=${row.id}`).then(res=>{
-        this.rightdata=res.data
-        console.log(res,'诊断');
-      })
+      getapi(
+        `/api/app/diagnosis-template-detail/diagnosis-template-in-diagnosis?DiagnosisTemplateId=${row.id}`
+      ).then((res) => {
+        this.rightdata = res.data;
+        console.log(res, "诊断");
+      });
       console.log(row);
     },
     getlist() {

src/views/fee-settings/Item.vue

@@ -387,7 +387,7 @@
       </span>
     </el-dialog>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 5%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <el-button
         type="primary"