소스 검색

11月28日 打印单

yq1 3 주 전
부모
커밋
195853a181
2개의 변경된 파일21개의 추가작업 그리고 18개의 파일을 삭제
  1. 9 6
      src/pages/main/template/DialysisPrintOrderServentynine.vue
  2. 12 12
      src/pages/main/template/DialysisPrintOrdereightytwo.vue

+ 9 - 6
src/pages/main/template/DialysisPrintOrderServentynine.vue 파일 보기

@@ -417,7 +417,7 @@ import { getDataConfig } from "@/utils/data";
417 417
 import { jsGetAge, uParseTime } from "@/utils/tools";
418 418
 import LabelBox from "../printItem/LabelBox";
419 419
 import { fetchAllAdminUsers } from "@/api/doctor";
420
-import {Toast} from 'vant'
420
+import {Toast,Dialog} from 'vant'
421 421
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
422 422
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
423 423
 import print from "print-js";
@@ -1154,12 +1154,15 @@ export default {
1154 1154
     getcheckData(val){
1155 1155
       if(val.length >0){
1156 1156
         let message = `记录单未填数据:\n${val.join("\n")}`;
1157
-        Toast({
1158
-          duration:0,
1157
+        Dialog.confirm({
1158
+          allowHtml:true,
1159 1159
           message:message,
1160
-          closeOnClick:true,
1161
-          closeOnClickOverlay:true,
1162
-        })
1160
+        }).then(() => {
1161
+
1162
+          })
1163
+          .catch(() => {
1164
+
1165
+          });
1163 1166
         return message
1164 1167
       }else{
1165 1168
         this.$toast('核对完成')

+ 12 - 12
src/pages/main/template/DialysisPrintOrdereightytwo.vue 파일 보기

@@ -654,7 +654,7 @@ import { getDialysisRecord, getPrintDialysisRecord } from '@/api/dialysis'
654 654
 import { getDataConfig } from '@/utils/data'
655 655
 import { jsGetAge, uParseTime } from '@/utils/tools'
656 656
 import LabelBox from '../printItem/LabelBox'
657
-import {Toast} from 'vant'
657
+import {Dialog} from 'vant'
658 658
 import { EasyScroller } from 'easyscroller'
659 659
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
660 660
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
@@ -805,7 +805,7 @@ export default {
805 805
         const obj0 = '血液净化方式'
806 806
         checkDate.push(obj0)
807 807
       }
808
-      if(this.prescription.dialyzer_perfusion_apparatus ==''){
808
+      if(this.prescription.dialysis_dialyszers =='' && this.prescription.dialysis_irrigation == ''){
809 809
         const obj = '血液净化器类型'
810 810
         checkDate.push(obj)
811 811
       } if(this.prescription.dialysate_formulation_name ==''){
@@ -817,10 +817,10 @@ export default {
817 817
       } if(this.predialysis.blood_access_part_opera_name ==''){
818 818
         const obj3 = '血管通路'
819 819
         checkDate.push(obj3)
820
-      } if(this.predialysis.catheter == ''){
820
+      } if(this.predialysis.catheter == '' && this.predialysis.internal_fistula ==''){
821 821
         const obj4 = '透前导管'
822 822
         checkDate.push(obj4)
823
-      } if(this.predialysis.internal_fistula ==''){
823
+      } if(this.predialysis.internal_fistula ==''&&this.predialysis.catheter == ''){
824 824
         const obj5 = '透前内瘘'
825 825
         checkDate.push(obj5)
826 826
       } if(this.prescription.anticoagulant == 0){
@@ -947,9 +947,6 @@ export default {
947 947
       } if(this.summary.dialysis_summary == ""){
948 948
         const obj41 = '透析小结'
949 949
         checkDate.push(obj41)
950
-      } if(this.summary.special_record == ""){
951
-        const obj42 = '病情记录'
952
-        checkDate.push(obj42)
953 950
       } if(this.tableAdvice.length > 0){
954 951
         this.tableAdvice.map((item) =>{
955 952
           if(item.id > 0 && (item.created_time || item.start_time)){
@@ -1589,12 +1586,15 @@ export default {
1589 1586
     getcheckData(val){
1590 1587
       if(val.length >0){
1591 1588
         let message = `记录单未填数据:\n${val.join("\n")}`;
1592
-        Toast({
1593
-          duration:0,
1589
+        Dialog.confirm({
1590
+          allowHtml:true,
1594 1591
           message:message,
1595
-          closeOnClick:true,
1596
-          closeOnClickOverlay:true,
1597
-        })
1592
+        }).then(() => {
1593
+
1594
+          })
1595
+          .catch(() => {
1596
+
1597
+          });
1598 1598
         return message
1599 1599
       }else{
1600 1600
         this.$toast('核对完成');