Browse Source

5月9日杨青

杨青 2 years ago
parent
commit
fef40a5dd5

+ 15 - 6
src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue View File

@@ -467,12 +467,13 @@ export default {
467 467
       // this.receiveTreatmentAsses.precaution = obj;
468 468
 
469 469
       // this.receiveTreatmentAsses.falldown=this.precautionTwo
470
-      // if(this.receiveTreatmentAsses.falldown.length<=0){
471
-      //   this.isFalldown('跌倒风险预防措施')
472
-      // }
470
+      if(this.precautionTwo.length>0){
471
+        this.$refs.receiveTreatmentAsses.clearValidate('precautionTwo');
472
+      }
473 473
       console.log('this.precaution_arr',this.precautionTwo);
474 474
       // console.log('arr的数据',this.receiveTreatmentAsses.falldown);
475 475
       // console.log('sadffdasfdg',this.receiveTreatmentAsses.falldown.length);
476
+      // this.$refs[fromName].resetFields();
476 477
       
477 478
     },
478 479
 
@@ -571,10 +572,18 @@ export default {
571 572
               },
572 573
             ];
573 574
           } 
574
-          else{
575
+          // if(name == "跌倒风险预防措施" && this.precautionTwo.length<=0){
576
+          //   return [
577
+          //     { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
578
+          //     {
579
+          //       required: true,
580
+          //       pattern: /^[1-9]\d*$/,
581
+          //       message: `请选择${name}`,
582
+          //       trigger: ['blur','change']
583
+          //     },
584
+          //   ];
585
+          // }
575 586
             return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
576
-          }
577
-          
578 587
         }
579 588
       }
580 589
     },

+ 6 - 4
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File

@@ -625,7 +625,7 @@
625 625
                         </el-form-item>
626 626
                     </el-col>
627 627
 
628
-                    <el-col :span="8" v-if="isShows('钠')"><!--  :prop="isName('钠')"-->
628
+                    <el-col :span="8" v-if="isShows('钠')"><!--  :prop="isName('钠')" prop="sodium"-->
629 629
                         <el-form-item label="钠(mmol/L):" prop="sodium" :rules="isCheckmust('纳')">
630 630
                             <el-input
631 631
                                     type="number"
@@ -3730,10 +3730,8 @@ mu
3730 3730
         var filedList = store.getters.xt_user.fileds
3731 3731
         for (let i = 0; i < filedList.length; i++) {
3732 3732
           if (filedList[i].module == 1 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
3733
-
3734 3733
             return true
3735 3734
           }
3736
-
3737 3735
         }
3738 3736
         return false
3739 3737
       },
@@ -3749,7 +3747,7 @@ mu
3749 3747
           filedList[i].is_show == 1
