3月25日杨青

src/xt_pages/workforce/appointment.vue

@@ -175,8 +175,7 @@
        
         <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" partitions-prop="partitions"
                   :schedule-zone-row-prop="scheduleZoneRow"
-                  :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                  @event2="changeSchedule"  @event3="changeWeekDay">
+                  :schedule-zone-prop="scheduleZone" title="" >
           </HistoryWeekTable>
       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
         <el-form :model="form" ref="form" label-width="90px" :rules="rules">
@@ -334,18 +333,17 @@ export default {
         this.showtable=true
         this.showtableOne=false
         this.$nextTick(() => {
-          this.$refs.tableDataZero.getgetSchedules()
+          // this.$refs.tableData.getSchedules()
+          // this.$refs.tableDataZero.getgetSchedules()
         })
-        console.log('12343545',this.$refs.tableDataZero);
+        // console.log('12343545',this.$refs.tableDataZero.getgetSchedules());
       }else{
         this.showtable=false
         this.showtableOne=true
+        this.$nextTick(() => {
+          this.$refs.tableData.getSchedules()
+        })
       }
-
-      // if(e.name == 'thisWeek'){
-      //    this.$refs.tableData.getWeekPanels()
-      // }
-      // console.log(getgetSchedules);
     },
     dragstart(event, item) {
       // console.log('start的索引',item.moveIndex)
@@ -440,13 +438,13 @@ 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(() => {
+        // console.log('sadfasfg',this.$refs.elTabs.$children);
+        this.$nextTick(() => { 
           childrenRefs.forEach(child => child.$forceUpdate())
         })
-
         var that = this
 
         if (partitions.length > 0) {

src/xt_pages/workforce/components/editTableData.vue

@@ -5663,7 +5663,7 @@ export default {
       this.$emit("event1", val);
       this.partition_id = val;
       this.getWeekPanels();
-      // this.getSchedules();
+      this.getSchedules();
     },
     changeSchedule_type(val) {
       this.$emit("event2", val);
@@ -5774,9 +5774,9 @@ textarea{
     padding: 0 0px ;
 
 }
-//  .el-table td .cell:hover {
-//   background: #22eeddc4 !important;
-// }
+.el-table {
+    font-size: 12px !important;
+}
 
 }
 .right_contain {

src/xt_pages/workforce/components/tableData.vue

@@ -878,12 +878,12 @@ export default {
     },
     weekTime: function() {
       // 
-      // if(this.weekTime != 'historyWeek'){
+      if(this.weekTime != 'historyWeek'){
         console.log('12343455',this.weekTime);
         var theType = this.weekType(this.weekTime);
         this.theType = theType
         this.getSchedules();
-      // }
+      }
       
     },
     scheduleZoneRow: function() {
@@ -992,10 +992,11 @@ export default {
           if (response.data.state == 0) {
             return false
           }
+          console.log("触发232332323232",response.data.data)
           var partitions = response.data.data.partitions
           console.log("partitions",partitions)
           this.theWeek.thisWeek = response.data.data.theWeek
-
+          // this.theWeek.historyWeek=this.theWeek.thisWeek - 2
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
           this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
@@ -2967,9 +2968,9 @@ export default {
     weekType(weekTime) {
       var theType = 2;
       switch (weekTime) {
-        case "historyWeek":
-          theType = 0;
-          break;
+        // case "historyWeek":
+        //   theType = 0;
+        //   break;
         case "lastWeek":
           theType = 1;
           break;
@@ -3345,9 +3346,11 @@ textarea{
 .schedule-table-row td:hover {
   background: rgb(88, 162, 236) !important;
 }
-
+.el-table {
+    font-size: 12px !important;
+}
 .schedule-table-row td .cell {
-  font-size: 12px;
+  font-size: 10px;
   white-space:normal  !important;
   // normal
 }