Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/bulletinBoard.vue

       }
     },
     created() {
-        // this.orgname = xtuser.org.org_name;
-        this.orgname = "遂溪方济医院";
+        var xtuser = this.$store.getters.xt_user
+        this.orgname = xtuser.org.org_name;
+        // this.orgname = "遂溪方济医院";
         this.modeOptions = this.$store.getters.treatment_mode;
         this.initData();
     },
                   return false;
               } else {
                   if(r.data.boards.length==0) {
-                      console.log("getBoards this.currentPage", this.currentPage);
                       this.currentPage = 1;
                       this.getBoards();
                   }else {

src/xt_pages/dialysis/dialysisPrintOrder.vue

 </template>
 
 <script>
-  import { getDialysisRecord } from '@/api/dialysis'
+import { getDialysisRecord } from '@/api/dialysis'
 import { getDataConfig } from '@/utils/data'
 import { jsGetAge, uParseTime } from '@/utils/tools'
 import LabelBox from './printItem/LabelBox'
-  import print from 'print-js'
+import print from 'print-js'
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
 export default {

src/xt_pages/qcd/dialysisTotal.vue

     return {
       crumbs:[
         {path:false, name:'科室质控'},
-        {path:'/qcd/dialysistotal', name:'透析总量'},
+        {path:false, name:'透析总量'},
       ],
       total: 0,
       totitle:'全部',

src/xt_pages/qcd/outcomeIndicators/query.vue

             <el-input v-model="listQuery.search" placeholder="姓名/透析号"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="onSearch">搜索</el-button>
+            <el-button type="primary" @click="onSearch"  icon="el-icon-search">搜索</el-button>
           </el-form-item>
         </el-form>
       </div>

src/xt_pages/qcd/patientAnalysis/person/components/personInfo.vue

 }
 </script>
 <style scoped>
+.patient-info-container {
+  margin: 10px 0px;
+}
 .patient-info-container .patient-info {
-    font-size: 20px;
-    font-weight: bold;
+    font-size: 16px;
 }
 </style>
 

src/xt_pages/qcd/patientAnalysis/total.vue

             <el-input v-model="listQuery.search" placeholder="姓名/透析号"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="onSearch">搜索</el-button>
+            <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
           </el-form-item>
         </el-form>
       </div>

src/xt_pages/role/admin.vue

   </div>
   <div class="app-container">
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" style="width:100%;" ref="table" border :data="admins" v-loading="is_loading_admins">
-      <el-table-column label="用户名" prop="user_name" min-width="160"></el-table-column>
-      <el-table-column label="最后登录IP" prop="ip" min-width="150"></el-table-column>
-      <el-table-column label="最后登录时间" prop="last_login_time" min-width="170">
+      <el-table-column label="用户名" prop="user_name" min-width="160" align="center"></el-table-column>
+      <el-table-column label="最后登录IP" prop="ip" min-width="150" align="center"></el-table-column>
+      <el-table-column label="最后登录时间" prop="last_login_time" min-width="170" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.last_login_time == 0 ? '' : (_parseTime(scope.row.last_login_time, '{y}-{m}-{d} {h}:{i}'))}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="角色" prop="role_name" min-width="160"></el-table-column>
-      <el-table-column label="职称" prop="title_name" min-width="160"></el-table-column>
-      <el-table-column label="状态" min-width="100">
+      <el-table-column label="角色" prop="role_name" min-width="160" align="center"></el-table-column>
+      <el-table-column label="职称" prop="title_name" min-width="160" align="center"></el-table-column>
+      <el-table-column label="状态" min-width="100" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.status == 1" style="color: #67C23A; font-size:20px;">
             <li class="el-icon-success"></li>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="120">
+      <el-table-column label="操作" width="120" align="center">
         <template slot-scope="scope">
           <!-- <router-link :to="{ path:'/role/admin/edit', query:{ id:scope.row.user_id }}"> -->
             <el-tooltip class="item" effect="dark" content="编辑" placement="top">

src/xt_pages/role/role.vue

   </div>
   <div class="app-container">
     <el-table :data="roles" v-loading="loading_roles" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
-      <el-table-column label="角色名称" prop="name" min-width="20%"></el-table-column>
-      <el-table-column label="角色描述" prop="intro" min-width="25%"></el-table-column>
-      <el-table-column label="状态" min-width="15%">
+      <el-table-column label="角色名称" prop="name" min-width="20%" align="center"></el-table-column>
+      <el-table-column label="角色描述" prop="intro" min-width="25%" align="center"></el-table-column>
+      <el-table-column label="状态" min-width="15%" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.status == 1" style="color: #67C23A; font-size:20px;">
             <li class="el-icon-success"></li>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="180">
+      <el-table-column label="操作" width="180" align="center">
         <template slot-scope="scope">
           <router-link :to='{ path:"/role/perview", query:{ id:scope.row.id }}'>
             <el-tooltip class="item" effect="dark" content="权限设置" placement="top">

src/xt_pages/sign/index.vue

         <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
     <div class="app-container sign-and-weigh-box">
-        <el-row :gutter="20">
-            <el-col :span="7">
+        <el-row :gutter="24">
+            <el-col :span="8">
                 <div class="dataTitle">患者列表</div>
                 <div style="margin-bottom: 10px;">
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>
                     </el-select>
                 </div>
                 <el-table  :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" max-height="300" @current-change="handleCurrentChange">  
-                    <el-table-column type="index" label="序号" min-width="30" align="center"></el-table-column>
-                   <el-table-column prop="name" label="姓名" min-width="30" align="center">
+                    <el-table-column type="index" label="序号" width="50px" align="center"></el-table-column>
+                    <el-table-column prop="name" label="姓名" min-width="20" align="center">
                        <template slot-scope="scope">
                             {{scope.row.name}}({{scope.row.dialysis_no}})
                         </template> 
                 </el-table>
             </el-col>
 
-            <el-col :span="17">
+            <el-col :span="16">
                 <div class="dataTitle">患者信息</div>
                 <el-form class="information" label-position="left">
-                   <div class="span"><span class="span">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span></div>
-                   <div class="patient-app-container">
-                      <span class="button"><el-button  @click="change()">修改</el-button></span>
-                    </div>
+                  <div class="inforTitle">
+                  <el-button  @click="change()" style="float:right;">修改</el-button>
+                   <span class="name">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span>
+                   </div>   
                     <div class="border"></div>
-                    <div style="margin-bottom:20px;color:rgb(96,96,96)">
+                    <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
                     透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>
                     </div>
-                    <div style="margin-bottom:12px;color:rgb(96,96,96)">
+                    <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
                      体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
                      脉搏(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
                      呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
                      血压(mmHg):&nbsp;<el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input><span> / </span> <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
                     </div>
                     <div class="border"></div>  
-                    <div style="margin-bottom:20px;color:rgb(96,96,96)">
+                    <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
                      透后称重(kg):&nbsp;<el-input v-model="weigh_infor.weight_after" style="width:200px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                      干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     </div> 
-                    <div style="margin-bottom:12px;color:rgb(96,96,96)">
+                    <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
                       体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
                       脉搏(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
                       呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
                       血压(mmHg):&nbsp;<el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input> <span> / </span><el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
                     </div>               
-                    <!-- <el-row :gutter="20">
-                    </el-row>
-                    <el-row :gutter="20">
-                        <el-col :span="5">
-                            <el-form-item label="脉搏(次/分):" label-width="90px">
-                                <el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row> -->
-                    
+                   
                     <div class="border"></div>
                     <div v-if="show">
                     <el-row :gutter="20">
       //     dialysis_no:'',
       // };
       this.disa = true
+      this.show=false
       this.weigh_form.choose = true
       this.weigh_form.name = row.name
       this.weigh_form.dialysis_no = row.dialysis_no
         if (response.data.data.patientlist != null) {
           var patientlist = response.data.data.patientlist
           this.weigh_list.dry_weight = patientlist.dry_weight
+          console.log("干体重:"+this.weigh_list.dry_weight)
+          if(this.weigh_list.dry_weight == 0){
+              this.weigh_list.dry_weight = ""
+          }
           this.weigh_list.weight_before = patientlist.weight_before
+          if(this.weigh_list.weight_before == 0){
+              this.weigh_list.weight_before = ""
+          }
           this.weigh_list.temperature = patientlist.temperature
+          if(this.weigh_list.temperature == 0){
+              this.weigh_list.temperature = ""
+          }
           this.weigh_list.pulse_frequency = patientlist.pulse_frequency
+          if(this.weigh_list.pulse_frequency == 0){
+              this.weigh_list.pulse_frequency = ""
+          }
           this.weigh_list.breathing_rate = patientlist.breathing_rate
+          if(this.weigh_list.breathing_rate == 0){
+              this.weigh_list.breathing_rate = ""
+          }
           this.weigh_list.systolic_blood_pressure = patientlist.systolic_blood_pressure
+          if(this.weigh_list.systolic_blood_pressure == 0){
+             this.weigh_list.systolic_blood_pressure = ""
+          }
           this.weigh_list.diastolic_blood_pressure = patientlist.diastolic_blood_pressure
+          if(this.weigh_list.diastolic_blood_pressure == 0){
+               this.weigh_list.diastolic_blood_pressure = ""
+          }
         }
       })
     },
           var patientinfor = response.data.data.patientinfor
           console.log(patientinfor)
           this.weigh_infor.dry_weight = patientinfor.dry_weight
+          if(this.weigh_infor.dry_weight == 0){
+              this.weigh_infor.dry_weight = ""
+          }
+
           this.weigh_infor.weight_after = patientinfor.weight_after
-          console.log(patientinfor.weight_after)
+          if(this.weigh_infor.weight_after == 0){
+              this.weigh_infor.weight_after = ""
+          }
+         
           this.weigh_infor.temperature = patientinfor.temperature
+          if(this.weigh_infor.temperature == 0){
+               this.weigh_infor.temperature = ""
+          }
           this.weigh_infor.pulse_frequency = patientinfor.pulse_frequency
+          if(this.weigh_infor.pulse_frequency == 0 ){
+              this.weigh_infor.pulse_frequency = ""
+          }
           this.weigh_infor.breathing_rate = patientinfor.breathing_rate
+          if(this.weigh_infor.breathing_rate == 0){
+              this.weigh_infor.breathing_rate = ""
+          }
           this.weigh_infor.systolic_blood_pressure = patientinfor.systolic_blood_pressure
+          if(this.weigh_infor.systolic_blood_pressure == 0){
+              this.weigh_infor.systolic_blood_pressure = ""
+          }
+
           this.weigh_infor.diastolic_blood_pressure = patientinfor.diastolic_blood_pressure
+           if(this.weigh_infor.diastolic_blood_pressure == 0){
+              this.weigh_infor.diastolic_blood_pressure = ""
+           }
+
         }
       })
     },
 
 <style rel="stylesheet/css" lang="scss" scoped>
 .information {
-    border: 1px #dcdfe6 solid;
+    border: 1px #EBEEF5 solid;
     padding: 30px 20px 30px 20px;
 
     .border {
 
 <style>
 .sign-and-weigh-box .sign-and-weigh-box-patients .cell{
-    font-size: 12px;
+    font-size: 14px;
 }
 
 .sign-and-weigh-box .sign-and-weigh-box-patients .current-row>td{
 
   .button{
       float: right;
-      margin-bottom:0px
+      margin-bottom:0px;
   }
 
-  .patient-app-container{
-
-    line-height: 20px;
+  .inforTitle{
+    line-height: 40px;
     height: 50px;
   }
 
-  .span{
-    height:1px;
+  .el-table th .cell, .el-table td .cell{
+    padding: 0!important;
   }
 </style>

src/xt_pages/statistics/index.vue

   data() {
     return {
       crumbs: [
-        { path: 'statistics', name: '科室质控' },
-        { path: 'statistics', name: '统计分析' },
+        { path: false, name: '科室质控' },
+        { path: false, name: '统计分析' },
       ],
         pageLoad:true,
         patientCount:0,

src/xt_pages/stock/Dialog/salesReturnDialog.vue

           border
           ref="multipleTable"
           max-height="250"
+          @row-click="clickRow"
           @selection-change="changeGoodInfoTableData"
           @select-all="changeAllGoodInfoTableData"
           row-key="row_key"
         this.multipleSelection = val
       }, changeAllGoodInfoTableData: function(val) {
         this.multipleSelection = val
+      },clickRow:function(row) {
+        this.$refs.multipleTable.toggleRowSelection(row)
+
       }
     }
   }

src/xt_pages/stock/Dialog/stockInDialog.vue

           border
           ref="multipleTable"
           max-height="250"
+          @row-click="clickRow"
           @selection-change="changeGoodInfoTableData"
           @select-all="changeAllGoodInfoTableData"
           row-key="row_key"
         this.multipleSelection = val
       }, changeAllGoodInfoTableData: function(val) {
         this.multipleSelection = val
+      },clickRow:function(row) {
+        this.$refs.multipleTable.toggleRowSelection(row)
       }
     }
   }

src/xt_pages/stock/cancelStockOrder.vue

 
 
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/cancel', name: '出库退库单' }
+          { path: false, name: '出库退库单' }
         ],
         searchKey:'',
         type: 1,

