Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
integral-mall
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
integralMall
integral-mall
Commits
01da9c1a
Commit
01da9c1a
authored
Apr 16, 2020
by
damodmg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
3dfe1372
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
editDeliver.vue
src/views/setting/editDeliver.vue
+3
-3
pickedAuto.vue
src/views/setting/pickedAuto.vue
+3
-3
No files found.
src/views/setting/editDeliver.vue
View file @
01da9c1a
...
...
@@ -400,7 +400,7 @@ export default {
if
(
this
.
form
.
dataRangeList
[
i
].
dataRange
)
{
let
selectTimePrev
=
new
Date
(
this
.
form
.
dataRangeList
[
i
].
dataRange
[
1
]).
valueOf
();
//和前前一个的存在的结束时间比较
if
(
selectTime
<
selectTimePrev
)
{
if
(
selectTime
<
=
selectTimePrev
)
{
this
.
$message
.
error
(
'日期不可重叠!'
);
this
.
form
.
dataRangeList
[
index
].
dataRange
=
null
;
}
...
...
@@ -411,7 +411,7 @@ export default {
if
(
this
.
form
.
dataRangeList
[
j
].
dataRange
)
{
let
selectTimeAfter
=
new
Date
(
this
.
form
.
dataRangeList
[
j
].
dataRange
[
0
]).
valueOf
();
//和后一个的存在的开始时间比较
if
(
selectTime
>
selectTimeAfter
||
selectTimeEnd
>
selectTimeAfter
)
{
if
(
selectTime
>
=
selectTimeAfter
||
selectTimeEnd
>=
selectTimeAfter
)
{
this
.
$message
.
error
(
'日期不可重叠!'
);
this
.
form
.
dataRangeList
[
index
].
dataRange
=
null
;
}
...
...
@@ -423,7 +423,7 @@ export default {
if
(
this
.
form
.
dataRangeList
[
j
].
dataRange
)
{
let
selectTimeAfter
=
new
Date
(
this
.
form
.
dataRangeList
[
j
].
dataRange
[
0
]).
valueOf
();
//和后一个的存在的开始时间比较
if
(
selectTime
>
selectTimeAfter
||
selectTimeEnd
>
selectTimeAfter
)
{
if
(
selectTime
>
=
selectTimeAfter
||
selectTimeEnd
>=
selectTimeAfter
)
{
this
.
$message
.
error
(
'日期不可重叠!'
);
this
.
form
.
dataRangeList
[
index
].
dataRange
=
null
;
}
...
...
src/views/setting/pickedAuto.vue
View file @
01da9c1a
...
...
@@ -370,7 +370,7 @@ export default {
if
(
this
.
pickedModal
.
dataRangeList
[
i
].
dataRange
)
{
let
selectTimePrev
=
new
Date
(
this
.
pickedModal
.
dataRangeList
[
i
].
dataRange
[
1
]).
valueOf
();
//和前前一个的存在的结束时间比较
if
(
selectTime
<
selectTimePrev
)
{
if
(
selectTime
<
=
selectTimePrev
)
{
this
.
$message
.
error
(
'日期不可重叠!'
);
this
.
pickedModal
.
dataRangeList
[
index
].
dataRange
=
null
;
}
...
...
@@ -381,7 +381,7 @@ export default {
if
(
this
.
pickedModal
.
dataRangeList
[
j
].
dataRange
)
{
let
selectTimeAfter
=
new
Date
(
this
.
pickedModal
.
dataRangeList
[
j
].
dataRange
[
0
]).
valueOf
();
//和后一个的存在的开始时间比较
if
(
selectTime
>
selectTimeAfter
||
selectTimeEnd
>
selectTimeAfter
)
{
if
(
selectTime
>
=
selectTimeAfter
||
selectTimeEnd
>=
selectTimeAfter
)
{
this
.
$message
.
error
(
'日期不可重叠!'
);
this
.
pickedModal
.
dataRangeList
[
index
].
dataRange
=
null
;
}
...
...
@@ -393,7 +393,7 @@ export default {
if
(
this
.
pickedModal
.
dataRangeList
[
j
].
dataRange
)
{
let
selectTimeAfter
=
new
Date
(
this
.
pickedModal
.
dataRangeList
[
j
].
dataRange
[
0
]).
valueOf
();
//和后一个的存在的开始时间比较
if
(
selectTime
>
selectTimeAfter
||
selectTimeEnd
>
selectTimeAfter
)
{
if
(
selectTime
>
=
selectTimeAfter
||
selectTimeEnd
>=
selectTimeAfter
)
{
this
.
$message
.
error
(
'日期不可重叠!'
);
this
.
pickedModal
.
dataRangeList
[
index
].
dataRange
=
null
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment