yq1 2 дней назад
Родитель
Сommit
01910dcb61

+ 1 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue Просмотреть файл

@@ -330,6 +330,7 @@
330 330
                                  
331 331
                                 <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
332 332
                                 &nbsp;
333
+                                <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('留置针16G') > -1 ? true : false" showValue="留置针16G"></label-box>
333 334
                             </div>
334 335
                             </td>
335 336
                             <td></td>

+ 26 - 11
src/xt_pages/dialysis/dialysisPrintOrder.vue Просмотреть файл

@@ -1020,7 +1020,18 @@
1020 1020
         >
1021 1021
         </div>
1022 1022
       </template>
1023
-
1023
+      <template v-if="org_template_info.template_id == 82">
1024
+        <div>
1025
+          <el-button
1026
+          :loading="loading"
1027
+          size="small"
1028
+          icon="el-icon-printer"
1029
+          @click="printThisPage"
1030
+          type="primary"
1031
+          >打印</el-button
1032
+        >
1033
+        </div>
1034
+      </template>
1024 1035
     </div>
1025 1036
     <div class="app-container" style="min-height: 0">
1026 1037
       <!--<div class="order-print-btn"-->
@@ -1547,6 +1558,9 @@
1547 1558
           <DialysisPrintOrdereightyone v-bind:childResponse="childResponse"
1548 1559
             v-if="org_template_info.template_id == 81">
1549 1560
           </DialysisPrintOrdereightyone>
1561
+          <DialysisPrintOrdereightytwo  v-bind:childResponse="childResponse"
1562
+          v-if="org_template_info.template_id == 82">
1563
+          </DialysisPrintOrdereightytwo>
1550 1564
         </div>
1551 1565
       </el-container>
1552 1566
     </div>
@@ -1646,6 +1660,7 @@ import DialysisPrintOrderSeventyeight from './template/DialysisPrintOrderSeventy
1646 1660
 import DialysisPrintOrderSeventynine from './template/DialysisPrintOrderSeventynine'
1647 1661
 import DialysisPrintOrdereighty from './template/DialysisPrintOrdereighty'
1648 1662
 import DialysisPrintOrdereightyone from './template/DialysisPrintOrdereightyone'
1663
+import DialysisPrintOrdereightytwo from './template/DialysisPrintOrdereightytwo'
1649 1664
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
1650 1665
 export default {
1651 1666
   name: "dialysisPrintOrder",
@@ -1731,6 +1746,7 @@ export default {
1731 1746
     DialysisPrintOrderSeventynine,
1732 1747
     DialysisPrintOrdereighty,
1733 1748
     DialysisPrintOrdereightyone,
1749
+    DialysisPrintOrdereightytwo,
1734 1750
     DialysisPrintOrderZero,
1735 1751
     LabelBox,
1736 1752
     BreadCrumb,
@@ -2459,15 +2475,14 @@ export default {
2459 2475
           style: style2,
2460 2476
           scanStyles: false,
2461 2477
         });
2478
+      } else if (this.org_template_info.template_id == 82) {
2479
+        printJS({
2480
+          printable: "dialysis-print-box-1",
2481
+          type: "html",
2482
+          style: style3,
2483
+          scanStyles: false,
2484
+        });
2462 2485
       }
2463
-      // else if (this.org_id == 10206 || this.org_id ==0 || org_id==9671) {
2464
-      //   printJS({
2465
-      //     printable: "dialysis-print-box-1",
2466
-      //     type: "html",
2467
-      //     style: style2,
2468
-      //     scanStyles: false,
2469
-      //   });
2470
-      // }
2471 2486
        else if (this.org_template_info.template_id == 199 ) {
2472 2487
         printJS({
2473 2488
           printable: "dialysis-print-box-1",
@@ -2686,12 +2701,12 @@ export default {
2686 2701
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
2687 2702
           this.patient_name = response.data.data.patientInfo.name
2688 2703
 
2689
-          if(this.org_id !=10206){
2704
+          if(this.org_id !=10206 && this.org_id !=0){
2690 2705
             this.org_template_info.template_id= response.data.data.org_template_info.template_id
2691 2706
             this.org_template_info = response.data.data.org_template_info;
2692 2707
           }else{
2693 2708
             this.org_template_info = response.data.data.org_template_info;
2694
-            this.org_template_info.template_id= 80
2709
+            this.org_template_info.template_id= 82
2695 2710
           }
2696 2711
 
2697 2712
 

+ 1 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue Просмотреть файл

@@ -395,6 +395,7 @@
395 395
                       &nbsp;
396 396
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
397 397
                       &nbsp;
398
+                      <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('留置针16G') > -1 ? true : false" showValue="留置针16G"></label-box>
398 399
                     </div>
399 400
                   </td>
400 401
 

+ 15 - 4
src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue Просмотреть файл

@@ -481,9 +481,17 @@
481 481
                           text-align: center; white-space: normal;
482 482
                         "
483 483
                       >
484
-                        {{
485
-                          afterdialysis.weight_loss ? afterdialysis.weight_loss : "/"
486
-                        }}
484
+                      <span v-if="predialysis.weight_before && afterdialysis.weight_after &&
485
+                          parseFloat( predialysis.weight_before - predialysis.additional_weight ).toFixed(1) - 
486
+                          parseFloat( afterdialysis.weight_after - afterdialysis.additional_weight).toFixed(1)==0
487
+                      ">
488
+                          0
489
+                      </span>
490
+                      <span v-else>
491
+                        {{ afterdialysis.weight_loss ? afterdialysis.weight_loss : "/"}}
492
+                      </span>
493
+
494
+                        
487 495
                       </div>kg
488 496
                     </div>
489 497
                     <div class="inline_block" style="flex:1;">
@@ -1879,7 +1887,10 @@ export default {
1879 1887
           const obj20 = "透后体重"
1880 1888
           checkDate.push(obj20)
1881 1889
         }
1882
-        if (this.afterdialysis.weight_loss == 0) {
1890
+        if (this.afterdialysis.weight_loss == '' && 
1891
+            this.predialysis.weight_before =='' && 
1892
+            this.afterdialysis.weight_after == ''
1893
+        ) {
1883 1894
           const obj21 = "体重减少"
1884 1895
           checkDate.push(obj21)
1885 1896
         }

Разница между файлами не показана из-за своего большого размера
+ 2018 - 0
src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue