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

config/dev.env.js

@@ -6,7 +6,7 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://112.74.16.180:9527"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com
+  BASE_API: '"http://localhost:9529"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
   // PATIENT_SIT: '"http://test1.sgjyun.com"',
   // MIRCOMALL_SIT: '"http://mall.test.sgjyun.com"'
 }

src/styles/index.scss

@@ -385,12 +385,12 @@ code {
           float: left;
           list-style: none;
           cursor: pointer;
-          padding: 6px 0;
+          padding: 6px 20px;
           color: #606266;
           border-radius: 4px;
           margin: 0 8px 0 0;
           font-size: 14px;
-          width: 70px;
+          // width: 70px;
           text-align: center;
           &:hover {
             background: #f5f7fa;
@@ -454,6 +454,13 @@ code {
   margin-top: 0 !important; 
 }
 
+.el-dialog__wrapper{
+  // z-index: 9999!important;
+}
 .el-message{
   z-index: 2004!important;
-}
+}
+.el-select-dropdown{
+  // z-index: 2003!important;
+}
+

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

@@ -8,7 +8,7 @@
           <el-button round @click="deleteRecordAction">删除监测</el-button>
 
         </div>
-        <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="table" :data="monitors" border highlight-current-row max-height="300"
+        <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="table" :data="monitors" border highlight-current-row 
                   @current-change="tableCurrentRowChange" style="width: 100%" :class="current_row_class">
           <el-table-column label="时间" align="center" width="144">
             <template slot-scope="scope">
@@ -241,14 +241,10 @@
           </el-row>
         </el-form>
 
-        <el-row>
-          <el-col :span="24">
-            <div style="text-align: right;">
+        <div slot="footer" class="dialog-footer">
               <el-button @click="cancelEditAction">取 消</el-button>
               <el-button type="primary" @click="submitAction">保 存</el-button>
-            </div>
-          </el-col>
-        </el-row>
+        </div>
       </div>
     </el-dialog>
   </div>

src/xt_pages/dialysis/schedualPatient.vue

@@ -5,7 +5,7 @@
   </div>
   <div class="app-container">
     <div class="cell clearfix">
-      <label class="title"><span class="name">病人查询</span> : </label>
+      <!-- <label class="title"><span class="name">病人查询</span> : </label> -->
       <el-input size="small" style="width: 280px;" v-model="search_input" class="filter-item"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
     </div>
@@ -67,14 +67,14 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         selected_date: new Date(), // this.$store.getters.app.dialysis_area.schedule_date,
         schedule_type_selected: 0, // this.$store.getters.app.dialysis_area.schedule_type_select_index,
         schedule_type_options: [
-          { value: 0, text: '全部班' },
+          { value: 0, text: '全部' },
           { value: 1, text: '上午' },
           { value: 2, text: '下午' },
           { value: 3, text: '晚上' }
         ],
         zone_selected: 0, // this.$store.getters.app.dialysis_area.zone_select_index,
         zone_options: [
-          { id: 0, text: '全部分区' }
+          { id: 0, text: '全部' }
         ],
         zone_schedules: [],
 
@@ -229,7 +229,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           if (resp.state == 1) {
             var zones = resp.data.zones
             var schedules = resp.data.schedules
-            var zone_options = [{ id: 0, text: '全部分区' }]
+            var zone_options = [{ id: 0, text: '全部' }]
             for (let z_i = 0; z_i < zones.length; z_i++) {
               const zone = zones[z_i]
               zone_options.push({ id: zone.id, text: zone.name })

src/xt_pages/stock/cancelStockOrder.vue

@@ -11,7 +11,7 @@
     <div class="app-container">
 
 
-      <div class="cell clearfix" style="margin-top:20px">
+      <div class="cell clearfix" >
         <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
@@ -37,7 +37,7 @@
         <el-table
           :data="cancelStockDate"
           :class="signAndWeighBoxPatients"
-          style="width: 100%" border
+          border
           highlight-current-row
           ref="multipleTable"
           @selection-change="select"
@@ -87,7 +87,7 @@
                 <el-button
                   size="mini"
                   type="primary"
-                  icon="el-icon-edit"
+                  icon="el-icon-edit-outline"
                   @click="handleEdit(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -111,7 +111,7 @@
                   <el-button
                     size="mini"
                     type="danger"
-                    icon="el-icon-remove-outline"
+                    icon="el-icon-delete"
                     @click="handleDelete(scope.$index, scope.row)">
                   </el-button>
                 </el-tooltip>

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -85,7 +85,7 @@
                 <el-button
                   size="mini"
                   type="danger"
-                  icon="el-icon-remove-outline"
+                  icon="el-icon-delete"
                   @click="handleDelete(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -10,7 +10,7 @@
 
     <div class="app-container">
 
-      <div class="cell clearfix" style="margin-top:20px">
+      <div class="cell clearfix">
         <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
@@ -86,7 +86,7 @@
                 <el-button
                   size="mini"
                   type="primary"
-                  icon="el-icon-edit"
+                  icon="el-icon-edit-outline"
                   @click="handleEdit(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -10,7 +10,7 @@
 
     <div class="app-container">
 
-      <div class="cell">
+      <div class="cell clearfix">
         <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
@@ -87,7 +87,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleEdit(scope.$index, scope.row)">
               </el-button>
               </el-tooltip>

src/xt_pages/stock/otherStockInOrder.vue

@@ -86,7 +86,7 @@
               <el-button
                 size="small"
                 type="primary"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleEdit(scope.$index, scope.row)">
               </el-button>
             </el-tooltip>

src/xt_pages/stock/otherStockOutOrder.vue

@@ -82,7 +82,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleEdit(scope.$index, scope.row)">
               </el-button>
             </el-tooltip>

src/xt_pages/stock/salesReturnEdit.vue

@@ -87,7 +87,7 @@
                   <el-button
                     size="mini"
                     type="danger"
-                    icon="el-icon-remove-outline"
+                    icon="el-icon-delete"
                     @click="handleDelete(scope.$index, scope.row)">
                   </el-button>
                 </el-tooltip>

src/xt_pages/stock/salesReturnOrder.vue

@@ -10,7 +10,7 @@
 
     <div class="app-container">
 
-      <div class="cell" >
+      <div class="cell clearfix" >
         <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
@@ -85,7 +85,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleEdit(scope.$index, scope.row)">
               </el-button>
               </el-tooltip>

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -116,7 +116,7 @@
                 <el-button
                   size="mini"
                   type="danger"
-                  icon="el-icon-remove-outline"
+                  icon="el-icon-delete"
                   @click="handleDelete(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>

src/xt_pages/stock/stockInOrder.vue

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

src/xt_pages/stock/stockInOrderAdd.vue

@@ -47,11 +47,11 @@
 
 
             <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
-              <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+              <el-table   id="oictable" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" border style="width: 100%"
                         max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
               >
 
-                <el-table-column min-width="35" align="center">
+                <el-table-column  align="center" width="200">
 
                   <template slot="header" slot-scope="scope">
                     <span>物品类型<span style="color: red">*</span></span>
@@ -65,7 +65,7 @@
                     </el-form-item>
                   </template>
                 </el-table-column>
-                <el-table-column min-width="35" align="center">
+                <el-table-column align="center" width="200">
                   <template slot="header" slot-scope="scope">
                     <span>规格名称<span style="color: red">*</span></span>
                   </template>
@@ -81,7 +81,7 @@
                 </el-table-column>
 
 
-                <el-table-column min-width="23" align="center">
+                <el-table-column  align="center" width="150">
                   <template slot="header" slot-scope="scope">
                     <span>单价<span style="color: red">*</span></span>
                   </template>
@@ -89,14 +89,14 @@
                     <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
                     <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
                                   style="padding-top: 17px">
-                      <el-input type="number" v-model="scope.row.price"></el-input>
+                      <el-input placeholder="请输入单价"  type="number" v-model="scope.row.price"></el-input>
                     </el-form-item>
 
 
                   </template>
                 </el-table-column>
 
-                <el-table-column min-width="23" align="center">
+                <el-table-column  align="center"  width="180">
                   <template slot="header" slot-scope="scope">
                     <span>入库数量<span style="color: red">*</span></span>
                   </template>
@@ -106,18 +106,18 @@
 
                     <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'"
                                   :rules='tableRules.warehousing_count' style="padding-top: 17px">
-                      <el-input type="number" v-model="scope.row.warehousing_count"></el-input>
+                      <el-input placeholder="请输入入库数量"  type="number" v-model="scope.row.warehousing_count"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="总价" min-width="20" align="center">
+                <el-table-column label="总价" align="center" width="150">
                   <template slot-scope="scope">
                     {{calculate(scope.row.price*scope.row.warehousing_count)}}
                   </template>
                 </el-table-column>
 
-                <el-table-column align="center" min-width="25">
+                <el-table-column align="center"  width="150">
                   <template slot="header" slot-scope="scope">
                     <span>批号<span style="color: red">*</span></span>
                   </template>
@@ -126,12 +126,12 @@
 
                     <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number'
                                   style="padding-top: 17px">
-                      <el-input v-model="scope.row.number"></el-input>
+                      <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
                     </el-form-item>
 
                   </template>
                 </el-table-column>
-                <el-table-column label="生产日期" min-width="43" align="center">
+                <el-table-column label="生产日期"  align="center" width="250">
                   <template slot-scope="scope">
                     <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
                     <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.product_date"
@@ -140,7 +140,7 @@
 
                   </template>
                 </el-table-column>
-                <el-table-column label="有效日期" min-width="43" align="center">
+                <el-table-column label="有效日期"  align="center" width="250">
                   <template slot-scope="scope">
                     <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
                     <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
@@ -149,14 +149,14 @@
 
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" min-width="20" align="center">
+                <el-table-column label="备注"  align="center" width="150">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.remark"></el-input>
+                    <el-input placeholder="请输入备注"   v-model="scope.row.remark"></el-input>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" align="center" min-width="40">
-                  <template slot-scope="scope">
+                <el-table-column label="操作" align="center" fixed="right"  width="150">
+                  <template slot-scope="scope" >
                     <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
                     <el-button
@@ -171,7 +171,7 @@
                     <el-button
                       size="mini"
                       type="danger"
-                      icon="el-icon-remove-outline"
+                      icon="el-icon-delete"
                       @click="handleDelete(scope.$index, scope.row)">
                     </el-button>
                     </el-tooltip>
@@ -601,6 +601,12 @@
   }
 </script>
 
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
+
 <style rel="stylesheet/css" lang="scss" scoped>
   .information {
     border: 1px #dcdfe6 solid;

src/xt_pages/stock/stockInOrderEdit.vue

@@ -24,57 +24,57 @@
 
 
         <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+          <el-table id="oictable" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
                     max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           >
 
-            <el-table-column min-width="35" align="center">
+            <el-table-column  align="center" width="200" >
 
               <template slot="header" slot-scope="scope">
                 <span>物品类型<span style="color: red">*</span></span>
               </template>
 
-              <template slot-scope="scope" >
-                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
-                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
-
-                <el-form-item  style="padding-top: 15px">
-                  <el-input placeholder="请输入物品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
+                            :value="typeName(scope.row.good_type_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
                 </el-form-item>
-
               </template>
             </el-table-column>
-            <el-table-column min-width="35" align="center">
+            <el-table-column align="center" width="200">
               <template slot="header" slot-scope="scope">
                 <span>规格名称<span style="color: red">*</span></span>
               </template>
               <template slot-scope="scope">
 
-                <el-form-item  style="padding-top: 15px">
-                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                            :value="specificationName(scope.row.good_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
                 </el-form-item>
 
               </template>
             </el-table-column>
 
 
-            <el-table-column  min-width="23" align="center">
+
+            <el-table-column  align="center" width="150">
               <template slot="header" slot-scope="scope">
                 <span>单价<span style="color: red">*</span></span>
               </template>
               <template slot-scope="scope">
                 <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price' style="padding-top: 17px">
-                  <el-input type="number"  v-model="scope.row.price" ></el-input>
+                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
+                              style="padding-top: 17px">
+                  <el-input placeholder="请输入单价"  type="number" v-model="scope.row.price"></el-input>
                 </el-form-item>
 
 
-
-
               </template>
             </el-table-column>
 
-            <el-table-column  min-width="23" align="center">
+            <el-table-column  align="center"  width="180">
               <template slot="header" slot-scope="scope">
                 <span>入库数量<span style="color: red">*</span></span>
               </template>
@@ -82,32 +82,32 @@
                 <!--{{scope.row.warehousing_count}}-->
                 <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
 
-                <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'" :rules='tableRules.warehousing_count' style="padding-top: 17px">
-                  <el-input type="number"  v-model="scope.row.warehousing_count" ></el-input>
+                <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'"
+                              :rules='tableRules.warehousing_count' style="padding-top: 17px">
+                  <el-input placeholder="请输入入库数量"  type="number" v-model="scope.row.warehousing_count"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
-
-            <el-table-column label="总价" min-width="20" align="center">
+            <el-table-column label="总价" align="center" width="150">
               <template slot-scope="scope">
                 {{calculate(scope.row.price*scope.row.warehousing_count)}}
               </template>
             </el-table-column>
 
-            <el-table-column  align="center" min-width="25">
+            <el-table-column align="center"  width="150">
               <template slot="header" slot-scope="scope">
                 <span>批号<span style="color: red">*</span></span>
               </template>
               <template slot-scope="scope">
                 <!--<el-input  v-model="scope.row.numbers"></el-input>-->
-
-                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number' style="padding-top: 17px">
-                  <el-input  v-model="scope.row.number" ></el-input>
+                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number'
+                              style="padding-top: 17px">
+                  <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
                 </el-form-item>
-
               </template>
             </el-table-column>
-            <el-table-column label="生产日期" min-width="40" align="center">
+
+            <el-table-column label="生产日期" width="250" align="center">
               <template slot-scope="scope" >
                 <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
                 <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.product_date"
@@ -116,7 +116,7 @@
 
               </template>
             </el-table-column>
-            <el-table-column label="有效日期" min-width="40" align="center">
+            <el-table-column label="有效日期" width="250" align="center">
               <template slot-scope="scope">
                 <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
                 <el-date-picker  prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
@@ -125,13 +125,13 @@
 
               </template>
             </el-table-column>
-            <el-table-column label="备注" min-width="20" align="center">
+            <el-table-column label="备注" width="150" align="center">
               <template slot-scope="scope">
                 <el-input  v-model="scope.row.remark"></el-input>
               </template>
             </el-table-column>
 
-            <el-table-column label="操作" align="center" min-width="40">
+            <el-table-column label="操作" align="center" width="150">
               <template slot-scope="scope">
                 <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
@@ -147,7 +147,7 @@
                   <el-button
                     size="mini"
                     type="danger"
-                    icon="el-icon-remove-outline"
+                    icon="el-icon-delete"
                     @click="handleDelete(scope.$index, scope.row)">
                   </el-button>
                 </el-tooltip>
@@ -472,6 +472,11 @@ export default {
 
   }
 </script>
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
 
 <style rel="stylesheet/css" lang="scss" scoped>
   .information {

src/xt_pages/stock/stockOutOrder.vue

@@ -78,7 +78,7 @@
             <el-button
               size="mini"
               type="primary"
-              icon="el-icon-edit"
+              icon="el-icon-edit-outline"
               @click="handleEdit(scope.$index, scope.row)">
             </el-button>
             </el-tooltip>
@@ -395,7 +395,6 @@ export default {
 };
 </script>
 
-<<<<<<< .mine
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
   // margin: 20px;
@@ -451,7 +450,6 @@ export default {
 }
 </style>
 
-=======
 
 
 
@@ -494,6 +492,21 @@ export default {
 
 
 
+<<<<<<< .mine
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
 
 
 

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -136,7 +136,7 @@
                   <el-button
                     size="mini"
                     type="danger"
-                    icon="el-icon-remove-outline"
+                    icon="el-icon-delete"
                     @click="handleDelete(scope.$index, scope.row)">
                   </el-button>
                 </el-tooltip>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -108,7 +108,7 @@
                   <el-button
                     size="mini"
                     type="danger"
-                    icon="el-icon-remove-outline"
+                    icon="el-icon-delete"
                     @click="handleDelete(scope.$index, scope.row)">
                   </el-button>
                 </el-tooltip>

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -234,7 +234,7 @@
       </el-row>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancleDialog()">取消</el-button>
+        <el-button @click="cancleDialog()">取 消</el-button>
         <el-button
           :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
           type="primary"

src/xt_pages/user/components/PatientDetail.vue

@@ -103,11 +103,11 @@
                 </el-form-item>
             </el-col>
             <el-col :span="8">
-                <el-form-item label="子女情况 : " style="width:90%;float:left;"  prop="children">
+                <el-form-item label="子女情况(个) : "  prop="children">
                   <el-input maxlength="5" v-model="form.children" disabled></el-input>
                 </el-form-item>
-                <el-form-item label="孩 " style="float:left;" label-width="30px" >
-                </el-form-item>
+                <!-- <el-form-item label=" " style="float:left;" label-width="30px" >
+                </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="住院(门诊)号 : " prop="admissionNumber" >

src/xt_pages/user/components/PatientForm.vue

@@ -59,8 +59,8 @@
               </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-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>
@@ -132,11 +132,11 @@
                 </el-form-item>
             </el-col>
             <el-col :span="8" style="clearfix" :style="isEdit?'width:360px':''">
-                <el-form-item label="子女情况 : " style="width:90%;float:left;"  prop="children">
+                <el-form-item label="子女情况(个) : " prop="children">
                   <el-input maxlength="5" v-model="form.children" ></el-input>
                 </el-form-item>
-                <el-form-item label="孩 " style="float:left;" label-width="30px">
-                </el-form-item>
+                <!-- <el-form-item label=" " style="float:left;" label-width="30px">
+                </el-form-item> -->
             </el-col>
             <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="住院(门诊)号 : " prop="admissionNumber" >

src/xt_pages/user/doctorAdvice.vue

@@ -383,7 +383,7 @@
                 </el-row>
 
                 <div slot="footer" class="dialog-footer">
-                    <el-button @click="cancleDialog()">取消</el-button>
+                    <el-button @click="cancleDialog()">取 消</el-button>
                     <el-button
                     :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
                     type="primary"
@@ -410,7 +410,7 @@
                     </el-row>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
-                        <el-button  @click="templateFormVisible = false">取消</el-button>
+                        <el-button  @click="templateFormVisible = false">取 消</el-button>
                         <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="addTempForm('templateForm')">保 存</el-button>
                 </div>
             </el-dialog>

src/xt_pages/user/patients.vue

@@ -6,7 +6,7 @@
   </div>
   <div class="app-container">
     <div class="cell clearfix">
-      <label class="title"><span class="name">病人搜索</span> : </label>
+      <!-- <label class="title"><span class="name">病人搜索</span> : </label> -->
       <el-input   style="width: 400px;" v-model="searchKey" class="filter-item" placeholder="病人姓名/透析号" size="small"/>
       <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" size="small" >搜索</el-button>
     </div>

src/xt_pages/workforce/components/tableData.vue

@@ -10,6 +10,8 @@
         :row-class-name="rowClass"
         :cell-class-name="cellClass"
         sum-text="总数"
+        :height="tableContainHeight"
+        ref="table"
         style="width: 100%;cursor: pointer;">
         <el-table-column  prop="area" label="分区" width="80"  align="center" fixed></el-table-column>
         <el-table-column  prop="cut" label="机号" width="80"  align="center" fixed></el-table-column>
@@ -1067,6 +1069,9 @@ export default {
         })()
       }
     },
+    mounted:function(){
+       this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
+    },
     created(){
       rowNumber = 0;
       this.modeOptions = this.$store.getters.treatment_mode;

src/xt_pages/workforce/components/template_table.vue

@@ -11,7 +11,9 @@
                 </div>
             </el-col>
         </el-row>
-        <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="table" id="table_data" :max-height="tableHeight" :data="opera_device_numbers" :span-method="spanMethod" row-class-name="table-row-new-class schedule-table-row" @cell-click="itemClick">
+      
+      <div id="table_data" >
+        <el-table :height="tableContainHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="table"   :data="opera_device_numbers" :span-method="spanMethod" row-class-name="table-row-new-class schedule-table-row" @cell-click="itemClick">
             <el-table-column label="分区" width="80" align="center" fixed style="width: 100px; background-color: red; display: block;">
                 <template slot-scope="scope">
                     {{ scope.row.zone.name }}
@@ -156,7 +158,8 @@
                 </template>
             </el-table-column>
         </el-table>
-
+      </div>
+      
         <schedule-selector-dialog ref="selector_dialog" :patients="patients" @did_selected="will_add_schedule_action" @did_cancel="cancel_schedule_action"></schedule-selector-dialog>
     </div>
 </template>
@@ -301,6 +304,9 @@ export default {
       })()
     }
   },
