Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -13,9 +13,7 @@
           <td style="text-align:center;">
             姓名:
             <span style="display:inline-block;margin-left:10px;">
-              {{
-              patientInfo.name
-              }}
+              {{patientInfo.name}}
             </span>
           </td>
           <td style="text-align:center;">

src/xt_pages/user/patients.vue

@@ -80,10 +80,10 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
 
-      <upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>
+      
 
-      <div style="float:right;"
-      >
+      <div style="display:flex;align-items:center">
+        <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>
         <el-link target="_blank" href="https://kuyi.shengws.com/patient_template.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
@@ -96,6 +96,7 @@
 
 
         <el-button
+          style="margin-left:10px;"
           @click="generateLog()"
           class="filter-item"
           type="primary"

src/xt_pages/workforce/appointment.vue

@@ -50,13 +50,9 @@
 
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
-      <el-col :span="15" style="text-align: right;">
-        <div>
-          <schedule-upload-excel style="float:left;margin-right: -500px" :on-success='handleSuccess'
-                                 :before-upload="beforeUpload"></schedule-upload-excel>
-          <el-button v-if="isShow()" type="primary" size="small" @click="export_file()"
-                     :loading="downloadLoading"
-          >
+        <div style="display:flex;align-items:center">
+          <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' :before-upload="beforeUpload"></schedule-upload-excel>
+          <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
             导出模版
           </el-button>
 
@@ -72,7 +68,6 @@
           <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
           </el-button>
         </div>
-      </el-col>
     </div>
     <div class="app-container">
       <!-- <el-row>

src/xt_pages/workforce/template.vue

@@ -64,27 +64,28 @@
 
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <div style="display:flex;align-items:center">
+        <!-- <el-col :span="3" style="text-align: right;"> -->
+        <el-button v-loading="downloadLoading" v-if="template_mode&&(template_mode.mode == 1 || template_mode.mode == 2)"
+                  size="small" icon="el-icon-setting" type="primary" @click="import_file()">导出模版
+        </el-button>
 
-      <!-- <el-col :span="3" style="text-align: right;"> -->
-      <el-button v-loading="downloadLoading" v-if="template_mode&&(template_mode.mode == 1 || template_mode.mode == 2)"
-                 size="small" icon="el-icon-setting" type="primary" @click="import_file()">导出模版
-      </el-button>
 
+        <el-button
+          @click="generateLog()"
+          class="filter-item"
+          type="primary"
+          size="small"
+        >下载错误日志
+        </el-button>
 
-      <el-button
-        @click="generateLog()"
-        class="filter-item"
-        type="primary"
-        size="small"
-      >下载错误日志
-      </el-button>
+        <!--<upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>-->
+        <schedule-template-upload-excel style="margin-right:10px;" :on-success='handleSuccess'
+                                        :before-upload="beforeUpload"></schedule-template-upload-excel>
 
-      <!--<upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>-->
-      <schedule-template-upload-excel style="float:right;" :on-success='handleSuccess'
-                                      :before-upload="beforeUpload"></schedule-template-upload-excel>
 
-
-      <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
+        <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
+      </div>
       <!-- </el-col> -->
     </div>
     <div class="app-container">

src/xt_permission.js

@@ -12,19 +12,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();