Browse Source

Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

28169 2 months ago
parent
commit
bb6a7105df

+ 8 - 6
src/pages/main/template/DialysisPrintOrderSeventyeight.vue View File

1362
       ) {
1362
       ) {
1363
         const obj34 = "首剂"
1363
         const obj34 = "首剂"
1364
         checkDate.push(obj34)
1364
         checkDate.push(obj34)
1365
-      } if (this.prescription.anticoagulant_weichi == 0 &&
1366
-        this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !=''
1367
-      ) {
1368
-        const obj35 = "维持"
1369
-        checkDate.push(obj35)
1370
-      } if (this.prescription.anticoagulant_zongliang == 0 && 
1365
+      } 
1366
+      // if (this.prescription.anticoagulant_weichi == 0 &&
1367
+      //   this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !=''
1368
+      // ) {
1369
+      //   const obj35 = "维持"
1370
+      //   checkDate.push(obj35)
1371
+      // } 
1372
+      if (this.prescription.anticoagulant_zongliang == 0 && 
1371
         this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !='' && prescription.anticoagulant != 5
1373
         this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !='' && prescription.anticoagulant != 5
1372
       ) {
1374
       ) {
1373
         const obj36 = "总量"
1375
         const obj36 = "总量"

+ 2 - 2
src/pages/main/template/DialysisPrintOrderSixtyeight.vue View File

1047
                   </div>kg
1047
                   </div>kg
1048
                 </div>
1048
                 </div>
1049
 
1049
 
1050
-                <div class="inline_block" style="flex:1;">
1050
+                <div class="inline_block" style="flex:1;" v-if="org_id != 10677">
1051
                   体重减少:
1051
                   体重减少:
1052
                   <div class="under_line" style="width: 50px;text-align: center">
1052
                   <div class="under_line" style="width: 50px;text-align: center">
1053
                     {{afterdialysis.weight_loss?afterdialysis.weight_loss:'/'}}
1053
                     {{afterdialysis.weight_loss?afterdialysis.weight_loss:'/'}}
1054
                   </div>kg
1054
                   </div>kg
1055
                 </div>
1055
                 </div>
1056
 
1056
 
1057
-                <div class="inline_block" style="flex:1;">
1057
+                <div class="inline_block" style="flex:1;" v-if="org_id != 10677">
1058
                   透析中入量:
1058
                   透析中入量:
1059
                   <div class="under_line" style="width: 50px;text-align: center">
1059
                   <div class="under_line" style="width: 50px;text-align: center">
1060
                     {{afterdialysis.dialysis_intakes?afterdialysis.dialysis_intakes:'/'}}
1060
                     {{afterdialysis.dialysis_intakes?afterdialysis.dialysis_intakes:'/'}}