src/xt_pages/stock/cancelStockOrderAdd.vue

       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/return', name: '退库单' },
-          { path: '/stock/return/add', name: '新增退库单' }
+          { path: false, name: '退库单' },
+          { path: false, name: '新增退库单' }
         ],
 
         type: this.$route.query.type,

src/xt_pages/stock/cancelStockOrderDetail.vue

       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/cancel', name: '退库单' },
-          { path: '/stock/cancel/add', name: '退库单详情' }
+          { path: false, name: '退库单' },
+          { path: false, name: '退库单详情' }
         ],
         isEdit: 0,
         checked: false,

src/xt_pages/stock/cancelStockOrderEdit.vue

       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/cancel', name: '退库单' },
-          { path: '/stock/cancel/detail', name: '编辑退库单' }
+          { path: false, name: '退库单' },
+          { path: false, name: '编辑退库单' }
         ],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         warehousing_time: '',

src/xt_pages/stock/detail/cancelStockDetail.vue

 <template>
-  <div class="main-contain">
-    <div class="app-container">
+    <div>
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
 
       </el-row>
     </div>
-  </div>
 </template>
 
 <script>

src/xt_pages/stock/detail/salesReturnDetail.vue

 <template>
-  <div class="main-contain">
-    <div class="app-container">
+    <div>
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
 
       </el-row>
     </div>
