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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.52"
+  "version": "1.0.55"
 }

src/pages/main/dialog/subMenu/LongAdviceSubMenu.vue

@@ -68,12 +68,19 @@
       }, getContent (val) {
         let prescribing_number = ''
         let single_dose = ''
+        let advice_desc = ''
+
         if (val.prescribing_number > 0) {
           prescribing_number = val.prescribing_number + val.prescribing_number_unit
         }
         if (val.single_dose > 0) {
           single_dose = ' 单次用量 ' + val.single_dose + val.single_dose_unit
         }
+
+        if (val.advice_desc > 0) {
+          advice_desc = val.advice_desc + val.drug_spec_unit
+        }
+
         let name = ""
         if (val.child.length > 0){
           for (let i = 0 ; i < val.child.length; i++){
@@ -89,19 +96,18 @@
               val.child[i]['single'] = ''
             }
             name = name+"▲"+val.child[i].advice_name+""
-              + val.child[i].drug_spec
+              + val.child[i].advice_desc
               + val.child[i].drug_spec_unit
               + val.child[i].presc
               + val.child[i].single
           }
-          return  val.advice_name +"  "+ val.drug_spec+" "
+          return  val.advice_name +"  "+advice_desc+" "
             + val.drug_spec_unit
             + prescribing_number
             + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark +name
 
         } else {
-          return val.advice_name +"  "+ val.drug_spec+" "
-            + val.drug_spec_unit
+          return val.advice_name +"  "+advice_desc
             + prescribing_number
             + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark
         }

src/pages/main/today/TodayTab.vue

@@ -109,8 +109,10 @@
     <van-popup title="透析处方" v-model="menuList[1].showPopup" :overlay="true" :close-on-click-overlay="false">
       <prescription-dialog :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
                            :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators"
-                           :types="goodTypes" :info="goodInfos" :status="status" :targetAdvices="targetAdvices"
-                           @close="closePrescriptionDialog" @prescription="prescriptionFunc"  :admin_users_prop="admin_users" @advice="adviceFunc"
+                           :types="goodTypes" :info="goodInfos" :status="status" :targetAdvices="longAdvices"
+                           :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
+                           @close="closePrescriptionDialog" @prescription="prescriptionFunc"
+                           :admin_users_prop="admin_users" @advice="adviceFunc"
                            @longSolution="longSolutionFunc" ref="prescription_dialog"></prescription-dialog>
     </van-popup>
 
@@ -217,7 +219,7 @@
   import MonitDialog from '../dialog/MonitDialog'
   import ComputerDialog from '../dialog/ComputerDialog'
 
-  import {dialysisGlobalConfig, getDialysisRecord,CreateGroupAdvice} from '@/api/dialysis'
+  import {CreateGroupAdvice, dialysisGlobalConfig, getDialysisRecord} from '@/api/dialysis'
   import {GetRemindLongAdvice} from '@/api/advice'
 
   import {parseTime} from '@/utils'
@@ -304,8 +306,10 @@
         goodInfos: [],
 
         longAdvices: [],
