Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/workforce/appointment.vue

@@ -130,7 +130,7 @@
                         :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
                          title="" @event1="changePartition"
                          @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
-                      
+
         <div class="position">
           <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
           <div>
@@ -161,7 +161,7 @@
               type="primary"
               v-if="is_edit"
               size="small"
-          >下载日志 
+          >下载日志
           </el-button>
           <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
           </el-button>
@@ -172,7 +172,7 @@
         </div>
       </div>
         </edit-table-data>
-       
+
         <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" partitions-prop="partitions"
                   :schedule-zone-row-prop="scheduleZoneRow"
                   :schedule-zone-prop="scheduleZone" title="" >
@@ -285,7 +285,7 @@ export default {
         nextWeek: 0,
         nextTwoWeek: 0
       },
-      
+
       tableList: [],
       weekTime: "",
       schedule_type: 0,
@@ -333,17 +333,18 @@ export default {
         this.showtable=true
         this.showtableOne=false
         this.$nextTick(() => {
-          // this.$refs.tableData.getSchedules()
-          // this.$refs.tableDataZero.getgetSchedules()
+          this.$refs.tableDataZero.getgetSchedules()
         })
-        // console.log('12343545',this.$refs.tableDataZero.getgetSchedules());
+        console.log('12343545',this.$refs.tableDataZero);
       }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)
@@ -438,11 +439,10 @@ 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
-        // console.log('sadfasfg',this.$refs.elTabs.$children);
-        this.$nextTick(() => { 
+        this.$nextTick(() => {
           childrenRefs.forEach(child => child.$forceUpdate())
         })
         var that = this
@@ -2363,7 +2363,7 @@ export default {
 
       return next_monday
     },
-    // 
+    //
     getThreeWeekList() {
       var params = {
         start_time: this.start_time,
@@ -3068,7 +3068,7 @@ export default {
     },
     getlist() {
       getScheduleTemplate().then(response => {
-        
+
         if (response.data.state == 1) {
           var template = response.data.data.template
           console.log('12243254',response.data.data);

src/xt_pages/workforce/components/tableData.vue

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