Преглед на файлове

Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

xiaoming_global преди 5 години
родител
ревизия
d1fd5b139f

+ 11 - 11
src/pages/advice/DialysisAdviceTable.vue Целия файл

@@ -95,17 +95,17 @@
95 95
 
96 96
       <table class="table">
97 97
         <tr>
98
-          <th width="50px">姓名</th>
99
-          <th width="50px">透析号</th>
100
-          <th width="50px">期效</th>
101
-          <th width="100px">开始时间</th>
102
-          <th width="200px">医嘱内容</th>
103
-          <th width="50px">执行时间</th>
104
-          <th width="50px">执行护士</th>
105
-          <th width="50px">校对护士</th>
106
-          <th width="100px">校对时间</th>
107
-          <th width="50px">开嘱医生</th>
108
-          <th width="100px">开嘱时间</th>
98
+          <th width="60px">姓名</th>
99
+          <th width="30px">透析号</th>
100
+          <th width="50px">类型</th>
101
+          <th width="110px">开始时间</th>
102
+          <th width="140px">医嘱内容</th>
103
+          <th width="100px">执行时间</th>
104
+          <th width="80px">执行护士</th>
105
+          <th width="80px">校对护士</th>
106
+          <th width="110px">校对时间</th>
107
+          <th width="60px">开嘱医生</th>
108
+          <th width="110px">开嘱时间</th>
109 109
         </tr>
110 110
         <template v-for="(schedules, zone_name, index) in filtedScheduals">
111 111
           <tr :key="index">

+ 1 - 1
src/pages/home/login.vue Целия файл

@@ -118,7 +118,7 @@ export default {
118 118
       this.$router.push({ path: "/forgetPassword" });
119 119
     },
120 120
     ok() {
121
-      Toast.success("程序员还在开发中");
121
+      Toast("程序员还在开发中");
122 122
     }
123 123
   }
124 124
 };

+ 1 - 1
src/pages/main/dialog/AcceptsDialog.vue Целия файл

