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

+ 17 - 8
src/pages/main/PrintIndex.vue Просмотреть файл

@@ -383,7 +383,7 @@
383 383
         v-bind:childResponse="childResponse"
384 384
         v-if="org_template_info.template_id == 73"
385 385
       ></DialysisPrintOrderSeventythree>
386
-      
386
+
387 387
       <DialysisPrintOrderServentyFour
388 388
         ref="childOne"
389 389
         style="margin-top: 60px"
@@ -409,7 +409,7 @@
409 409
         ref="childOne"
410 410
         style="margin-top: 60px"
411 411
         v-bind:childResponse="childResponse"
412
-        v-if="org_template_info.template_id == 78" 
412
+        v-if="org_template_info.template_id == 78"
413 413
       >
414 414
       </DialysisPrintOrderSeventyeight>
415 415
       <DialysisPrintOrderServentynine
@@ -431,8 +431,14 @@
431 431
         v-bind:childResponse="childResponse"
432 432
         v-if="org_template_info.template_id == 81">
433 433
       </DialysisPrintOrdereightyone>
434
+      <DialysisPrintOrdereightytwo ref="childOne"
435
+        style="margin-top: 60px"
436
+        v-bind:childResponse="childResponse"
437
+        v-if="org_template_info.template_id == 82">
438
+
439
+      </DialysisPrintOrdereightytwo>
434 440
     </div>
435
-    
441
+
436 442
     <!--<side-bar :active_index="0" v-if="isShow == true"></side-bar>-->
437 443
   </div>
438 444
 </template>
@@ -504,6 +510,7 @@ import DialysisPrintOrderSeventyeight from './template/DialysisPrintOrderSeventy
504 510
 import DialysisPrintOrderServentynine from './template/DialysisPrintOrderServentynine'
505 511
 import DialysisPrintOrdereighty from './template/DialysisPrintOrdereighty'
506 512
 import DialysisPrintOrdereightyone from './template/DialysisPrintOrdereightyone'
513
+import DialysisPrintOrdereightytwo from './template/DialysisPrintOrdereightytwo'
507 514
 export default {
508 515
   name: "PrintIndex",
509 516
   components: {
@@ -568,7 +575,8 @@ export default {
568 575
     DialysisPrintOrderSeventyeight,
569 576
     DialysisPrintOrderServentynine,
570 577
     DialysisPrintOrdereighty,
571
-    DialysisPrintOrdereightyone
578
+    DialysisPrintOrdereightyone,
579
+    DialysisPrintOrdereightytwo
572 580
   },
573 581
   data() {
574 582
     return {
@@ -726,13 +734,14 @@ export default {
726 734
         this.loading = false;
727 735
         if (response.data.state == 1) {
728 736
             this.childResponse = response;
729
-            
730
-          if(this.org_id != 10206){
737
+
738
+          if(this.org_id != 10727&&this.org_id !=0){
731 739
             this.org_template_info = response.data.data.org_template_info;
732 740
           }else{
733
-            this.org_template_info.template_id = 80
741
+            this.org_template_info.template_id = 82
734 742
           }
735
-          console.log('this.org_template_info',this.org_template_info);
743
+          console.log('responsevvvvvv',response.data.data);
744
+          
736 745
         } else {
737 746
           this.$message.error("请求数据失败");
738 747
           return false;

+ 13 - 6
src/pages/main/template/DialysisPrintOrderSeventyeight.vue Просмотреть файл

@@ -416,11 +416,15 @@
416 416
                       style=" width: 50%; text-align: center; white-space: normal;
417 417
                       "
418 418
                     >
419
-                      {{
420
-                        afterdialysis.weight_loss
421
-                          ? afterdialysis.weight_loss
422
-                          : "/"
423
-                      }}
419
+                      <span v-if="predialysis.weight_before && afterdialysis.weight_after &&
420
+                          parseFloat( predialysis.weight_before - predialysis.additional_weight ).toFixed(1) - 
421
+                          parseFloat( afterdialysis.weight_after - afterdialysis.additional_weight).toFixed(1)==0
422
+                      ">
423
+                          0
424
+                      </span>
425
+                      <span v-else>
426
+                        {{ afterdialysis.weight_loss ? afterdialysis.weight_loss : "/"}}
427
+                      </span>
424 428
                     </div>kg
425 429
                   </div>
426 430
                   <div class="inline_block" style="flex:1;">
@@ -1317,7 +1321,10 @@ export default {
1317 1321
         } if (this.afterdialysis.weight_after == 0) {
1318 1322
           const obj20 = "透后体重"
1319 1323
           checkDate.push(obj20)
1320
-        } if (this.afterdialysis.weight_loss == 0) {
1324
+        } if (this.afterdialysis.weight_loss == 0&& 
1325
+            this.predialysis.weight_before =='' && 
1326
+            this.afterdialysis.weight_after == ''
1327
+        ) {
1321 1328
           const obj21 = "体重减少"
1322 1329
           checkDate.push(obj21)
1323 1330
         } if (this.prescription.target_ultrafiltration == 0) {

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