3月25日杨青

src/xt_pages/workforce/appointment.vue

@@ -333,9 +333,8 @@ export default {
         this.showtable=true
         this.showtableOne=false
         this.$nextTick(() => {
-          // this.$refs.tableDataZero.getAllZones()
-          this.$refs.tableDataZero.getSchedules()
-          // this.$refs.tableDataZero.getSchedulesOnes()
+
+          this.$refs.tableDataZero.start()
         })
         console.log('12343545',this.$refs.tableDataZero);
       }else{
@@ -343,10 +342,6 @@ export default {
         this.showtableOne=true
       }
 
-      // if(e.name == 'thisWeek'){
-      //    this.$refs.tableData.getWeekPanels()
-      // }
-      // console.log(getgetSchedules);
     },
     dragstart(event, item) {
       // console.log('start的索引',item.moveIndex)
@@ -441,7 +436,7 @@ export default {
         this.theWeek.lastWeek = response.data.data.theLastWeek
         this.theWeek.nextWeek = response.data.data.theNextWeek
         this.theWeek.nextTwoWeek = response.data.data.theNextSecWeek
-        // this.theWeek.historyWeek = response.data.data.theWeek - 2
+        this.theWeek.historyWeek = response.data.data.theWeek - 2
         // 在控制变量改变的时候进行 强制渲染更新
         let childrenRefs = this.$refs.elTabs.$children
         this.$nextTick(() => {

src/xt_pages/workforce/components/historyWeekTable.vue

@@ -2848,7 +2848,7 @@ export default {
       this.getSchedules()
     },
     // 选择周次
-    getSchedules(){
+    start(){
       var thisweek = {};
       var date = new Date();
     // 本周一的日期
@@ -2863,13 +2863,21 @@ export default {
       var date = new Date();
       // 上上周一的日期
       date.setDate(date.getDate()-14 - date.getDay() + 1);
-      this.lastweek.start_day = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() ;
+      var month=(date.getMonth() + 1)<10 ? "0"+(date.getMonth()+1):(date.getMonth()+1)
+      var day=(date.getDate())<10 ? "0"+(date.getDate()):(date.getDate())
+      console.log('wqertwetwe',month);
+      this.start_time = date.getFullYear() + "-" + month + "-" + day;
 
       // 上上周日的日期
       date.setDate(date.getDate() + 6);
-      this.lastweek.end_day = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
+      var month=(date.getMonth() + 1)<10 ? "0"+(date.getMonth()+1):(date.getMonth()+1)
+      var day=(date.getDate())<10 ? "0"+(date.getDate()):(date.getDate())
+      this.end_time = date.getFullYear() + "-" + month + "-" + day;
       console.log('1234566',this.lastweek.start_day,this.lastweek.end_day);
-
+      this.getSchedules()
+    },
+    getSchedules(){
+      
       var partionStr = this.partition_id
       var arr = this.zoneIdList.join(',')
       var str = ""
@@ -2881,10 +2889,10 @@ export default {
       }
       const params = {
         is_before:1,
-        // start_time: this.start_time || this.lastweek.start_day + " 00:00:00",
-        // end_time:this.end_time || this.lastweek.end_day + ' 23:59:59',
-        start_time: this.lastweek.start_day + " 00:00:00",
-        end_time: this.lastweek.end_day + ' 23:59:59',
+        start_time: this.start_time  + " 00:00:00",
+        end_time:this.end_time  + ' 23:59:59',
+        // start_time: this.lastweek.start_day + " 00:00:00",
+        // end_time: this.lastweek.end_day + ' 23:59:59',
         weekTime: this.theType,
         patitionid: str,
         schedule_type: this.schedule_type,
@@ -3138,295 +3146,6 @@ export default {
         }
       });
     },
-    // getSchedulesOnes(){
-    //   var thisweek = {};
-    //   var date = new Date();
-    // // 本周一的日期
-    //   date.setDate(date.getDate() - date.getDay() + 1);
-    //   thisweek.start_day = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() ;
-
-    // // 本周日的日期
-    //   date.setDate(date.getDate() + 6);
-    //   thisweek.end_day = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
-    //   console.log('asdfgdsafg',thisweek.start_day,thisweek.end_day);
-
-    //   var lastweek = {};
-    //   var date = new Date();
-    //   // 上上周一的日期
-    //   date.setDate(date.getDate()-14 - date.getDay() + 1);
-    //   lastweek.start_day = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() ;
-
-    //   // 上上周日的日期
-    //   date.setDate(date.getDate() + 6);
-    //   lastweek.end_day = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
-    //   console.log('1234566',lastweek.start_day,lastweek.end_day);
-
-    //   var partionStr = this.partition_id
-    //   var arr = this.zoneIdList.join(',')
-    //   var str = ""
-    //   if (partionStr == 0) {
-    //     str = arr
-    //   }
-    //   if (partionStr != 0) {
-    //     str = partionStr.join(',')
-    //   }
-    //   const params = {
-    //     is_before:1,
-    //     start_time: lastweek.start_day + " 00:00:00",
-    //     end_time:lastweek.end_day + ' 23:59:59',
-    //     weekTime: this.theType,
-    //     patitionid: str,
-    //     schedule_type: this.schedule_type,
-    //   }
-
-    //   getSchedulesOne(params).then(response => {
-    //     if (response.data.state == 1) {
-    //       this.weekTitle = response.data.data.weekTitle;
-
-    //       this.weekDays = response.data.data.days;
-    //       this.toDay = response.data.data.today;
-    //       var theSchedules = response.data.data.schdules;
-    //       var schedulesGroup = response.data.data.schedulesGroup
-    //       this.schedulesGroup = schedulesGroup
-
-    //       var that = this;
-
-    //       this.scheduleZone.forEach(function (zone, index) {
-
-    //         that.scheduleZone[index].Mon_M = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Mon_A = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Mon_N = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Tue_M = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Tue_A = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Tue_N = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Wed_M = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Wed_A = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Wed_N = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-
-    //         };
-    //         that.scheduleZone[index].Thurs_M = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Thurs_A = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Thurs_N = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Fri_M = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Fri_A = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Fri_N = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Sat_M = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Sat_A = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Sat_N = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Sun_A = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Sun_N = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-    //         that.scheduleZone[index].Sun_M = {
-    //           mode_id: 0,
-    //           mode_name: "",
-    //           patient_id: 0,
-    //           patient: "",
-    //           dialysis_machine_name: "",
-    //           schedule_date: "",
-    //           Count: 0,
-    //         };
-
-    //         that.scheduleZone[index].total = 0;
-
-    //         if (response.data.data.schdules.length > 0) {
-    //           theSchedules.forEach(function (schedule, sindex) {
-
-    //             if (zone.jihao_id == schedule.bed_id) {
-
-    //               var weekPath = that.weekPath(
-    //                 schedule.schedule_week,
-    //                 schedule.schedule_type
-    //               );
-
-    //               if (weekPath.length == 2) {
-
-
-    //                 var weekPathKey = weekPath[0] + "_" + weekPath[1];
-    //                 that.scheduleZone[index][weekPathKey] = {
-    //                   schedule_id: schedule.id,
-    //                   mode_id: schedule.mode_id,
-    //                   patient_id: schedule.patient_id,
-    //                   patient: schedule.patient,
-    //                   dialysis_machine_name: schedule.dialysis_machine_name,
-    //                   patient_contagions: schedule.patient_contagions,
-    //                   schedule_date: schedule.schedule_date,
-    //                   mode_name: typeof that.modeOptions[schedule.mode_id] === "undefined" ? "" : that.modeOptions[schedule.mode_id].name
-    //                 };
-    //                 that.scheduleZone[index].total += 1;
-
-    //               }
-    //             }
-    //           });
-    //         }
-
-    //       });
-
-    //       this.source_scheduleZone = this.scheduleZone
-    //       console.log("默认aaaa", this.scheduleZone)
-    //     } else {
-    //       this.$message.error("网络错误");
-    //       return false;
-    //     }
-    //   });
-    // },
   },
   components: {
     ScheduleItem