@@ -474,7 +474,7 @@ export default {
474 474
 .acceptsForm {
475 475
   .el-radio {
476 476
     margin-right: 20px;
477
-    width: 2.4rem;
477
+    width: 2.2rem;
478 478
   }
479 479
 }
480 480
 

+ 9 - 9
src/pages/main/dialog/DoubleDialog.vue Целия файл

@@ -21,7 +21,7 @@
21 21
               >错误</el-radio
22 22
             >
23 23
           </el-form-item>
24
-          <el-form-item label="差错描述 : " label-width="3.4rem">
24
+          <el-form-item label="差错描述 : " label-width="3.5rem">
25 25
             <el-input
26 26
               class="doubleInput"
27 27
               v-model="doubleReview.dialysis_item_desc"
@@ -32,7 +32,7 @@
32 32
           :inline="true"
33 33
           class="demo-form-inline doubleForm"
34 34
           :model="doubleReview"
35
-          label-width="3.4rem"
35
+          label-width="3.5rem"
36 36
         >
37 37
           <el-form-item label="透析参数核查 : ">
38 38
             <el-radio v-model="doubleReview.dialysis_parameter_check" label="1"
@@ -42,7 +42,7 @@
42 42
               >错误</el-radio
43 43
             >
44 44
           </el-form-item>
45
-          <el-form-item label="差错描述 : " label-width="3.4rem">
45
+          <el-form-item label="差错描述 : " label-width="3.5rem">
46 46
             <el-input
47 47
               class="doubleInput"
48 48
               v-model="doubleReview.dialysis_parameter_desc"
@@ -53,7 +53,7 @@
53 53
           :inline="true"
54 54
           class="demo-form-inline doubleForm"
55 55
           :model="doubleReview"
56
-          label-width="3.4rem"
56
+          label-width="3.5rem"
57 57
         >
58 58
           <el-form-item label="血管通路核查 : ">
59 59
             <!--<el-radio-group v-model="form.appetite">-->
@@ -71,7 +71,7 @@
71 71
               >错误</el-radio
72 72
             >
73 73
           </el-form-item>
74
-          <el-form-item label="差错描述 : " label-width="3.4rem">
74
+          <el-form-item label="差错描述 : " label-width="3.5rem">
75 75
             <el-input
76 76
               class="doubleInput"
77 77
               v-model="doubleReview.vascular_access_desc"
@@ -82,7 +82,7 @@
82 82
           :inline="true"
83 83
           class="demo-form-inline doubleForm"
84 84
           :model="doubleReview"
85
-          label-width="3.4rem"
85
+          label-width="3.5rem"
86 86
         >
87 87
           <el-form-item label="管道连接核查 : ">
88 88
             <!--<el-radio-group v-model="form.condition">-->
@@ -94,7 +94,7 @@
94 94
             >
95 95
             <!--</el-radio-group>-->
96 96
           </el-form-item>
97
-          <el-form-item label="差错描述 : " label-width="3.4rem">
97
+          <el-form-item label="差错描述 : " label-width="3.5rem">
98 98
             <el-input
99 99
               class="doubleInput"
100 100
               v-model="doubleReview.pipeline_connection_desc"
@@ -107,7 +107,7 @@
107 107
           <div class="content">
108 108
             <span
109 109
               class="text"
110
-              style="width: 3.4rem"
110
+              style="width: 3.5rem"
111 111
               @click="selectCheckTimeAction"
112 112
               >{{ check_time_str }}</span
113 113
             >
@@ -119,7 +119,7 @@
119 119
           :inline="true"
120 120
           class="demo-form-inline doubleForm"
121 121
           :model="doubleReview"
122
-          label-width="3.4rem"
122
+          label-width="3.5rem"
123 123
         >
124 124
           <p style="margin: 10px 0 10px 13px;" v-if="doubleReview.creater != 0">
125 125
             {{ getFirstCheckDesc() }}

+ 5 - 1
src/pages/main/dialog/MonitDialog.vue Целия файл

@@ -1075,7 +1075,7 @@ export default {
1075 1075
   .content {
1076 1076
     .cell {
1077 1077
       float: left;
1078
-      width: 4.93rem;
1078
+      width: 4.8rem;
1079 1079
       margin: 0.35rem 0 0 0.5rem !important;
1080 1080
       label {
1081 1081
         display: block;
@@ -1106,6 +1106,10 @@ export default {
1106 1106
         }
1107 1107
       }
1108 1108
       .typeButton{
1109
+        height: 38px;
1110
+          line-height: 38px;
1111
+          font-size: 0.45rem;
1112
+          padding: 0 !important;
1109 1113
         @media only screen and (min-width: 768px) {
1110 1114
           height: 60px;
1111 1115
           line-height: 60px;

+ 175 - 164
src/pages/main/dialog/PrescriptionDialog.vue Целия файл

@@ -327,6 +327,7 @@
327 327
   import CheckBoxSubMenu from './subMenu/checkBoxSubMenu'
328 328
   import MultipleSubMenu from './subMenu/multipleSubMenu'
329 329
   import {commitDialysisPrescription, CreateGroupAdvice, GetSolution, postSign, postSolution} from '@/api/dialysis'
330
+  import { calculateAnticoagulantZL} from '@/utils/tools'
330 331
 
331 332
   import {Toast} from 'vant'
332 333
   import {getDataConfig} from '@/utils/data'
@@ -422,6 +423,7 @@
422 423
         msgtip_visibility: false,
423 424
         time: '03:00',
424 425
         timeValue: '',
426
+        tempTimeValue:'',
425 427
         isShowSign: false,
426 428
         anticoagulantsConfit: {},
427 429
         dialysateFormulationOptions: [],
@@ -434,8 +436,8 @@
434 436
           result: [],
435 437
           operators: [],
436 438
 
437
-      },
438
-      is_show: false,
439
+        },
440
+        is_show: false,
439 441
 
440 442
         perfusion_apparatus: {},
441 443
         replacementWays: [],
@@ -587,7 +589,7 @@
587 589
         }
588 590
         this.timeValue = this.dialysisPrescription.dialysis_duration_hour + '小时' + this.dialysisPrescription.dialysis_duration_minute + '分钟'
589 591
 
590
-        this.dialysisPrescription.dialysis_duration = this.dialysisPrescription.dialysis_duration_hour + '.' + (this.dialysisPrescription.dialysis_duration_minute)
592
+        this.dialysisPrescription.dialysis_duration = parseFloat(this.dialysisPrescription.dialysis_duration_hour) + parseFloat((this.dialysisPrescription.dialysis_duration_minute / 60).toFixed(2))
591 593
 
592 594
       },
593 595
       inputFocus: function (event) {
@@ -657,139 +659,139 @@
657 659
             this.propForm.selectId = this.dialysisPrescription.perfusion_apparatus
658 660
             this.propForm.click_ref = 'perfusion_apparatus'
659 661
 
660
-          break
661
-        case 'replacement_way':
662
-          this.propForm.type = 4
663
-          this.isShowDialog = false
664
-          this.propForm.title = '置换方式'
665
-          this.visibility = true
666
-          this.propForm.list = []
667
-          this.propForm.optionList = this.replacementWays
668
-          this.propForm.isMultiple = 1
669
-          this.propForm.selectId = this.dialysisPrescription.replacement_way
670
-          this.propForm.click_ref = 'replacement_way'
662
+            break
663
+          case 'replacement_way':
664
+            this.propForm.type = 4
665
+            this.isShowDialog = false
666
+            this.propForm.title = '置换方式'
667
+            this.visibility = true
668
+            this.propForm.list = []
669
+            this.propForm.optionList = this.replacementWays
670
+            this.propForm.isMultiple = 1
671
+            this.propForm.selectId = this.dialysisPrescription.replacement_way
672
+            this.propForm.click_ref = 'replacement_way'
671 673
 
672 674
             break
673 675
 
674
-        case 'anticoagulant':
675
-          this.propForm.type = 5
676
-          this.isShowDialog = false
677
-          this.propForm.title = '抗疑剂'
678
-          this.visibility = true
679
-          this.propForm.list = []
680
-          this.propForm.optionList = this.anticoagulantsConfit
681
-          this.propForm.isMultiple = 1
682
-          this.propForm.selectId = this.dialysisPrescription.anticoagulant
683
-          this.propForm.click_ref = 'anticoagulant'
684
-          break
685
-        case 'dialysate_formulation':
686
-          this.propForm.type = 6
687
-          this.isShowDialog = false
688
-          this.propForm.title = '透析液配方'
689
-          this.visibility = true
690
-          this.propForm.list = []
691
-          this.propForm.optionList = this.dialysateFormulationOptions
692
-          this.propForm.isMultiple = 1
693
-          this.propForm.selectId = this.dialysisPrescription.dialysate_formulation
694
-          this.propForm.click_ref = 'dialysate_formulation'
695
-          break
696
-        case 'body_fluid':
697
-          this.propForm.type = 7
698
-          this.isShowDialog = false
699
-          this.propForm.title = '体液过多症状'
700
-          this.visibility = true
701
-          this.propForm.list = []
702
-          this.propForm.optionList = this.bodyFluidOptions
703
-          this.propForm.isMultiple = 1
704
-          this.propForm.selectId = this.dialysisPrescription.body_fluid
705
-          this.propForm.click_ref = 'body_fluid'
706
-          break
707
-        case 'special_medicine':
708
-          this.propForm.type = 8
709
-          this.isShowDialog = false
710
-          this.propForm.title = '透析前使用特殊药物'
711
-          this.visibility = true
712
-          this.propForm.list = []
713
-          this.propForm.optionList = this.specialMedicineOptions
714
-          this.propForm.isMultiple = 1
715
-          this.propForm.selectId = this.dialysisPrescription.special_medicine
716
-          this.propForm.click_ref = 'special_medicine'
717
-          break
718
-        case 'displace_liqui_part':
719
-          this.propForm.type = 9
720
-          this.isShowDialog = false
721
-          this.propForm.title = '置换液'
722
-          this.visibility = true
723
-          this.propForm.list = []
724
-          this.propForm.optionList = this.displaceLiquiPartOptions
725
-          this.propForm.isMultiple = 1
726
-          this.propForm.selectId = this.dialysisPrescription.displace_liqui_part
727
-          this.propForm.click_ref = 'displace_liqui_part'
728
-          break
729
-        case 'blood_access':
730
-          this.propForm.type = 10
731
-          this.isShowDialog = false
732
-          this.propForm.title = '血管通路'
733
-          this.visibility = true
734
-          this.propForm.list = []
735
-          this.propForm.optionList = this.bloodAccessOptions
736
-          this.propForm.isMultiple = 1
737
-          this.propForm.selectId = this.dialysisPrescription.blood_access
738
-          this.propForm.click_ref = 'blood_access'
739
-          break
740
-        case 'dialyzer_perfusion_apparatus':
741
-          // this.propForm.type = 11
742
-          // this.isShowDialog = false
743
-          // this.propForm.title = '透析器/灌流器'
744
-          // this.visibility = true
745
-          // this.propForm.list = []
746
-          // this.propForm.optionList = this.bloodAccessOptions
747
-          // this.propForm.isMultiple = 1
748
-          // this.propForm.selectId = this.dialysisPrescription.dialyzer_perfusion_apparatus
749
-          // this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
750
-          // break
751
-
752
-          this.propForm.result = []
753
-          this.isHasOther = 2
754
-          this.propForm.type = 11
755
-          this.isShowDialog = false
756
-          this.propForm.title = '透析器/灌流器'
757
-          this.visibility = true
758
-          this.propForm.list = []
759
-          this.propForm.list = getDataConfig('hemodialysis', 'dialyzer_perfusion_apparatus')
760
-          this.propForm.optionList = []
761
-          this.propForm.isMultiple = 2
762
-          // this.propForm.result = typeof(this.formValue.hemorrhage) == "string"? this.formValue.hemorrhage.split(","):[]
763
-          if (this.dialysisPrescription.dialyzer_perfusion_apparatus != undefined || this.dialysisPrescription.dialyzer_perfusion_apparatus != null) {
764
-            if (this.dialysisPrescription.dialyzer_perfusion_apparatus.length > 0) {
765
-              this.propForm.result = this.dialysisPrescription.dialyzer_perfusion_apparatus.split(',')
676
+          case 'anticoagulant':
677
+            this.propForm.type = 5
678
+            this.isShowDialog = false
679
+            this.propForm.title = '抗疑剂'
680
+            this.visibility = true
681
+            this.propForm.list = []
682
+            this.propForm.optionList = this.anticoagulantsConfit
683
+            this.propForm.isMultiple = 1
684
+            this.propForm.selectId = this.dialysisPrescription.anticoagulant
685
+            this.propForm.click_ref = 'anticoagulant'
686
+            break
687
+          case 'dialysate_formulation':
688
+            this.propForm.type = 6
689
+            this.isShowDialog = false
690
+            this.propForm.title = '透析液配方'
691
+            this.visibility = true
692
+            this.propForm.list = []
693
+            this.propForm.optionList = this.dialysateFormulationOptions
694
+            this.propForm.isMultiple = 1
695
+            this.propForm.selectId = this.dialysisPrescription.dialysate_formulation
696
+            this.propForm.click_ref = 'dialysate_formulation'
697
+            break
698
+          case 'body_fluid':
699
+            this.propForm.type = 7
700
+            this.isShowDialog = false
701
+            this.propForm.title = '体液过多症状'
702
+            this.visibility = true
703
+            this.propForm.list = []
704
+            this.propForm.optionList = this.bodyFluidOptions
705
+            this.propForm.isMultiple = 1
706
+            this.propForm.selectId = this.dialysisPrescription.body_fluid
707
+            this.propForm.click_ref = 'body_fluid'
708
+            break
709
+          case 'special_medicine':
710
+            this.propForm.type = 8
711
+            this.isShowDialog = false
712
+            this.propForm.title = '透析前使用特殊药物'
713
+            this.visibility = true
714
+            this.propForm.list = []
715
+            this.propForm.optionList = this.specialMedicineOptions
716
+            this.propForm.isMultiple = 1
717
+            this.propForm.selectId = this.dialysisPrescription.special_medicine
718
+            this.propForm.click_ref = 'special_medicine'
719
+            break
720
+          case 'displace_liqui_part':
721
+            this.propForm.type = 9
722
+            this.isShowDialog = false
723
+            this.propForm.title = '置换液'
724
+            this.visibility = true
725
+            this.propForm.list = []
726
+            this.propForm.optionList = this.displaceLiquiPartOptions
727
+            this.propForm.isMultiple = 1
728
+            this.propForm.selectId = this.dialysisPrescription.displace_liqui_part
729
+            this.propForm.click_ref = 'displace_liqui_part'
730
+            break
731
+          case 'blood_access':
732
+            this.propForm.type = 10
733
+            this.isShowDialog = false
734
+            this.propForm.title = '血管通路'
735
+            this.visibility = true
736
+            this.propForm.list = []
737
+            this.propForm.optionList = this.bloodAccessOptions
738
+            this.propForm.isMultiple = 1
739
+            this.propForm.selectId = this.dialysisPrescription.blood_access
740
+            this.propForm.click_ref = 'blood_access'
741
+            break
742
+          case 'dialyzer_perfusion_apparatus':
743
+            // this.propForm.type = 11
744
+            // this.isShowDialog = false
745
+            // this.propForm.title = '透析器/灌流器'
746
+            // this.visibility = true
747
+            // this.propForm.list = []
748
+            // this.propForm.optionList = this.bloodAccessOptions
749
+            // this.propForm.isMultiple = 1
750
+            // this.propForm.selectId = this.dialysisPrescription.dialyzer_perfusion_apparatus
751
+            // this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
752
+            // break
753
+
754
+            this.propForm.result = []
755
+            this.isHasOther = 2
756
+            this.propForm.type = 11
757
+            this.isShowDialog = false
758
+            this.propForm.title = '透析器/灌流器'
759
+            this.visibility = true
760
+            this.propForm.list = []
761
+            this.propForm.list = getDataConfig('hemodialysis', 'dialyzer_perfusion_apparatus')
762
+            this.propForm.optionList = []
763
+            this.propForm.isMultiple = 2
764
+            // this.propForm.result = typeof(this.formValue.hemorrhage) == "string"? this.formValue.hemorrhage.split(","):[]
765
+            if (this.dialysisPrescription.dialyzer_perfusion_apparatus != undefined || this.dialysisPrescription.dialyzer_perfusion_apparatus != null) {
766
+              if (this.dialysisPrescription.dialyzer_perfusion_apparatus.length > 0) {
767
+                this.propForm.result = this.dialysisPrescription.dialyzer_perfusion_apparatus.split(',')
768
+              } else {
769
+                this.propForm.result = []
770
+              }
766 771
             } else {
767 772
               this.propForm.result = []
768 773
             }
769
-          } else {
770
-            this.propForm.result = []
771
-          }
772
-          this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
773
-          break
774
-      }
775
-    },
776
-    menuCancle: function () {
777
-      this.visibility = false
778
-      this.isShowDialog = true
779
-      this.$nextTick(() => {
780
-        if (this.$refs[this.propForm.click_ref] != undefined && this.$refs[this.propForm.click_ref] != null) {
781
-          this.$refs[this.propForm.click_ref].scrollIntoView()
774
+            this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
775
+            break
782 776
         }
783
-      })
784
-    },
785
-    menuCancleThree: function () {
786
-      this.advice_visibility = false
787
-      this.isShowDialog = true
788
-    },
789
-    menuMsgTip: function () {
790
-      this.msgtip_visibility = false
791
-      this.isShowDialog = true
792
-    },
777
+      },
778
+      menuCancle: function () {
779
+        this.visibility = false
780
+        this.isShowDialog = true
781
+        this.$nextTick(() => {
782
+          if (this.$refs[this.propForm.click_ref] != undefined && this.$refs[this.propForm.click_ref] != null) {
783
+            this.$refs[this.propForm.click_ref].scrollIntoView()
784
+          }
785
+        })
786
+      },
787
+      menuCancleThree: function () {
788
+        this.advice_visibility = false
789
+        this.isShowDialog = true
790
+      },
791
+      menuMsgTip: function () {
792
+        this.msgtip_visibility = false
793
+        this.isShowDialog = true
794
+      },
793 795
 
794 796
       menuComfirmThree: function (targetAdvices) {
795 797
 
@@ -992,10 +994,6 @@
992 994
                 }
993 995
               }
