修改

src/store/getters.js

@@ -24,6 +24,7 @@ const getters = {
   zone_selected: state => state.xt_user.zone_selected,
   patient_state_selected: state => state.xt_user.patient_state_selected,
   treat_state_selected: state => state.xt_user.treat_state_selected,
+  selected_date: state => state.xt_user.selected_date,
 
   xt_role_temps: state => state.xt_role_temps,
 

src/store/modules/xt_user.js

@@ -11,6 +11,7 @@ const xt_user = {
     zone_selected: 0,
     patient_state_selected: 0,
     treat_state_selected: 0,
+    selected_date:new Date(),
     app_id: 0,
     user: {
       id: 0,
@@ -68,6 +69,9 @@ const xt_user = {
     SET_TREAT_STATE_SELECTED: (state, treat_state_selected) => {
       state.treat_state_selected = treat_state_selected
     },
+    SET_SELECTED_DATE: (state, selected_date) => {
+      state.selected_date = selected_date
+    },
     SET_FILEDS_LIST: (state, configlist) => {
       state.fileds = configlist
     },
@@ -190,6 +194,9 @@ const xt_user = {
     SetTreatStateSelected({ commit }, treat_state_selected) {
       commit('SET_TREAT_STATE_SELECTED', treat_state_selected)
     },
+    SetSelectedDate({ commit }, selected_date) {
+      commit('SET_SELECTED_DATE', selected_date)
+    },
     SetSubscibePatients({
                           commit,
                           state

src/xt_pages/dialysis/details/index.vue

@@ -101,12 +101,12 @@
         </el-tab-pane>
         <el-tab-pane label="透析区" name="second">
           <div class="cell clearfix" style="margin-bottom:10px;">
-            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 130px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
-            <el-input size="small" style="width:80px;" v-model.trim="search_input" class="filter-item"/>
-            <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
+            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
+            <el-input size="small" style="width:24%;" v-model.trim="search_input" class="filter-item"/>
+            <el-button size="small" class="filter-item" style="margin-right:20px;" type="primary" @click="searchAction">搜索</el-button>
           </div>
-          <div class="cell clearfix" style="margin-bottom:10px;">
-            <el-select v-model="patientStateVal" placeholder="全部患者状态" style="width:130px;" @change="handleStateChange">
+          <div class="cell clearfix" style="margin-bottom:10px;display:flex;">
+            <el-select v-model="patientStateVal" placeholder="全部患者状态" style="margin-right:10px;" @change="handleStateChange">
               <el-option
                 v-for="item in patient_state"
                 :key="item.value"
@@ -114,7 +114,7 @@
                 :value="item.value">
               </el-option>
             </el-select>
-            <el-select v-model="treatStateVal" placeholder="全部治疗状态" style="width:130px;" @change="handleTreatChange">
+            <el-select v-model="treatStateVal" placeholder="全部治疗状态" style="margin-right:20px;" @change="handleTreatChange">
               <el-option
                 v-for="item in treat_state"
                 :key="item.value"
@@ -123,8 +123,8 @@
               </el-option>
             </el-select>
           </div>
-          <div class="cell clearfix" style="margin-bottom:10px;">
-            <el-select v-model="scheduleStateVal" placeholder="班次" style="width:130px;" @change="handletimeType">
+          <div class="cell clearfix" style="margin-bottom:10px;display:flex;">
+            <el-select v-model="scheduleStateVal" placeholder="班次" style="margin-right:10px;" @change="handletimeType">
               <el-option
                 v-for="item in schedule_options"
                 :key="item.value"
@@ -132,7 +132,7 @@
                 :value="item.value">
               </el-option>
             </el-select>
-            <el-select v-model="zoneVal" placeholder="分区" style="width:130px;" @change="handleZoneChange">
+            <el-select v-model="zoneVal" placeholder="分区" style="margin-right:20px;" @change="handleZoneChange">
               <el-option
                 v-for="item in zone_options"
                 :key="item.id"
@@ -637,7 +637,7 @@ export default {
     var date = this.$route.query.date;
     this.patient_id = patient_id;
     this.date = date;
-    this.getInitData();
+    
     this.getScheduleDetail();
     this.getLongAdvice();
     
@@ -646,6 +646,7 @@ export default {
     var zone_selected = this.$store.getters.zone_selected
     var patient_state_selected = this.$store.getters.patient_state_selected
     var treat_state_selected = this.$store.getters.treat_state_selected
+    var selected_date = this.$store.getters.selected_date
     if (schedule_type_selected) {
       this.scheduleStateVal = schedule_type_selected.schedule_type_selected
     }
@@ -658,12 +659,20 @@ export default {
     if (treat_state_selected) {
       this.treatStateVal = treat_state_selected.treat_state_selected
     }
+    if(selected_date.selected_date){
+      this.selected_date = selected_date.selected_date
+      
+    }
+
+    this.getInitData();
+    this.requestDialysisSchedules()
     
     
   },
   mounted(){
     const timer = setInterval(() =>{
-      this.getInitData();               
+      // this.getInitData();      
+      this.requestDialysisSchedules()         
     }, 1000 * 60);            
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once('hook:beforeDestroy', () => {            
@@ -1019,7 +1028,7 @@ export default {
       )
     },
     //日期
-    handleScheduleDateChange: function() {
+    handleScheduleDateChange: function(index) {
       this.treatStateVal = 0
       this.patientStateVal = 0
       this.zoneVal = 0
@@ -1030,6 +1039,8 @@ export default {
       //   schedule_type: this.schedule_type_selected,
       //   schedule_date: this.selected_date,
       // })
+      this.selected_date = index
+      this.$store.dispatch('SetSelectedDate', { selected_date: index })
       this.requestDialysisSchedules()
     },
     //初始化数据
@@ -1045,7 +1056,7 @@ export default {
             zone_options.push({ id: zone.id, text: zone.name })
           }
           this.zone_options = zone_options
-          this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
+          // this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
           this.arr = this.processedDialysisSchedules(schedules, this.zone_options)
           this.getData()
         } else {

src/xt_pages/dialysis/schedualPatient.vue

@@ -248,6 +248,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       var zone_selected = this.$store.getters.zone_selected
       var patient_state_selected = this.$store.getters.patient_state_selected
       var treat_state_selected = this.$store.getters.treat_state_selected
+      var selected_date = this.$store.getters.selected_date
       if (schedule_type_selected) {
         this.schedule_type_selected = schedule_type_selected.schedule_type_selected
       }
@@ -260,7 +261,12 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       if (treat_state_selected) {
         this.treatStateVal = treat_state_selected.treat_state_selected
       }
+      if(selected_date.selected_date){
+        this.selected_date = selected_date.selected_date
+      }
+      
       this.getInitData()
+      this.requestDialysisSchedules()
     },
     methods: {
       // handletimeType: function(index) {
@@ -283,7 +289,8 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       //   //   schedule_date: this.selected_date,
       //   // })
       // },
-      handleScheduleDateChange: function() {
+      handleScheduleDateChange: function(index) {
+        console.log("askdjlkas",index)
         this.zone_selected = 0
         this.schedule_type_selected = 0
         this.patientStateVal = 0
@@ -294,6 +301,8 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         //   schedule_type: this.schedule_type_selected,
         //   schedule_date: this.selected_date,
         // })
+        this.selected_date = index
+        this.$store.dispatch('SetSelectedDate', { selected_date: index })
         this.requestDialysisSchedules()
       },
       searchAction: function() {
@@ -321,7 +330,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
               zone_options.push({ id: zone.id, text: zone.name })
             }
             this.zone_options = zone_options
-            this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
+            // this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
             this.getData()
             console.log(1111111111111,this.zone_schedules)
           } else {
@@ -336,6 +345,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           if (resp.state == 1) {
             var schedules = resp.data.schedules
             this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
+            this.allPatient = this.filtedSchedules
           } else {
             this.$message.error(resp.msg)
           }