pad

src/pages/main/DialysisArea.vue

@@ -135,13 +135,8 @@ export default {
       user_id: 0,
       networkStates: true,
       timer: null,
-<<<<<<< .mine
-      selected_date: this.$store.getters.app.dialysis_area.schedule_date, // new Date(),
-
-=======
       ismypatient: false,
-      selected_date: this.$store.getters.app.dialysis_area.schedule_date, //new Date(),
->>>>>>> .theirs
+      selected_date: this.$store.getters.app.dialysis_area.schedule_date, // new Date(),
       schedual_types: [
         { value: 0, text: '全部班', select: true },
         { value: 1, text: '上午', select: false },
@@ -204,50 +199,19 @@ export default {
         }
         return schedules
       }
-
-<<<<<<< .mine
-      var zone_selected = this.zone_selected
-      var timetype_selected = this.schedual_type_selected
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
-       if (this.ismypatient) {
-        var schedules = [];
+      if (this.ismypatient) {
+        var schedules = []
         for (let o_i = 0; o_i < this.dialysis_scheduals.length; o_i++) {
-          const scheduleInfo = this.dialysis_scheduals[o_i];
-          var originSchedules = scheduleInfo.scheduals;
+          const scheduleInfo = this.dialysis_scheduals[o_i]
+          var originSchedules = scheduleInfo.scheduals
           if (originSchedules.length == 0) {
-            continue;
+            continue
           }
-          var filtedSchedules = [];
+          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 ) {
-              filtedSchedules.push(schedule);
+            const schedule = originSchedules[s_i]
+            if (schedule.dialysis_order.start_nurse == this.user_id) {
+              filtedSchedules.push(schedule)
               // break;
             }
           }
@@ -255,16 +219,15 @@ export default {
             schedules.push({
               zone_name: scheduleInfo.zone_name,
               scheduals: filtedSchedules
-            });
+            })
           }
         }
-        return schedules;
+        return schedules
       }
 
-      var zone_selected = this.zone_selected;
-      var timetype_selected = this.schedual_type_selected;
->>>>>>> .theirs
-      if ( (zone_selected == 0 && timetype_selected == 0) || this.zones.length <= 1 ) {
+      var zone_selected = this.zone_selected
+      var timetype_selected = this.schedual_type_selected
+      if ((zone_selected == 0 && timetype_selected == 0) || this.zones.length <= 1) {
         return this.dialysis_scheduals
       }
 
@@ -276,29 +239,15 @@ export default {
         var filtedSchedules = []
         for (let s_i = 0; s_i < originSchedules.length; s_i++) {
           const schedule = originSchedules[s_i]
-<<<<<<< .mine
-          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
-            ) {
+          if (this.ismypatient) {
+            if (schedule.dialysis_order.creator == this.user_id) {
               filtedSchedules.push(schedule)
-=======
-           if(this.ismypatient){
-             if ( schedule.dialysis_order.creator == this.user_id){
-               filtedSchedules.push(schedule);
              }
-           }
-          else {
-            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);
+          } else {
+            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)
               }
->>>>>>> .theirs
             }
           }
         }
@@ -309,112 +258,60 @@ export default {
           })
         }
       }
-<<<<<<< .mine
-      return schedules
-
-=======
       this.ismypatient = false
-      return schedules;
->>>>>>> .theirs
+      return schedules
     }
   },
-<<<<<<< .mine
-  methods: {
-    myPatients () {
-      alert('aaa')
-    }
-=======
-  created() {
-    this.user_id = this.$store.getters.user.user.id;
-    this.requestDialysisScheduals();
 
->>>>>>> .theirs
-  },
   created () {
+    this.user_id = this.$store.getters.user.user.id
     this.requestDialysisScheduals()
   },
   mounted () {
     this.timer = window.setInterval(() => {
-      setTimeout(this.requestDialysisScheduals(), 0);
-    }, 30000);
+      setTimeout(this.requestDialysisScheduals(), 0)
+    }, 30000)
   },
   beforeDestroy () {
     clearInterval(this.timer)
     this.timer = null
   },
   methods: {
-<<<<<<< .mine
+    mypatient () {
+      this.search_keyword = ''
+      this.zone_selected = 0
+      this.schedual_type_selected = 0
+      this.ismypatient = true
+    },
     reloads: function () {
       this.reload()
-
-
-
-
-
-
-=======
-    mypatient(){
-      this.search_keyword = '';
-      this.zone_selected = 0;
-      this.schedual_type_selected = 0;
-      this.ismypatient = true;
     },
-    reloads: function() {
-      this.reload();
->>>>>>> .theirs
-    },
-<<<<<<< .mine
     handletimeType: function (index) {
+      this.ismypatient = false
       this.sch_type_options_visible = false
       this.schedual_type_selected = index
       this.$emit('clear_search_keyword')
       this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
-
-=======
-    handletimeType: function(index) {
-      this.ismypatient = false
-      this.sch_type_options_visible = false;
-      this.schedual_type_selected = index;
-      this.$emit("clear_search_keyword");
-      this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
->>>>>>> .theirs
         zone: this.zone_selected,
         schedule_type: this.schedual_type_selected,
         schedule_date: this.selected_date
       })
     },
-<<<<<<< .mine
     handleZoneChange: function (index) {
+      this.ismypatient = false
       this.zone_options_visible = false
       this.zone_selected = index
       this.$emit('clear_search_keyword')
       this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
-
-=======
-    handleZoneChange: function(index) {
-      this.ismypatient = false
-      this.zone_options_visible = false;
-      this.zone_selected = index;
-      this.$emit("clear_search_keyword");
-      this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
->>>>>>> .theirs
         zone: this.zone_selected,
         schedule_type: this.schedual_type_selected,
         schedule_date: this.selected_date
       })
     },
-<<<<<<< .mine
     handleScheduleDateChange: function (date) {
+      this.ismypatient = false
       this.zone_selected = 0
       this.schedual_type_selected = 0
-
-=======
-    handleScheduleDateChange: function(date) {
-      this.ismypatient = false
-      this.zone_selected = 0;
-      this.schedual_type_selected = 0;
->>>>>>> .theirs
-
       this.$emit('clear_search_keyword')
       this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
         zone: this.zone_selected,
@@ -426,13 +323,8 @@ export default {
 
     requestDialysisScheduals () {
       // this.$toast.loading({forbidClick: true, duration: 0})
-<<<<<<< .mine
-      this.loading = true
-      var type = 0
-=======
       // this.loading = true;
-      var type = 0;
->>>>>>> .theirs
+      var type = 0
       getDialysisScheduals({ type: type, date: this.selected_date_str })
         .then(rs => {
           this.networkStates = true