+  mounted:function(){
+       this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 310
+    },
   methods: {
     // handleScroll: function() {
     //     var scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
@@ -590,4 +596,10 @@ export default {
   font-size: 12px;
   white-space:nowrap !important;
 }
+#table_data{
+    min-height: calc(100vh - 350px);
+}
+#table_data ::-webkit-scrollbar {
+  height: 15px;
+}
 </style>

src/xt_pages/workforce/template.vue

@@ -1,8 +1,15 @@
 <template>
+<div class="main-contain">
+    <div class="position">
+        <bread-crumb></bread-crumb>
+        <!-- <el-col :span="3" style="text-align: right;"> -->
+        <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
+        <!-- </el-col> -->
+    </div>
     <div class="app-container">
-        <el-row>
-            <el-col :span="21">
-                <el-tabs v-model="activeName" tab-position="top" :stretch="true">
+        <!-- <el-row>
+            <el-col :span="21"> -->
+                <el-tabs v-model="activeName" tab-position="top" >
                     <el-tab-pane name="schedules">
                         <span slot="label"> 排班信息 </span>
                         <template-table :editable="false" :device_numbers="device_numbers" :template="this_week_schedules" :patients="patients"></template-table>
@@ -16,26 +23,27 @@
                         <template-table :editable="true" :device_numbers="device_numbers" :template="second_template" :patients="patients"></template-table>
                     </el-tab-pane>
                 </el-tabs>
-            </el-col>
-            <el-col :span="3" style="text-align: right;">
-                <el-button type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
-            </el-col>
-        </el-row>
+            <!-- </el-col> -->
+            
+        <!-- </el-row> -->
 
         <set-up-template-dialog ref="setup_dialog" :template_mode="template_mode" :origin_mode="origin_mode" @chenge_mode="didChangeTemplateMode"></set-up-template-dialog>
     </div>
+ </div>
 </template>
 
 <script>
 import SetUpTemplateDialog from "./components/setup_template_dialog"
 import TemplateTable from "./components/template_table"
 import { getTemplateInitData } from "@/api/schedule_template/patient"
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
 export default {
     name: "WorkforceTemplate",
     components: {
         SetUpTemplateDialog,
         TemplateTable,
+        BreadCrumb
     },
     data: function() {
         return {

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