Explorar el Código

需求和bug修改

XMLWAN hace 4 años
padre
commit
a59812affa

+ 14 - 14
src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue Ver fichero

@@ -31,12 +31,12 @@
31 31
                       {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
32 32
                     </span>
33 33
                   </td>
34
-                  <td style="text-align:center;">
34
+                  <td style="text-align:center">
35 35
                     姓名:<span style="display:inline-block;margin-left:10px;">
36 36
                        {{ record.patient.name }}
37 37
                     </span>
38 38
                   </td>
39
-                  <td style="text-align:center;">
39
+                  <td style="text-align:center;width:100px">
40 40
                     性别:<span
41 41
                       style="display:inline-block;margin-left:10px;"
42 42
                     >
@@ -55,7 +55,7 @@
55 55
                    &nbsp;
56 56
                      <check-box text="住院" :checked="record.receive_assessment.condition == 2"></check-box>
57 57
                   </td>
58
-                  <td style="text-align:center;">
58
+                  <td style="text-align:center;width:160px"">
59 59
                     住院号:<span style="display:inline-block;margin-left:10px;">
60 60
                        {{record.receive_assessment.admission_number?record.receive_assessment.admission_number:"/"}}
61 61
                     </span>
@@ -132,7 +132,7 @@
132 132
                       }}kg</span
133 133
                     >
134 134
                   </td>
135
-                  <td style="text-align:left;" colspan="1">
135
+                  <td style="text-align:left;" colspan="2">
136 136
                     <span style="display:inline-block;margin-left:15px;"
137 137
                       >电导率:{{record.prescription.conductivity?record.prescription.conductivity:"0"}}(mS/cm)</span
138 138
                     >
@@ -223,7 +223,7 @@
223 223
                       {{record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:"0"}}
224 224
                       </span>&nbsp;L
225 225
                   </td>
226
-                   <td style="text-align:left;" colspan="2">
226
+                   <td style="text-align:left;" colspan="3">
227 227
                     <span style="display:inline-block;margin-left:15px;"
228 228
                       >透析时间:
229 229
                      {{
@@ -247,7 +247,7 @@
247 247
                         }}
248 248
                       </span>&nbsp;L
249 249
                   </td>
250
-                   <td style="text-align:left;" colspan="2">
250
+                   <td style="text-align:left;" colspan="1">
251 251
                     <span style="display:inline-block;margin-left:15px;"
252 252
                       >置换方式:
253 253
                        <label-box
@@ -273,7 +273,7 @@
273 273
                 </tr>
274 274
                 <tr>
275 275
                   <td style="text-align:left;">
276
-                    <span style="display:inline-block;margin-left:15px;"
276
+                    <span style="display:inline-block;margin-left:15px;display:flex;align-items:center;height:36px;"
277 277
                       >责任护士:
278 278
                        <span
279 279
                             v-if="
@@ -359,9 +359,10 @@
359 359
                       </span>
360 360
                   </td>
361 361
                   <td style="text-align:left;" colspan="3">
362
-                    <span style="display:inline-block;margin-left:15px;"
362
+                    <span style="display:inline-block;margin-left:15px;display:flex;align-items:center;height:36px;"
363 363
                       >医生签名:
364 364
                        <span
365
+                           
365 366
                             v-if="
366 367
                               !record.advices ||
367 368
                                 typeof record.advices[0] == 'undefined' ||
@@ -382,7 +383,9 @@
382 383
                               )
383 384
                             }}</span
384 385
                           >
386
+                          
385 387
                           <img
388
+                            v-else
386 389
                             class="es-img"
387 390
                             :src="
388 391
                               setAdminUserES(
@@ -392,10 +395,7 @@
392 395
                             "
393 396
                             alt=""
394 397
                             srcset=""
395
-                            v-else
396
-                            style="height: 30px;"
397
-                          />  </span
398
-                    >
398
+                            style="height: 30px;"/> </span> 
399 399
                   </td>
400 400
                 </tr>
401 401
                 <tr>
@@ -1078,8 +1078,8 @@
1078 1078
            </span>
1079 1079
          </td>
1080 1080
          <td style="text-align:left;" >
1081
-           <span>下机护士:
1082
-              <span v-if="setAdminUserES(record.dialysis_order, 'finish_nurse') == ''">{{getAdminUser(record.dialysis_order, 'finish_nurse')}}</span>
1081
+           <span style="display:flex;align-items:center;height:36px;">下机护士:
1082
+              <span  v-if="setAdminUserES(record.dialysis_order, 'finish_nurse') == ''">{{getAdminUser(record.dialysis_order, 'finish_nurse')}}</span>
1083 1083
                 <img class="es-img" :src="setAdminUserES(record.dialysis_order, 'finish_nurse')" alt=""
1084 1084
               srcset="" v-else style="height: 30px;">
1085 1085
            </span>

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue Ver fichero

@@ -887,7 +887,7 @@
887 887
               ></label-box>
888 888
               <label-box
889 889
                 :isChecked="
890
-                  afterdialysis.complications_index.indexOf('无') > -1
890
+                  afterdialysis.complication.indexOf('无') > -1
891 891
                     ? true
892 892
                     : false
893 893
                 "