-        targetAdvices:[],
-        status:'',
+        waitUploadAdvices: [],
+        is_open: 0,
+        targetAdvices: [],
+        status: '',
       }
     },
     computed: {
@@ -379,7 +383,7 @@
       this.patient_id = patient_id
       this.date = date
       this.requestDialysisRecord()
-      // this.requestLongAdvice()
+      this.requestLongAdvice()
 
     },
     mounted () {
@@ -942,118 +946,44 @@
 
             switch (status) {
               case 2:
-                this.longAdvices = resp.data.advices
-
+                var totalAdvice = resp.data.advices
                 var longAdvicesTwo = resp.data.advices_two
+                var waitUploadAdvices = []
+                for (let i = 0; i < totalAdvice.length; i++) {
+                  totalAdvice[i]['isCheck'] = 1
 
-                for (let i = 0; i < this.longAdvices.length; i++) {
-                  this.longAdvices[i]['isCheck'] = 0
-                  switch (this.longAdvices[i].frequency_type) {
-                    case 1: //每日推送
-                      this.longAdvices[i]['isCheck'] = 1
-                      break
-                    case 2: //用今天的日期与推送类型为2的医嘱进行比较如果相差天数等于设定的天数，则设置为选中状态
-                      for (let i = 0;i < this.longAdvices.length;i++){
-                        for (let a = 0; a < longAdvicesTwo.length;a++){
-                          if(this.longAdvices[i].advice_name == longAdvicesTwo[a].advice_name && this.longAdvices[i].advice_desc == longAdvicesTwo[a].advice_desc){
-                            this.longAdvices[i]['isCheck'] = 1
-                          }
-                        }
-                      }
-                      break
-                    case 3://用今天的属于周几与推送类型为3的医嘱进行比较如果包含某个字符串，则设置为选中状态
-                      let day = new Date().getDay()
-                      console.log(day)
-                      let name =""
-                      switch (day) {
-                        case 1:
-                          name="周一"
-                          break
-                        case 2:
-                          name="周二"
-
-                          break
-                        case 3:
-                          name="周三"
-
-                          break
-                        case 4:
-                          name="周四"
-                          break
-                        case 5:
-                          name="周五"
-                          break
-                        case 6:
-                          name="周六"
-                          break
-                        case 0:
-                          name="周日"
-                          break
-                      }
-
+                }
 
-                      if (this.longAdvices[i].week_day.indexOf(name) != -1){
-                        console.log("11111")
-                        this.longAdvices[i]['isCheck'] = 1
-                      }
-                      break
+                for (let i = 0; i < totalAdvice.length; i++) {
+                  for (let a = 0; a < longAdvicesTwo.length; a++) {
+                    if (totalAdvice[i].template_id == longAdvicesTwo[a].template_id) {
+                      totalAdvice[i]['isCheck'] = 0
+                    }
                   }
                 }
 
-                console.log( this.longAdvices)
-                this.targetAdvices = this.longAdvices
 
-                break
-              case 3:
-                this.longAdvices = resp.data.advices
-
-                var advices_two = resp.data.advices_two
-                let dayAdvices = []
-                for (let i = 0; i < this.longAdvices.length; i++) {
-                  switch (this.longAdvices[i].frequency_type) {
-                    case 1: //每日推送，则加入到待上传数组里面
-                      dayAdvices.push(this.longAdvices[i])
-                      break
-                    case 3://用今天的属于周几与推送类型为3的医嘱进行比较如果包含某个字符串，则加入到待上传数组里面
-                      let day = new Date().getDay()
-                      let name =""
-
-                      switch (day) {
-                        case 1:
-                          name="周一"
-                          break
-                        case 2:
-                          name="周二"
-                          break
-                        case 3:
-                          name="周三"
-                          break
-                        case 4:
-                          name="周四"
-                          break
-                        case 5:
-                          name="周五"
-                          break
-                        case 6:
-                          name="周六"
-                          break
-                        case 0:
-                          name="周日"
-                          break
-                      }
-                      if (this.longAdvices[i].week_day.indexOf(name) != -1){
-                        dayAdvices.push(this.longAdvices[i])
-                      }
-                      break
-                  }
+                for (let i = 0; i < totalAdvice.length; i++) {
+                    if( totalAdvice[i].isCheck == 1){
+                      waitUploadAdvices.push(totalAdvice[i])
+                    }
                 }
-                this.targetAdvices = dayAdvices.concat(advices_two)
+
+
+                this.is_open = resp.data.is_open_remind
+                this.longAdvices = totalAdvice
+                this.waitUploadAdvices = waitUploadAdvices
+                console.log(this.longAdvices)
+                console.log(this.waitUploadAdvices)
+
                 break
+
             }
           } else {
 
           }
         })
+
       }, getNowFormatDate () {
         var date = new Date()
         var seperator1 = '-'
@@ -1083,18 +1013,17 @@
           }
         )
       }
