shijiplus-web-plugin 0.1.31 → 0.1.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -47,6 +47,10 @@ export default {
|
|
|
47
47
|
...searchForm,
|
|
48
48
|
startDate: intervalStart,
|
|
49
49
|
endDate: intervalEnd,
|
|
50
|
+
startTime: intervalStart,
|
|
51
|
+
endTime: intervalEnd,
|
|
52
|
+
createdAtStart: intervalStart,
|
|
53
|
+
createdAtEnd: intervalEnd,
|
|
50
54
|
pageNo: 1,
|
|
51
55
|
currentPage: 1,
|
|
52
56
|
pageSize: 1,
|
|
@@ -64,6 +68,10 @@ export default {
|
|
|
64
68
|
...searchForm,
|
|
65
69
|
startDate: intervalStart,
|
|
66
70
|
endDate: intervalEnd,
|
|
71
|
+
startTime: intervalStart,
|
|
72
|
+
endTime: intervalEnd,
|
|
73
|
+
createdAtStart: intervalStart,
|
|
74
|
+
createdAtEnd: intervalEnd,
|
|
67
75
|
pageNo: 1,
|
|
68
76
|
currentPage: 1,
|
|
69
77
|
pageSize: intervalTotalCount
|
|
@@ -78,6 +86,10 @@ export default {
|
|
|
78
86
|
...searchForm,
|
|
79
87
|
startDate: intervalStart,
|
|
80
88
|
endDate: intervalEnd,
|
|
89
|
+
startTime: intervalStart,
|
|
90
|
+
endTime: intervalEnd,
|
|
91
|
+
createdAtStart: intervalStart,
|
|
92
|
+
createdAtEnd: intervalEnd,
|
|
81
93
|
pageNo: page,
|
|
82
94
|
currentPage: page,
|
|
83
95
|
pageSize: this.orderExportPageSize
|
|
@@ -95,7 +107,7 @@ export default {
|
|
|
95
107
|
try {
|
|
96
108
|
// 0. Validate the date range (limit to 1 month)
|
|
97
109
|
const startDate = new Date(searchForm.startDate || searchForm.startTime || searchForm.createdAtStart || "")
|
|
98
|
-
|
|
110
|
+
let endDate = new Date(searchForm.endDate || searchForm.endTime || searchForm.createdAtEnd || "")
|
|
99
111
|
const oneMonthInMs = 31 * 24 * 60 * 60 * 1000 // 1 个月的毫秒数
|
|
100
112
|
|
|
101
113
|
if (!startDate || isNaN(startDate.getTime()) || !endDate || isNaN(endDate.getTime())) {
|
|
@@ -104,6 +116,9 @@ export default {
|
|
|
104
116
|
}, 0)
|
|
105
117
|
return
|
|
106
118
|
}
|
|
119
|
+
if (endDate > new Date()) {
|
|
120
|
+
endDate = new Date()
|
|
121
|
+
}
|
|
107
122
|
if (endDate - startDate > oneMonthInMs) {
|
|
108
123
|
setTimeout(() => {
|
|
109
124
|
this.$Message.error('导出时间范围不能超过1个月，请调整后重试', 3)
|