소스 검색

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

28169 2 달 전
부모
커밋
bb6a7105df
2개의 변경된 파일10개의 추가작업 그리고 8개의 파일을 삭제
  1. 8 6
      src/pages/main/template/DialysisPrintOrderSeventyeight.vue
  2. 2 2
      src/pages/main/template/DialysisPrintOrderSixtyeight.vue

+ 8 - 6
src/pages/main/template/DialysisPrintOrderSeventyeight.vue 파일 보기

@@ -1362,12 +1362,14 @@ export default {
1362 1362
       ) {
1363 1363
         const obj34 = "首剂"
1364 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 1373
         this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !='' && prescription.anticoagulant != 5
1372 1374
       ) {
1373 1375
         const obj36 = "总量"

+ 2 - 2
src/pages/main/template/DialysisPrintOrderSixtyeight.vue 파일 보기

@@ -1047,14 +1047,14 @@
1047 1047
                   </div>kg
1048 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 1052
                   <div class="under_line" style="width: 50px;text-align: center">
1053 1053
                     {{afterdialysis.weight_loss?afterdialysis.weight_loss:'/'}}
1054 1054
                   </div>kg
1055 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 1059
                   <div class="under_line" style="width: 50px;text-align: center">
1060 1060
                     {{afterdialysis.dialysis_intakes?afterdialysis.dialysis_intakes:'/'}}