Browse Source

修改华侨医院bug

csx 5 years ago
parent
commit
d7d2447a0c

+ 2 - 7
src/pages/main/dialog/MonitDialog.vue View File

@@ -663,13 +663,8 @@ export default {
663 663
       var m = newDate.getMonth() + 1;
664 664
       var d = newDate.getDate();
665 665
       var record_date =
666
-        y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
667
-      this.form.monitor_date = Math.round(
668
-        new Date(record_date + " 00:00:00").getTime() / 1000
669
-      );
670
-      // alert(record_date+"))))")
671
-
672
-
666
+        y + "/" + (m < 10 ? "0" + m : m) + "/" + (d < 10 ? "0" + d : d);
667
+      this.form.monitor_date = new Date(record_date + " 00:00:00").getTime() / 1000;
673 668
       var nowTime = new Date();
674 669
       // this.form.monitor_time = parseTime(nowTime, "{h}:{i}");
675 670
       // this.monitor_time_str = this.handleTime(nowTime);

+ 61 - 63
src/pages/main/template/DialysisPrintOrderTwo.vue View File

@@ -10,40 +10,37 @@
10 10
           &nbsp;
11 11
           <check-box text="住院" :checked="patientInfo_source_2"></check-box>
12 12
         </div>
13
-        <div class="inline_block" style="margin-left: 25px;">
13
+        <div class="inline_block" style="margin-left: 5px;">
14 14
           住院号:
15
-          <div class="under_line" style="width: 100px;text-align: left" v-if="patientInfo.admission_number">
15
+          <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
16 16
             {{patientInfo.admission_number}}
17 17
           </div>
18
-          <div class="under_line" style="width: 100px;text-align: left" v-else>
18
+          <div class="under_line" style="width: 70px;text-align: left" v-else>
19 19
             {{'/'}}
20 20
           </div>
21 21
         </div>
22
-        <div class="inline_block" style="margin-left:25px;">
22
+        <div class="inline_block" style="margin-left:5px;">
23 23
           姓名:
24
-          <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
24
+          <div class="under_line" style="width: 50px;text-align: left">{{patientInfo.name}}</div>
25 25
         </div>
26
-        <div class="inline_block" style="margin-left: 25px;">
26
+        <div class="inline_block" style="margin-left: 5px;">
27 27
           性别:
28 28
           <check-box text="男" :checked="patientInfo_gender_1"></check-box>
29 29
           &nbsp;
30 30
           <check-box text="女" :checked="patientInfo_gender_2"></check-box>
31 31
         </div>
32
-        <div class="inline_block" style="margin-left: 25px;">
32
+        <div class="inline_block" style="margin-left: 5px;">
33 33
           年龄:
34
-          <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
34
+          <div class="under_line" style="width: 30px;text-align: left">{{getAge(patientInfo)}}</div>
35 35
36 36
         </div>
37
-
38
-      </div>
39
-
40
-      <div class="row flex">
41
-        <div class="inline_block">
37
+        <div class="inline_block" style="margin-left: 5px;">
42 38
           诊断:
43
-          <div class="under_line" style="width: 500px;text-align: left">{{patientInfo.diagnose}}</div>
39
+          <div class="under_line" style="width: 190px;text-align: left">{{patientInfo.diagnose}}</div>
44 40
         </div>
45 41
       </div>
46 42
 
43
+
47 44
       <div class="row">
48 45
         <table class="proj_table" >
49 46
           <tbody>
@@ -66,10 +63,10 @@
66 63
                   次/周
67 64
                 </div>
68 65
                 <div class="inline_block" style="margin-left: 30px;">
69
-                  透析机编号
70
-                  <div class="under_line" style="width: 100px;text-align: left">{{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:patientInfo.DialysisSchedule.device_number.number}}</div>
66
+                  透析机编号:
67
+                  <div class="under_line" style="width: 40px;text-align: left">{{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:patientInfo.DialysisSchedule.device_number.number}}</div>
71 68
                   型号
72
-                  <div class="under_line" style="width: 100px;text-align: left">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
69
+                  <div class="under_line" style="width: 70px;text-align: left">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
73 70
                 </div>
74 71
               </div>
75 72
               <div class="row" style="padding: 2px 0;line-height:19px;">
@@ -290,42 +287,43 @@
290 287
       <template v-if="this.monitors.length > 8 ">
291 288
         <div class="order-yy-name">{{orgname}}</div>
292 289
         <div class="order-title">血液净化专科护理记录单</div>
293
-        <div class="row" style="margin-top: 15px;">
290
+        <div class="row">
294 291
           <div class="inline_block">
295 292
             科室:
296 293
             <check-box text="门诊透析" :checked="patientInfo_source_1 "></check-box>
297 294
             &nbsp;
298 295
             <check-box text="住院" :checked="patientInfo_source_2"></check-box>
299 296
           </div>
300
-          <div class="inline_block" style="margin-left: 25px;">
297
+          <div class="inline_block" style="margin-left: 5px;">
301 298
             住院号:
302
-            <div class="under_line" style="width: 100px;text-align: left">
303
-              {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
299
+            <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
300
+              {{patientInfo.admission_number}}
301
+            </div>
302
+            <div class="under_line" style="width: 70px;text-align: left" v-else>
303
+              {{'/'}}
304 304
             </div>
305 305
           </div>
306
-          <div class="inline_block" style="margin-left:25px;">
306
+          <div class="inline_block" style="margin-left:5px;">
307 307
             姓名:
308
-            <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
308
+            <div class="under_line" style="width: 50px;text-align: left">{{patientInfo.name}}</div>
309 309
           </div>
310
-          <div class="inline_block" style="margin-left: 25px;">
310
+          <div class="inline_block" style="margin-left: 5px;">
311 311
             性别:
312 312
             <check-box text="男" :checked="patientInfo_gender_1"></check-box>
313 313
             &nbsp;
314 314
             <check-box text="女" :checked="patientInfo_gender_2"></check-box>
315 315
           </div>
316
-          <div class="inline_block" style="margin-left: 25px;">
316
+          <div class="inline_block" style="margin-left: 5px;">
317 317
             年龄:
318
-            <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
318
+            <div class="under_line" style="width: 30px;text-align: left">{{getAge(patientInfo)}}</div>
319 319
320 320
           </div>
321
-
322
-        </div>
323
-        <div class="row flex">
324
-          <div class="inline_block">
321
+          <div class="inline_block" style="margin-left: 5px;">
325 322
             诊断:
326
-            <div class="under_line_two" style="width: 500px;text-align: left">{{patientInfo.diagnose}}</div>
323
+            <div class="under_line" style="width: 190px;text-align: left">{{patientInfo.diagnose}}</div>
327 324
           </div>
328 325
         </div>
326
+
329 327
       </template>
330 328
       <div class="row" :style="this.monitors.length <= 8 ? 'margin-top:-11px':''">
331 329
         <table class="proj_table">
@@ -582,43 +580,43 @@
582 580
 
583 581
         <div class="order-yy-name">{{orgname}}</div>
584 582
         <div class="order_title"> 血液净化科医嘱及执行单 </div>
585
-        <div class="row" style="margin-top: 15px;">
586
-          <div class="inline_block" >
583
+        <div class="row">
584
+          <div class="inline_block">
587 585
             科室:
588
-            <check-box text="门诊透析" :checked="patientInfo_source_1"></check-box>
586
+            <check-box text="门诊透析" :checked="patientInfo_source_1 "></check-box>
587
+            &nbsp;
589 588
             <check-box text="住院" :checked="patientInfo_source_2"></check-box>
590 589
           </div>
591
-          <div class="inline_block" style="margin-left:25px;">
590
+          <div class="inline_block" style="margin-left: 5px;">
592 591
             住院号:
593
-            <div class="under_line" style="width: 100px;text-align: left" v-if="patientInfo.admission_number">
592
+            <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
594 593
               {{patientInfo.admission_number}}
595 594
             </div>
596
-            <div class="under_line" style="width: 100px;text-align: left" v-else>
595
+            <div class="under_line" style="width: 70px;text-align: left" v-else>
597 596
               {{'/'}}
598 597
             </div>
599 598
           </div>
600
-          <div class="inline_block" style="margin-left:25px;">
599
+          <div class="inline_block" style="margin-left:5px;">
601 600
             姓名:
602
-            <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
601
+            <div class="under_line" style="width: 50px;text-align: left">{{patientInfo.name}}</div>
603 602
           </div>
604
-          <div class="inline_block" style="margin-left: 25px;">
603
+          <div class="inline_block" style="margin-left: 5px;">
605 604
             性别:
606 605
             <check-box text="男" :checked="patientInfo_gender_1"></check-box>
606
+            &nbsp;
607 607
             <check-box text="女" :checked="patientInfo_gender_2"></check-box>
608 608
           </div>
609
-          <div class="inline_block" style="margin-left: 25px">
609
+          <div class="inline_block" style="margin-left: 5px;">
610 610
             年龄:
611
-            <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
611
+            <div class="under_line" style="width: 30px;text-align: left">{{getAge(patientInfo)}}</div>
612 612
613 613
           </div>
614
-
615
-        </div>
616
-        <div class="row flex">
617
-          <div class="inline_block">
614
+          <div class="inline_block" style="margin-left: 5px;">
618 615
             诊断:
619
-            <div class="under_line"  style="width: 500px;text-align: left">{{patientInfo.diagnose}}</div>
616
+            <div class="under_line" style="width: 190px;text-align: left">{{patientInfo.diagnose}}</div>
620 617
           </div>
621 618
         </div>
619
+
622 620
         <table class="proj_table">
623 621
           <tbody>
624 622
           <tr>
@@ -909,43 +907,43 @@
909 907
         <template v-if="this.advice_groups_2.length > 0">
910 908
           <div class="order-yy-name">{{orgname}}</div>
911 909
           <div class="order_title"> 血液净化科医嘱及执行单 </div>
912
-          <div class="row" style="margin-top: 15px;">
913
-            <div class="inline_block" >
910
+          <div class="row">
911
+            <div class="inline_block">
914 912
               科室:
915
-              <check-box text="门诊透析" :checked="patientInfo_source_1"></check-box>
913
+              <check-box text="门诊透析" :checked="patientInfo_source_1 "></check-box>
914
+              &nbsp;
916 915
               <check-box text="住院" :checked="patientInfo_source_2"></check-box>
917 916
             </div>
918
-            <div class="inline_block" style="margin-left:25px;">
917
+            <div class="inline_block" style="margin-left: 5px;">
919 918
               住院号:
920
-              <div class="under_line" style="width: 100px;text-align: left" v-if="patientInfo.admission_number">
919
+              <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
921 920
                 {{patientInfo.admission_number}}
922 921
               </div>
923
-              <div class="under_line" style="width: 100px;text-align: left" v-else>
922
+              <div class="under_line" style="width: 70px;text-align: left" v-else>
924 923
                 {{'/'}}
925 924
               </div>
926 925
             </div>
927
-            <div class="inline_block" style="margin-left:25px;">
926
+            <div class="inline_block" style="margin-left:5px;">
928 927
               姓名:
929
-              <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
928
+              <div class="under_line" style="width: 50px;text-align: left">{{patientInfo.name}}</div>
930 929
             </div>
931
-            <div class="inline_block" style="margin-left: 25px;">
930
+            <div class="inline_block" style="margin-left: 5px;">
932 931
               性别:
933 932
               <check-box text="男" :checked="patientInfo_gender_1"></check-box>
933
+              &nbsp;
934 934
               <check-box text="女" :checked="patientInfo_gender_2"></check-box>
935 935
             </div>
936
-            <div class="inline_block" style="margin-left: 25px;">
936
+            <div class="inline_block" style="margin-left: 5px;">
937 937
               年龄:
938
-              <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
938
+              <div class="under_line" style="width: 30px;text-align: left">{{getAge(patientInfo)}}</div>
939 939
940 940
             </div>
941
-
942
-          </div>
943
-          <div class="row flex">
944
-            <div class="inline_block">
941
+            <div class="inline_block" style="margin-left: 5px;">
945 942
               诊断:
946
-              <div class="under_line" style="width: 500px;text-align: left">{{patientInfo.diagnose}}</div>
943
+              <div class="under_line" style="width: 190px;text-align: left">{{patientInfo.diagnose}}</div>
947 944
             </div>
948 945
           </div>
946
+
949 947
           <table class="print-table-no" border="1"  count="0">
950 948
             <tbody>
951 949
             <tr style="line-height:35px;padding:8px 5px;">