yq1 1 year ago
parent
commit
e209d20e59
2 changed files with 6 additions and 6 deletions
  1. 2 2
      src/vendor/Export2Excel.js
  2. 4 4
      src/xt_pages/workforce/appointment.vue

+ 2 - 2
src/vendor/Export2Excel.js View File

405
   filename = filename || 'excel-list'
405
   filename = filename || 'excel-list'
406
   data = [...data]
406
   data = [...data]
407
   data.unshift(header);
407
   data.unshift(header);
408
-  console.log('wwwww',data);
408
+  // console.log('wwwww',data);
409
   for (let i = multiHeader.length - 1; i > -1; i--) {
409
   for (let i = multiHeader.length - 1; i > -1; i--) {
410
     data.unshift(multiHeader[i])
410
     data.unshift(multiHeader[i])
411
   }
411
   }
412
-  console.log('qqqqq',data);
412
+  // console.log('qqqqq',data);
413
   var ws_name = "SheetJS";
413
   var ws_name = "SheetJS";
414
   var wb = new Workbook(),
414
   var wb = new Workbook(),
415
     ws = sheet_from_array_of_arrays(data);
415
     ws = sheet_from_array_of_arrays(data);

+ 4 - 4
src/xt_pages/workforce/appointment.vue View File

124
         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
124
         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
125
                     :schedule-zone-row-prop="scheduleZoneRow"
125
                     :schedule-zone-row-prop="scheduleZoneRow"
126
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
126
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
127
-                    @event2="changeSchedule"  @event3="changeWeekDay"  @guanliu_show="guanliu" v-show="showtableOne">
127
+                    @event2="changeSchedule"  @event3="changeWeekDay" @event6="changeScheduleType" @guanliu_show="guanliu" v-show="showtableOne">
128
         </table-data>
128
         </table-data>
129
-        <!-- @event6="changeScheduleType" -->
129
+        <!--  -->
130
       </div>
130
       </div>
131
       <!-- 编辑 -->
131
       <!-- 编辑 -->
132
        <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
132
        <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
1332
       } else if (this.activeName == 'nextTwoWeek') {
1332
       } else if (this.activeName == 'nextTwoWeek') {
1333
         date = date + 14 * 24 * 60 * 60 * 1000
1333
         date = date + 14 * 24 * 60 * 60 * 1000
1334
       }
1334
       }
1335
+      console.log('3333333',this.partition_id,this.activeName,this.week_date);
1335
        this.$router.push({path: '/scheduleTablePrintSix?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date+"&schedule_type="+this.schedule_type})
1336
        this.$router.push({path: '/scheduleTablePrintSix?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date+"&schedule_type="+this.schedule_type})
1336
-
1337
     },
1337
     },
1338
     isShow() {
1338
     isShow() {
1339
       let isShow = false
1339
       let isShow = false
4898
 
4898
 
4899
     changeScheduleType(val){
4899
     changeScheduleType(val){
4900
       // console.log('444444');
4900
       // console.log('444444');
4901
-      // this.schedule_type = val
4901
+      this.schedule_type = val
4902
     },
4902
     },
4903
 
4903
 
4904
     changeWeek(val) {
4904
     changeWeek(val) {