Merge pull request 'projects/mescc/zjl' (#62) from projects/mescc/zjl into projects/mescc/develop

Reviewed-on: #62
2024-06-24 13:33:08 +08:00 · 2024-06-24 13:33:08 +08:00 · ca0a0142db
commit ca0a0142db
parent 3897f35d28 703334ac3c
2 changed files with 10 additions and 0 deletions
--- a/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue
+++ b/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue
@ -26,6 +26,7 @@
        placeholder="选择日期"
        value-format="yyyy-MM-dd"
        style="width: 150px"
+        :picker-options="pickerOptions"
      >
      </el-date-picker>
    </el-form-item>
@ -38,6 +39,7 @@
        placeholder="选择周"
        value-format="yyyy-MM-dd"
        style="width: 150px"
+        :picker-options="pickerOptions"
      >
      </el-date-picker>
    </el-form-item>
@ -97,6 +99,9 @@ export default {
        { id: 2, name: "月" },
        { id: 3, name: "年" },
      ],
+      pickerOptions: {
+        firstDayOfWeek: 1,
+      },
    };
  },
  methods: {
--- a/src/views/report/components/bmSearchBar.vue
+++ b/src/views/report/components/bmSearchBar.vue
@ -25,6 +25,7 @@
        placeholder="选择日期"
        value-format="yyyy-MM-dd"
        style="width: 150px"
+        :picker-options="pickerOptions"
      >
      </el-date-picker>
    </el-form-item>
@ -37,6 +38,7 @@
        placeholder="选择周"
        value-format="yyyy-MM-dd"
        style="width: 150px"
+        :picker-options="pickerOptions"
      >
      </el-date-picker>
    </el-form-item>
@ -118,6 +120,9 @@ export default {
        { id: 0, name: "瑞昌" },
        { id: 1, name: "邯郸" },
      ],
+      pickerOptions: {
+        firstDayOfWeek: 1,
+      },
    };
  },
  methods: {