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

src/pages/main/DialysisArea.vue

     this.requestDialysisScheduals();
   },
   mounted() {
-    this.timer = window.setInterval(() => {
-      setTimeout(this.requestDialysisScheduals(), 0);
-    }, 30000);
+    // this.timer = window.setInterval(() => {
+    //   setTimeout(this.requestDialysisScheduals(), 0);
+    // }, 30000);
   },
   beforeDestroy() {
     clearInterval(this.timer);

src/pages/main/WaitingArea.vue

                 <li
                   v-for="(option, index) in zone_options"
                   :key="index"
-                  @click="handleZoneChange(index)"
+                  @click="handleZoneChange(index,option)"
                   :class="zone_selected == index ? 'tick' : ''"
                 >
                   {{ option.text }}
       select_index: 0,
       zone_selected: 0,
       time_selected: 0,
+      cur_zone_selected: 0,
       networkStates: true,
       scheduals: [],
 
   },
   computed: {
     filtedScheduals: function() {
+
       var search_keyword = this.search_keyword;
       if (this.search_keyword.length > 0) {
         var scheduals = [];
       //   }
       //   return schedules
       // }
-
+      
       var zone_selected = this.zone_selected;
       var timetype_selected = this.time_selected;
+      var assessment_before_dislysis_count = 0;
+      var prescription_count = 0;
       if (zone_selected != 0 || timetype_selected != 0) {
-        var zone_name =
-          zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
-        var schedules = [];
-        for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
-          const scheduleInfo = this.zone_scheduals[o_i];
-          var originSchedules = scheduleInfo.scheduals;
-          var filtedSchedules = [];
-          for (let s_i = 0; s_i < originSchedules.length; s_i++) {
-            const schedule = originSchedules[s_i];
-            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);
+        // var zone_name = zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
+        // var schedules = [];
+        // for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
+        //   const scheduleInfo = this.zone_scheduals[o_i];
+        //   var originSchedules = scheduleInfo.scheduals;
+        //   var filtedSchedules = [];
+        //   for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+        //     const schedule = originSchedules[s_i];
+        //     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);
+        //       }
+        //     }
+        //   }
+        //   if (filtedSchedules.length > 0) {
+        //     schedules.push({
+        //       zone_name: scheduleInfo.zone_name,
+        //       scheduals: filtedSchedules
+        //     });
+        //   }
+        // }
+       
+        // return schedules;
+        if (this.select_index == 2) {
+          var scheduals = [];
+          for (let index = 0; index < this.scheduals.length; index++) {
+            const schedual = this.scheduals[index];
+            if (schedual.assessment_before_dislysis == null) {
+              if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
+                continue
               }
+              if(timetype_selected > 0 && schedual.schedule_type != timetype_selected) {
+                continue
+              }
+              scheduals.push(schedual);
             }
           }
-          if (filtedSchedules.length > 0) {
-            schedules.push({
-              zone_name: scheduleInfo.zone_name,
-              scheduals: filtedSchedules
-            });
+          return this.processScheduals(scheduals);
+          // return scheduals;
+        } else if (this.select_index == 1) {
+          var scheduals = [];
+          for (let index = 0; index < this.scheduals.length; index++) {
+            const schedual = this.scheduals[index];
+            if (schedual.assessment_before_dislysis == null && schedual.prescription == null) {
+              if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
+                continue
+              }
+              if(timetype_selected > 0 && schedual.schedule_type != timetype_selected) {
+                continue
+              }
+              scheduals.push(schedual);
+            }
           }
+          // return scheduals;
+          return this.processScheduals(scheduals);
+        } else {
+          // return this.zone_scheduals;
+          var scheduals = [];
+          for (let index = 0; index < this.scheduals.length; index++) {
+            const schedual = this.scheduals[index];
+            if (schedual.dialysis_order == null) {
+              if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
+                continue
+              }
+              if(timetype_selected > 0 && schedual.schedule_type != timetype_selected) {
+                continue
+              }
+              scheduals.push(schedual);
+            }
+          }
+          // return scheduals;
+          return this.processScheduals(scheduals);
         }
-        return schedules;
       }
 
       if (this.select_index == 2) {
         var scheduals = [];
         for (let index = 0; index < this.scheduals.length; index++) {
           const schedual = this.scheduals[index];
-          if (
-            schedual.assessment_before_dislysis == null &&
-            schedual.prescription == null
-          ) {
+          if (schedual.assessment_before_dislysis == null && schedual.prescription == null) {
             scheduals.push(schedual);
           }
         }
         // return scheduals;
         return this.processScheduals(scheduals);
       } else {
-        return this.zone_scheduals;
+        // return this.zone_scheduals;
+        var scheduals = [];
+        for (let index = 0; index < this.scheduals.length; index++) {
+          const schedual = this.scheduals[index];
+          if (schedual.dialysis_order == null) {
+            scheduals.push(schedual);
+          }
+        }
+        // return scheduals;
+        return this.processScheduals(scheduals);
       }
     }
   },
     this.requestScheduals();
   },
   mounted() {
-    this.timer = window.setInterval(() => {
-      setTimeout(this.requestScheduals(), 0);
-    }, 30000);
+    // this.timer = window.setInterval(() => {
+    //   setTimeout(this.requestScheduals(), 0);
+    // }, 30000);
   },
   beforeDestroy() {
     clearInterval(this.timer);
     // })
   },
   methods: {
+    processScheduals: function(scheduals) {
+      var zoneMap = {};
+      var schedualMap = {};
+      var assessment_before_dislysis_count = 0;
+      var prescription_count = 0;
+      for (let index = 0; index < scheduals.length; index++) {
+        const schedual = scheduals[index];
+        if (schedualMap[schedual.device_number.zone.id] == null) {
+          schedualMap[schedual.device_number.zone.id] = [];
+        }
+        if (this.select_index == 1) {
+            if(schedual.assessment_before_dislysis == null && schedual.prescription == null){
+            schedualMap[schedual.device_number.zone.id].push(schedual);
+            prescription_count++
+          }
+        } else if (this.select_index == 2){
+            if(schedual.assessment_before_dislysis == null ){
+            schedualMap[schedual.device_number.zone.id].push(schedual);
+            assessment_before_dislysis_count++
+          }
+        } else {
+          if(schedual.dialysis_order == null){
+            schedualMap[schedual.device_number.zone.id].push(schedual);
+          }
+        }
+        if (zoneMap[schedual.device_number.zone.id] == null) {
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
+        }
+      }
+
+      if (this.select_index == 1) {
+        this.menuList[1].count = prescription_count;
+      }
+      if (this.select_index == 2) {
+        this.menuList[2].count = assessment_before_dislysis_count;
+      }
+            
+
+      var zones = [];
+      // zones.push({ value: 0, text: "全部分区" })
+      for (var zoneId in zoneMap) {
+        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name });
+      }
+
+      zones = zones.sort(function(a, b) {
+        return a.id > b.id;
+      });
+      // this.zones = zones
+
+      var zone_scheduals = [];
+      for (let index = 0; index < zones.length; index++) {
+        const zone = zones[index];
+        var scheduals = schedualMap[zone.id];
+        zone_scheduals.push({
+          zone_id: zone.id,
+          zone_name: zone.name,
+
+          scheduals: scheduals
+        });
+      }
+      // this.zone_scheduals = zone_scheduals;
+      return zone_scheduals;
+    },
     reloads: function() {
       this.reload();
     },
       setSelectedTimesDataConfigList(this.time_selected);
       setWaitTypeSelectedConfig(tabIndex);
     },