-  </div>
 </template>
 
 <script>

src/xt_pages/stock/detail/stockInDetail.vue

 <template>
-  <div class="main-contain">
-    <div class="app-container">
+    <div>
       <div class="cell clearfix">
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
 
       </el-row>
     </div>
-  </div>
 </template>
 
 <script>

src/xt_pages/stock/detail/stockOutDetail.vue

 <template>
-  <div class="main-contain">
-    <div class="app-container">
+    <div>
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
 
       </el-row>
     </div>
-  </div>
 </template>
 
 <script>

src/xt_pages/stock/otherCancelStockOrder.vue

     <div class="app-container">
 
       <div class="cell clearfix">
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 

src/xt_pages/stock/otherSalesReturnOrder.vue

         searchKey:'',
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/return', name: '其他退货单' }
+          { path: false, name: '其他退货单' }
         ],
         type: 2,
         page: 1,

src/xt_pages/stock/otherStockInOrder.vue

         searchKey:'',
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/in/other', name: '其他入库单' }
+          { path: false, name: '其他入库单' }
         ],
         page: 1,
         limit: 7,

src/xt_pages/stock/otherStockOutOrder.vue

     return {
       crumbs: [
         { path: false, name: "库存管理" },
-        { path: "/stock/out", name: "其他出库单" }
+        { path: false, name: "其他出库单" }
       ],
       searchKey:'',
       page: 1,

src/xt_pages/stock/salesReturnOrder.vue

         searchKey:'',
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/return', name: '退货单' }
+          { path: false, name: '退货单' }
         ],
         type: 1,
         page: 1,

