pxb 1 viikko sitten
vanhempi
sitoutus
c1eb11ec29

+ 12 - 1
src/components/TableSearch/index.vue

@@ -61,6 +61,7 @@
                   :type="item.type"
                   :placeholder="item.placeholder || `请选择${item.label}`"
                   :picker-options="datePickerOptions(item)"
+                  :default-value="dateDefaultValue(item)"
                   :style="{
                     width: (item.type === 'datetimerange' || item.type === 'daterange') ? '230px' : '150px'
                   }"
@@ -173,7 +174,17 @@ export default {
       areaListProp: '',
       searchHeight: 0,
       optsCols: 24,
-      cancalDebounce: null
+      cancalDebounce: null,
+      // 打开日期面板默认显示:左边前一个月、右边当前月(单日选择器定位到前一个月)
+      dateDefaultValue(item) {
+        const now = new Date()
+        const prevMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1)
+        // daterange/datetimerange 需传数组 [前一个月, 当前月]
+        if (item && (item.type === 'daterange' || item.type === 'datetimerange' || item.type === 'monthrange')) {
+          return [prevMonth, now]
+        }
+        return prevMonth
+      }
     }
   },
   computed: {

+ 1 - 0
src/views/Digital/MacauMarkSix/index.vue

@@ -23,6 +23,7 @@
             end-placeholder="结束日期"
             value-format="timestamp"
             clearable
+            :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
             :picker-options="disableFutureDate"
           />
         </el-form-item>

+ 1 - 1
src/views/Digital/order/index.vue

@@ -5,7 +5,7 @@
         <div style="margin-right: 20px">
           <el-date-picker v-model="form.created_range" type="daterange" align="right" unlink-panels range-separator="至"
             start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy年MM月dd日"
-            :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions" style="width: 260px">
+            :default-time="['00:00:00', '23:59:59']" :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]" :picker-options="pickerOptions" style="width: 260px">
           </el-date-picker>
         </div>
       </template>

+ 7 - 0
src/views/Homepage/Homepage/index.vue

@@ -9,6 +9,7 @@
               type="date"
               placeholder="选择开始日期"
               value-format="yyyy-MM-dd"
+              :default-value="dateDefaultValue"
               :picker-options="startDateOptions"
             />
           </el-form-item>
@@ -19,6 +20,7 @@
               type="date"
               placeholder="选择结束日期"
               value-format="yyyy-MM-dd"
+              :default-value="dateDefaultValue"
               :picker-options="endDateOptions"
             />
           </el-form-item>
