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

src/xt_pages/data/druguseTemplate.vue

@@ -28,6 +28,7 @@
             :row-class-name="tableRowClassNames"
             :span-method="merge"
             style="width: 100%;min-height:500px;"
+            :cell-class-name="adviceNameShow"
           >
             <el-table-column
               prop="id"
@@ -172,8 +173,8 @@
               </el-form>
               <div class="txsj" style="text-align: center;margin-bottom: 30px">
                 <el-button round @click="newRecordAction">新增医嘱内容</el-button>
-                <el-button round @click="deleteRecordAction">删除医嘱内容</el-button>
                 <el-button round @click="modifyRecordAction">修改医嘱内容</el-button>
+                <el-button round @click="deleteRecordAction">删除医嘱内容</el-button>
               </div>
               <el-table
                 ref="table" :data="adviceTableData"
@@ -241,7 +242,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="规格 :" required prop="advice_desc">
+                  <el-form-item label="规格 :" >
                     <el-input v-model="templateForm.advice_desc"></el-input>
                   </el-form-item>
 
@@ -377,7 +378,7 @@
 
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="规格" prop="advice_desc">
+                  <el-form-item label="规格" >
                     <el-input v-model="templateFormEdit.advice_desc"></el-input>
                   </el-form-item>
                   <!-- <el-form-item label="药品规格 :" prop="drug_spec">
@@ -572,7 +573,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="规格 :" required prop="advice_desc">
+                  <el-form-item label="规格 :" >
                     <el-input v-model="templateForm.advice_desc"></el-input>
                   </el-form-item>
                   <!-- <el-form-item label="药品规格 :" prop="drug_spec">
