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

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

See999 преди 5 години
родител
ревизия
b49c1a7117
променени са 3 файла, в които са добавени 226 реда и са изтрити 210 реда
  1. 177 164
      src/pages/main/dialog/PrescriptionDialog.vue
  2. 34 46
      src/pages/main/dialog/new_order/AddNewOrders.vue
  3. 15 0
      src/pages/main/today/dialysisPrescription.vue

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

@@ -112,7 +112,7 @@
112 112
         </div> -->
113 113
 
114 114
         <div class="line"></div>
115
-        <div class="item" v-if="isShow('置换量')">
115
+        <div class="item" v-if="isShow('置换量')" v-show="zhiShow">
116 116
           <label class="name" for="zhy">置换量(L)</label>
117 117
           <div class="content">
118 118
             <input type="tel" @focus="inputFocus" id="zhy" v-model="dialysisPrescription.replacement_total"/>
@@ -215,7 +215,7 @@
215 215
           </div>
216 216
         </div>
217 217
 
218
-        <div @click="showSubMenu('displace_liqui_part')" class="item" ref="displace_liqui_part" v-if="isShow('置换液')">
218
+        <div @click="showSubMenu('displace_liqui_part')" class="item" ref="displace_liqui_part" v-if="isShow('置换液')" v-show="huShow">
219 219
           <label class="name" for="knj">置换液</label>
220 220
           <div class="content">
221 221
             <span class="text" id="knjaa">{{getDisplaceLiquiPart(dialysisPrescription.displace_liqui_part)}}</span>
@@ -223,7 +223,7 @@
223 223
           </div>
224 224
         </div>
225 225
 
226
-        <div class="item" v-if="isShow('置换液总量')">
226
+        <div class="item" v-if="isShow('置换液总量')" v-show="totalShow">
227 227
           <label class="name" for="knj">置换液总量(L)</label>
228 228
           <div class="content">
229 229
             <input @focus="inputFocus" id="dt" v-model="dialysisPrescription.displace_liqui_value"/>
@@ -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
 
@@ -1939,6 +1937,10 @@
1939 1937
 
1940 1938
       }
1941 1939
 
1940
+
1941
+
1942
+
1943
+
1942 1944
       if (this.dialysisPrescription.dialysis_duration_hour.length == 0 || this.dialysisPrescription.dialysis_duration_minute.length == 0) {
1943 1945
         this.timeValue = ''
1944 1946
         this.time = '03:00'
@@ -1987,6 +1989,19 @@
1987 1989
       this.dialysisPrescription.ultrafiltration = this.getFloat(this.dialysisPrescription.ultrafiltration)
1988 1990
       this.dialysisPrescription.target_ultrafiltration = this.getFloat(this.dialysisPrescription.target_ultrafiltration)
1989 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
+
1990 2005
     },
1991 2006
 
1992 2007
     components: {
@@ -1997,40 +2012,37 @@
1997 2012
       CheckBoxSubMenu
1998 2013
     },
1999 2014
     watch: {
2000
-      'dialysisPrescription.anticoagulant_shouji': function (val) {
2001
-        if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_weichi == '') {
2002
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(0)
2003
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_weichi != '') {
2004
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
2005
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_shouji == '') {
2006
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(0)
2007
-        } else if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_shouji != '') {
2008
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(this.dialysisPrescription.anticoagulant_shouji)
2009
-        }
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
+        );
2010 2022
         if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
2011 2023
           this.dialysisPrescription.anticoagulant_zongliang = ''
2012 2024
         }
2013
-
2014
-
2015
-      }, 'dialysisPrescription.anticoagulant_weichi': function (val) {
2016
-        console.log(this.dialysisPrescription.anticoagulant_shouji)
2017
-        console.log(this.dialysisPrescription.anticoagulant_weichi)
2018
-        if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_weichi == '') {
2019
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(0)
2020
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_weichi != '') {
2021
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
2022
-        } else if (this.dialysisPrescription.anticoagulant_shouji != '' && this.dialysisPrescription.anticoagulant_shouji == '') {
2023
-          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(0)
2024
-        } else if (this.dialysisPrescription.anticoagulant_shouji == '' && this.dialysisPrescription.anticoagulant_shouji != '') {
2025
-          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 = ''
2026 2034
         }
