解决bug

src/pages/main/DialysisArea.vue

@@ -139,7 +139,7 @@ export default {
       user_id: 0,
       networkStates: true,
       timer: null,
-      ismypatient: false,
+      ismypatient: this.$store.getters.app.dialysis_area.ismypatient,
       selected_date: this.$store.getters.app.dialysis_area.schedule_date, // new Date(),
       schedual_types: [
         { value: 0, text: '全部班', select: true },
@@ -204,7 +204,9 @@ export default {
         return schedules
       }
       if (this.ismypatient) {
+        var zone_selected = this.zone_selected
         var timetype_selected = this.schedual_type_selected
+        var zone_name = zone_selected == 0 ? '' : this.zones[zone_selected].text
         var schedules = []
         for (let o_i = 0; o_i < this.dialysis_scheduals.length; o_i++) {
           const scheduleInfo = this.dialysis_scheduals[o_i]
@@ -215,9 +217,11 @@ export default {
           var filtedSchedules = []
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
             const schedule = originSchedules[s_i]
-            if (schedule.dialysis_order.start_nurse == this.user_id) {
-              if (timetype_selected == 0 || schedule.schedule_type == timetype_selected) {
-                filtedSchedules.push(schedule)
+            if (schedule.dialysis_order.start_nurse == this.user_id ) {
+              if (zone_name.length == 0 || (zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
+                if (timetype_selected == 0 || schedule.schedule_type == timetype_selected) {
+                  filtedSchedules.push(schedule)
+                }
               }
               // break;
             }
@@ -247,7 +251,6 @@ export default {
         for (let s_i = 0; s_i < originSchedules.length; s_i++) {
           const schedule = originSchedules[s_i]
           if (this.ismypatient) {
-            console.log("22222222222222")
 
             if (schedule.dialysis_order.creator == this.user_id) {
               filtedSchedules.push(schedule)
@@ -335,9 +338,14 @@ export default {
   methods: {
     mypatient () {
       this.search_keyword = ''
-      this.zone_selected = 0
-      this.schedual_type_selected = 0
       this.ismypatient = true
+      this.$emit('clear_search_keyword')
+      this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
+        zone: this.zone_selected,
+        schedule_type: this.schedual_type_selected,
+        schedule_date: this.selected_date,
+        ismypatient:   this.ismypatient,
+      })
     },
     reloads: function () {
       this.reload()
@@ -352,29 +360,38 @@ export default {
       this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
         zone: this.zone_selected,
         schedule_type: this.schedual_type_selected,
-        schedule_date: this.selected_date
+        schedule_date: this.selected_date,
+        ismypatient:   this.ismypatient,
+
       })
     },
     handleZoneChange: function (index) {
-      this.ismypatient = false
+      if(!this.ismypatient){
+        this.ismypatient = false
+      }
       this.zone_options_visible = false
       this.zone_selected = index
       this.$emit('clear_search_keyword')
       this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
         zone: this.zone_selected,
         schedule_type: this.schedual_type_selected,
-        schedule_date: this.selected_date
+        schedule_date: this.selected_date,
+        ismypatient:   this.ismypatient,
       })
     },
     handleScheduleDateChange: function (date) {
-      this.ismypatient = false
+      if(!this.ismypatient){
+        this.ismypatient = false
+      }
       this.zone_selected = 0
       this.schedual_type_selected = 0
       this.$emit('clear_search_keyword')
       this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
         zone: this.zone_selected,
         schedule_type: this.schedual_type_selected,
-        schedule_date: this.selected_date
+        schedule_date: this.selected_date,
+        ismypatient:   this.ismypatient,
+
       })
       this.requestDialysisScheduals()
     },

src/pages/main/dialog/ComputerDialog.vue

@@ -268,7 +268,7 @@
           } else {
             Toast.success('上机成功')
             var monitor = response.data.data.monitor
-            this.$emit('did_add_monitor', monitor)
+            // this.$emit('did_add_monitor', monitor)
             this.$emit('did_start', response.data.data.dialysis_order)
             var record = this.record
             for (const key in response.data.data.dialysis_order) {

src/pages/main/dialog/MonitDialog.vue

@@ -906,9 +906,9 @@ export default {
             var monitor = resp.data.monitor
             this.$emit('did_add_monitor', monitor)
 
-            // this.monitor_records.unshift(monitor)
+            this.monitor_records.unshift(monitor)
 
-            // this.monitor_records= this.quickSort(this.monitor_records,"operate_time",false)
+            this.monitor_records= this.quickSort(this.monitor_records,"operate_time",false)
 
             this.form.pulse_frequency = ''
             this.form.breathing_rated = ''

src/pages/main/dialog/PrescriptionDialog.vue

@@ -176,7 +176,15 @@
             <input type="tel" @focus="inputFocus" id="dtl" v-model="dialysisPrescription.conductivity"/>
           </div>
         </div>
-        <div class="item" v-if="isShow('透析器/灌流器')">
+        <div @click="showSubMenu('dialyzer_perfusion_apparatus')" class="item" ref="dialyzer_perfusion_apparatus" v-if="isShow('透析器/灌流器') && template_id == 6">
+          <label class="name" for="dt1">透析器/灌流器</label>
+          <div class="content">
+            <span class="text" id="dt">{{dialysisPrescription.dialyzer_perfusion_apparatus}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+
+        <div class="item" v-if="isShow('透析器/灌流器') && template_id != 6">
           <label class="name" for="dtl">透析器/灌流器</label>
           <div class="content">
 
@@ -409,6 +417,7 @@
     data () {
       return {
         is_pre: 0,
+        template_id: 0,
         loading: false,
         signUrl: '',
         isShowDesc: true,
@@ -725,6 +734,40 @@
             this.propForm.selectId = this.dialysisPrescription.blood_access
             this.propForm.click_ref = 'blood_access'
             break
+          case 'dialyzer_perfusion_apparatus':
+            // this.propForm.type = 11
+            // this.isShowDialog = false
+            // this.propForm.title = '透析器/灌流器'
+            // this.visibility = true
+            // this.propForm.list = []
+            // this.propForm.optionList = this.bloodAccessOptions
+            // this.propForm.isMultiple = 1
+            // this.propForm.selectId = this.dialysisPrescription.dialyzer_perfusion_apparatus
+            // this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
+            // break
+
+            this.propForm.result = []
+            this.isHasOther = 2
+            this.propForm.type = 11
+            this.isShowDialog = false
+            this.propForm.title = '透析器/灌流器'
+            this.visibility = true
+            this.propForm.list = []
+            this.propForm.list = getDataConfig('hemodialysis', 'dialyzer_perfusion_apparatus')
+            this.propForm.optionList = []
+            this.propForm.isMultiple = 2
+            // this.propForm.result = typeof(this.formValue.hemorrhage) == "string"? this.formValue.hemorrhage.split(","):[]
+            if (this.dialysisPrescription.dialyzer_perfusion_apparatus != undefined || this.dialysisPrescription.dialyzer_perfusion_apparatus != null) {
+              if (this.dialysisPrescription.dialyzer_perfusion_apparatus.length > 0) {
+                this.propForm.result = this.dialysisPrescription.dialyzer_perfusion_apparatus.split(',')
+              } else {
+                this.propForm.result = []
+              }
+            } else {
+              this.propForm.result = []
+            }
+            this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
+            break
 
         }
       },
@@ -925,7 +968,6 @@
             break
           case 4:
             this.dialysisPrescription.replacement_way = val.selectId
-            console.log(this.dialysisPrescription.replacement_way)
             break
           case 5:
             this.dialysisPrescription.anticoagulant = val.selectId
@@ -950,6 +992,9 @@
           case 10:
             this.dialysisPrescription.blood_access = val.selectId
             break
+          case 11:
+            this.dialysisPrescription.dialyzer_perfusion_apparatus = val.result.join(',')
+            break
         }
       },
       GetModeByModeId: function (val) {
@@ -961,20 +1006,20 @@
             treatment_mode_name = treatment_mode[keys].name
           }
         }
-        // for (let keys in treatment_mode) {
-        //   if (treatment_mode[keys].id == val) {
-        //     treatment_mode_name = treatment_mode[keys].name
-        //     if (treatment_mode_name == 'HD') {
-        //       this.zhiShow = false
-        //       this.totalShow = false
-        //       this.huShow = false
-        //     } else {
-        //       this.zhiShow = true
-        //       this.totalShow = true
-        //       this.huShow = true
-        //     }
-        //   }
-        // }
+        for (let keys in treatment_mode) {
+          if (treatment_mode[keys].id == val) {
+            treatment_mode_name = treatment_mode[keys].name
+            if (treatment_mode_name == 'HD') {
+              this.zhiShow = false
+              this.totalShow = false
+              this.huShow = false
+            } else {
+              this.zhiShow = true
+              this.totalShow = true
+              this.huShow = true
+            }
+          }
+        }
 
         return treatment_mode_name
       },
@@ -1798,6 +1843,7 @@
       }
     },
     created () {
+      this.template_id = this.$store.getters.user.template_info.template_id
       if (this.$store.getters.user.user.user_type == 2) {
         this.isShowSign = true
 

src/pages/main/today/TodayTab.vue

@@ -398,7 +398,7 @@
         }
         if (
           !isNaN(this.assessment_after_dislysis.id) &&
-          this.assessment_after_dislysis.id > 0
+          this.assessment_after_dislysis.id  &&  this.assessment_after_dislysis.creater > 0
         ) {
           steps[8].value = 1
         }
@@ -446,17 +446,17 @@
 
         this.monitor_records.sort((a, b) => b.operate_time - a.operate_time)
 
-        // for (let index = 0; index < this.monitor_records.length; index++) {
-        //   const record = this.monitor_records[index];
-        //   if (record.operate_time <= monitor.operate_time) {
-        //     this.monitor_records.splice(index, 0, monitor)
-        //     break
-        //   }
-        // }
-        this.monitor_records.reverse()
-        this.last_monitor_record = monitor
-        this.$refs.plane_dialog.set_last_monitor_record(monitor)
-      },
+      // for (let index = 0; index < this.monitor_records.length; index++) {
+      //   const record = this.monitor_records[index];
+      //   if (record.operate_time <= monitor.operate_time) {
+      //     this.monitor_records.splice(index, 0, monitor)
+      //     break
+      //   }
+      // }
+      this.monitor_records.reverse()
+      this.last_monitor_record = monitor
+      // this.$refs.plane_dialog.set_last_monitor_record(monitor)
+    },
 
       didEditMonitor (monitor) {
         var mrl = this.monitor_records.length
@@ -468,8 +468,8 @@
           }
         }
 
-        console.log(monitor)
-        console.log(this.monitor_records[monitor_index])
+      console.log(monitor)
+      console.log(this.monitor_records[monitor_index])
 
         this.monitor_records[monitor_index].arterial_pressure =
           monitor.arterial_pressure
@@ -517,106 +517,106 @@
           monitor.displacement_flow_quantity
         this.monitor_records.sort((a, b) => a.operate_time - b.operate_time)
 
-        // if (monitor_index >= 0) {
-        //   var record = this.monitor_records[monitor_index]
-        //
-        //   this.monitor_records.splice(monitor_index, 1)
-        //   if(this.monitor_records.length == 0){
-        //     this.monitor_records.splice(0, 0, monitor)
-        //   }else {
-        //
-        //     for (let index = 0; index < this.monitor_records.length; index++) {
-        //       const temp = this.monitor_records[index];
-        //       if (temp.operate_time <= monitor.operate_time) {
-        //         this.monitor_records.splice(index, 0, monitor)
-        //         break
-        //       }
-        //     }
-        //   }
-        // }
-      },
-      didDelMonitor (record_id) {
-        var mrl = this.monitor_records.length
-        for (let index = 0; index < mrl; index++) {
-          if (this.monitor_records[index].id == record_id) {
-            this.monitor_records.splice(index, 1)
-            break
-          }
+      // if (monitor_index >= 0) {
+      //   var record = this.monitor_records[monitor_index]
+      //
+      //   this.monitor_records.splice(monitor_index, 1)
+      //   if(this.monitor_records.length == 0){
+      //     this.monitor_records.splice(0, 0, monitor)
+      //   }else {
+      //
+      //     for (let index = 0; index < this.monitor_records.length; index++) {
+      //       const temp = this.monitor_records[index];
+      //       if (temp.operate_time <= monitor.operate_time) {
+      //         this.monitor_records.splice(index, 0, monitor)
+      //         break
+      //       }
+      //     }
+      //   }
+      // }
+    },
+    didDelMonitor (record_id) {
+      var mrl = this.monitor_records.length
+      for (let index = 0; index < mrl; index++) {
+        if (this.monitor_records[index].id == record_id) {
+          this.monitor_records.splice(index, 1)
+          break
         }
-      },
+      }
+    },
 
-      menuClick: function (popupIndex) {
-        this.index = popupIndex
-        if (popupIndex >= 0) {
-          this.menuList[popupIndex].showPopup = true
-        }
-        if (
-          popupIndex == 1 &&
-          typeof this.$refs.prescription_dialog != 'undefined'
-        ) {
-          this.$refs.prescription_dialog.open()
-        } else if (
-          popupIndex == 3 &&
-          typeof this.$refs.assessment_dialog != 'undefined'
-        ) {
-          this.$refs.assessment_dialog.open()
-        } else if (
-          popupIndex == 4 &&
-          typeof this.$refs.orders_dialog != 'undefined'
-        ) {
-          // this.$refs.orders_dialog.open();
-        } else if (
-          popupIndex == 0 &&
-          typeof this.$refs.computer_dialog != 'undefined'
-        ) {
-          this.$refs.computer_dialog.open()
-        } else if (
-          popupIndex == 6 &&
-          typeof this.$refs.monit_dialog != 'undefined'
-        ) {
-          this.$refs.monit_dialog.open()
-        } else if (
-          popupIndex == 7 &&
-          typeof this.$refs.plane_dialog != 'undefined'
-        ) {
-          this.$refs.plane_dialog.open()
-        } else if (
-          popupIndex == 8 &&
-          typeof this.$refs.thoroug_dialog != 'undefined'
-        ) {
-          this.$refs.thoroug_dialog.open()
-        } else if (
-          popupIndex == 9 &&
-          typeof this.$refs.treatment_dialog != 'undefined'
-        ) {
-          this.$refs.treatment_dialog.open()
-        }
-      },
-      popupDidHide: function (popupIndex) {
-        this.index = -1
-      },
-      closeDialog (index) {
-        this.index = -1
-        this.menuList[index].showPopup = false
-      },
-      refresh () {
-        var dateStr = parseTime(this.$route.query.date, '{y}-{m}-{d}')
-        var params = {
-          patient_id: this.$route.query.patient_id,
-          date: dateStr
-        }
-        getDialysisRecord(params).then(rs => {
-          var resp = rs.data
-          console.log(resp)
-          if (resp.state == 1) {
-            var patient = resp.data.patient // 患者信息
-            var schedual = resp.data.schedual // 患者排班信息
-            var prescription = resp.data.prescription // 透析处方
-            var solution = resp.data.solution // 透析方案
-            var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
-            var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
-            var doctor_advices = resp.data.doctor_advices // 临时医嘱
-            this.dryWeight = resp.data.dry_weight
+    menuClick: function (popupIndex) {
+      this.index = popupIndex
+      if (popupIndex >= 0) {
+        this.menuList[popupIndex].showPopup = true
+      }
+      if (
+        popupIndex == 1 &&
+          typeof this.$refs.prescription_dialog !== 'undefined'
+      ) {
+        this.$refs.prescription_dialog.open()
+      } else if (
+        popupIndex == 3 &&
+          typeof this.$refs.assessment_dialog !== 'undefined'
+      ) {
+        this.$refs.assessment_dialog.open()
+      } else if (
+        popupIndex == 4 &&
+          typeof this.$refs.orders_dialog !== 'undefined'
+      ) {
+        // this.$refs.orders_dialog.open();
+      } else if (
+        popupIndex == 0 &&
+          typeof this.$refs.computer_dialog !== 'undefined'
+      ) {
+        this.$refs.computer_dialog.open()
+      } else if (
+        popupIndex == 6 &&
+          typeof this.$refs.monit_dialog !== 'undefined'
+      ) {
+        this.$refs.monit_dialog.open()
+      } else if (
+        popupIndex == 7 &&
+          typeof this.$refs.plane_dialog !== 'undefined'
+      ) {
+        this.$refs.plane_dialog.open()
+      } else if (
+        popupIndex == 8 &&
+          typeof this.$refs.thoroug_dialog !== 'undefined'
+      ) {
+        this.$refs.thoroug_dialog.open()
+      } else if (
+        popupIndex == 9 &&
+          typeof this.$refs.treatment_dialog !== 'undefined'
+      ) {
+        this.$refs.treatment_dialog.open()
+      }
+    },
+    popupDidHide: function (popupIndex) {
+      this.index = -1
+    },
+    closeDialog (index) {
+      this.index = -1
+      this.menuList[index].showPopup = false
+    },
+    refresh () {
+      var dateStr = parseTime(this.$route.query.date, '{y}-{m}-{d}')
+      var params = {
+        patient_id: this.$route.query.patient_id,
+        date: dateStr
+      }
+      getDialysisRecord(params).then(rs => {
+        var resp = rs.data
+        console.log(resp)
+        if (resp.state == 1) {
+          var patient = resp.data.patient // 患者信息
+          var schedual = resp.data.schedual // 患者排班信息
+          var prescription = resp.data.prescription // 透析处方
+          var solution = resp.data.solution // 透析方案
+          var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
+          var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
+          var doctor_advices = resp.data.doctor_advices // 临时医嘱
+          this.dryWeight = resp.data.dry_weight
 
             for (let i = 0; i < doctor_advices.length; i++) {
               doctor_advices[i]['is_selected'] = 0

src/store/app/app.js

@@ -4,6 +4,7 @@ const app = {
             zone_select_index: 0,
             schedule_type_select_index: 0,
             schedule_date: new Date(),
+            ismypatient:false,
         }
     },
     mutations: {
@@ -11,11 +12,12 @@ const app = {
             state.dialysis_area.zone_select_index = selects.zone
             state.dialysis_area.schedule_type_select_index = selects.schedule_type
             state.dialysis_area.schedule_date = selects.schedule_date
+            state.dialysis_area.ismypatient = selects.ismypatient
         }
     },
     actions: {
         SaveDialysisAreaSelectIndexs({commit}, selects) { // selects: {zone: zone_index, schedule_type: schedule_type_index, schedule_date: Date}
-            commit('UPDATE_DIALYSIS_AREA_SELECT', {zone: selects.zone, schedule_type: selects.schedule_type, schedule_date: selects.schedule_date})
+            commit('UPDATE_DIALYSIS_AREA_SELECT', {zone: selects.zone, schedule_type: selects.schedule_type, schedule_date: selects.schedule_date,ismypatient:selects.ismypatient})
         }
     }
 }