-      ,adviceFunc:function(){
-
+      , adviceFunc: function () {
 
       },
       prescriptionFunc: function (val) {
-        if (this.status == 2){
-          if(val.creater > 0 && val.modifier == 0){
+        if (this.status == 2) {
+          if (val.creater > 0 && val.modifier == 0) {
             this.requestDialysisRecord()
           }
 
-        }else if(this.status == 3){
-          if(val.creater > 0 && val.modifier == 0){
+        } else if (this.status == 3) {
+          if (val.creater > 0 && val.modifier == 0) {
             this.requestDialysisRecord()
           }
         }
@@ -1105,13 +1034,13 @@
       ,
       longSolutionFunc: function (val) {
         this.solution = val
-        if (this.status == 2){
-          if(val.creater > 0 && val.modifier == 0){
+        if (this.status == 2) {
+          if (val.creater > 0 && val.modifier == 0) {
             this.requestDialysisRecord()
           }
 
-        }else if(this.status == 3){
-          if(val.creater > 0 && val.modifier == 0){
+        } else if (this.status == 3) {
+          if (val.creater > 0 && val.modifier == 0) {
             this.requestDialysisRecord()
           }
         }

src/pages/main/today/detailsInfo.vue

@@ -49,12 +49,12 @@ x<template>
 </template>
 
 <script>
-import { parseTime } from "@/utils";
+import { parseTime } from '@/utils'
 import { jsGetAge } from '@/utils/tools'
 
 export default {
-  name: "DetailsInfo",
-  data() {
+  name: 'DetailsInfo',
+  data () {
     return {
       // patient: {
       //   name: "",
@@ -69,18 +69,18 @@ export default {
       //   number: "",
       // },
       steps: [
-        { title: "透析处方" },
-        { title: "接诊评估" },
-        { title: "透前评估" },
-        { title: "临时医嘱" },
-        { title: "透析上机" },
-        { title: "双人查对" },
-        { title: "透析监测" },
-        { title: "透析下机" },
-        { title: "透后评估" },
-        { title: "治疗小结" }
+        { title: '透析处方' },
+        { title: '接诊评估' },
+        { title: '透前评估' },
+        { title: '临时医嘱' },
+        { title: '透析上机' },
+        { title: '双人查对' },
+        { title: '透析监测' },
+        { title: '透析下机' },
+        { title: '透后评估' },
+        { title: '治疗小结' }
       ]
-    };
+    }
   },
   props: {
     step_data: {
@@ -88,16 +88,16 @@ export default {
     },
     patient: {
       type: Object,
-      default: function() {
+      default: function () {
         return {
-          name: "",
+          name: '',
           gender: 1,
-          birthday: "",
-          dialysis_no: "",
+          birthday: '',
+          dialysis_no: '',
           // device_number: "",
-          source: "",
-          admission_number: ""
-        };
+          source: '',
+          admission_number: ''
+        }
       }
     },
     device_number: {
@@ -105,19 +105,18 @@ export default {
     }
   },
   computed: {
-    dialysis_date:function(){
-      return parseTime(this.$route.query.date, "{y}/{m}/{d}");
-
+    dialysis_date: function () {
+      return parseTime(this.$route.query.date, '{y}/{m}/{d}')
     },
-    age: function() {
-      if (this.patient.age == 0){
+    age: function () {
+      if (this.patient.age == 0) {
         return jsGetAge(parseTime(this.patient.birthday, '{y}-{m}-{d}'), '-')
-      }else{
+      } else {
         return this.patient.age
       }
     },
-    source: function() {
-      return this.patient.source == 1 ? "门诊" : "住院";
+    source: function () {
+      return this.patient.source == 1 ? '门诊' : '住院'
     }
   },
   methods: {
@@ -141,8 +140,8 @@ export default {
     //   }
     // }
   },
-  created() {}
-};
+  created () {}
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
@@ -239,4 +238,3 @@ export default {
   }
 }
 </style>
-

src/pages/main/today/dialysisPrescription.vue

@@ -156,288 +156,289 @@
 </template>
 
 <script>
-  import {getDataConfig} from '@/utils/data';
+import {getDataConfig} from '@/utils/data'
 export default {
-  name: "DialysisPrescription",
-  data() {
+  name: 'DialysisPrescription',
+  data () {
     return {
-      title: "透析处方",
+      title: '透析处方',
       perfusion_apparatus_map: {},
-      dialysateFormulationMap:{},
-    };
+      dialysateFormulationMap: {}
+    }
   },
   props: {
     prescription: {
-      type: Object,
+      type: Object
     },
     solution: {
-      type: Object,
+      type: Object
     },
     device_number_map: {
-      type: Object,
+      type: Object
     }
   },
   computed: {
-    target_ultrafiltration:function(){
-      var v = this.getValueStr("target_ultrafiltration", "target_ultrafiltration")
+    target_ultrafiltration: function () {
+      var v = this.getValueStr('target_ultrafiltration', 'target_ultrafiltration')
       v = this.getFloat(v)
-      return v.length == 0 ? "0" : v
+      return v.length == 0 ? '0' : v
     },
-    dialysis_mode: function() {
-      var mode = this.getValueStr("mode_id", "mode_id")
+    dialysis_mode: function () {
+      var mode = this.getValueStr('mode_id', 'mode_id')
       if (mode.length == 0) {
-        return ""
+        return ''
       }
       if (this.$store.getters.treatment_mode[mode] != undefined) {
         return this.$store.getters.treatment_mode[mode].name
       }
-      return ""
+      return ''
     },
-    perfusion_apparatus: function() {
-      var v = this.getValueStr("perfusion_apparatus", "perfusion_apparatus")
+    perfusion_apparatus: function () {
+      var v = this.getValueStr('perfusion_apparatus', 'perfusion_apparatus')
       if (v.length == 0) {
-        return ""
+        return ''
       }
       if (this.perfusion_apparatus_map[v] != undefined) {
         return this.perfusion_apparatus_map[v].name
       }
-      return ""
+      return ''
     },
-    displace_liqui: function() {
-      var v = this.getValueStr("displace_liqui", "displace_liqui")
-      return v.length == 0 ? "0" : v
+    displace_liqui: function () {
+      var v = this.getValueStr('displace_liqui', 'displace_liqui')
+      return v.length == 0 ? '0' : v
     },
-    anticoagulant_shouji: function() {
-      var v = this.getValueStr("anticoagulant_shouji", "anticoagulant_shouji")
-      return v.length == 0 ? "0" : v
+    anticoagulant_shouji: function () {
+      var v = this.getValueStr('anticoagulant_shouji', 'anticoagulant_shouji')
+      return v.length == 0 ? '0' : v
     },
-    kalium: function() {
-      var v = this.getValueStr("kalium", "kalium")
+    kalium: function () {
+      var v = this.getValueStr('kalium', 'kalium')
       v = this.getFloat(v)
-      return v == 0 ? "0":v
-    },
-    replacement_total:function(){
-      var v = this.getValueStr("replacement_total", "replacement_total")
-      return v.length == 0 ? "0" : v
-    },
-    bicarbonate: function() {
-      var v = this.getValueStr("bicarbonate", "bicarbonate")
-      return v.length == 0 ? "0" : v
-    },
-    dialysate_flow: function() {
-      var v = this.getValueStr("dialysate_flow", "dialysate_flow")
-      return v.length == 0 ? "0" : v
-    },
-    dialysis_duration: function() {
-      var dialysis_duration_hour = (this.getValueStr("dialysis_duration_hour", "dialysis_duration_hour"))
-      var dialysis_duration_minute = (this.getValueStr("dialysis_duration_minute", "dialysis_duration_minute"))
-      if(dialysis_duration_hour.length == 0 && dialysis_duration_minute.length == 0){
-        return  "0"
-      }else{
-        var time = dialysis_duration_hour+"h"+dialysis_duration_minute+"min"
-        return time.length == 0 ? "0" : time
+      return v == 0 ? '0' : v
+    },
+    replacement_total: function () {
+      var v = this.getValueStr('replacement_total', 'replacement_total')
+      return v.length == 0 ? '0' : v
+    },
+    bicarbonate: function () {
+      var v = this.getValueStr('bicarbonate', 'bicarbonate')
+      return v.length == 0 ? '0' : v
+    },
+    dialysate_flow: function () {
+      var v = this.getValueStr('dialysate_flow', 'dialysate_flow')
+      return v.length == 0 ? '0' : v
+    },
+    dialysis_duration: function () {
+      var dialysis_duration_hour = (this.getValueStr('dialysis_duration_hour', 'dialysis_duration_hour'))
+      var dialysis_duration_minute = (this.getValueStr('dialysis_duration_minute', 'dialysis_duration_minute'))
+      if (dialysis_duration_hour.length == 0 && dialysis_duration_minute.length == 0) {
+        return '0'
+      } else {
+        var time = dialysis_duration_hour + 'h' + dialysis_duration_minute + 'min'
+        return time.length == 0 ? '0' : time
       }
-
     },
-    blood_flow_volume: function() {
-      var v = this.getValueStr("blood_flow_volume", "blood_flow_volume")
-      return v.length == 0 ? "0" : v
+    blood_flow_volume: function () {
+      var v = this.getValueStr('blood_flow_volume', 'blood_flow_volume')
+      return v.length == 0 ? '0' : v
     },
-    replacement_way: function() {
-      return this.getValueStr("replacement_way", "replacement_way")
+    replacement_way: function () {
+      return this.getValueStr('replacement_way', 'replacement_way')
     },
-    anticoagulant_weichi: function() {
-      var v = this.getValueStr("anticoagulant_weichi", "anticoagulant_weichi")
-      return v.length == 0 ? "0" : v
+    anticoagulant_weichi: function () {
+      var v = this.getValueStr('anticoagulant_weichi', 'anticoagulant_weichi')
+      return v.length == 0 ? '0' : v
     },
-    sodium: function() {
-      var v = this.getValueStr("sodium", "sodium")
+    sodium: function () {
+      var v = this.getValueStr('sodium', 'sodium')
       console.log(v)
       v = this.getFloat(v)
       console.log(v)
-      return v == 0 ? "0":v
+      return v == 0 ? '0' : v
     },
-    glucose: function() {
-      var v = this.getValueStr("glucose", "glucose")
-      return v.length == 0 ? "0" : v
+    glucose: function () {
+      var v = this.getValueStr('glucose', 'glucose')
+      return v.length == 0 ? '0' : v
     },
-    dialysate_temperature: function() {
-      var v = this.getValueStr("dialysate_temperature", "dialysate_temperature")
-      return v.length == 0 ? "0" : v
+    dialysate_temperature: function () {
+      var v = this.getValueStr('dialysate_temperature', 'dialysate_temperature')
+      return v.length == 0 ? '0' : v
     },
-    dialyzer: function() {
-      var v = this.getValueStr("dialyzer", "hemodialysis_machine")
+    dialyzer: function () {
+      var v = this.getValueStr('dialyzer', 'hemodialysis_machine')
       if (v.length == 0) {
-        return ""
+        return ''
       }
       if (this.device_number_map[v] != undefined) {
         return this.device_number_map[v].name
       }
-      return ""
+      return ''
     },
-    dialysate_formulation: function(){
-      var v = this.getValueStr("dialysate_formulation", "dialysate_formulation")
+    dialysate_formulation: function () {
+      var v = this.getValueStr('dialysate_formulation', 'dialysate_formulation')
       if (v.length == 0) {
-        return ""
+        return ''
       }
-      if(v in this.dialysateFormulationMap) {
-        return  this.dialysateFormulationMap[v].name;
+      if (v in this.dialysateFormulationMap) {
+        return this.dialysateFormulationMap[v].name
       }
-      return ""
+      return ''
     },
-    prescription_dewatering: function() {
-      var v = this.getValueStr("prescription_dewatering", "dewater")
-      return v.length == 0 ? "0" : v
+    prescription_dewatering: function () {
+      var v = this.getValueStr('prescription_dewatering', 'dewater')
+      return v.length == 0 ? '0' : v
     },
-    anticoagulant: function() {
-      var v = this.getValueStr("anticoagulant", "anticoagulant")
+    anticoagulant: function () {
+      var v = this.getValueStr('anticoagulant', 'anticoagulant')
       if (v.length == 0) {
-        return ""
+        return ''
       }
       if (this.$store.getters.anticoagulants_confit[v] != undefined) {
         return this.$store.getters.anticoagulants_confit[v].name
       }
-      return ""
+      return ''
     },
-    anticoagulant_zongliang: function() {
-      var v = this.getValueStr("anticoagulant_zongliang", "anticoagulant_zongliang")
-      return v.length == 0 ? "0" : v
+    anticoagulant_zongliang: function () {
+      var v = this.getValueStr('anticoagulant_zongliang', 'anticoagulant_zongliang')
+      return v.length == 0 ? '0' : v
     },
-    calcium: function() {
-
-      var v = this.getValueStr("calcium", "calcium")
+    calcium: function () {
+      var v = this.getValueStr('calcium', 'calcium')
       v = this.getFloat(v)
-      return v == 0 ? "0":v
-
-
+      return v == 0 ? '0' : v
     },
 
-    conductivity: function() {
-      var v = this.getValueStr("conductivity", "conductivity")
-      return v.length == 0 ? "0" : v
-    },
-    dialyzer_perfusion_apparatus: function() {
-      return this.getValueStr("dialyzer_perfusion_apparatus", "dialyzer_perfusion_apparatus")
-    },
-    note: function() {
-      return this.getValueStr("remark", "remark")
-    },body_fluid:function () {
-      var id =  this.getValueStr("body_fluid", "body_fluid")
-      if(id == 0){
-        return ""
+    conductivity: function () {
+      var v = this.getValueStr('conductivity', 'conductivity')
+      return v.length == 0 ? '0' : v
+    },
+    dialyzer_perfusion_apparatus: function () {
+      return this.getValueStr('dialyzer_perfusion_apparatus', 'dialyzer_perfusion_apparatus')
+    },
+    note: function () {
+      return this.getValueStr('remark', 'remark')
+    },
+    body_fluid: function () {
+      var id = this.getValueStr('body_fluid', 'body_fluid')
+      if (id == 0) {
+        return ''
       }
-      var bodyFluidOptions = this.$store.getters.body_fluid;
-      for (let i = 0; i <bodyFluidOptions.length; i++){
-        if(bodyFluidOptions[i].id == id){
+      var bodyFluidOptions = this.$store.getters.body_fluid
+      for (let i = 0; i < bodyFluidOptions.length; i++) {
+        if (bodyFluidOptions[i].id == id) {
           return bodyFluidOptions[i].name
         }
       }
-    },special_medicine:function () {
-      var id =  this.getValueStr("special_medicine", "special_medicine")
-      if(id == 0){
-        return ""
+    },
+    special_medicine: function () {
+      var id = this.getValueStr('special_medicine', 'special_medicine')
+      if (id == 0) {
+        return ''
       }
-      var special_medicine = this.$store.getters.special_medicine;
-      for (let i = 0; i <special_medicine.length; i++){
-        if(special_medicine[i].id == id){
+      var special_medicine = this.$store.getters.special_medicine
+      for (let i = 0; i < special_medicine.length; i++) {
+        if (special_medicine[i].id == id) {
           return special_medicine[i].name
         }
       }
-    },special_medicine_other:function () {
-      return this.getValueStr("special_medicine_other", "special_medicine_other")
-    },blood_access:function () {
-      var id =  this.getValueStr("blood_access", "blood_access")
-      if(id == 0){
-        return ""
+    },
+    special_medicine_other: function () {
+      return this.getValueStr('special_medicine_other', 'special_medicine_other')
+    },
+    blood_access: function () {
+      var id = this.getValueStr('blood_access', 'blood_access')
+      if (id == 0) {
+        return ''
       }
-      var blood_access = this.$store.getters.blood_access;
-      for (let i = 0; i <blood_access.length; i++){
-        if(blood_access[i].id == id){
+      var blood_access = this.$store.getters.blood_access
+      console.log('blood_access', blood_access)
+      for (let i = 0; i < blood_access.length; i++) {
+        if (blood_access[i].id == id) {
           return blood_access[i].name
         }
       }
-    },displace_liqui:function () {
-      var id =  this.getValueStr("displace_liqui_part", "displace_liqui_part")
-      var displace_liqui_value =  this.getValueStr("displace_liqui_value", "displace_liqui_value")
-      var displace_liqui_part = ""
-      var displace_liqui = this.$store.getters.displace_liqui;
-      for (let i = 0; i <displace_liqui.length; i++){
-        if(displace_liqui[i].id == id){
-           displace_liqui_part = displace_liqui[i].name
+    },
+    displace_liqui: function () {
+      var id = this.getValueStr('displace_liqui_part', 'displace_liqui_part')
+      var displace_liqui_value = this.getValueStr('displace_liqui_value', 'displace_liqui_value')
+      var displace_liqui_part = ''
+      var displace_liqui = this.$store.getters.displace_liqui
+      for (let i = 0; i < displace_liqui.length; i++) {
+        if (displace_liqui[i].id == id) {
+          displace_liqui_part = displace_liqui[i].name
         }
       }
-      return displace_liqui_part + displace_liqui_value+"L"
-    },ultrafiltration:function () {
-      var v = this.getValueStr("ultrafiltration", "ultrafiltration")
+      return displace_liqui_part + displace_liqui_value + 'L'
+    },
+    ultrafiltration: function () {
+      var v = this.getValueStr('ultrafiltration', 'ultrafiltration')
       v = this.getFloat(v)
-      return v.length == 0 ? "0" : v
-    },target_ktv:function () {
-      var v = this.getValueStr("target_ktv", "target_ktv")
-      return v.length == 0 ? "0" : v
+      return v.length == 0 ? '0' : v
+    },
+    target_ktv: function () {
+      var v = this.getValueStr('target_ktv', 'target_ktv')
+      return v.length == 0 ? '0' : v
     }
   },
-  created() {
+  created () {
     var perfusion_apparatus = this.$store.getters.perfusion_apparatus
     var map = {}
     for (let index = 0; index < perfusion_apparatus.length; index++) {
-      const p = perfusion_apparatus[index];
+      const p = perfusion_apparatus[index]
       map[p.id] = p
     }
     this.perfusion_apparatus_map = map
 
-    var dialysateFormulationOptions = getDataConfig('hemodialysis','dialysate_formulation');
-    for(var index in dialysateFormulationOptions){
-      this.dialysateFormulationMap[dialysateFormulationOptions[index].id] = dialysateFormulationOptions[index];
+    var dialysateFormulationOptions = getDataConfig('hemodialysis', 'dialysate_formulation')
+    for (var index in dialysateFormulationOptions) {
+      this.dialysateFormulationMap[dialysateFormulationOptions[index].id] = dialysateFormulationOptions[index]
     }
   },
   methods: {
-    isShow(name){
+    isShow (name) {
       var filedList = this.$store.getters.user.fileds
-      for (let i = 0; i < filedList.length; i++){
-        if(filedList[i].module == 1 && filedList[i].filed_name_cn == name&&filedList[i].is_show == 1){
+      for (let i = 0; i < filedList.length; i++) {
+        if (filedList[i].module == 1 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
           return true
         }
       }
       return false
     },
-    getValueStr(pkey, skey) {
-      if ((this.prescription == null || this.prescription.id == "") && (this.solution == null || this.solution.id == "")) {
-        return ""
-      } else if (this.prescription != null && this.prescription.id != "") {
+    getValueStr (pkey, skey) {
+      if ((this.prescription == null || this.prescription.id == '') && (this.solution == null || this.solution.id == '')) {
+        return ''
+      } else if (this.prescription != null && this.prescription.id != '') {
         if (this.prescription[pkey] == null || this.prescription[pkey] == undefined) {
-          return ""
+          return ''
         }
-        return this.prescription[pkey] + ""
+        return this.prescription[pkey] + ''
       } else {
         if (this.solution[skey] == null || this.solution[skey] == undefined) {
-          return ""
+          return ''
         }
-        return this.solution[skey] + ""
+        return this.solution[skey] + ''
       }
-    }, getFloat: function(x) {
+    },
+    getFloat: function (x) {
       if (x != '.') {
-        var f = Math.round(x * 100) / 100;
-        var s = f.toString();
-        var rs = s.indexOf('.');
+        var f = Math.round(x * 100) / 100
+        var s = f.toString()
+        var rs = s.indexOf('.')
         if (rs <= 0) {
-          rs = s.length;
-          s += '.';
+          rs = s.length
+          s += '.'
         }
         while (s.length <= rs + 1) {
-          s += '0';
+          s += '0'
         }
-        return s;
+        return s
       } else {
-        return '0.0';
+        return '0.0'
       }
-
     }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 </style>
-
-
-

src/pages/personal/ElectronicSignature.vue

@@ -11,12 +11,17 @@
       </h1>
       <div class="information">
         <div class="blueBorder"></div>
-        <div class="name" v-show="showpan == 'canvas'">
+        <div
+          class="name"
+          v-show="showpan == 'canvas'"
+          style="display:fixed;width:100%;left:0;top:0;"
+        >
           <canvas
             id="canvas"
             class="fl"
             width="600"
             height="400"
+            disable-scroll="true"
             @mousedown="canvasDown($event)"
             @mouseup="canvasUp($event)"
             @mousemove="canvasMove($event)"
@@ -418,6 +423,7 @@ export default {
       height: 400px;
       margin: 0 auto;
       border-radius: 4px;
+
       @media only screen and (max-width: 812px) {
         width: 500px !important;
         height: 200px !important;

src/styles/style.scss

@@ -438,7 +438,7 @@
       background: -webkit-linear-gradient(#dfe4ea, #ebf1f7);
     }
     .DialogContent {
-      height: 6.8rem;
+      height: 8.8rem;
       overflow-y: scroll;
       background: #fff;
       @media only screen and (max-width: 812px) {