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"
@@ -1152,7 +1153,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 +2180,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/user/doctorAdvice.vue

@@ -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 @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">
@@ -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) {
@@ -3024,6 +3031,7 @@ export default {
 
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+
 .printForm {
   width: 960px;
 }
@@ -3197,5 +3205,9 @@ export default {
   -webkit-transform: rotate(90deg) !important;
   transform: rotate(90deg) !important;
 }
+.advicenamedisplay .cell {
+    float: left;
+    text-align: left;
+}
 </style>