浏览代码

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

csx 4 年前
父节点
当前提交
f7117ef07f

+ 1 - 1
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue 查看文件

@@ -1423,7 +1423,7 @@
1423 1423
       setLastRecord: function(schedual,lastAssessmentAfterDislysis,lastPredialysisEvaluation,lastDialysisPrescribe,lastDryWeightDislysis,system_prescribe) {
1424 1424
 
1425 1425
         this.treatment_mode = this.$store.getters.treatment_mode
1426
-        // console.log("99999",this.treatment_mode)
1426
+        console.log("99999",this.treatment_mode)
1427 1427
         this.perfusion_apparatus = getDataConfig(
1428 1428
           'hemodialysis',
1429 1429
           'perfusion_apparatus'

+ 11 - 19
src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue 查看文件

@@ -210,25 +210,15 @@
210 210
                 <div class="row" style="padding: 2px 0;line-height:23px;">
211 211
                   <div class="inline_block" style="flex:1;">
212 212
                     置换方式:
213
-                    <label-box
214
-                      :isChecked="
215
-                        prescription.displace_liqui_part == 1 ? true : false
216
-                      "
217
-                      showValue="前置换"
218
-                    ></label-box>&nbsp;
219
-                    <label-box
220
-                      :isChecked="
221
-                        prescription.displace_liqui_part == 2 ? true : false
222
-                      "
223
-                      showValue="后置换"
224
-                    ></label-box>
213
+                    <check-box :checked="prescription.displace_liqui_part == 1 ? true : false" text="前置换"></check-box>&nbsp;
214
+                    <check-box :checked="prescription.displace_liqui_part == 2 ? true : false" text="前置换"></check-box>&nbsp;
225 215
                   </div>
226 216
                   <div class="inline_block" style="margin-left:20px;flex:1;">
227 217
                     置换量:
228 218
                     <div class="under_line" style="width: 70px;text-align: center">
229 219
                     {{ prescription.replacement_total ? prescription.replacement_total : "" }}
230 220
                     </div>
231
-                    ml
221
+                    L
232 222
                   </div>
233 223
                 </div>
234 224
               </td>
@@ -374,12 +364,6 @@
374 364
                             </div>
375 365
                             kg
376 366
                         </div>
377
-                        <div class="inline_block" style="margin-left:10px;">
378
-                            透析器级别
379
-                            <div class="under_line" style="width: 100px;text-align: center">
380
-                                {{ afterdialysis.cruor ? afterdialysis.cruor : '' }}
381
-                            </div>
382
-                        </div>
383 367
                         <div class="inline_block" style="margin-left:10px;">
384 368
                             离科时间
385 369
                             <div class="under_line" style="width: 70px;text-align: center">
@@ -430,6 +414,14 @@
430 414
                         </div>
431 415
                         
432 416
                         
417
+                    </div>
418
+                    <div class="row" style="padding: 2px 0;line-height:30px; display:flex;">
419
+                      <div class="inline_block">
420
+                        透析器级别
421
+                        <div class="under_line" style="width: 300px;text-align:left;">
422
+                            {{ afterdialysis.cruor ? afterdialysis.cruor : '' }}
423
+                        </div>
424
+                      </div>
433 425
                     </div>
434 426
                     <div class="row" style="min-height:40px;">
435 427
                         <div style="width: 100%;line-height: 25px;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;">