994 996
 
995
-              console.log(this.dialysisPrescription.dialysis_duration_hour)
996
-              console.log(this.dialysisPrescription.dialysis_duration_minute)
997
-              console.log(this.dialysisPrescription.dialysis_duration_hour == '')
998
-              console.log(this.dialysisPrescription.dialysis_duration_minute == 0)
999 997
 
1000 998
 
1001 999
 
@@ -1049,7 +1047,6 @@
1049 1047
         }
1050 1048
       },
1051 1049
       GetModeByModeId: function (val) {
1052
-        console.log("val",val)
1053 1050
         let treatment_mode_name = ''
1054 1051
         let treatment_mode = this.modeOption
1055 1052
 
@@ -1061,8 +1058,7 @@
1061 1058
         for (let keys in treatment_mode) {
1062 1059
           if (treatment_mode[keys].id == val) {
1063 1060
             treatment_mode_name = treatment_mode[keys].name
1064
-            console.log("treatment_mode_name",treatment_mode_name)
1065
-            if (treatment_mode_name == 'HD' || treatment_mode_name == 'HD+HP' || treatment_mode_name == 'HP' || treatment_mode_name == 'HF' || treatment_mode_name == 'SCUF' || treatment_mode_name == 'IUF' || treatment_mode_name == 'HFHD' || treatment_mode_name == 'HFHD +HP' || treatment_mode_name == 'PHF'|| treatment_mode_name == 'HFR' || treatment_mode_name == 'CRRT' || treatment_mode_name == '腹水回收' || treatment_mode_name == 'HD前置换' || treatment_mode_name == 'HD后置换') {
1061
+            if (treatment_mode_name == 'HD') {
1066 1062
               this.zhiShow = false
1067 1063
               this.totalShow = false
1068 1064
               this.huShow = false
@@ -1941,6 +1937,10 @@
1941 1937
 
1942 1938
       }
1943 1939
 
1940
+
1941
+
1942
+
1943
+
1944 1944
       if (this.dialysisPrescription.dialysis_duration_hour.length == 0 || this.dialysisPrescription.dialysis_duration_minute.length == 0) {
1945 1945
         this.timeValue = ''
1946 1946
         this.time = '03:00'
@@ -1989,6 +1989,19 @@
1989 1989
       this.dialysisPrescription.ultrafiltration = this.getFloat(this.dialysisPrescription.ultrafiltration)
1990 1990
       this.dialysisPrescription.target_ultrafiltration = this.getFloat(this.dialysisPrescription.target_ultrafiltration)
1991 1991
 
1992
+      if(this.dialysisPrescription.anticoagulant_shouji == ''){
1993
+        this.dialysisPrescription.anticoagulant_shouji = '0'
1994
+      }
1995
+
1996
+      if(this.dialysisPrescription.anticoagulant_weichi == ''){
1997
+        this.dialysisPrescription.anticoagulant_weichi = '0'
1998
+      }
1999
+
2000
+      if(this.dialysisPrescription.anticoagulant_zongliang == ''){
2001
+        this.dialysisPrescription.anticoagulant_weichi = '0'
2002
+      }
2003
+
2004
+
1992 2005
     },
1993 2006
 
1994 2007
     components: {
@@ -1999,40 +2012,37 @@
1999 2012
       CheckBoxSubMenu
2000 2013
     },
2001 2014
     watch: {
2002
-      'dialysisPrescription.anticoagulant_shouji': function (val) {
2003
-        if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_weichi == '') {
2004
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(0)
2005
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_weichi != '') {
2006
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
2007
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_shouji == '') {
2008
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(0)
2009
-        } else if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_shouji != '') {
2010
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(this.dialysisPrescription.anticoagulant_shouji)
2011
-        }
2015
+      "dialysisPrescription.dialysis_duration":function(){
2016
+        console.log(this.dialysisPrescription.dialysis_duration)
2017
+        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
2018
+          this.dialysisPrescription.anticoagulant_shouji,
2019
+          this.dialysisPrescription.dialysis_duration,
2020
+          this.dialysisPrescription.anticoagulant_weichi
2021
+        );
2012 2022
         if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
2013 2023
           this.dialysisPrescription.anticoagulant_zongliang = ''
2014 2024
         }
2015
-
2016
-
2017
-      }, 'dialysisPrescription.anticoagulant_weichi': function (val) {
2018
-        console.log(this.dialysisPrescription.anticoagulant_shouji)
2019
-        console.log(this.dialysisPrescription.anticoagulant_weichi)
2020
-        if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_weichi == '') {
2021
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(0)
2022
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_weichi != '') {
2023
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
2024
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_shouji == '') {
2025
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(0)
2026
-        } else if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_shouji != '') {
2027
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(this.dialysisPrescription.anticoagulant_shouji)
2025
+      },
2026
+      "dialysisPrescription.anticoagulant_shouji":function(){
2027
+        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
2028
+          this.dialysisPrescription.anticoagulant_shouji,
2029
+          this.dialysisPrescription.dialysis_duration,
2030
+          this.dialysisPrescription.anticoagulant_weichi
2031
+        );
2032
+        if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
2033
+          this.dialysisPrescription.anticoagulant_zongliang = ''
2028 2034
         }
