Browse Source

打印单

XMLWAN 4 years ago
parent
commit
58dffbdb1c

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

@@ -233,18 +233,18 @@ export default {
233 233
         const end = moment().weekday(7).format('YYYY-MM-DD')
234 234
         // console.log("start",moment(start).unix())
235 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
-        // }
242 236
         const params = {
243
-          start_time:1609603200,
244
-          end_time:1610208000,
237
+          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
238
+          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
245 239
           week_type:this.week_type,
246 240
           week_time:this.week_time,
247 241
         }
242
+        // const params = {
243
+        //   start_time:1609603200,
244
+        //   end_time:1610208000,
245
+        //   week_type:this.week_type,
246
+        //   week_time:this.week_time,
247
+        // }
248 248
       
249 249
       getNextScheduleWeekDay(params).then(response => {
250 250
         this.scheduleData = [];

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

@@ -127,19 +127,19 @@
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 = {
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 = {
130
+      const params = {
138 131
           week_type:this.week_type,
139 132
           week_time:this.week_time,
140
-          start_time:1609603200,
141
-          end_time:1610208000,
133
+          start_time:this.start_time,
134
+          end_time:this.end_time,
142 135
         }
136
+
137
+        //  const params = {
138
+        //   week_type:this.week_type,
139
+        //   week_time:this.week_time,
140
+        //   start_time:1609603200,
141
+        //   end_time:1610208000,
142
+        // }
143 143
       console.log("打印下周",params)
144 144
       getNextScheduleWeekDay(params).then(rs => {
145 145
         var resp = rs.data