弱化排班的分区字段，改用床位的分区字段

src/pages/advice/DialysisAdviceTable.vue

@@ -83,7 +83,7 @@
 
         </tr>
         <template v-for="(schedule) in schedules">
-          <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice_index + '_' + index"  @click="clickfunction(schedule)">
+          <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice.id + '_' + advice_index + '_' + index"  @click="clickfunction(schedule)">
             <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
             <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
             <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
@@ -213,7 +213,7 @@ export default {
   },
   methods: {
     clickfunction: function(val) {
-      console.log(val);
+      // console.log(val);
       this.$router.push({
         path: "/details",
         query: {
@@ -264,7 +264,7 @@ export default {
       this.show_zone_selector = false;
     },
     parseTime: function(time, layout) {
-      console.log(time);
+      // console.log(time);
       if (time == 0) {
         return "";
       }
@@ -287,12 +287,12 @@ export default {
             if (schedule.doctor_advice.length == 0) {
               continue;
             }
-            if (scheduleMap[schedule.device_zone.name] == null) {
-              scheduleMap[schedule.device_zone.name] = [];
+            if (scheduleMap[schedule.device_number.zone.name] == null) {
+              scheduleMap[schedule.device_number.zone.name] = [];
             }
-            scheduleMap[schedule.device_zone.name].push(schedule);
-            if (zoneMap[schedule.device_zone.name] == null) {
-              zoneMap[schedule.device_zone.name] = schedule.device_zone;
+            scheduleMap[schedule.device_number.zone.name].push(schedule);
+            if (zoneMap[schedule.device_number.zone.name] == null) {
+              zoneMap[schedule.device_number.zone.name] = schedule.device_number.zone;
             }
           }
 

src/pages/advice/NormalAdviceTable.vue

@@ -82,7 +82,7 @@
 
           </tr>
           <template v-for="(schedule) in schedules">
-            <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice_index + '_' + index"  @click="clickfunction(schedule)">
+            <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice.id + '_' + advice_index + '_' + index"  @click="clickfunction(schedule)">
               <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
               <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
               <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
@@ -213,7 +213,7 @@
     },
     methods: {
       clickfunction: function(val) {
-        console.log(val);
+        // console.log(val);
         this.$router.push({
           path: "/details",
           query: {
@@ -283,12 +283,12 @@
               if (schedule.doctor_advice.length == 0) {
                 continue;
               }
-              if (scheduleMap[schedule.device_zone.name] == null) {
-                scheduleMap[schedule.device_zone.name] = [];
+              if (scheduleMap[schedule.device_number.zone.name] == null) {
+                scheduleMap[schedule.device_number.zone.name] = [];
               }
-              scheduleMap[schedule.device_zone.name].push(schedule);
-              if (zoneMap[schedule.device_zone.name] == null) {
-                zoneMap[schedule.device_zone.name] = schedule.device_zone;
+              scheduleMap[schedule.device_number.zone.name].push(schedule);
+              if (zoneMap[schedule.device_number.zone.name] == null) {
+                zoneMap[schedule.device_number.zone.name] = schedule.device_number.zone;
               }
             }
 

src/pages/main/DialysisArea.vue

@@ -140,7 +140,7 @@ export default {
           const schedule = originSchedules[s_i];
           if (
             zone_name.length == 0 ||
-            (zone_name.length > 0 && zone_name == schedule.device_zone.name)
+            (zone_name.length > 0 && zone_name == schedule.device_number.zone.name)
           ) {
             if (
               timetype_selected == 0 ||
@@ -209,12 +209,12 @@ export default {
               if (schedual.dialysis_order == null) {
                 continue;
               }
-              if (schedualMap[schedual.device_zone.name] == null) {
-                schedualMap[schedual.device_zone.name] = [];
+              if (schedualMap[schedual.device_number.zone.name] == null) {
+                schedualMap[schedual.device_number.zone.name] = [];
               }
-              schedualMap[schedual.device_zone.name].push(schedual);
-              if (zoneMap[schedual.device_zone.name] == null) {
-                zoneMap[schedual.device_zone.name] = schedual.device_zone;
+              schedualMap[schedual.device_number.zone.name].push(schedual);
+              if (zoneMap[schedual.device_number.zone.name] == null) {
+                zoneMap[schedual.device_number.zone.name] = schedual.device_number.zone;
               }
             }
 

src/pages/main/WaitingArea.vue

@@ -165,8 +165,8 @@ export default {
       var zoneMap = {};
       for (let index = 0; index < scheduals.length; index++) {
         const schedual = scheduals[index];
-        if (zoneMap[schedual.device_zone.id] == null) {
-          zoneMap[schedual.device_zone.id] = schedual.device_zone;
+        if (zoneMap[schedual.device_number.zone.id] == null) {
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
         }
       }
 
@@ -186,12 +186,12 @@ export default {
       var schedualMap = {};
       for (let index = 0; index < scheduals.length; index++) {
         const schedual = scheduals[index];
-        if (schedualMap[schedual.device_zone.id] == null) {
-          schedualMap[schedual.device_zone.id] = [];
+        if (schedualMap[schedual.device_number.zone.id] == null) {
+          schedualMap[schedual.device_number.zone.id] = [];
         }
-        schedualMap[schedual.device_zone.id].push(schedual);
-        if (zoneMap[schedual.device_zone.id] == null) {
-          zoneMap[schedual.device_zone.id] = schedual.device_zone;
+        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;
         }
       }