Explorar el Código

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

XMLWAN hace 3 años
padre
commit
1c85ccb23c

+ 2 - 2
src/xt_pages/outpatientCharges/costComparison.vue Ver fichero

197
                     </el-form-item>
197
                     </el-form-item>
198
 
198
 
199
 
199
 
200
-                  <el-form-item label="清算机构" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id = 10106">
200
+                  <el-form-item label="清算机构" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id == 10106">
201
                     <el-select v-model="query_clr_org" placeholder="请选择" style="width: 200px;">
201
                     <el-select v-model="query_clr_org" placeholder="请选择" style="width: 200px;">
202
                       <el-option
202
                       <el-option
203
                           v-for="item in clrOrgOptions"
203
                           v-for="item in clrOrgOptions"
208
                     </el-select>
208
                     </el-select>
209
                   </el-form-item>
209
                   </el-form-item>
210
 
210
 
211
-                  <el-form-item label="清算类别" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id = 9919">
211
+                  <el-form-item label="清算类别" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id == 9919">
212
                     <el-select v-model="clr_type" placeholder="请选择" style="width: 200px;">
212
                     <el-select v-model="clr_type" placeholder="请选择" style="width: 200px;">
213
                       <el-option
213
                       <el-option
214
                           v-for="item in clrOptions"
214
                           v-for="item in clrOptions"

+ 6 - 6
src/xt_pages/user/hospitalSummaryPrint.vue Ver fichero

167
               </span>
167
               </span>
168
             </td>   
168
             </td>   
169
             <td style="text-align:center;" colspan="11">
169
             <td style="text-align:center;" colspan="11">
170
-              <span style="display:inline-block;margin-left:10px;">
170
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
171
                 <span v-html="hosDetail.admitting_diagnosis"></span>
171
                 <span v-html="hosDetail.admitting_diagnosis"></span>
172
               </span>
172
               </span>
173
             </td>   
173
             </td>   
178
             </td>
178
             </td>
179
              <td style="text-align:center;width:170px" colspan="11">
179
              <td style="text-align:center;width:170px" colspan="11">
180
              
180
              
181
-              <span style="display:inline-block;margin-left:10px;">
181
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
182
                <span v-html="hosDetail.discharge_diagnosis"></span>  
182
                <span v-html="hosDetail.discharge_diagnosis"></span>  
183
               </span>
183
               </span>
184
             </td>
184
             </td>
190
             </td>
190
             </td>
191
            <td style="text-align:center;width:170px" colspan="11">
191
            <td style="text-align:center;width:170px" colspan="11">
192
             
192
             
193
-              <span style="display:inline-block;margin-left:10px;">
193
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
194
                  <span v-html="hosDetail.diagnosis_admission"></span>
194
                  <span v-html="hosDetail.diagnosis_admission"></span>
195
               </span>
195
               </span>
196
             </td>
196
             </td>
203
            
203
            
204
             </td>
204
             </td>
205
             <td style="text-align:center;width:170px" colspan="11">
205
             <td style="text-align:center;width:170px" colspan="11">
206
-              <span style="display:inline-block;margin-left:10px;">
206
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
207
                <span v-html="hosDetail.treatment"></span> 
207
                <span v-html="hosDetail.treatment"></span> 
208
               </span>
208
               </span>
209
             </td>
209
             </td>
215
             </td>
215
             </td>
216
             <td style="text-align:center;width:170px" colspan="11">
216
             <td style="text-align:center;width:170px" colspan="11">
217
             
217
             
218
-              <span style="display:inline-block;margin-left:10px;">
218
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
219
                <span v-html="hosDetail.illness_discharge"></span> 
219
                <span v-html="hosDetail.illness_discharge"></span> 
220
               </span>
220
               </span>
221
             </td>
221
             </td>
227
               出院医嘱:
227
               出院医嘱:
228
             </td>
228
             </td>
229
             <td style="text-align:center;width:170px" colspan="11">
229
             <td style="text-align:center;width:170px" colspan="11">
230
-              <span style="display:inline-block;margin-left:10px;">
230
+              <span style="display:inline-block;margin-left:10px;text-align:left;">
231
                 <span v-html="hosDetail.discharge_advice"></span> 
231
                 <span v-html="hosDetail.discharge_advice"></span> 
232
               </span>
232
               </span>
233
             </td>
233
             </td>