1月13

src/vendor/Export2Excel.js

@@ -405,11 +405,11 @@ export function export_json_to_excel3({
   filename = filename || 'excel-list'
   data = [...data]
   data.unshift(header);
-  console.log('wwwww',data);
+  // console.log('wwwww',data);
   for (let i = multiHeader.length - 1; i > -1; i--) {
     data.unshift(multiHeader[i])
   }
-  console.log('qqqqq',data);
+  // console.log('qqqqq',data);
   var ws_name = "SheetJS";
   var wb = new Workbook(),
     ws = sheet_from_array_of_arrays(data);

src/xt_pages/workforce/appointment.vue

@@ -124,9 +124,9 @@
         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
                     :schedule-zone-row-prop="scheduleZoneRow"
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                    @event2="changeSchedule"  @event3="changeWeekDay"  @guanliu_show="guanliu" v-show="showtableOne">
+                    @event2="changeSchedule"  @event3="changeWeekDay" @event6="changeScheduleType" @guanliu_show="guanliu" v-show="showtableOne">
         </table-data>
-        <!-- @event6="changeScheduleType" -->
+        <!--  -->
       </div>
       <!-- 编辑 -->
        <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
@@ -1332,8 +1332,8 @@ export default {
       } else if (this.activeName == 'nextTwoWeek') {
         date = date + 14 * 24 * 60 * 60 * 1000
       }
+      console.log('3333333',this.partition_id,this.activeName,this.week_date);
        this.$router.push({path: '/scheduleTablePrintSix?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date+"&schedule_type="+this.schedule_type})
-
     },
     isShow() {
       let isShow = false
@@ -4898,7 +4898,7 @@ export default {
 
     changeScheduleType(val){
       // console.log('444444');
-      // this.schedule_type = val
+      this.schedule_type = val
     },
 
     changeWeek(val) {