@@ -1073,7 +1074,6 @@ export default {
         },
         templateRules: {
           advice_name: [{ required: true, message: '请填写医嘱内容' }],
-          advice_desc: [{ required: true, message: '请填写规格' }]
 
         },
         templateEditRules: {
@@ -1152,7 +1152,13 @@ export default {
       this.unitsOption = getDataConfig('hemodialysis', 'units')
   },
     methods: {
-
+      adviceNameShow({row, column, rowIndex, columnIndex}){
+        if(columnIndex==1) {
+          return 'templateadvicenamedisplay';
+        }else {
+          return '';
+        }
+      },
       showCreatedTimes() {
         this.createdTimes = this.createdTimes + 1
       },
@@ -2173,3 +2179,11 @@ export default {
     }
   }
 </script>
+<style>
+
+  .templateadvicenamedisplay .cell {
+    float: left;
+    text-align: left;
+  }
+</style>
+

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

@@ -5,7 +5,7 @@
       :visible.sync="isVisibility"
       width="1010px"
       @close="resetDialog"
-      modal-append-to-body=“false”
+      :modal-append-to-body="false"
     >
       <div class="txsj" v-show="showAdvicePanel">
         <el-button  round @click="openGroupFrom" :loading="deleLoading">新增医嘱</el-button>
@@ -29,7 +29,7 @@
       <!--&lt;!&ndash;:header-cell-style="{ backgroundColor: 'rgb(64, 158, 255)', color: 'white'}"&ndash;&gt;@current-change="selectRow"-->
       <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="doctor_advices" border style="width: 100%" v-show="showAdvicePanel"
                 ref="advices_list" :row-class-name="tableRowClassName" :span-method="mergeSpan"
-                @row-click="cellMouseEnter" modal-append-to-body=“false”
+                @row-click="cellMouseEnter" :cell-class-name="adviceNameShow" :modal-append-to-body="false"
       >
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
@@ -192,7 +192,7 @@
       :show-close="isClose"
       :close-on-click-modal="isClose"
       :close-on-press-escape="isClose"
-      modal-append-to-body=“false”
+      :modal-append-to-body="false"
       >
       <el-date-picker
         v-model="execTime"
@@ -368,6 +368,13 @@ export default {
     },
     methods: {
 
+      adviceNameShow({row, column, rowIndex, columnIndex}){
+        if(columnIndex==2) {
+          return 'dialysisadvicenamedisplay';
+        }else {
+          return '';
+        }
+      },
       submitEditAdvice() {
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
@@ -1305,6 +1312,10 @@ export default {
     margin-bottom: 20px;
   }
 
+  .dialysisadvicenamedisplay .cell {
+    float: left;
+    text-align: left;
+  }
 </style>
 
 

src/xt_pages/role/components/AdminInfoForm.vue

@@ -1,15 +1,15 @@
 <template>
     <el-dialog :title="formTitle" :visible.sync="dialogFormVisible">
-        <el-form :model="form" ref="form" :rules="rules" label-width="100px">
-                <el-form-item label="账号" prop="mobile">
+        <el-form :model="form" ref="form" :rules="rules" label-width="60px">
+                <el-form-item label="账号 : " prop="mobile">
                     <el-input v-model="form.mobile" placeholder="用户手机号" :disabled="form.id !==  0"></el-input>
                 </el-form-item>
 
-                <el-form-item label="姓名" prop="name">
+                <el-form-item label="姓名 : " prop="name">
                     <el-input v-model="form.name" placeholder="用户姓名"></el-input>
                 </el-form-item>
 
-                <el-form-item label="职称">
+                <el-form-item label="职称 : ">
                     <el-select v-model="form.user_type" placeholder="用户类型">
                         <el-option v-for="item in user_types" :label="item.name" :value="item.index" :key="item.index"></el-option>
                     </el-select>
@@ -19,13 +19,13 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="角色">
+                <el-form-item label="角色 : ">
                     <el-select v-model="form.role" placeholder="角色">
                         <el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="介绍">
+                <el-form-item label="介绍 : ">
                     <Tinymce :height=400 menubar='' ref="editor" v-model="form.intro" :show_upload_img="false" />
                 </el-form-item>
 

src/xt_pages/role/components/EditRole.vue

@@ -1,10 +1,10 @@
 <template>
     <el-dialog title='新增角色' width="600px" :visible.sync="visible" :before-close="_close">
-        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
-            <el-form-item label="角色名称" prop="name">
+        <el-form :model="form" :rules="rules" ref="form" label-width="90px">
+            <el-form-item label="角色名称 : " prop="name">
                 <el-input v-model="form.name" placeholder="" maxlength="30" ></el-input>
             </el-form-item>
-            <el-form-item label="角色描述" prop="intro">
+            <el-form-item label="角色描述 : " prop="intro">
                 <el-input type="textarea" v-model="form.intro" placeholder="" resize="none" rows="4" ></el-input>
             </el-form-item>
         </el-form>

src/xt_pages/sign/index.vue

@@ -10,7 +10,7 @@
                 <div class="dataTitle">患者列表</div>
                 <div style="margin-bottom: 10px;">
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>&nbsp;
-                    <el-button type="primary" @change="changeSearch">搜索</el-button>
+                    <el-button type="primary" @change="changeSearch" icon="el-icon-search">搜索</el-button>
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
                     </el-select>
@@ -59,9 +59,9 @@
                     </div>
                     <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>
+                     <!-- 呼吸(次/分):&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>&nbsp;&nbsp;&nbsp;
+                     脉率(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
                     </div>
                     <div class="border"></div>
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
@@ -70,9 +70,9 @@
                     </div>
                     <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>
+                      <!-- 呼吸(次/分):&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>&nbsp;&nbsp;&nbsp;
+                      脉率(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
                     </div>
 
                     <div class="border"></div>
@@ -198,7 +198,7 @@ export default {
         this.patients = []
         if (response.data.state === 1) {
           this.patients = response.data.data.patients
-          console.log('病人信息', this.patients[0].schedule)
+          // console.log('病人信息', this.patients[0].schedule)
           // 将没有排班的信息排除
           for (let i = this.patients.length - 1; i >= 0; i--) {
             if (this.patients[i].schedule.id == 0) {

src/xt_pages/user/doctorAdvice.vue

@@ -4,7 +4,7 @@
         <div class="patient-app-container advice-container app-container">
             <div class="cellButton" style="float:right;">
               <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" size="small"   @click="openNew" type="primary" icon="el-icon-circle-plus-outline" >新增</el-button>
-                <el-button size="small"  @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印</el-button>            
+                <el-button size="small"  @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印</el-button>
             </div>
             <div class="cell clearfix">
                 <el-input   style="width: 400px;" v-model="listQuery.keywords" class="filter-item" size="small" />
@@ -32,7 +32,7 @@
                 <span class="cellLine"> - </span>
                 <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"  format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
             </div>
-            <el-table @cell-click="clickuseradvicecell" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"  row-class-name="user-advice-table-row" :span-method="mergeSpan" ref="multipleTable" :data="adviceTableData" border fit highlight-current-row @select="selectAdvice" @selection-change="changeAdvice" style="width: 100%;margin-top: 10px;" >
+            <el-table id="oictable" @cell-click="clickuseradvicecell" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"  row-class-name="user-advice-table-row" :span-method="mergeSpan" ref="multipleTable" :data="adviceTableData" border fit highlight-current-row @select="selectAdvice" @selection-change="changeAdvice" style="width: 100%;margin-top: 10px;" :cell-class-name="adviceNameShow" >
 
                 <el-table-column align="center" label="全选" width="60px" type="selection" fixed></el-table-column>
                 <!--<el-table-column type="index" :index="indexMethod"  label="序号" width="60px" align="center"></el-table-column>-->
@@ -49,7 +49,7 @@
                     <span v-else></span>
                 </template>
                 </el-table-column>
-                <el-table-column  label="医嘱内容" property="advice_name" width="180"  style="word-break: keep-all;white-space:nowrap;">
+                <el-table-column  label="医嘱内容" property="advice_name" width="180" align="center" style="word-break: keep-all;white-space:nowrap;">
                     <template slot-scope="scope">
                     <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
                         <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
@@ -252,7 +252,7 @@
                         <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-row>
                     <el-row>
                       <el-col :span="24">
@@ -1178,6 +1178,13 @@ export default {
     onTranPatient: function(tranPatient) {
       this.currentPatient = tranPatient;
     },
+    adviceNameShow({row, column, rowIndex, columnIndex}){
+      if(columnIndex==3) {
+        return 'advicenamedisplay';
+      }else {
+        return '';
+      }
+    },
     submitEditAdvice(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -3022,8 +3029,14 @@ export default {
 };
 </script>
 
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+
 .printForm {
   width: 960px;
 }
@@ -3197,5 +3210,9 @@ export default {
   -webkit-transform: rotate(90deg) !important;
   transform: rotate(90deg) !important;
 }
+.advicenamedisplay .cell {
+    float: left;
+    text-align: left;
+}
 </style>
 

src/xt_pages/user/inspection.vue

@@ -5,7 +5,7 @@
       <el-row :gutter="20">
         <el-col :span="7">
           <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="projects" border style="width: 100%" highlight-current-row @current-change="handleCurrentChange" ref="singleTable" >
-            <el-table-column label="检验检查项目">
+            <el-table-column label="检验检查项目" align="center">
               <el-table-column
                 prop="project_name"
                 label="检验项目"
@@ -31,10 +31,11 @@
           </div>
           <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
             :data="items" border style="width: 100%" id="user-inspection-order"  >
-         
+
             <el-table-column
               prop="item_name"
               label="检验项目"
+              align="center"
               min-width="180">
               <template slot-scope="scope">
                 {{scope.row.item_name}} {{scope.row.item_name_addition}}
@@ -43,6 +44,7 @@
             <el-table-column
               prop="name"
               label="结果"
+              align="center"
               min-width="80">
               <template slot-scope="scope">
                 <span>{{scope.row.value}}</span>
@@ -52,6 +54,7 @@
             <el-table-column
               prop="address"
               label="参考值"
+              align="center"
               min-width="120">
               <template slot-scope="scope">
                 <span v-if="scope.row.range_type==1">{{scope.row.range_min}}~{{scope.row.range_max}}</span>
@@ -61,6 +64,7 @@
             <el-table-column
               prop="unit"
               label="单位"
+              align="center"
               min-width="80">
             </el-table-column>
           </el-table>
@@ -100,13 +104,13 @@
 
           <template v-for="(item, index) in form.formItem" >
             <el-col :span="7" :key="index">
-              <el-form-item :label="item.item_name" v-if="item.range_type==1"  :key="item.item_id" :prop="'formItem.' + index + '.value'" 
+              <el-form-item :label="item.item_name" v-if="item.range_type==1"  :key="item.item_id" :prop="'formItem.' + index + '.value'"
              >
                 <el-input placeholder="请填入" v-model="item.value" style="width:95%" type="number">
                   <template slot="append">{{item.unit}}</template>
                 </el-input>
-              </el-form-item> 
-              <el-form-item :label="item.item_name" v-else :key="item.item_id" :prop="'formItem.' + index + '.value'"  
+              </el-form-item>
+              <el-form-item :label="item.item_name" v-else :key="item.item_id" :prop="'formItem.' + index + '.value'"
               >
                 <el-select  v-model="item.value" placeholder="请选择" style="width:95%">
                   <el-option
@@ -116,14 +120,14 @@
                     :value="optionItem">
                   </el-option>
                 </el-select>
-              </el-form-item> 
+              </el-form-item>
             </el-col>
             <el-col :span="1" :key="'form-col'+index">&nbsp;</el-col>
           </template>
-          
+
         </el-row>
-        
-        
+
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -180,12 +184,12 @@ export default {
   },
   methods:{
     deleteInspection(){
-      
+
       if(this.project == null || this.itemDate == "") {
         this.$message.error("请先选择删除删除的记录");
         return false;
       }
-      
+
       this.$confirm('确认删除此记录?', '删除', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -203,7 +207,7 @@ export default {
                     type: "success",
                     duration: 2000
                 });
-                
+
                 for( var index in this.projects) {
                   if (this.projects[index].project_id == params.project_id) {
                     this.projects[index].count --;
@@ -226,7 +230,7 @@ export default {
         this.$message.error("请先选择项目");
         return false;
       }
-      
+
       this.form.method = "edit";
       this.formTitle = "修改" + this.project.project_name;
       this.form.project_id = this.project.project_id;
@@ -268,7 +272,7 @@ export default {
         // formItem["value"] = '';
         // if (formItem.range_type==2) {
         //   formItem["select_options"] = formItem.range_options.split(",");
-        // } 
+        // }
         this.form.formItem.push({
           id:    0,
           project_id: this.project.inspection_reference[index].project_id,
@@ -340,7 +344,7 @@ export default {
                   this.items.push(item);
                 }
               }
-              
+
               this.resetForm(formName);
               this.dialogFormVisible = false;
 
@@ -421,7 +425,7 @@ export default {
                   this.items.push(item);
                 }
               }
-              
+
               this.resetForm(formName);
               this.dialogFormVisible = false;
 
@@ -439,7 +443,7 @@ export default {
           return false;
         }
       });
-      
+
     },
     fetchInspectionReference(){
       fetchInspectionReference(this.patientID).then(response=>{
@@ -480,7 +484,7 @@ export default {
         this.fetchPatientInspections(this.queryParams);
       }
     },
-    
+
     handleCurrentChangePage(val) {
         this.itemLoading = true;
       this.queryParams.page = val;
@@ -549,6 +553,12 @@ export default {
 };
 </script>
 
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
+
 <style >
 #user-inspection-order td {
     border-bottom:0px !important;