表格修改

src/pages/advice/DialysisAdviceTable.vue

       </div>
       <el-table :data="date" border style="width: 100%">
         <el-table-column fixed prop="date" label="姓名" width="100" align="center">
-<<<<<<< .mine
             <template slot-scope="scope">
                {{ scope.row.advice_name }}
             </template>
-=======
-          <template slot-scope="scope"></template>
-
-
->>>>>>> .theirs
         </el-table-column>
         <el-table-column prop="name" label="透析号" width="100" align="center"></el-table-column>
         <el-table-column prop="province" label="期效" width="100" align="center"></el-table-column>
 </template>
 
 <script>
-import SideBar from "@/pages/layout/SideBar";
-import { parseTime } from "@/utils";
-import { getSchedualDoctors } from "@/api/advice";
+import SideBar from '@/pages/layout/SideBar';
+import { parseTime } from '@/utils';
+import { getSchedualDoctors } from '@/api/advice';
 
 export default {
-  name: "DialysisAdviceTable",
+  name: 'DialysisAdviceTable',
   components: {
     SideBar
   },
-  data() {
+  data () {
     return {
       selected_date: new Date(),
       admin_user: [],
       show_sch_type_selector: false,
       schedule_type_selected: 0,
       schedule_types: [
-        { value: 0, text: "全部班次" },
-        { value: 1, text: "上午" },
-        { value: 2, text: "下午" },
-        { value: 3, text: "晚上" }
+        { value: 0, text: '全部班次' },
+        { value: 1, text: '上午' },
+        { value: 2, text: '下午' },
+        { value: 3, text: '晚上' }
       ],
 
       show_zone_selector: false,
       zone_selected: 0,
       show_patient_type_selector: false,
-      zones: [{ value: 0, text: "全部分区", select: true }],
+      zones: [{ value: 0, text: '全部分区', select: true }],
 
       show_advice_type_selector: false,
       advice_type_selected: 0,
       advice_types: [
-        { value: 0, text: "全部医嘱" },
-        { value: 1, text: "长期医嘱" },
-        { value: 3, text: "临时医嘱" }
+        { value: 0, text: '全部医嘱' },
+        { value: 1, text: '长期医嘱' },
+        { value: 3, text: '临时医嘱' }
       ],
 
       patient_types: [
-        { value: 0, text: "全部病人" },
-        { value: 1, text: "我的病人" },
-        { value: 2, text: "未执行病人" }
+        { value: 0, text: '全部病人' },
+        { value: 1, text: '我的病人' },
+        { value: 2, text: '未执行病人' }
       ],
       patient_selected: 0,
 
       scheduleMap: {},
       tableData: []
-    };
+    }
   },
   computed: {
-    selected_date_str: function() {
-      return parseTime(this.selected_date, "{y}-{m}-{d}");
+    selected_date_str: function () {
+      return parseTime(this.selected_date, '{y}-{m}-{d}')
     },
-    filtedScheduals: function() {
-      var scheduleMap = new Object();
+    filtedScheduals: function () {
+      var scheduleMap = new Object()
       if (this.zone_selected == 0) {
         for (const key in this.scheduleMap) {
-          scheduleMap[key] = this.scheduleMap[key];
+          scheduleMap[key] = this.scheduleMap[key]
         }
       } else {
-        var zone_name = this.zones[this.zone_selected].text;
-        scheduleMap[zone_name] = this.scheduleMap[zone_name];
+        var zone_name = this.zones[this.zone_selected].text
+        scheduleMap[zone_name] = this.scheduleMap[zone_name]
       }
 
       if (this.schedule_type_selected != 0) {
-        var _scheduleMap = {};
+        var _scheduleMap = {}
         for (const key in scheduleMap) {
-          var origin_schedules = scheduleMap[key];
-          var schedules = [];
+          var origin_schedules = scheduleMap[key]
+          var schedules = []
           for (let index = 0; index < origin_schedules.length; index++) {
-            const schedule = origin_schedules[index];
+            const schedule = origin_schedules[index]
             if (schedule.schedule_type == this.schedule_type_selected) {
-              schedules.push(schedule);
+              schedules.push(schedule)
             }
           }
           if (schedules.length > 0) {
-            _scheduleMap[key] = schedules;
+            _scheduleMap[key] = schedules
           }
         }
 
-        scheduleMap = _scheduleMap;
+        scheduleMap = _scheduleMap
       }
       for (var key in scheduleMap) {
-        let mapArr = scheduleMap[key];
+        let mapArr = scheduleMap[key]
         for (let i = 0; i < mapArr.length; i++) {
-          mapArr[i]["new_advice"] = [];
+          mapArr[i]['new_advice'] = []
         }
       }
 
       for (var key in scheduleMap) {
-        let mapArr = scheduleMap[key];
+        let mapArr = scheduleMap[key]
         for (let i = 0; i < mapArr.length; i++) {
-          var maps = mapArr[i];
-          var resp_advices = maps.doctor_advice;
+          var maps = mapArr[i]
+          var resp_advices = maps.doctor_advice
           if (resp_advices.length > 0) {
-            var newGroupObject = function() {
+            var newGroupObject = function () {
               return Object.assign(
                 {},
                 {
                   group_no: 0,
                   advices: []
                 }
-              );
+              )
             };
-            var initGroupBlock = function(group, advice) {
-              group.group_no = advice.groupno;
+            var initGroupBlock = function (group, advice) {
+              group.group_no = advice.groupno
             };
 
-            var advice_groups = [];
-            var group = newGroupObject();
+            var advice_groups = []
+            var group = newGroupObject()
             for (let index = 0; index < resp_advices.length; index++) {
-              const advice = resp_advices[index];
+              const advice = resp_advices[index]
               if (advice.groupno == 0) {
                 // 老版本的医嘱
                 if (advice.parent_id > 0) {
                   if (advice_groups.length > 0) {
-                    var parent_group = advice_groups[advice_groups.length - 1];
+                    var parent_group = advice_groups[advice_groups.length - 1]
                     if (parent_group.advices.length > 0) {
                       if (parent_group.advices[0].id == advice.parent_id) {
-                        parent_group.advices.push(advice);
+                        parent_group.advices.push(advice)
                       }
                     }
                   }
-                  continue;
+                  continue
                 } else {
                   if (group.group_no > 0) {
-                    advice_groups.push(group);
-                    group = newGroupObject();
+                    advice_groups.push(group)
+                    group = newGroupObject()
                   }
 
-                  initGroupBlock(group, advice);
-                  group.advices.push(advice);
-                  advice_groups.push(group);
-                  group = newGroupObject();
+                  initGroupBlock(group, advice)
+                  group.advices.push(advice)
+                  advice_groups.push(group)
+                  group = newGroupObject()
                   continue;
                 }
               } else {
                 if (group.group_no > 0 && group.group_no != advice.groupno) {
-                  advice_groups.push(group);
-                  group = newGroupObject();
+                  advice_groups.push(group)
+                  group = newGroupObject()
                 }
                 if (group.group_no == 0) {
-                  initGroupBlock(group, advice);
+                  initGroupBlock(group, advice)
                 }
                 if (group.group_no == advice.groupno) {
-                  group.advices.push(advice);
+                  group.advices.push(advice)
                 }
               }
             }
             if (group.group_no > 0) {
               // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-              advice_groups.push(group);
+              advice_groups.push(group)
             }
-            advice_groups = advice_groups;
+            advice_groups = advice_groups
           } else {
-            advice_groups = [];
+            advice_groups = []
           }
-          maps.new_advice = advice_groups;
+          maps.new_advice = advice_groups
         }
       }
 
-      return scheduleMap;
+      return scheduleMap
     }
   },
-  created() {
-    this.requestSchedualDoctors();
+  created () {
+    this.requestSchedualDoctors()
   },
   methods: {
     // getNumber: function (advice,schedule) {
     //   }
     //
     // },
-    clickfunction: function(val) {
+    clickfunction: function (val) {
       // console.log(val);
       this.$router.push({
-        path: "/details",
+        path: '/details',
         query: {
           patient_id: val.patient.id,
           date: this.selected_date.getTime() / 1000,
           patient_name: val.patient.name
         }
-      });
+      })
     },
-    handlePaitentType: function(index) {
-      this.patient_selected = index;
-      this.show_patient_type_selector = false;
-      this.requestSchedualDoctors();
+    handlePaitentType: function (index) {
+      this.patient_selected = index
+      this.show_patient_type_selector = false
+      this.requestSchedualDoctors()
     },
-    openPicker() {
-      this.$refs.picker.open();
+    openPicker () {
+      this.$refs.picker.open()
     },
-    getAdaviceType(type, parent_id) {
+    getAdaviceType (type, parent_id) {
       if (parent_id == 0) {
         if (type == 1) {
-          return "长嘱";
+          return '长嘱';
         } else if (type == 2) {
-          return "临嘱";
+          return '临嘱';
         } else if (type == 3) {
-          return "临嘱";
+          return '临嘱';
         }
       }
     },
-    getName(val) {
-      console.log(this.admin_user);
+    getName (val) {
+      console.log(this.admin_user)
 
       for (let i = 0; i < this.admin_user.length; i++) {
         if (this.admin_user[i].id == val) {
-          return this.admin_user[i].name;
+          return this.admin_user[i].name
         }
       }
     },
-    handletimeType: function(index) {
-      this.schedule_type_selected = index;
-      this.show_sch_type_selector = false;
+    handletimeType: function (index) {
+      this.schedule_type_selected = index
+      this.show_sch_type_selector = false
     },
-    handleAdviceType: function(index) {
-      this.advice_type_selected = index;
-      this.show_advice_type_selector = false;
-      this.requestSchedualDoctors();
+    handleAdviceType: function (index) {
+      this.advice_type_selected = index
+      this.show_advice_type_selector = false
+      this.requestSchedualDoctors()
     },
-    handleZoneChange: function(index) {
-      this.zone_selected = index;
-      this.show_zone_selector = false;
+    handleZoneChange: function (index) {
+      this.zone_selected = index
+      this.show_zone_selector = false
     },
-    parseTime: function(time, layout) {
+    parseTime: function (time, layout) {
       // console.log(time);
       if (time == 0) {
-        return "";
+        return '';
       }
-      return parseTime(time, layout);
+      return parseTime(time, layout)
     },
-    requestSchedualDoctors() {
+    requestSchedualDoctors () {
       getSchedualDoctors({
         date: this.selected_date_str,
         patient_type: this.patient_selected,
         advice_type: 2
       }).then(rs => {
-        var resp = rs.data;
+        var resp = rs.data
         if (resp.state == 1) {
-          this.admin_user = resp.data.adminUser;
-          var schedules = resp.data.scheduals;
-          console.log("schedules", schedules);
-          var zoneMap = {};
-          var scheduleMap = {};
+          this.admin_user = resp.data.adminUser
+          var schedules = resp.data.scheduals
+          console.log('schedules', schedules)
+          var zoneMap = {}
+          var scheduleMap = {}
           for (let index = 0; index < schedules.length; index++) {
-            const schedule = schedules[index];
+            const schedule = schedules[index]
             if (schedule.doctor_advice.length == 0) {
-              continue;
+              continue
             }
             if (scheduleMap[schedule.device_number.zone.name] == null) {
-              scheduleMap[schedule.device_number.zone.name] = [];
+              scheduleMap[schedule.device_number.zone.name] = []
             }
-            scheduleMap[schedule.device_number.zone.name].push(schedule);
+            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;
+                schedule.device_number.zone
             }
           }
 
-          var zones = [];
-          zones.push({ value: 0, text: "全部分区" });
+          var zones = []
+          zones.push({ value: 0, text: '全部分区' })
           for (var zoneName in zoneMap) {
-            zones.push({ value: zoneMap[zoneName].id, text: zoneName });
+            zones.push({ value: zoneMap[zoneName].id, text: zoneName })
           }
 
-          zones = zones.sort(function(a, b) {
-            return a.value > b.value;
-          });
-          this.zones = zones;
+          zones = zones.sort(function (a, b) {
+            return a.value > b.value
+          })
+          this.zones = zones
 
-          this.scheduleMap = scheduleMap;
+          this.scheduleMap = scheduleMap
         } else {
           this.$toast({
             message: resp.msg
-          });
+          })
         }
-      });
+      })
     },
-    adviceDesc(advice) {}
+    adviceDesc (advice) {}
   }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>