Browse Source

打印单

XMLWAN 4 years ago
parent
commit
4cd9ede707

+ 12 - 5
src/xt_pages/workforce/components/nextTableWeeks.vue View File

@@ -229,9 +229,19 @@ export default {
229 229
       }
230 230
      },
231 231
     getNextScheduleWeekDay() {
232
+        const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
233
+        const end = moment().weekday(7).format('YYYY-MM-DD')
234
+        console.log("start",moment(start).unix())
235
+      
236
+        // const params = {
237
+        //   start_time:moment().week(moment().week() + 1).startOf('week').unix(),
238
+        //   end_time:moment().week(moment().week() + 1).endOf('week').unix(),
239
+        //   week_type:this.week_type,
240
+        //   week_time:this.week_time,
241
+        // }
232 242
         const params = {
233
-          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
234
-          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
243
+          start_time:1609603200,
244
+          end_time:1610208000,
235 245
           week_type:this.week_type,
236 246
           week_time:this.week_time,
237 247
         }
@@ -293,9 +303,6 @@ export default {
293 303
     },
294 304
     selectWeekType(type) {
295 305
       this.week_type = type;
296
-      // let params = {
297
-      //   week_type: this.week_type
298
-      // };
299 306
       this.getNextScheduleWeekDay();
300 307
     },
301 308
     selectWeekTime(type){

+ 10 - 3
src/xt_pages/workforce/next_remind_print.vue View File

@@ -127,11 +127,18 @@
127 127
       this.week_type = this.$route.query.week_type
128 128
       this.week_time  = this.$route.query.week_time
129 129
       
130
-      const params = {
130
+      // const params = {
131
+      //     week_type:this.week_type,
132
+      //     week_time:this.week_time,
133
+      //     start_time:this.start_time,
134
+      //     end_time:this.end_time,
135
+      //   }
136
+
137
+         const params = {
131 138
           week_type:this.week_type,
132 139
           week_time:this.week_time,
133
-          start_time:this.start_time,
134
-          end_time:this.end_time,
140
+          start_time:1609603200,
141
+          end_time:1610208000,
135 142
         }
136 143
       console.log("打印下周",params)
137 144
       getNextScheduleWeekDay(params).then(rs => {