历史排班周

src/xt_pages/workforce/appointment.vue

@@ -334,7 +334,7 @@ export default {
         this.showtable=true
         this.showtableOne=false
         this.$nextTick(() => {
-          this.$refs.tableDataZero.getgetSchedules()
+          this.$refs.tableDataZero.getAllZones()
         })
         console.log('12343545',this.$refs.tableDataZero);
       }else{

src/xt_pages/workforce/components/historyWeekTable.vue

@@ -533,10 +533,10 @@ export default {
       dafault: []
     },
     // 分区
-    partitionsProp: {
-      type: Object,
-      dafault: {}
-    },
+    // partitionsProp: {
+    //   type: Object,
+    //   dafault: {}
+    // },
     config: {
       type: Object,
       dafault: {}
@@ -791,7 +791,7 @@ export default {
     rowNumber = 0;
     this.modeOptions = this.$store.getters.treatment_mode;
 
-    this.partitions = this.partitionsProp;
+    // this.partitions = this.partitionsProp;
 
 
     var contagions = this.$store.getters.contagions;
@@ -2792,15 +2792,15 @@ export default {
           var strArr = this.zoneIdList.join(",")
 
           this.strArr = strArr
-          this.getWeekPanels()
-          this.getgetSchedules()
+           this.getWeekPanels()
+          // this.getgetSchedules()
         }
       })
     },
     changePartiton(val) {
       this.$emit('event1', val)
       this.partition_id = val
-      this.getWeekPanels()
+      // this.getWeekPanels()
       
       this.getgetSchedules()
     },
@@ -2832,9 +2832,285 @@ export default {
       this.end_time = this.getTime(end)
       console.log('44444',this.start_time)
       console.log('555555',this.end_time )
-      this.getgetSchedules()
+      this.getWeekPanels()
     },
-    getgetSchedules(){
+
+   //  表格所有数据
+     getWeekPanels() {
+        console.log("触发232332323232")
+         this.scheduleZone=[]
+         var partionStr = this.partition_id
+         var arr = this.zoneIdList.join(',')
+
+         var str = ""
+         if(partionStr == 0){
+            str = arr
+         }
+         if(partionStr != 0){
+            str = partionStr.join(',')
+         }
+
+
+        getWeekPanelsOne(1,str).then(response => {
+          if (response.data.state == 0) {
+            return false
+          }
+          var partitions = response.data.data.partitions
+          console.log("partitions",partitions)
+          this.theWeek.thisWeek = response.data.data.theWeek
+
+          this.theWeek.lastWeek = this.theWeek.thisWeek - 1
+          this.theWeek.nextWeek = this.theWeek.thisWeek + 1
+          this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
+          var that = this
+          if (partitions.length > 0) {
+            partitions.forEach(function(partition) {
+              if (partition.jihaos.length == 0) {
+                return false
+              }
+              that.scheduleZoneRow.push(partition.jihaos.length)
+            
+             
+              that.partitions[partition.id] = partition
+
+              partition.jihaos.forEach(function(jihao) {
+                var thisPa = {
+                  area: partition.name,
+                  zone_id: partition.id,
+                  zone_type: partition.type,
+                  cut: jihao.number,
+                  jihao_id: jihao.id,
+                  sort:jihao.sort,
+
+                  Mon_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Mon_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Mon_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Tue_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Tue_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Tue_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Wed_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Wed_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Wed_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Thurs_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Thurs_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Thurs_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Fri_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Fri_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Fri_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sat_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sat_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sat_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sun_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sun_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  Sun_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: '',
+                    dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
+                  },
+                  total: 0
+                }
+
+                that.scheduleZone.push(thisPa)
+
+              })
+            })
+          }
+          console.log("9wwoowowowowowowowo",that.scheduleZone)
+          console.log("历史上午鹅鹅鹅饿",this.scheduleZone)
+          this.scheduleZone.sort(this.compare('sort'))
+          this.source_scheduleZone = this.scheduleZone
+          this.getSchedules()
+        
+        })
+     },
+   
+
+    getSchedules(){
       var partionStr = this.partition_id
       var arr = this.zoneIdList.join(',')
       var str = ""
@@ -2846,10 +3122,10 @@ export default {
       }
       const params = {
         is_before:1,
-        // start_time: this.start_time + " 00:00:00",
-        // end_time:this.end_time + ' 23:59:59',
-        start_time: '2023-03-20' + " 00:00:00",
-        end_time:'2023-03-26' + ' 23:59:59',
+        start_time: this.start_time + " 00:00:00",
+        end_time:this.end_time + ' 23:59:59',
+        // start_time: "2023-03-20" + " 00:00:00",
+        // end_time:"2023-03-26" + "23:59:59",
         weekTime: this.theType,
         patitionid: str,
         schedule_type: this.schedule_type,
@@ -2864,11 +3140,11 @@ export default {
           var theSchedules = response.data.data.schdules;
           var schedulesGroup = response.data.data.schedulesGroup
           this.schedulesGroup = schedulesGroup
-
+            
           var that = this;
-
-          this.scheduleZone.forEach(function (zone, index) {
-
+         console.log("历史周2332222😯o-----------",response.data.data.schdules)
+         this.scheduleZone.forEach(function (zone, index) {
+            console.log("之心3222222222222222222")
             that.scheduleZone[index].Mon_M = {
               mode_id: 0,
               mode_name: "",
@@ -3059,12 +3335,13 @@ export default {
               schedule_date: "",
               Count: 0,
             };
-
+           console.log("response.data.data.schdules++++++++",response.data.data)
             that.scheduleZone[index].total = 0;
-
+             console.log("response.data.data.schdules-----",response.data.data.schdules)
+            
             if (response.data.data.schdules.length > 0) {
               theSchedules.forEach(function (schedule, sindex) {
-
+               
                 if (zone.jihao_id == schedule.bed_id) {
 
                   var weekPath = that.weekPath(

src/xt_pages/workforce/components/tableData.vue

@@ -2018,7 +2018,7 @@ export default {
           this.schedulesGroup = schedulesGroup
 
           var that = this;
-
+          
           this.scheduleZone.forEach(function (zone, index) {
 
             that.scheduleZone[index].Mon_M = {
@@ -2214,7 +2214,7 @@ export default {
 
 
             that.scheduleZone[index].total = 0;
-
+            
             if (response.data.data.schdules.length > 0) {
               theSchedules.forEach(function (schedule, sindex) {
 
@@ -2249,7 +2249,7 @@ export default {
           });
 
           this.source_scheduleZone = this.scheduleZone
-          console.log("------------aaaa", this.scheduleZone)
+         
         } else {
           this.$message.error("网络错误");
           return false;