Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientCharges/costComparison.vue

@@ -197,7 +197,7 @@
                     </el-form-item>
 
 
-                  <el-form-item label="清算机构" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id = 10106">
+                  <el-form-item label="清算机构" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id == 10106">
                     <el-select v-model="query_clr_org" placeholder="请选择" style="width: 200px;">
                       <el-option
                           v-for="item in clrOrgOptions"
@@ -208,7 +208,7 @@
                     </el-select>
                   </el-form-item>
 
-                  <el-form-item label="清算类别" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id = 9919">
+                  <el-form-item label="清算类别" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id == 9919">
                     <el-select v-model="clr_type" placeholder="请选择" style="width: 200px;">
                       <el-option
                           v-for="item in clrOptions"

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -167,7 +167,7 @@
               </span>
             </td>   
             <td style="text-align:center;" colspan="11">
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
                 <span v-html="hosDetail.admitting_diagnosis"></span>
               </span>
             </td>   
@@ -178,7 +178,7 @@
             </td>
              <td style="text-align:center;width:170px" colspan="11">
              
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.discharge_diagnosis"></span>  
               </span>
             </td>
@@ -190,7 +190,7 @@
             </td>
            <td style="text-align:center;width:170px" colspan="11">
             
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
                  <span v-html="hosDetail.diagnosis_admission"></span>
               </span>
             </td>
@@ -203,7 +203,7 @@
            
             </td>
             <td style="text-align:center;width:170px" colspan="11">
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.treatment"></span> 
               </span>
             </td>
@@ -215,7 +215,7 @@
             </td>
             <td style="text-align:center;width:170px" colspan="11">
             
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.illness_discharge"></span> 
               </span>
             </td>
@@ -227,7 +227,7 @@
               出院医嘱:
             </td>
             <td style="text-align:center;width:170px" colspan="11">
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
                 <span v-html="hosDetail.discharge_advice"></span> 
               </span>
             </td>