-    handleZoneChange: function(index) {
+    handleZoneChange: function(index,zone) {
       this.zone_options_visible = false;
       this.zone_selected = index;
-      this.select_index = -1;
+      this.cur_zone_selected = zone.value
+      // this.select_index = -1;
       setSelectedAreaDataConfigList(index.toString());
     },
     handleTimeChange: function(index) {
       this.time_selected = index;
-      this.select_index = -1;
+      // this.select_index = -1;
       this.time_options_visible = false;
       setSelectedTimesDataConfigList(index.toString());
     },
       //   return a.value > b.value
       // })
       return zones;
-    },
-    processScheduals: function(scheduals) {
-      var zoneMap = {};
-      var schedualMap = {};
-      for (let index = 0; index < scheduals.length; index++) {
-        const schedual = scheduals[index];
-        if (schedualMap[schedual.device_number.zone.id] == null) {
-          schedualMap[schedual.device_number.zone.id] = [];
-        }
-        schedualMap[schedual.device_number.zone.id].push(schedual);
-        if (zoneMap[schedual.device_number.zone.id] == null) {
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
-        }
-      }
-
-      var zones = [];
-      // zones.push({ value: 0, text: "全部分区" })
-      for (var zoneId in zoneMap) {
-        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name });
-      }
-
-      zones = zones.sort(function(a, b) {
-        return a.id > b.id;
-      });
-      // this.zones = zones
-
-      var zone_scheduals = [];
-      for (let index = 0; index < zones.length; index++) {
-        const zone = zones[index];
-        var scheduals = schedualMap[zone.id];
-        zone_scheduals.push({
-          zone_id: zone.id,
-          zone_name: zone.name,
-
-          scheduals: scheduals
-        });
-      }
-      // this.zone_scheduals = zone_scheduals;
-      return zone_scheduals;
     }
   }
 };

src/pages/main/dialog/AssessmentDialog.vue

             <input type="tel" @focus="inputFocus" v-model="formValue.dry_weight"/>
           </div>
         </div>
+        <div class="item" v-if="isShow('衣物重')">
+          <h2 class="name">衣物重(kg)</h2>
+          <div class="content">
+            <input type="tel" @focus="inputFocus" v-model="formValue.additional_weight"/>
+          </div>
+        </div>
         <div class="item" v-if="isShow('体温')">
           <h2 class="name">体温(℃)</h2>
           <div class="content">
         formValue: {
           weight_before: '',
           dry_weight: '',
+          AdditionalWeight :'',
           temperature: '',
           systolic_blood_pressure: '',
           diastolic_blood_pressure: '',
       this.formValue = this.predialysis
       if (this.predialysis.id == undefined && this.last_predialysis.id != undefined) {
         this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
+        this.$set(this.formValue, 'additional_weight', this.last_predialysis['additional_weight'].toString())
         this.$set(this.formValue, 'internal_fistula', this.last_predialysis['internal_fistula'])
         this.$set(this.formValue, 'internal_fistula_skin', this.last_predialysis['internal_fistula_skin'])
         this.$set(this.formValue, 'blood_access_part_id', this.last_predialysis['blood_access_part_id'])