See999 5 years ago
parent
commit
c3c3a61025

+ 1 - 0
src/store/getters.js View File

24
   zone_selected: state => state.xt_user.zone_selected,
24
   zone_selected: state => state.xt_user.zone_selected,
25
   patient_state_selected: state => state.xt_user.patient_state_selected,
25
   patient_state_selected: state => state.xt_user.patient_state_selected,
26
   treat_state_selected: state => state.xt_user.treat_state_selected,
26
   treat_state_selected: state => state.xt_user.treat_state_selected,
27
+  selected_date: state => state.xt_user.selected_date,
27
 
28
 
28
   xt_role_temps: state => state.xt_role_temps,
29
   xt_role_temps: state => state.xt_role_temps,
29
 
30
 

+ 7 - 0
src/store/modules/xt_user.js View File

11
     zone_selected: 0,
11
     zone_selected: 0,
12
     patient_state_selected: 0,
12
     patient_state_selected: 0,
13
     treat_state_selected: 0,
13
     treat_state_selected: 0,
14
+    selected_date:new Date(),
14
     app_id: 0,
15
     app_id: 0,
15
     user: {
16
     user: {
16
       id: 0,
17
       id: 0,
68
     SET_TREAT_STATE_SELECTED: (state, treat_state_selected) => {
69
     SET_TREAT_STATE_SELECTED: (state, treat_state_selected) => {
69
       state.treat_state_selected = treat_state_selected
70
       state.treat_state_selected = treat_state_selected
70
     },
71
     },
72
+    SET_SELECTED_DATE: (state, selected_date) => {
73
+      state.selected_date = selected_date
74
+    },
71
     SET_FILEDS_LIST: (state, configlist) => {
75
     SET_FILEDS_LIST: (state, configlist) => {
72
       state.fileds = configlist
76
       state.fileds = configlist
73
     },
77
     },
190
     SetTreatStateSelected({ commit }, treat_state_selected) {
194
     SetTreatStateSelected({ commit }, treat_state_selected) {
191
       commit('SET_TREAT_STATE_SELECTED', treat_state_selected)
195
       commit('SET_TREAT_STATE_SELECTED', treat_state_selected)
192
     },
196
     },
197
+    SetSelectedDate({ commit }, selected_date) {
198
+      commit('SET_SELECTED_DATE', selected_date)
199
+    },
193
     SetSubscibePatients({
200
     SetSubscibePatients({
194
                           commit,
201
                           commit,
195
                           state
202
                           state

+ 24 - 13
src/xt_pages/dialysis/details/index.vue View File

101
         </el-tab-pane>
101
         </el-tab-pane>
102
         <el-tab-pane label="透析区" name="second">
102
         <el-tab-pane label="透析区" name="second">
103
           <div class="cell clearfix" style="margin-bottom:10px;">
103
           <div class="cell clearfix" style="margin-bottom:10px;">
104
-            <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>
105
-            <el-input size="small" style="width:80px;" v-model.trim="search_input" class="filter-item"/>
106
-            <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
104
+            <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>
105
+            <el-input size="small" style="width:24%;" v-model.trim="search_input" class="filter-item"/>
106
+            <el-button size="small" class="filter-item" style="margin-right:20px;" type="primary" @click="searchAction">搜索</el-button>
107
           </div>
107
           </div>
108
-          <div class="cell clearfix" style="margin-bottom:10px;">
109
-            <el-select v-model="patientStateVal" placeholder="全部患者状态" style="width:130px;" @change="handleStateChange">
108
+          <div class="cell clearfix" style="margin-bottom:10px;display:flex;">
109
+            <el-select v-model="patientStateVal" placeholder="全部患者状态" style="margin-right:10px;" @change="handleStateChange">
110
               <el-option
110
               <el-option
111
                 v-for="item in patient_state"
111
                 v-for="item in patient_state"
112
                 :key="item.value"
112
                 :key="item.value"
114
                 :value="item.value">
114
                 :value="item.value">
115
               </el-option>
115
               </el-option>
116
             </el-select>
116
             </el-select>
117
-            <el-select v-model="treatStateVal" placeholder="全部治疗状态" style="width:130px;" @change="handleTreatChange">
117
+            <el-select v-model="treatStateVal" placeholder="全部治疗状态" style="margin-right:20px;" @change="handleTreatChange">
118
               <el-option
118
               <el-option
119
                 v-for="item in treat_state"
119
                 v-for="item in treat_state"
120
                 :key="item.value"
120
                 :key="item.value"
123
               </el-option>
123
               </el-option>
124
             </el-select>
124
             </el-select>
125
           </div>
125
           </div>
126
-          <div class="cell clearfix" style="margin-bottom:10px;">
127
-            <el-select v-model="scheduleStateVal" placeholder="班次" style="width:130px;" @change="handletimeType">
126
+          <div class="cell clearfix" style="margin-bottom:10px;display:flex;">
127
+            <el-select v-model="scheduleStateVal" placeholder="班次" style="margin-right:10px;" @change="handletimeType">
128
               <el-option
128
               <el-option
129
                 v-for="item in schedule_options"
129
                 v-for="item in schedule_options"
130
                 :key="item.value"
130
                 :key="item.value"
132
                 :value="item.value">
132
                 :value="item.value">
133
               </el-option>
133
               </el-option>
134
             </el-select>
134
             </el-select>
135
-            <el-select v-model="zoneVal" placeholder="分区" style="width:130px;" @change="handleZoneChange">
135
+            <el-select v-model="zoneVal" placeholder="分区" style="margin-right:20px;" @change="handleZoneChange">
136
               <el-option
136
               <el-option
137
                 v-for="item in zone_options"
137
                 v-for="item in zone_options"
138
                 :key="item.id"
138
                 :key="item.id"
637
     var date = this.$route.query.date;
637
     var date = this.$route.query.date;
638
     this.patient_id = patient_id;
638
     this.patient_id = patient_id;
639
     this.date = date;
639
     this.date = date;
640
-    this.getInitData();
640
+    
641
     this.getScheduleDetail();
641
     this.getScheduleDetail();
642
     this.getLongAdvice();
642
     this.getLongAdvice();
643
     
643
     
646
     var zone_selected = this.$store.getters.zone_selected
646
     var zone_selected = this.$store.getters.zone_selected
647
     var patient_state_selected = this.$store.getters.patient_state_selected
647
     var patient_state_selected = this.$store.getters.patient_state_selected
648
     var treat_state_selected = this.$store.getters.treat_state_selected
648
     var treat_state_selected = this.$store.getters.treat_state_selected
649
+    var selected_date = this.$store.getters.selected_date
649
     if (schedule_type_selected) {
650
     if (schedule_type_selected) {
650
       this.scheduleStateVal = schedule_type_selected.schedule_type_selected
651
       this.scheduleStateVal = schedule_type_selected.schedule_type_selected
651
     }
652
     }
658
     if (treat_state_selected) {
659
     if (treat_state_selected) {
659
       this.treatStateVal = treat_state_selected.treat_state_selected
660
       this.treatStateVal = treat_state_selected.treat_state_selected
660
     }
661
     }
662
+    if(selected_date.selected_date){
663
+      this.selected_date = selected_date.selected_date
664
+      
665
+    }
666
+
667
+    this.getInitData();
668
+    this.requestDialysisSchedules()
661
     
669
     
662
     
670
     
663
   },
671
   },
664
   mounted(){
672
   mounted(){
665
     const timer = setInterval(() =>{
673
     const timer = setInterval(() =>{
666
-      this.getInitData();               
674
+      // this.getInitData();      
675
+      this.requestDialysisSchedules()         
667
     }, 1000 * 60);            
676
     }, 1000 * 60);            
668
     // 通过$once来监听定时器,在beforeDestroy钩子可以被清除。
677
     // 通过$once来监听定时器,在beforeDestroy钩子可以被清除。
669
     this.$once('hook:beforeDestroy', () => {            
678
     this.$once('hook:beforeDestroy', () => {            
1019
       )
1028
       )
1020
     },
1029
     },
1021
     //日期
1030
     //日期
1022
-    handleScheduleDateChange: function() {
1031
+    handleScheduleDateChange: function(index) {
1023
       this.treatStateVal = 0
1032
       this.treatStateVal = 0
1024
       this.patientStateVal = 0
1033
       this.patientStateVal = 0
1025
       this.zoneVal = 0
1034
       this.zoneVal = 0
1030
       //   schedule_type: this.schedule_type_selected,
1039
       //   schedule_type: this.schedule_type_selected,
1031
       //   schedule_date: this.selected_date,
1040
       //   schedule_date: this.selected_date,
1032
       // })
1041
       // })
1042
+      this.selected_date = index
1043
+      this.$store.dispatch('SetSelectedDate', { selected_date: index })
1033
       this.requestDialysisSchedules()
1044
       this.requestDialysisSchedules()
1034
     },
1045
     },
1035
     //初始化数据
1046
     //初始化数据
1045
             zone_options.push({ id: zone.id, text: zone.name })
1056
             zone_options.push({ id: zone.id, text: zone.name })
1046
           }
1057
           }
1047
           this.zone_options = zone_options
1058
           this.zone_options = zone_options
1048
-          this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
1059
+          // this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
1049
           this.arr = this.processedDialysisSchedules(schedules, this.zone_options)
1060
           this.arr = this.processedDialysisSchedules(schedules, this.zone_options)
1050
           this.getData()
1061
           this.getData()
1051
         } else {
1062
         } else {

+ 12 - 2
src/xt_pages/dialysis/schedualPatient.vue View File

248
       var zone_selected = this.$store.getters.zone_selected
248
       var zone_selected = this.$store.getters.zone_selected
249
       var patient_state_selected = this.$store.getters.patient_state_selected
249
       var patient_state_selected = this.$store.getters.patient_state_selected
250
       var treat_state_selected = this.$store.getters.treat_state_selected
250
       var treat_state_selected = this.$store.getters.treat_state_selected
251
+      var selected_date = this.$store.getters.selected_date
251
       if (schedule_type_selected) {
252
       if (schedule_type_selected) {
252
         this.schedule_type_selected = schedule_type_selected.schedule_type_selected
253
         this.schedule_type_selected = schedule_type_selected.schedule_type_selected
253
       }
254
       }
260
       if (treat_state_selected) {
261
       if (treat_state_selected) {
261
         this.treatStateVal = treat_state_selected.treat_state_selected
262
         this.treatStateVal = treat_state_selected.treat_state_selected
262
       }
263
       }
264
+      if(selected_date.selected_date){
265
+        this.selected_date = selected_date.selected_date
266
+      }
267
+      
263
       this.getInitData()
268
       this.getInitData()
269
+      this.requestDialysisSchedules()
264
     },
270
     },
265
     methods: {
271
     methods: {
266
       // handletimeType: function(index) {
272
       // handletimeType: function(index) {
283
       //   //   schedule_date: this.selected_date,
289
       //   //   schedule_date: this.selected_date,
284
       //   // })
290
       //   // })
285
       // },
291
       // },
286
-      handleScheduleDateChange: function() {
292
+      handleScheduleDateChange: function(index) {
293
+        console.log("askdjlkas",index)
287
         this.zone_selected = 0
294
         this.zone_selected = 0
288
         this.schedule_type_selected = 0
295
         this.schedule_type_selected = 0
289
         this.patientStateVal = 0
296
         this.patientStateVal = 0
294
         //   schedule_type: this.schedule_type_selected,
301
         //   schedule_type: this.schedule_type_selected,
295
         //   schedule_date: this.selected_date,
302
         //   schedule_date: this.selected_date,
296
         // })
303
         // })
304
+        this.selected_date = index
305
+        this.$store.dispatch('SetSelectedDate', { selected_date: index })
297
         this.requestDialysisSchedules()
306
         this.requestDialysisSchedules()
298
       },
307
       },
299
       searchAction: function() {
308
       searchAction: function() {
321
               zone_options.push({ id: zone.id, text: zone.name })
330
               zone_options.push({ id: zone.id, text: zone.name })
322
             }
331
             }
323
             this.zone_options = zone_options
332
             this.zone_options = zone_options
324
-            this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
333
+            // this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
325
             this.getData()
334
             this.getData()
326
             console.log(1111111111111,this.zone_schedules)
335
             console.log(1111111111111,this.zone_schedules)
327
           } else {
336
           } else {
336
           if (resp.state == 1) {
345
           if (resp.state == 1) {
337
             var schedules = resp.data.schedules
346
             var schedules = resp.data.schedules
338
             this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
347
             this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
348
+            this.allPatient = this.filtedSchedules
339
           } else {
349
           } else {
340
             this.$message.error(resp.msg)
350
             this.$message.error(resp.msg)
341
           }
351
           }