Merge remote-tracking branch 'origin/superman' into superman

src/views/layout/components/TagsView.vue

@@ -132,6 +132,7 @@ export default {
     position: fixed;
     z-index: 2004;
     top: 60px;
+    overflow-x: scroll;
     .tags-view-item {
       display: inline-block;
       position: relative;

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -205,14 +205,12 @@
     <el-dialog
       title="选择执行时间"
       :visible.sync="execTimeDialogVisible"
-      width="30%"
+      width="400px"
       @close="closeTimePanel"
-
       :show-close="isClose"
       :close-on-click-modal="isClose"
       :close-on-press-escape="isClose"
-
-      center>
+      >
       <el-date-picker
         v-model="execTime"
         format="yyyy-MM-dd HH:mm:00"

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="user-edit-group-advice">
-    <el-dialog title="新增医嘱" :visible.sync="groupAddFormVisible" width="854px">
+    <el-dialog title="新增医嘱" :visible.sync="groupAddFormVisible" width="700px">
       <el-form ref="groupForm" :rules="groupRules" :model="groupForm" label-width="90px">
 
         <el-row>
@@ -11,13 +11,14 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="开始时间 :" required prop="start_time">
+            <el-form-item label="开始时间 :" required prop="start_time" style="width:100%;">
               <el-date-picker
                 type="datetime"
                 format="yyyy-MM-dd HH:mm:ss"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="选择时间"
                 v-model="groupForm.start_time"
+                style="width:100%;"
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -41,7 +42,10 @@
           </el-col>
         </el-row>
 
-        <el-row style="margin:20px 60px;">
+        <el-row >
+          <el-col :span="2">
+            &nbsp;&nbsp;
+          </el-col>  
           <el-col :span="5">
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openAdviceTemplate()">选择医嘱模板
@@ -62,20 +66,8 @@
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openDeleteGroupAdvice()">删除医嘱内容
             </el-button>
-
           </el-col>
-
-          <!-- <el-col :span="1">&nbsp;</el-col>
-          <el-col :span="4">
-            <el-button
-              :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
-              @click="openGroupChild()"
-            >添加子药内容</el-button>
-          </el-col> -->
         </el-row>
-
-
         <el-row>
           <el-col :span="24">
             <el-table

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -37,9 +37,8 @@
           </el-col>
         </el-row>
 
-        <el-row style="margin-bottom: 20px">
-
-
+        <el-row>
+          <el-col :span="2">&nbsp;&nbsp;</el-col>          
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
@@ -48,39 +47,16 @@
             >选择医嘱模板
             </el-button>
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
-
-
           <el-col :span="5">
-            <!--<el-button-->
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
-            <!--type="primary"-->
-            <!--@click="openGroupAdvice(0)"-->
-            <!--&gt;新增医嘱内容</el-button>-->
-
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openGroupAdvice(0)">新增医嘱内容
             </el-button>
-
-
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
-
-
           <el-col :span="5">
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openGroupAdvice(1)">修改医嘱内容
             </el-button>
-
-            <!--<el-button-->
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
-            <!--type="primary"-->
-            <!--@click="openGroupAdvice(1)"-->
-            <!--&gt;修改医嘱内容</el-button>-->
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
-
-
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
@@ -89,16 +65,6 @@
             >删除医嘱内容
             </el-button>
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
-
-          <!-- <el-col :span="1">&nbsp;</el-col>
-          <el-col :span="4">
-            <el-button
-              :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
-              @click="openGroupChild()"
-            >添加子药内容</el-button>
-          </el-col> -->
         </el-row>
 
 
@@ -389,7 +355,7 @@
                 allow-create
                 :disabled="isChild"
                 placeholder="请选择(输入可搜索)"
-                style="width:90%"
+                style="width:100%"
               >
                 <el-option
                   v-for="item in deliveryWayOptions"
@@ -409,7 +375,7 @@
                 allow-create
                 :disabled="isChild"
                 placeholder="请选择(输入可搜索)"
-                style="width:90%"
+                style="width:100%"
               >
                 <el-option
                   v-for="item in executionFrequencyOptions"

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -40,49 +40,41 @@
           </el-col>
         </el-row>
         <el-row style="margin-bottom: 20px">
+          <el-col :span="2">&nbsp;</el-col>
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
               @click="openAdviceTemplate()"
+              round
             >选择医嘱模板
             </el-button>
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
+          
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
+              round
               @click="openGroupAdvice(0)"
             >新增医嘱内容
             </el-button>
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
+          
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
+              round              
               @click="openDeleteGroupAdvice()"
             >删除医嘱内容
             </el-button>
           </el-col>
-          <el-col :span="1">&nbsp;</el-col>
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
+              round              
               @click="openGroupAdvice(1)"
             >修改医嘱内容
             </el-button>
           </el-col>
-          <!-- <el-col :span="1">&nbsp;</el-col>
-          <el-col :span="4">
-            <el-button
-              :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              type="primary"
-              @click="openGroupChild()"
-            >添加子药内容</el-button>
-          </el-col> -->
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -374,7 +366,7 @@
                 allow-create
                 :disabled="isChild"
                 placeholder="请选择(输入可搜索)"
-                style="width:90%"
+                style="width:100%"
               >
                 <el-option
                   v-for="item in deliveryWayOptions"
@@ -394,7 +386,7 @@
                 allow-create
                 :disabled="isChild"
                 placeholder="请选择(输入可搜索)"
-                style="width:90%"
+                style="width:100%"
               >
                 <el-option
                   v-for="item in executionFrequencyOptions"

src/xt_pages/user/dialysisSolution.vue

@@ -132,7 +132,7 @@
     width="1010px">
     <el-form ref="addPlan" :model="addPlan" :rules="addPlanRules" label-width="160px">
       <el-row :gutter="20">
-        <el-col  :span="8" style="height:59px;" >
+        <el-col  :span="8"  >
             <el-form-item label="透析模式:" prop="mode" >
               <el-select v-model="addPlan.mode" @change="addPlanModeChange" :disabled="isEdit?true:false" >
                 <el-option v-for="item in modeOptions"  :label="item.name" :key="item.id" :value="item.id"></el-option>

src/xt_pages/user/doctorAdvice.vue

@@ -213,9 +213,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-
-                            <el-form-item label="开始时间 :" required prop="start_time">
-                                <el-date-picker type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  placeholder="选择时间" v-model="groupForm.start_time" ></el-date-picker>
+                            <el-form-item label="开始时间 :" required prop="start_time" style="width:100%;">
+                                <el-date-picker style="width:100%;" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  placeholder="选择时间" v-model="groupForm.start_time" ></el-date-picker>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -236,33 +235,22 @@
                         </el-col>
                     </el-row>
                     <el-row>
-                        <el-col :span="5">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="openAdviceTemplate()">选择医嘱模板</el-button>
-                        </el-col>
-                        <el-col :span="1">
-                          &nbsp;
+                        <el-col :span="2">
+                           &nbsp;
                         </el-col>
                         <el-col :span="5">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="openGroupAdvice(0)">新增医嘱内容</el-button>
-                        </el-col>
-                        <el-col :span="1">
-                          &nbsp;
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openAdviceTemplate()">选择医嘱模板</el-button>
                         </el-col>
                         <el-col :span="5">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="openDeleteGroupAdvice()">删除医嘱内容</el-button>
-                        </el-col>
-                        <el-col :span="1">
-                          &nbsp;
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openGroupAdvice(0)">新增医嘱内容</el-button>
                         </el-col>
                         <el-col :span="5">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="openGroupAdvice(1)">修改医嘱内容</el-button>
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round @click="openDeleteGroupAdvice()">删除医嘱内容</el-button>
                         </el-col>
-                        <!-- <el-col :span="1">
-                          &nbsp;
+                        <el-col :span="5">
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openGroupAdvice(1)">修改医嘱内容</el-button>
                         </el-col>
-                        <el-col :span="4">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="openGroupChild()">添加子药内容</el-button>
-                        </el-col> -->
+                        
                     </el-row>
                     <el-row>
                       <el-col :span="24">
@@ -482,7 +470,7 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="给药途径 :" prop="delivery_way">
-                                <el-select v-model="nameForm.delivery_way"  filterable clearable allow-create  :disabled='isChild' placeholder="请选择(输入可搜索)" style="width:90%" >
+                                <el-select v-model="nameForm.delivery_way"  filterable clearable allow-create  :disabled='isChild' placeholder="请选择(输入可搜索)" style="width:100%" >
                                     <el-option
                                     v-for="item in deliveryWayOptions"
                                     :key="item.id"
@@ -494,7 +482,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="执行频率 :" prop="execution_frequency">
-                                 <el-select v-model="nameForm.execution_frequency"  filterable clearable allow-create :disabled='isChild' placeholder="请选择(输入可搜索)" style="width:90%" >
+                                 <el-select v-model="nameForm.execution_frequency"  filterable clearable allow-create :disabled='isChild' placeholder="请选择(输入可搜索)" style="width:100%" >
                                     <el-option
                                     v-for="item in executionFrequencyOptions"
                                     :key="item.id"

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -1,6 +1,6 @@
 <template>
  <!-- top="5vh" -->
-    <el-dialog title="设置模板" width="50%" :visible.sync="visible" :before-close="_close">
+    <el-dialog title="设置模板" width="400px" :visible.sync="visible" :before-close="_close">
         <el-form :model="form" label-width="100px">
             <el-form-item label="模板启用数量">
                 <el-select v-model="form.mode" placeholder="">
@@ -10,7 +10,7 @@
                 </el-select>
             </el-form-item>
         </el-form>
-        <div style="text-align: right; padding-right: 25px; padding-top: 10px; padding-bottom: 10px;">
+        <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
             <el-button :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false" type="primary" @click="saveAction">保 存</el-button>
         </div>
@@ -49,7 +49,7 @@ export default {
             done()
         },
         clear: function() {
-            
+         
         },
         show() {
             this.clear()

src/xt_pages/workforce/components/template_table.vue

@@ -6,8 +6,8 @@
                     <el-button type="primary" size="small" @click="is_editing = true" icon="el-icon-edit-outline">编辑</el-button>
                 </div>
                 <div v-show="editable && is_editing">
-                    <el-button type="info" size="small" @click="is_editing = false" icon="el-icon-delete">取消</el-button>
-                    <el-button type="primary" size="small" icon="el-icon-document" @click="saveAction">保存</el-button>
+                    <el-button  size="small" @click="is_editing = false" icon="el-icon-refresh">取消</el-button>
+                    <el-button type="primary" size="small" icon="el-icon-setting" @click="saveAction">保存</el-button>
                 </div>
             </el-col>
         </el-row>

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()