Browse Source

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

28169 8 months ago
parent
commit
a51eb05c7d

+ 3 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_seventyfour.vue View File

@@ -17,6 +17,7 @@
17 17
           v-for="(record, index) in records"
18 18
           :key="record.id"
19 19
           class="print_page_main_content"
20
+          style="page-break-after: always;"
20 21
         >
21 22
           <div id="dialysis-print-box">
22 23
             <div class="dialysis-print-order">
@@ -60,7 +61,7 @@
60 61
                     <td colspan="3">
61 62
                       <div style="line-height:30px;">
62 63
                         上机前病情:
63
-                        <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis!=''?true :false" showValue="无特殊"></label-box>&nbsp;
64
+                        <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
64 65
                         <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis_other!=''?true :false" showValue="出现:"></label-box>
65 66
                         <span>{{record.assessment_before_dislysis.symptom_before_dialysis_other}}</span>
66 67
                       </div>
@@ -396,7 +397,7 @@
396 397
   import { jsGetAge, uParseTime } from '@/utils/tools'
397 398
   import { getDataConfig } from '@/utils/data'
398 399
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
399
-
400
+  import print from "print-js";
400 401
   export default {
401 402
     name: 'BatchPrintOrderSeven',
402 403
     components: {

+ 5 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSop.vue View File

@@ -35,8 +35,11 @@
35 35
               <td colspan="3">
36 36
                 <div style="line-height:30px;">
37 37
                   上机前病情:
38
-                  <label-box :isChecked="predialysis.symptom_before_dialysis!=''?true :false" showValue="无特殊"></label-box>&nbsp;
39
-                  <label-box :isChecked="predialysis.symptom_before_dialysis==''?true :false" showValue="出现:"></label-box>
38
+                  <!-- <span v-if="predialysis.symptom_before_dialysis_other==''"> -->
39
+                    <label-box :isChecked="predialysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
40
+                    <label-box :isChecked="predialysis.symptom_before_dialysis_other!=''?true :false" showValue="出现:"></label-box>
41
+                  <!-- </span> -->
42
+                  
40 43
                   <!-- <span>{{predialysis.symptom_before_dialysis}}</span> -->
41 44
                   <span>{{predialysis.symptom_before_dialysis_other}}</span>
42 45
                 </div>