1、病人管理页面

src/styles/sidebar.scss

@@ -47,7 +47,7 @@
     }
     .el-menu {
       border: none;
-      min-height: 100%;
+      min-height: 110%;
       width: 100% !important;
     }
   }

src/views/layout/components/Navbar.vue

@@ -127,7 +127,7 @@ export default {
   top: 0;
   left: 0;
   right: 0;
-  // z-index: 2052;
+  z-index: 1;
   .nav-logo {
     width: 162px;
     display: flex;

src/views/layout/components/Sidebar/index.vue

@@ -12,7 +12,6 @@
       background-color="#304156"
       text-color="#bfcbd9"
       active-text-color="#409EFF"
-
     >
       <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"></sidebar-item>
     </el-menu>

src/views/layout/components/TagsView.vue

@@ -124,7 +124,7 @@ export default {
     border-bottom: 1px solid #d8dce5;
     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
     position: fixed;
-    // z-index: 2052;
+    z-index: 2;
     top: 60px;
     .tags-view-item {
       display: inline-block;

src/xt_pages/user/components/PatientForm.vue

@@ -36,8 +36,8 @@
               </el-col> -->
               <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="透析号 : " class="is-required">
-                    <el-input disabled v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 1%;" ></el-input> 
-                    <el-button style="width:70px;padding:10px 0;" disabled type="primary">自动生成</el-button>
+                    <el-input disabled v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input> 
+                    <el-button style="width:36%;padding:10px 0;" disabled type="primary">自动生成</el-button>
                 </el-form-item>
               </el-col>
             </template>
@@ -49,20 +49,21 @@
                   </el-select>
                 </el-form-item>
               </el-col> -->
-              <el-col :span="8" >
-                <el-form-item label="透析号 : " class="is-required" prop="dialysisNo" >
-                    <el-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 1%;" ></el-input> 
-                    <el-button style="width:70px;padding:10px 0;" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" @click="generatedialysisno">自动生成</el-button>
-                </el-form-item>
-              </el-col>
-            </template>
-            <el-col :span="8" :style="isEdit?'width:360px':''">
+              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;" >
                 <el-form-item label="性别 : " class="is-required" prop="gender" >
                   <el-radio-group v-model="form.gender" @change="changeGender">
                     <el-radio v-for="item in sexOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
                   </el-radio-group>
                 </el-form-item>
-            </el-col>
+              </el-col>
+              <el-col :span="8" >
+                <el-form-item label="透析号 : " class="is-required" prop="dialysisNo" >
+                    <el-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input> 
+                    <el-button style="width:36%;padding:10px 0;" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" @click="generatedialysisno">自动生成</el-button>
+                </el-form-item>
+              </el-col>
+            </template>
+            
             <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="出生日期 : "  class="is-required" prop="birth" >
                   <el-date-picker v-model="form.birth" type="date" placeholder="选择日期" :suffix-icon="'el-icon-menu'" @change="hadSelectBirth" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
@@ -78,7 +79,7 @@
                 <el-input v-model="form.homeTelephone" maxlength="20"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" :style="isEdit?'width:360px':''">
+            <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;" >
               <el-form-item label="患者来源 : " class="is-required" prop="source" >
                 <el-radio-group v-model="form.source">
                   <el-radio v-for="item in sourceOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
@@ -987,7 +988,7 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 
 .uploadHead {
-  margin-top: 25%;
+  // margin-top: 25%;
 }
 .uploadHeadBtn {
   width: 148px;
@@ -995,7 +996,7 @@ export default {
 }
 .el-form{
     .el-col-6,.el-col-8{
-    // width: 430px;
+    width: 430px;
     }
   .el-form-item {
     // margin-bottom: 17px !important;

src/xt_pages/user/components/PatientSidebar.vue

@@ -202,7 +202,7 @@
     float: left;
     bottom: 0;
     left: 0;
-    z-index: 99;
+    /* z-index: 99; */
     overflow: hidden;
   }
 

src/xt_permission.js

@@ -10,19 +10,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
 
   NProgress.start()