2027
-
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
+        );
2028 2042
         if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
2029 2043
           this.dialysisPrescription.anticoagulant_zongliang = ''
2030
-
2031 2044
         }
2032 2045
       },
2033
-
2034 2046
       isShowDialog (val) {
2035 2047
         if (val) {
2036 2048
           this.advice_visibility = false
@@ -2041,6 +2053,7 @@
2041 2053
 </script>
2042 2054
 
2043 2055
 
2056
+
2044 2057
 <style style="stylesheet/scss" lang="scss" scoped>
2045 2058
   .DialogContent {
2046 2059
   // padding-bottom:2rem !important;
@@ -2057,12 +2070,12 @@
2057 2070
   }
2058 2071
   }
2059 2072
   .newButton{
2060
-    
2073
+
2061 2074
     background: #258ffc;
2062 2075
     padding: 0 0.2rem;
2063 2076
     height: 0.85rem;
2064 2077
     line-height: 0.85rem;
2065
-    border-radius:5px; 
2078
+    border-radius:5px;
2066 2079
     color: #fff;
2067 2080
     margin-right: -3.5rem;
2068 2081
   }

+ 34 - 46
src/pages/main/dialog/new_order/AddNewOrders.vue Целия файл

@@ -18,12 +18,7 @@
18 18
         <div style="overflow: hidden;">
19 19
           <div class="cell" style="margin-top: 0;">
20 20
             <label>医嘱类型</label>
21
-            <el-input
22
-              class="typeInput"
23
-              ref="advice_type"
24
-              value="临时"
25
-              disabled
26
-            ></el-input>
21
+            <el-input class="typeInput" ref="advice_type" value="临时" disabled></el-input>
27 22
           </div>
28 23
           <div class="cell" style="margin-top: 0;">
29 24
             <label>开始时间</label>
@@ -43,11 +38,7 @@
43 38
             <label>开嘱时间 {{ record_date_str }}</label>
44 39
           </div>
45 40
         </div>
46
-        <div
47
-          id="newDialogContent"
48
-          class="DialogContent choose"
49
-          style="height: 6.2rem;"
50
-        >
41
+        <div id="newDialogContent" class="DialogContent choose" style="height: 6.2rem;">
51 42
           <div class="newAddTable">
52 43
             <table class="table">
53 44
               <tr>
@@ -70,20 +61,16 @@
70 61
                 >
71 62
                   <td
72 63
                     style="text-align: left; padding-left: 5px; padding-right: 5px;"
73
-                  >
74
-                    {{ advice.title }}
75
-                  </td>
76
-                  <td v-if="advice.advice_desc">
77
-                    {{ advice.advice_desc }}{{ advice.drug_spec_unit }}
78
-                  </td>
64
+                  >{{ advice.title }}</td>
65
+                  <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</td>
79 66
                   <td v-if="advice.prescribing_number">
80 67
                     {{ advice.prescribing_number
81 68
                     }}{{ advice.prescribing_number_unit }}
82 69
                   </td>
83 70
                   <td v-else></td>
84
-                  <td v-if="advice.single_dose">
85
-                    {{ advice.single_dose }} {{ advice.single_dose_unit }}
86
-                  </td>
71
+                  <td
72
+                    v-if="advice.single_dose"
73
+                  >{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
87 74
                   <td v-else></td>
88 75
                   <td>{{ advice.delivery_way }}</td>
89 76
                   <td>{{ advice.execution_frequency }}</td>
@@ -100,23 +87,19 @@
100 87
                 >
101 88
                   <td
102 89
                     style="text-align: left; padding-right: 5px; padding-left: 25px;"
103
-                  >
104
-                    {{ subdrug.title }}
105
-                  </td>
90
+                  >{{ subdrug.title }}</td>
91
+                  <td>{{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}</td>
106 92
                   <td>
107
-                    {{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}
93
+                    <span v-if="subdrug.prescribing_number">
94
+                      {{ subdrug.prescribing_number
95
+                      }}{{ subdrug.prescribing_number_unit }}
96
+                    </span>
108 97
                   </td>
109 98
                   <td>
110
-                    <span v-if="subdrug.prescribing_number"
111
-                      >{{ subdrug.prescribing_number
112
-                      }}{{ subdrug.prescribing_number_unit }}</span
113
-                    >
114
-                  </td>
115
-                  <td>
116
-                    <span v-if="subdrug.single_dose"
117
-                      >{{ subdrug.single_dose }}
118
-                      {{ subdrug.single_dose_unit }}</span
119
-                    >
99
+                    <span v-if="subdrug.single_dose">
100
+                      {{ subdrug.single_dose }}
101
+                      {{ subdrug.single_dose_unit }}
102
+                    </span>
120 103
                   </td>
121 104
                   <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
122 105
                   <td></td>
@@ -171,7 +154,7 @@
171 154
 import SingleOptionDialog from "./single_option_dialog";
172 155
 import OrderFormDialog from "./order_form";
173 156
 import AdviceTemplate from "./select_advice_template_dialog";
174
-import { Toast } from "vant";
157
+import { Toast, Dialog } from "vant";
175 158
 import { parseTime } from "@/utils";
176 159
 import { batchCreateAdvices } from "@/api/advice";
177 160
 import { setTimeout } from "timers";
@@ -290,19 +273,24 @@ export default {
290 273
       }
291 274
     },
292 275
     deleteOrderAction: function() {
293
-      if (this.selecting_advice_index >= 0) {
294
-        if (this.selecting_subdrug_index < 0) {
295
-          this.advices.splice(this.selecting_advice_index, 1);
296
-          this.selecting_advice_index = -1;
276
+      Dialog.confirm({
277
+        title: "删除医嘱",
278
+        message: "确认删除医嘱吗?"
279
+      }).then(() => {
280
+        if (this.selecting_advice_index >= 0) {
281
+          if (this.selecting_subdrug_index < 0) {
282
+            this.advices.splice(this.selecting_advice_index, 1);
283
+            this.selecting_advice_index = -1;
284
+          } else {
285
+            var advice = this.advices[this.selecting_advice_index];
286
+            advice.subdrugs.splice(this.selecting_subdrug_index, 1);
287
+            this.selecting_advice_index = -1;
288
+            this.selecting_subdrug_index = -1;
289
+          }
297 290
         } else {
298
-          var advice = this.advices[this.selecting_advice_index];
299
-          advice.subdrugs.splice(this.selecting_subdrug_index, 1);
300
-          this.selecting_advice_index = -1;
301
-          this.selecting_subdrug_index = -1;
291
+          Toast.fail("请先选择医嘱内容");
302 292
         }
303
-      } else {
304
-        Toast.fail("请先选择医嘱内容");
305
-      }
293
+      });
306 294
     },
307 295
     selectStartTimeAction: function() {
308 296
       this.$refs.start_time_picker.open();

+ 15 - 0
src/pages/main/today/dialysisPrescription.vue Целия файл

@@ -153,6 +153,13 @@
153 153
           <span class="content">{{body_fluid}}</span>
154 154
           <span class="unit"></span>
155 155
         </li>
156
+
157
+        <li v-if="isShow('体液过多其他症状')">
158
+          <label>体液过多其他症状: </label>
159
+          <span class="content">{{this.prescription.body_fluid_other}}</span>
160
+          <span class="unit"></span>
161
+        </li>
162
+
156 163
         <li v-if="isShow('透析前使用特殊药物')">
157 164
           <label>透析前使用特殊药物: </label>
158 165
           <span class="content">{{special_medicine}}</span>
@@ -169,6 +176,14 @@
169 176
           <span class="content">{{displace_liqui}}</span>
170 177
           <span class="unit"></span>
171 178
         </li>
179
+
180
+        <li v-if="isShow('置换液总量')">
181
+          <label>置换液总量: </label>
182
+          <span class="content">{{this.prescription.displace_liqui_value ? this.prescription.displace_liqui_value:''}}</span>
183
+          <span class="unit">{{this.prescription.displace_liqui_value?"L":""}}</span>
184
+
185
+        </li>
186
+
172 187
         <li v-if="isShow('血管通路')">
173 188
           <label>血管通路: </label>
174 189
           <span class="content">{{blood_access}}</span>