Qukatie 6 месяцев назад
Родитель
Сommit
7ece7ab1af

+ 19 - 5
src/views/iosBasicData/boxPlan/boxPlan/index.vue

@@ -31,6 +31,7 @@
 
 <script>
 import { getList, remove } from "@/api/iosBasicData/boxPlan/boxPlan.js";
+import { getWeekNumber, getYearDate } from "@/util/date";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
@@ -40,7 +41,12 @@ export default {
     return {
       isShow: true,
       form: {},
-      query: {},
+      query: {
+        year: getYearDate().toString(),
+        week: getWeekNumber().weekNumber,
+        startDate: getWeekNumber().mondayDate + ' 00:00:00',
+        endDate: getWeekNumber().sundayDate + ' 23:59:59'
+      },
       loading: false,
       page: {
         pageSize: 10,
@@ -123,8 +129,8 @@ export default {
             prop: "startDate",
             width: "100",
             overHidden: true,
-            hide:true,
-            showColumn:false,
+            hide: true,
+            showColumn: false,
             search: true,
             type: "date",
             format: "yyyy-MM-dd",
@@ -135,8 +141,8 @@ export default {
             prop: "endDate",
             width: "100",
             overHidden: true,
-            hide:true,
-            showColumn:false,
+            hide: true,
+            showColumn: false,
             search: true,
             type: "date",
             format: "yyyy-MM-dd",
@@ -152,6 +158,12 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(504), this.optionBack);
+    this.query = {
+      year: getYearDate().toString(),
+      week: getWeekNumber().weekNumber,
+      startDate: getWeekNumber().mondayDate + ' 00:00:00',
+      endDate: getWeekNumber().sundayDate + ' 23:59:59'
+    }
   },
   activated() {
     setTimeout(() => {
@@ -214,6 +226,8 @@ export default {
     },
     onLoad(page, params = {}) {
       let obj = {}
+      this.query = this.deepClone(this.query)
+      console.log(params, this.query)
       obj = {
         ...Object.assign(params, this.query),
       }

+ 7 - 1
src/views/iosBasicData/boxPlan/boxStatistics/index.vue

@@ -23,7 +23,7 @@
 import { getList } from "@/api/iosBasicData/boxPlan/boxStatistics.js";
 import { defaultDate2 } from "@/util/date";
 import dicSelect from "@/components/dicSelect/main";
-import { getWeekNumber, getWeeksInYear, getYearDate, getWeekRange } from "@/util/date";
+import { getWeekNumber, getYearDate } from "@/util/date";
 import { getToken } from "@/util/auth";
 export default {
   data() {
@@ -176,6 +176,12 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(507), this.optionBack);
+    this.query = {
+      year: getYearDate().toString(),
+      week: getWeekNumber().weekNumber,
+      startDate: getWeekNumber().mondayDate,
+      endDate: getWeekNumber().sundayDate
+    }
   },
   activated() {
     setTimeout(() => {