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

src/pages/main/template/DialysisPrintOrderServentyFour.vue

@@ -349,6 +349,7 @@ import { getDataConfig } from "@/utils/data";
 import { jsGetAge, uParseTime } from "@/utils/tools";
 import LabelBox from "../printItem/LabelBox";
 import { fetchAllAdminUsers } from "@/api/doctor";
+import {Dialog} from 'vant'
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
 import print from "print-js";
@@ -1063,10 +1064,17 @@ export default {
     },
     getcheckData(val){
       if(val.length >0){
-        const a = val.join(',')
-        console.log('a',a);
-        this.$toast(a +" 未填");
-        return a
+        let message = `记录单未填数据:\n${val.join("\n")}`;
+        Dialog.confirm({
+          allowHtml:true,
+          message:message,
+        }).then(() => {
+
+          })
+          .catch(() => {
+
+          });
+        return message
       }else{
         this.$toast('核对完成');
       }

src/pages/main/template/DialysisPrintOrderServentynine.vue

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

src/pages/main/template/DialysisPrintOrderSeventysix.vue

@@ -924,7 +924,7 @@ import { getDialysisRecord } from '@/api/dialysis'
 import { getDataConfig } from '@/utils/data'
 import { jsGetAge, uParseTime, uParseTimeOne } from '@/utils/tools'
 import LabelBox from '../printItem/LabelBox'
-
+import {Dialog} from 'vant'
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
 import print from 'print-js'
@@ -1178,13 +1178,15 @@ export default {
       ) {
         const obj30 = '首剂'
         checkDate.push(obj30);
-      } if (
-        this.prescription.anticoagulant_weichi == "" &&
-        this.prescription.anticoagulant != 1
-      ) {
-        const obj31 = '维持'
-        checkDate.push(obj31);
-      } if (
+      } 
+      // if (
+      //   this.prescription.anticoagulant_weichi == "" &&
+      //   this.prescription.anticoagulant != 1
+      // ) {
+      //   const obj31 = '维持'
+      //   checkDate.push(obj31);
+      // } 
+      if (
         this.prescription.anticoagulant_zongliang == "" &&
         this.prescription.anticoagulant != 1 &&
         this.prescription.anticoagulant != 5
@@ -1854,10 +1856,17 @@ export default {
     },
     getcheckData(val){
       if(val.length >0){
-        const a = val.join(',')
-        console.log('a',a);
-        this.$toast(a +" 未填");
-        return a
+        let message = `记录单未填数据:\n${val.join("\n")}`;
+        Dialog.confirm({
+          allowHtml:true,
+          message:message,
+        }).then(() => {
+
+          })
+          .catch(() => {
+
+          });
+        return message
       }else{
         this.$toast('核对完成')
       }

src/pages/main/template/DialysisPrintOrdereighty.vue

@@ -175,7 +175,7 @@
                           : ""
                       }}
                     </div>
-                    
+                    /
                     <div class="under_line" style="width: 50px; text-align: center">
                       {{
                         predialysis.diastolic_blood_pressure
@@ -568,7 +568,7 @@
 
                     <tr v-for="(monitor, monindex) in monitors" :key="monindex">
                       <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-                      <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "": ""}}
+                      <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
                         {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>
                       <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
                       <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
@@ -768,7 +768,7 @@
                     </span>
                       <span v-else></span>
                   </div>
-                  
+                  /
                   <div class="under_line"
                     style="width: 50px; text-align: center"
                   >

src/pages/main/template/DialysisPrintOrdereightytwo.vue

@@ -654,7 +654,7 @@ import { getDialysisRecord, getPrintDialysisRecord } from '@/api/dialysis'
 import { getDataConfig } from '@/utils/data'
 import { jsGetAge, uParseTime } from '@/utils/tools'
 import LabelBox from '../printItem/LabelBox'
-import {Toast} from 'vant'
+import {Dialog} from 'vant'
 import { EasyScroller } from 'easyscroller'
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
@@ -805,7 +805,7 @@ export default {
         const obj0 = '血液净化方式'
         checkDate.push(obj0)
       }
-      if(this.prescription.dialyzer_perfusion_apparatus ==''){
+      if(this.prescription.dialysis_dialyszers =='' && this.prescription.dialysis_irrigation == ''){
         const obj = '血液净化器类型'
         checkDate.push(obj)
       } if(this.prescription.dialysate_formulation_name ==''){
@@ -817,10 +817,10 @@ export default {
       } if(this.predialysis.blood_access_part_opera_name ==''){
         const obj3 = '血管通路'
         checkDate.push(obj3)
-      } if(this.predialysis.catheter == ''){
+      } if(this.predialysis.catheter == '' && this.predialysis.internal_fistula ==''){
         const obj4 = '透前导管'
         checkDate.push(obj4)
-      } if(this.predialysis.internal_fistula ==''){
+      } if(this.predialysis.internal_fistula ==''&&this.predialysis.catheter == ''){
         const obj5 = '透前内瘘'
         checkDate.push(obj5)
       } if(this.prescription.anticoagulant == 0){
@@ -947,9 +947,6 @@ export default {
       } if(this.summary.dialysis_summary == ""){
         const obj41 = '透析小结'
         checkDate.push(obj41)
-      } if(this.summary.special_record == ""){
-        const obj42 = '病情记录'
-        checkDate.push(obj42)
       } if(this.tableAdvice.length > 0){
         this.tableAdvice.map((item) =>{
           if(item.id > 0 && (item.created_time || item.start_time)){
@@ -1589,12 +1586,15 @@ export default {
     getcheckData(val){
       if(val.length >0){
         let message = `记录单未填数据:\n${val.join("\n")}`;
-        Toast({
-          duration:0,
+        Dialog.confirm({
+          allowHtml:true,
           message:message,
-          closeOnClick:true,
-          closeOnClickOverlay:true,
-        })
+        }).then(() => {
+
+          })
+          .catch(() => {
+
+          });
         return message
       }else{
         this.$toast('核对完成');