3750 3748
         ) {
3751 3749
           // console.log(filedList[i],'false')
3752
-          if (name == "透析模式" || name == "透析时长") {
3750
+          if (name == "透析模式" || name == "透析时长" ) {
3753 3751
           return [
3754 3752
             { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
3755 3753
             {
@@ -3759,6 +3757,9 @@ mu
3759 3757
               trigger: ['blur','change']
3760 3758
             },
3761 3759
           ];
3760
+        }
3761
+        if(name == '钠'){
3762
+          return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
3762 3763
         }
3763 3764
           return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
3764 3765
 
@@ -4706,6 +4707,7 @@ mu
4706 4707
       }
4707 4708
     },
4708 4709
     created() {
4710
+      console.log('weretrertf',this.dialysisPrescription.sodium);
4709 4711
       console.log("schedual232323323232323232",this.adminRoles)
4710 4712
       this.illnessList = getDataConfig('hemodialysis', 'illness')
4711 4713
 

+ 5 - 3
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

@@ -656,16 +656,18 @@ export default {
656 656
       this.$refs.multipleTable3.toggleAllSelection()
657 657
     },
658 658
     printThisPage() {
659
-      if (this.org_id == 10138 || this.org_id == 10278) {
659
+      if (this.org_id == 10138 || this.org_id == 10278 ) {
660 660
         const style =
661 661
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
662
-        printJS({
662
+            
663
+          printJS({
663 664
           printable: 'printMain',
664 665
           type: 'html',
665 666
           style: style,
666 667
           scanStyles: false
667 668
         })
668
-      } else {
669
+      } 
670
+      else {
669 671
         const style =
670 672
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
671 673
         printJS({

+ 35 - 3
src/xt_pages/outpatientDoctorStation/recordPrint.vue View File

@@ -13,12 +13,12 @@
13 13
 
14 14
     <div class="dialysisPage" style="padding-top: 40px">
15 15
       <printOne
16
-        v-if="
16
+      v-if="
17 17
           org_id != 10217 && org_id != 10188 &&org_id != 10318&&
18 18
           org_id != 9675 &&
19 19
           org_id != 9671 &&
20 20
           org_id != 0 &&
21
-          org_id != 10164 
21
+          org_id != 10164
22 22
         "
23 23
         ref="printOne"
24 24
         v-bind:childResponse="childResponse"
@@ -27,6 +27,7 @@
27 27
         :history="history"
28 28
         :patientid="patientid"
29 29
       ></printOne>
30
+      <!--   -->
30 31
       <printTwo
31 32
         v-if="
32 33
           org_id == 10217 ||
@@ -43,6 +44,7 @@
43 44
         :history="history"
44 45
         :patientid="patientid"
45 46
       ></printTwo>
47
+      
46 48
       <printThree
47 49
         v-if="org_id == 10318 || org_id == 0"
48 50
         ref="printThree"
@@ -52,7 +54,18 @@
52 54
         :history="history"
53 55
         :patientid="patientid"
54 56
       >
57
+      <!--  -->
55 58
       </printThree>
59
+      <printFour
60
+        v-if="org_id == 10138 || org_id == 10278 || org_id == 0"
61
+        ref="printFour"
62
+        v-bind:childResponse="childResponse"
63
+        :patient="patient"
64
+        :hispatient="hispatient"
65
+        :history="history"
66
+        :patientid="patientid"
67
+      >
68
+      </printFour>
56 69
     </div>
57 70
   </div>
58 71
 </template>
@@ -68,6 +81,7 @@ import { getPatientCaseHistory } from "@/api/project/project";
68 81
 import printOne from "./recordTemplate/printOne";
69 82
 import printTwo from "./recordTemplate/printTwo";
70 83
 import printThree from "./recordTemplate/printThree";
84
+import printFour from "./recordTemplate/printFour";
71 85
 export default {
72 86
   name: "dialysisPrintOrder",
73 87
   components: {
@@ -75,6 +89,7 @@ export default {
75 89
     printOne,
76 90
     printTwo,
77 91
     printThree,
92
+    printFour
78 93
   },
79 94
   props: {
80 95
     patientid: Number,
@@ -137,7 +152,7 @@ export default {
137 152
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
138 153
 
139 154
       const style =
140
-        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle div{width: 200px;}}";
155
+        "@media print {.prescription-print{font-size: 14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.recordTitle div{width: 200px;}}";
141 156
       const style1 =
142 157
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: fit-content;min-height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
143 158
       const style2 =
@@ -170,6 +185,23 @@ export default {
170 185
           scanStyles: false,
171 186
         });
172 187
       }
188
+      else if(this.org_id == 10138 || this.org_id == 10278 || this.org_id == 0){
189
+        printJS({
190
+          printable: "prescription-print",
191
+          type: "html",
192
+          style: style,
193
+          scanStyles: false,
194
+        });
195
+      
196
+      }
197
+      // if(this.org_id == 10138 || this.org_id == 10278 || this.org_id == 0){
198
+      //   printJS({
199
+      //     printable: "prescription-print",
200
+      //     type: "html",
201
+      //     style: style,
202
+      //     scanStyles: false,
203
+      //   });
204
+      // }
173 205
     },
174 206
 
175 207
     //患者列表