2029
-
2035
+      },
2036
+      "dialysisPrescription.anticoagulant_weichi":function(){
2037
+        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
2038
+          this.dialysisPrescription.anticoagulant_shouji,
2039
+          this.dialysisPrescription.dialysis_duration,
2040
+          this.dialysisPrescription.anticoagulant_weichi
2041
+        );
2030 2042
         if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
2031 2043
           this.dialysisPrescription.anticoagulant_zongliang = ''
2032
-
2033 2044
         }
2034 2045
       },
2035
-
2036 2046
       isShowDialog (val) {
2037 2047
         if (val) {
2038 2048
           this.advice_visibility = false
@@ -2043,6 +2053,7 @@
2043 2053
 </script>
2044 2054
 
2045 2055
 
2056
+
2046 2057
 <style style="stylesheet/scss" lang="scss" scoped>
2047 2058
   .DialogContent {
2048 2059
   // padding-bottom:2rem !important;
@@ -2059,12 +2070,12 @@
2059 2070
   }
2060 2071
   }
2061 2072
   .newButton{
2062
-    
2073
+
2063 2074
     background: #258ffc;
2064 2075
     padding: 0 0.2rem;
2065 2076
     height: 0.85rem;
2066 2077
     line-height: 0.85rem;
2067
-    border-radius:5px; 
2078
+    border-radius:5px;
2068 2079
     color: #fff;
2069 2080
     margin-right: -3.5rem;
2070 2081
   }

+ 1 - 1
src/pages/main/dialog/subMenu/checkBoxSubMenu.vue Целия файл

@@ -11,7 +11,7 @@
11 11
         class="success"
12 12
       ></span>
13 13
       <span v-if="propsForm.isMultiple == 2" @click="comfirm" class="success"
14
-        >确定</span
14
+        >保存</span
15 15
       >
16 16
     </div>
17 17
 

+ 5 - 2
src/pages/main/today/dialysisMonitoring.vue Целия файл

@@ -6,9 +6,9 @@
6 6
       <span class="line"></span>
7 7
     </h2>
8 8
     <div class="dm" style="width:100%;overflow:hildden;overflow-x:auto;">
9
-      <table class="table" style>
9
+      <table class="table dialsisTable" style>
10 10
         <tr>
11
-          <th v-if="isShow('监测时间')" width="124px">时间</th>
11
+          <th v-if="isShow('监测时间')" width="80px">时间</th>
12 12
           <th v-if="isShow('体温')" width="80px">体温(℃)</th>
13 13
           <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
14 14
           <th v-if="isShow('脉搏')" width="80px">脉搏(次/分)</th>
@@ -272,6 +272,9 @@ export default {
272 272
 </script>
273 273
 
274 274
 <style rel="stylesheet/scss" lang="scss" scoped>
275
+.dialsisTable {
276
+  width: 2400px;
277
+}
275 278
 .dm {
276 279
   /* 针对缺省样式 (必须的) */
277 280
   &::-webkit-scrollbar {

+ 5 - 5
src/pages/main/today/statOrder.vue Целия файл

@@ -9,11 +9,11 @@
9 9
     <div class="newDiv">
10 10
       <table class="table">
11 11
         <tr>
12
-          <th width="12%">开嘱医生</th>
13
-          <th width="18%">开始时间</th>
14
-          <th width="31%">医嘱内容</th>
15
-          <th width="18.6%">执行时间</th>
16
-          <th width="10.5%">执行护士</th>
12
+          <th width="8%">开嘱医生</th>
13
+          <th width="8%">开始时间</th>
14
+          <th width="20%">医嘱内容</th>
15
+          <th width="8%">执行时间</th>
16
+          <th width="8%">执行护士</th>
17 17
           <th v-if="template_id != 6" width="9.4%">核对护士</th>
18 18
         </tr>
19 19
 

+ 1 - 0
src/pages/personal/ElectronicSignature.vue Целия файл

@@ -430,6 +430,7 @@ export default {
430 430
       margin: 0 auto;
431 431
       text-align: center;
432 432
       padding: 10px 0;
433
+      height: 200px;
433 434
       background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC");
434 435
     }
435 436
     .name {

+ 1 - 1
src/pages/personal/index.vue Целия файл

@@ -153,7 +153,7 @@ export default {
153 153
       this.$router.push("/");
154 154
     },
155 155
     okk() {
156
-      Toast.success("程序员还在开发中");
156
+      Toast("程序员还在开发中");
157 157
     }
158 158
   }
159 159
 };

+ 2 - 2
src/styles/style.scss Целия файл

@@ -544,7 +544,7 @@ body {
544 544
         border: $main-color;
545 545
         font-size: 0.45rem;
546 546
         text-align: center;
547
-        height: 1rem;
547
+        height: 1.3rem;
548 548
         line-height: 0.7rem;
549 549
         background: #fff;
550 550
         border: 1px $main-color solid;
@@ -562,7 +562,7 @@ body {
562 562
 
563 563
 // 表单样式
564 564
 .table {
565
-  width: 2400px;
565
+  width: 1800px;
566 566
   overflow: auto;
567 567
   font-size: 0.45rem;
568 568
   text-align: center;