src/xt_pages/stock/salesReturnOrderAdd.vue

       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/return', name: '退回单' },
-          { path: '/stock/return/add', name: '新增退货单' }
+          { path: false, name: '退回单' },
+          { path: false, name: '新增退货单' }
         ],
 
         type: this.$route.query.type,

src/xt_pages/stock/salesReturnOrderDetail.vue

       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/return', name: '退货单' },
-          { path: '/stock/return/detail', name: '退货单详情' }
+          { path: false, name: '退货单' },
+          { path: false, name: '退货单详情' }
         ],
         isEdit: 0,
         checked: false,

src/xt_pages/stock/stockDetail.vue

 
 
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 

src/xt_pages/stock/stockInOrder.vue

 
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/in', name: '入库单' }
+          { path: false, name: '入库单' }
         ],
         searchKey:'',
         type: 1,

src/xt_pages/stock/stockInOrderAdd.vue

       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/in', name: '入库单' },
-          { path: '/stock/in/add', name: '新增入库单' }
+          { path: false, name: '入库单' },
+          { path: false, name: '新增入库单' }
         ],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         warehousing_time: '',

src/xt_pages/stock/stockInOrderDetail.vue

       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/in', name: '入库单' },
-          { path: '/stock/in/detail', name: '入库单详情' }
+          { path: false, name: '入库单' },
+          { path: false, name: '入库单详情' }
         ],
         isEdit: 0,
         checked: false,

src/xt_pages/stock/stockInOrderEdit.vue

       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/in', name: '入库单' },
-          { path: '/stock/in/detail', name: '编辑入库单' }
+          { path: false, name: '入库单' },
+          { path: false, name: '编辑入库单' }
         ],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         warehousing_time: '',

src/xt_pages/stock/stockOutOrder.vue

       searchKey:"",
       crumbs: [
         { path: false, name: "库存管理" },
-        { path: "/stock/out", name: "出库单" }
+        { path: false, name: "出库单" }
       ],
       page: 1,
       limit: 7,

src/xt_pages/stock/stockOutOrderAdd.vue

       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/out', name: '出库单' },