@@ -993,6 +995,11 @@ export default {
     this.getData()
   },
   methods: {
+    // 打开日期面板默认显示:前一个月
+    dateDefaultValue() {
+      const now = new Date()
+      return new Date(now.getFullYear(), now.getMonth() - 1, 1)
+    },
     // 初始化日期范围(默认最近7天)
     initDateRange() {
       const endDate = new Date()

+ 1 - 0
src/views/agent/index.vue

@@ -32,6 +32,7 @@
           <el-date-picker
             v-model="query.date_range"
             type="daterange"
+            :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
             range-separator="-"
             start-placeholder="开始日期"
             end-placeholder="结束日期"

+ 1 - 0
src/views/agent/loginLog/index.vue

@@ -34,6 +34,7 @@
           <el-date-picker
             v-model="query.date_range"
             type="daterange"
+            :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
             range-separator="-"
             start-placeholder="开始日期"
             end-placeholder="结束日期"

+ 1 - 0
src/views/agent/report/index.vue

@@ -37,6 +37,7 @@
           <el-date-picker
             v-model="query.date_range"
             type="daterange"
+            :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
             range-separator="-"
             start-placeholder="开始日期"
             end-placeholder="结束日期"

+ 1 - 0
src/views/agent/withdrawLog/index.vue

@@ -33,6 +33,7 @@
           <el-date-picker
             v-model="query.date_range"
             type="daterange"
+            :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
             range-separator="-"
             start-placeholder="开始日期"
             end-placeholder="结束日期"

+ 12 - 0
src/views/certification/jisuHistory/index.vue

@@ -47,6 +47,7 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 type="daterange"
+                :default-value="dateDefaultValue({ type: 'daterange' })"
                 value-format="yyyy-MM-dd"
                 :picker-options="disableFutureDate"
               />
@@ -167,6 +168,7 @@
                 end-placeholder="结束日期"
                 value-format="timestamp"
                 clearable
+                :default-value="dateDefaultValue({ type: 'datetimerange' })"
                 :picker-options="disableFutureDate"
               />
             </el-form-item>
@@ -597,6 +599,16 @@ export default {
     this.handleSearch();
   },
   methods: {
+    // 打开日期面板默认显示:左边前一个月、右边当前月
+    dateDefaultValue(item) {
+      const now = new Date()
+      const prevMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1)
+      // daterange/datetimerange 需传数组 [前一个月, 当前月]
+      if (item && (item.type === 'daterange' || item.type === 'datetimerange' || item.type === 'monthrange')) {
+        return [prevMonth, now]
+      }
+      return prevMonth
+    },
     padZero(n) { return n < 10 ? '0' + n : n.toString(); },
 
     // 极速系列样式取色

+ 1 - 0
src/views/certification/jisuHistory/index1.vue

@@ -40,6 +40,7 @@
               start-placeholder="开始日期"
               type="daterange"
               value-format="yyyy-MM-dd"
+              :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
               :picker-options="disableFutureDate"
             />
           </el-form-item>

+ 1 - 0
src/views/certification/jisuOrder/index.vue

@@ -34,6 +34,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
+          :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
           :picker-options="disableFutureDate"
           @change="handleDateChange"
         />

+ 1 - 0
src/views/fund/inOutSummary/index.vue

@@ -15,6 +15,7 @@
               value-format="yyyy-MM-dd HH:mm:ss"
               format="yyyy年MM月dd日"
               :default-time="['00:00:00', '23:59:59']"
+              :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
               :picker-options="pickerOptions"
               style="width: 380px"
             />

+ 1 - 0
src/views/fund/manualAudit/index.vue

@@ -37,6 +37,7 @@
               value-format="yyyy-MM-dd HH:mm:ss"
               format="yyyy年MM月dd日"
               :default-time="['00:00:00', '23:59:59']"
+              :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
               :picker-options="pickerOptions"
               style="width: 380px"
             />

+ 12 - 0
src/views/fund/thirdPartyDeposit/index.vue

@@ -42,6 +42,7 @@
               value-format="yyyy-MM-dd HH:mm:ss"
               format="yyyy年MM月dd日"
               :default-time="['00:00:00', '23:59:59']"
+              :default-value="dateDefaultValue({ type: 'daterange' })"
               :picker-options="pickerOptions"
               style="width: 380px"
             />
@@ -58,6 +59,7 @@
               value-format="yyyy-MM-dd HH:mm:ss"
               format="yyyy年MM月dd日"
               :default-time="['00:00:00', '23:59:59']"
+              :default-value="dateDefaultValue({ type: 'daterange' })"
               :picker-options="pickerOptions"
               style="width: 380px"
             />
@@ -200,6 +202,16 @@ export default {
     this.fetchList()
   },
   methods: {
+    // 打开日期面板默认显示:左边前一个月、右边当前月
+    dateDefaultValue(item) {
+      const now = new Date()
+      const prevMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1)
+      // daterange/datetimerange 需传数组 [前一个月, 当前月]
+      if (item && (item.type === 'daterange' || item.type === 'datetimerange' || item.type === 'monthrange')) {
+        return [prevMonth, now]
+      }
+      return prevMonth
+    },
     // 列表字段映射
     mapRow(row) {
       return {

+ 7 - 0
src/views/operationalData/index.vue

@@ -16,6 +16,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="请选择"
+            :default-value="dateDefaultValue"
             :picker-options="disableFutureDate">
           </el-date-picker>
 
@@ -25,6 +26,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="请选择"
+            :default-value="dateDefaultValue"
             :picker-options="disableFutureDate">
           </el-date-picker>
 
@@ -118,6 +120,11 @@ export default {
     this.getData()
   },
   methods: {
+    // 打开日期面板默认显示:前一个月
+    dateDefaultValue() {
+      const now = new Date()
+      return new Date(now.getFullYear(), now.getMonth() - 1, 1)
+    },
     // 拉取数据
     getData() {
       this.loading = true

+ 1 - 1
src/views/orderManage/List/index.vue

@@ -5,7 +5,7 @@
         <div style="margin-right: 20px">
           <el-date-picker v-model="form.created_range" type="daterange" align="right" unlink-panels range-separator="至"
             start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy年MM月dd日"
-            :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions" style="width: 260px">
+            :default-time="['00:00:00', '23:59:59']" :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]" :picker-options="pickerOptions" style="width: 260px">
           </el-date-picker>
         </div>
       </template>

+ 1 - 0
src/views/orderManage/TotalSoccerAdvanceOrder/index.vue

@@ -29,6 +29,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd HH:mm:ss"
+          :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
           :picker-options="disableFutureDate"
           @change="handleDateChange"
         />

+ 12 - 2
src/views/user/demoList/index.vue

@@ -5,7 +5,7 @@
         <div style="margin-right: 20px">
           <el-date-picker v-model="form.dateRange" type="daterange" align="right" unlink-panels range-separator="至"
             start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions" style="width: 260px">
+            :default-time="['00:00:00', '23:59:59']" :default-value="dateDefaultValue({ type: 'daterange' })" :picker-options="pickerOptions" style="width: 260px">
           </el-date-picker>
         </div>
       </template>
@@ -249,7 +249,7 @@
           <el-form-item label="日期范围">
             <el-date-picker v-model="logFormData.dateRange" type="daterange" value-format="yyyy-MM-dd"
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-              :picker-options="disableFutureDate" />
+              :default-value="dateDefaultValue({ type: 'daterange' })" :picker-options="disableFutureDate" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="getLogList">查询</el-button>
@@ -838,6 +838,16 @@ export default {
       .catch((err) => console.log("获取通道组合失败", err));
   },
   methods: {
+    // 打开日期面板默认显示:左边前一个月、右边当前月
+    dateDefaultValue(item) {
+      const now = new Date()
+      const prevMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1)
+      // daterange/datetimerange 需传数组 [前一个月, 当前月]
+      if (item && (item.type === 'daterange' || item.type === 'datetimerange' || item.type === 'monthrange')) {
+        return [prevMonth, now]
+      }
+      return prevMonth
+    },
     getSfList(member_id) {
       this.logLoading = true;
       const params = {

+ 7 - 2
src/views/user/userList/index.vue

@@ -5,7 +5,7 @@
         <div style="margin-right: 20px">
           <el-date-picker v-model="form.dateRange" type="daterange" align="right" unlink-panels range-separator="至"
             start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions" style="width: 260px">
+            :default-time="['00:00:00', '23:59:59']" :default-value="pickerDefaultValue" :picker-options="pickerOptions" style="width: 260px">
           </el-date-picker>
         </div>
       </template>
@@ -267,7 +267,7 @@
           <el-form-item label="日期范围">
             <el-date-picker v-model="logFormData.dateRange" type="daterange" value-format="yyyy-MM-dd"
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-              :picker-options="disableFutureDate" />
+              :default-value="pickerDefaultValue" :picker-options="disableFutureDate" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="getLogList">查询</el-button>
@@ -497,6 +497,11 @@ export default {
   },
   data() {
     return {
+      // 打开日期面板时默认显示:左边前一个月、右边当前月
+      pickerDefaultValue: (() => {
+        const now = new Date()
+        return [new Date(now.getFullYear(), now.getMonth() - 1, 1), now]
+      })(),
       pwdFormData: {
         member_id: "",
         pwdType: "login",

+ 1 - 0
src/views/user/userOnlineSummary/index.vue

@@ -55,6 +55,7 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 value-format="yyyy-MM-dd"
+                :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
                 :picker-options="pickerOptions"
                 :clearable="false"
               />

+ 1 - 0
src/views/user/userStatistics/index.vue

@@ -23,6 +23,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd"
+              :default-value="[new Date(new Date().getFullYear(), new Date().getMonth() - 1, 1), new Date()]"
               :picker-options="pickerOptions"
               :clearable="false"
             />