-          { path: '/stock/out/add', name: '新增出库单' }
+          { path: false, name: '出库单' },
+          { path: false, name: '新增出库单' }
         ],
         type: this.$route.query.type,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',

src/xt_pages/stock/stockOutOrderDetail.vue

       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/out', name: '出库单' },
-          { path: '/stock/out/detail', name: '出库单详情' }
+          { path: false, name: '出库单' },
+          { path: false, name: '出库单详情' }
         ],
         isEdit: 0,
         checked: false,

src/xt_pages/stock/stockOutOrderEdit.vue

       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/out', name: '出库单' },
-          { path: '/stock/out/detail', name: '编辑出库单' }
+          { path: false, name: '出库单' },
+          { path: false, name: '编辑出库单' }
         ],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
 

src/xt_pages/stock/stockQuery.vue

         </el-table-column>
         <el-table-column label="入库数量" align="center" >
           <template slot-scope="scope">
-            <span @click="showStockInDetailDialog(scope.row.good_id)" style="color: blue">{{stockInCount(scope.row)}}</span>
+            <span @click="showStockInDetailDialog(scope.row.good_id)" style="color: #579ef8">{{stockInCount(scope.row)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="入库退货" align="center">
         </el-table-column>
         <el-table-column label="出库数量" align="center">
           <template slot-scope="scope">
-            <span @click="showStockOutDetailDialog(scope.row.good_id)" style="color: blue">{{stockOutCount(scope.row)}}</span>
+            <span @click="showStockOutDetailDialog(scope.row.good_id)" style="color: #579ef8">{{stockOutCount(scope.row)}}</span>
 
           </template>
         </el-table-column>

src/xt_pages/user/components/PatientForm.vue

 <template>
 <div class="main-contain">
-    
+  <div class="position">
+    <bread-crumb v-if="!isEdit" :crumbs='crumbs'></bread-crumb>
+
+    <!-- <div class="" style="float:right;">
+       <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
+       <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
+       <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="success" icon="el-icon-setting" >保存</el-button>
+       <el-button v-if="this.isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button>
+    </div> -->
+  </div>
   <div class="app-container " v-loading="pageLoad">
     <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" >
         <div class="" style="z-index: 99;position: absolute;right: 20px;">
                   <el-input v-model="form.name" ></el-input>
               </el-form-item>
             </el-col>
+            <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 :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="身份证号 : "  class="is-required" prop="idCardNo" >
                   <el-input v-model="form.idCardNo" @blur="checkIdCardNo" ></el-input>
               </el-form-item>
             </el-col>
 
-            <template v-if="this.isEdit">
+            <template v-if="isEdit">
               <!-- <el-col  :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="患者类型 : " class="is-required" >
                   <el-select v-model="form.patientType"  placeholder="请选择患者类型" disabled >
                   </el-select>
                 </el-form-item>
               </el-col> -->
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;" >
-                <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 :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>
     }
 
     return {
+      crumbs:[
+        {path:false, name:'病人管理'},
+        {path:false, name:'新增病人'},
+      ],
       generic_info_fold: true,
       treat_info_fold: true,
 

src/xt_pages/user/components/PatientSidebar.vue

 </script>
 
 <style>
-.el-tree-node__content {
+.patient-menu .el-tree-node__content {
   font-size: 14px;
   height: 40px;
   font-weight: 400;
 }
-.el-tree-node__label:hover {
+.patient-menu .el-tree-node__label:hover {
   color:#409eff;
 }
-.el-tree-node:focus > .el-tree-node__content {
+.patient-menu .el-tree-node:focus > .el-tree-node__content {
   color:#409eff;
 }
-.el-tree-node .el-tree-node.is-current > .el-tree-node__content {
+.patient-menu .el-tree-node .el-tree-node.is-current > .el-tree-node__content {
   color:#409eff;
 }
-.el-tree {
+.patient-menu .el-tree {
   background: #f6f8f9;
 }
 .patient-menu {

src/xt_pages/user/rescueRecord.vue

 <template>
-    <div class="patient-container">
-        <patient-sidebar :id="patient_id" defaultActive="1-5"></patient-sidebar>
-        <div class="container" v-loading="loading">
-            <div>
+  <div class="patient-container">
+    <patient-sidebar :id="patient_id" defaultActive="1-5"></patient-sidebar>
+    <div v-loading="loading">
+      <div class="patient-app-container advice-container app-container">
+
+        <div>
                 <span style="margin-left: 10px;float:right;">
-                    <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="show_dialog = true">新增</el-button>
-                    <el-button size="small" icon="el-icon-delete" v-show="selectingRows.length > 0" type="danger" @click="deleteAction">删除</el-button>
+                    <el-button size="small" icon="el-icon-circle-plus-outline" type="primary"
+                               @click="show_dialog = true">新增</el-button>
+                    <el-button size="small" icon="el-icon-delete" v-show="selectingRows.length > 0" type="danger"
+                               @click="deleteAction">删除</el-button>
                 </span>
-                <span class="filter_title">日期查询</span>
-                <el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestRescueRecords()"></el-date-picker>
-            </div>
-            <div class="record">
-                <el-row :gutter="15">
-                    <el-col :span="10">
-                        <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="record_table" :data="records" border highlight-current-row @current-change="didChangeCurrentRecord" @selection-change="didSelectionChange">
-                            <el-table-column type="selection" width="40" align="center"></el-table-column>
-                            <el-table-column label="记录时间" align="center">
-                                <template slot-scope="scope">
-                                    {{ recordTime(scope.row.record_time) }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="记录医生" align="center">
-                                <template slot-scope="scope">
-                                    {{ doctorName(scope.row.recorder) }}
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </el-col>
-                    <el-col :span="14">
-                        <div class="record_content_panel">
-                            <div class="title">抢救内容</div>
-                            <div class="content">
-                                {{ current_select_record == null ? "" : current_select_record.content }}
-                            </div>
-                        </div>
-                    </el-col>
-                </el-row>
-            </div>
+          <!--<span class="filter_title">日期查询</span>-->
+          <!--<el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestRescueRecords()"></el-date-picker>-->
+        </div>
+        <div class="cell clearfix">
+          <label class="title"><span class="name">日期查询</span> : </label>
+          <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+          <span class="">-</span>
+          <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+        </div>
+        <div class="record">
+          <el-row :gutter="15">
+            <el-col :span="10">
+              <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="record_table" :data="records"
+                        border highlight-current-row @current-change="didChangeCurrentRecord"
+                        @selection-change="didSelectionChange">
+                <el-table-column type="selection" width="40" align="center"></el-table-column>
+                <el-table-column label="记录时间" align="center">
+                  <template slot-scope="scope">
+                    {{ recordTime(scope.row.record_time) }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="记录医生" align="center">
+                  <template slot-scope="scope">
+                    {{ doctorName(scope.row.recorder) }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-col>
+            <el-col :span="14">
+              <div class="record_content_panel">
+                <div class="title">抢救内容</div>
+                <div class="content">
+                  {{ current_select_record == null ? '' : current_select_record.content }}
+                </div>
+              </div>
+            </el-col>
+          </el-row>
         </div>
+      </div>
 
-        <el-dialog title="新增抢救记录" width="40%" top="5vh" :visible.sync="show_dialog">
-            <div>
-                <div class="new_record_form">
-                    <diV>
-                        <span class="filter_title">日常抢救:</span>
-                        <el-select v-model="select_template" placeholder="可选择抢救模板"  @change="didSelectTemplate">
-                            <el-option v-for="(option, index) in templates" :key="index" :label="option.title" :value="option.content"></el-option>
-                        </el-select>
-                    </diV>
-                    <div class="textarea_panel">
-                        <el-input v-model="new_content" type="textarea" rows="6" resize="none"></el-input>
-                    </div>
+      <el-dialog title="新增抢救记录" width="40%" top="5vh" :visible.sync="show_dialog">
+        <div>
+          <div class="new_record_form">
+            <diV>
+              <span class="filter_title">日常抢救:</span>
+              <el-select v-model="select_template" placeholder="可选择抢救模板" @change="didSelectTemplate">
+                <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                           :value="option.content"></el-option>
+              </el-select>
+            </diV>
+            <div class="textarea_panel">
+              <el-input v-model="new_content" type="textarea" rows="6" resize="none"></el-input>
+            </div>
 
-                    <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
-                        <el-button @click="show_dialog = false">取消</el-button>
-                        <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="createAction" :loading="uploading_new_record">确定</el-button>
-                    </div>
-                </div>
+            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+              <el-button @click="show_dialog = false">取消</el-button>
+              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
+                         @click="createAction" :loading="uploading_new_record">确定
+              </el-button>
             </div>
-        </el-dialog>
+          </div>
+        </div>
+      </el-dialog>
     </div>
+  </div>
 </template>
 
 <script>
-import PatientSidebar from "./components/PatientSidebar"
-import { getRescueRecords, createRescueRecord, deleteRescueRecords } from "@/api/patient"
-import { parseTime } from "@/utils"
+  import PatientSidebar from './components/PatientSidebar'
+  import { createRescueRecord, deleteRescueRecords, getRescueRecords } from '@/api/patient'
+  import { parseTime } from '@/utils'
 
-export default {
-    name: "RescueRecord",
-    components: { 
-        PatientSidebar 
+  export default {
+    name: 'RescueRecord',
+    components: {
+      PatientSidebar
     },
     data() {
-        return {
-            loading: false,
-
-            patient_id: 0,
-            date: [],
+      return {
+        loading: false,
 
-            records: [],
-            doctors: [],
-            current_select_record: null,
+        patient_id: 0,
+        date: [],
+        start_time: '',
+        end_time: '',
+        records: [],
+        doctors: [],
+        current_select_record: null,
 
-            show_dialog: false,
-            uploading_new_record: false,
-            templates: this.$store.getters.configlist.rescue_record,
-            select_template: [],
-            new_content: "",
+        show_dialog: false,
+        uploading_new_record: false,
+        templates: this.$store.getters.configlist.rescue_record,
+        select_template: [],
+        new_content: '',
 
-            selectingRows: [],
-        }
+        selectingRows: []
+      }
     },
     created() {
-        this.patient_id = parseInt(this.$route.query.id)
-        if (isNaN(this.patient_id) || this.patient_id <= 0) {
-            this.$notify.error({
-                title: "错误",
-                message: "无效的id"
-            })
-            this.$router.push("/patients/patients")
-            return
-        }
-        var now = new Date()
-        this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
+      this.patient_id = parseInt(this.$route.query.id)
+      if (isNaN(this.patient_id) || this.patient_id <= 0) {
+        this.$notify.error({
+          title: '错误',
+          message: '无效的id'
+        })
+        this.$router.push('/patients/patients')
+        return
+      }
+      var now = new Date()
+      this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
 
-        this.requestRescueRecords()
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+
+      this.requestRescueRecords()
     },
     methods: {
-        requestRescueRecords: function() {
-            var startTime = new Date(this.date[0])
-            var endTime = new Date(this.date[1])
-            this.loading = true
-            getRescueRecords(this.patient_id, parseTime(startTime, "{y}-{m}-{d}"), parseTime(endTime, "{y}-{m}-{d}")).then(rs => {
-                this.loading = false
-                var resp = rs.data
-                if (resp.state == 1) {
-                    this.current_select_record = null
-                    this.records = resp.data.records
-                    this.doctors = resp.data.doctors
-                    
-                } else {
-                    this.$message.error(resp.msg)
-                }
-            }).catch(error => {
-                this.loading = false
-                this.$message.error(error)
-            })
-        },
+      requestRescueRecords: function() {
+        var startTime = new Date(this.date[0])
+        var endTime = new Date(this.date[1])
+        this.loading = true
+        getRescueRecords(this.patient_id, this.start_time, this.end_time).then(rs => {
+          this.loading = false
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.current_select_record = null
+            this.records = resp.data.records
+            this.doctors = resp.data.doctors
 
-        didChangeCurrentRecord: function(record) {
-            this.current_select_record = record
-        },
-        recordTime: function(timestamp) {
-            var time = new Date(timestamp * 1000)
-            return parseTime(time, "{y}-{m}-{d}")
-        },
-        doctorName: function(doctor_id) {
-            for (let index = 0; index < this.doctors.length; index++) {
-                const doctor = this.doctors[index];
-                if (doctor.id == doctor_id) {
-                    return doctor.name
-                }
-            }
-            return ""
-        },
+          } else {
+            this.$message.error(resp.msg)
+          }
+        }).catch(error => {
+          this.loading = false
+          this.$message.error(error)
+        })
+      },
 
-        createAction: function() {
-            if (this.new_content.length == 0) {
-                this.$message.error("请填写抢救内容")
-                return
-            }
-            this.uploading_new_record = true
-            createRescueRecord(this.patient_id, this.new_content).then(rs => {
-                this.uploading_new_record = false
-                var resp = rs.data
-                if (resp.state == 1) {
-                    this.records.unshift(resp.data.record)
-                    // this.$refs.record_table.setCurrentRow()
-                    this.$refs.record_table.setCurrentRow(this.records[0])
-                    // this.current_select_record = this.records[0]
-                    this.show_dialog = false
-                    this.new_content = ""
+      didChangeCurrentRecord: function(record) {
+        this.current_select_record = record
+      },
+      recordTime: function(timestamp) {
+        var time = new Date(timestamp * 1000)
+        return parseTime(time, '{y}-{m}-{d}')
+      },
+      doctorName: function(doctor_id) {
+        for (let index = 0; index < this.doctors.length; index++) {
+          const doctor = this.doctors[index]
+          if (doctor.id == doctor_id) {
+            return doctor.name
+          }
+        }
+        return ''
+      },
 
-                } else {
-                    this.$message.error(resp.msg)
-                }
+      createAction: function() {
+        if (this.new_content.length == 0) {
+          this.$message.error('请填写抢救内容')
+          return
+        }
+        this.uploading_new_record = true
+        createRescueRecord(this.patient_id, this.new_content).then(rs => {
+          this.uploading_new_record = false
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.records.unshift(resp.data.record)
+            // this.$refs.record_table.setCurrentRow()
+            this.$refs.record_table.setCurrentRow(this.records[0])
+            // this.current_select_record = this.records[0]
+            this.show_dialog = false
+            this.new_content = ''
 
-            }).catch(error => {
-                this.uploading_new_record = false
-                this.$message.error(error)
-            })
-        },
-        didSelectTemplate: function(templateContent) {
-            this.new_content = this.new_content.length > 0 ? (this.new_content + templateContent) : templateContent
+          } else {
+            this.$message.error(resp.msg)
+          }
 
-            this.select_template = ""
-        },
+        }).catch(error => {
+          this.uploading_new_record = false
+          this.$message.error(error)
+        })
+      },
+      didSelectTemplate: function(templateContent) {
+        this.new_content = this.new_content.length > 0 ? (this.new_content + templateContent) : templateContent
+      },
 
-        didSelectionChange: function(selectRows) {
-            this.selectingRows = selectRows
-        },
-        deleteAction: function() {
-            if (this.selectingRows.length == 0) {
-                return
-            }
-            var ids = []
-            for (let index = 0; index < this.selectingRows.length; index++) {
-                const row = this.selectingRows[index];
-                ids.push(row.id)
+      didSelectionChange: function(selectRows) {
+        this.selectingRows = selectRows
+      },
+      deleteAction: function() {
+        if (this.selectingRows.length == 0) {
+          return
+        }
+        var ids = []
+        for (let index = 0; index < this.selectingRows.length; index++) {
+          const row = this.selectingRows[index]
+          ids.push(row.id)
+        }
+        var ids_str = ids.join(',')
+        this.loading = true
+        deleteRescueRecords(this.patient_id, ids_str).then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            for (let id_index = 0; id_index < ids.length; id_index++) {
+              for (let record_index = 0; record_index < this.records.length; record_index++) {
+                if (ids[id_index] == this.records[record_index].id) {
+                  this.records.splice(record_index, 1)
+                  break
+                }
+              }
             }
-            var ids_str = ids.join(",")
-            this.loading = true
-            deleteRescueRecords(this.patient_id, ids_str).then(rs => {
-                var resp = rs.data
-                if (resp.state == 1) {
-                    for (let id_index = 0; id_index < ids.length; id_index++) {
-                        for (let record_index = 0; record_index < this.records.length; record_index++) {
-                            if (ids[id_index] == this.records[record_index].id) {
-                                this.records.splice(record_index, 1)
-                                break
-                            }
-                        }
-                    }
-                    this.selectingRows = []
-                    this.$message.success("已删除")
+            this.selectingRows = []
+            this.$message.success('已删除')
 
-                } else {
-                    this.$message.error(resp.msg)
-                }
-                this.loading = false
-            }).catch(err => {
-                this.loading = false
-                this.$message.error(err)
-            })
-        },
-    },
-}
+          } else {
+            this.$message.error(resp.msg)
+          }
+          this.loading = false
+        }).catch(err => {
+          this.loading = false
+          this.$message.error(err)
+        })
+      }, startTimeChange(val) {
+        this.requestRescueRecords()
+      }, endTimeChange(val) {
+        this.requestRescueRecords()
+      }
+    }
+  }
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-.container {
+  .container {
     margin-left: 180px;
     padding: 20px;
     background: #fff;
     min-height: calc(100vh - 173px);
     margin-bottom: 15px;
 
-    .record {
-        padding-top: 20px;
-    }
-}
+  .record {
+    padding-top: 20px;
+  }
+
+  }
 
-.record_content_panel {
+  .record_content_panel {
     border-width: 1px;
     border-style: solid;
     border-color: #ebeef5;
     }
 }
 
-.new_record_form {
-    // padding: 10px, 25px;
+  .new_record_form {
+  .textarea_panel {
+    margin-top: 10px;
+  }
 
-    .textarea_panel {
-        margin-top: 10px;
-    }
-}
+  }
 </style>

src/xt_pages/workforce/appointment.vue

 </script>
 
 <style rel="stylesheet/css" lang="scss">
+
+.schedule-table-cell-disable {
+    background-color: #F5F5F5 !important;
+}
 </style>
 

src/xt_permission.js

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