Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
57b159eb
Commit
57b159eb
authored
Aug 16, 2021
by
wangzhaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加日期范围支持重复添加多组日期范围,请求参数中对象的属性为null、undefined不进行拼接
parent
08da6834
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
15 deletions
+16
-15
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/utils/request.js
+5
-3
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/utils/ruoyi.js
+11
-12
No files found.
ruoyi-ui/src/utils/request.js
View file @
57b159eb
...
...
@@ -28,9 +28,11 @@ service.interceptors.request.use(config => {
if
(
value
!==
null
&&
typeof
(
value
)
!==
"
undefined
"
)
{
if
(
typeof
value
===
'
object
'
)
{
for
(
const
key
of
Object
.
keys
(
value
))
{
let
params
=
propName
+
'
[
'
+
key
+
'
]
'
;
var
subPart
=
encodeURIComponent
(
params
)
+
"
=
"
;
url
+=
subPart
+
encodeURIComponent
(
value
[
key
])
+
"
&
"
;
if
(
value
[
key
]
!==
null
&&
typeof
(
value
[
key
])
!==
'
undefined
'
)
{
let
params
=
propName
+
'
[
'
+
key
+
'
]
'
let
subPart
=
encodeURIComponent
(
params
)
+
'
=
'
url
+=
subPart
+
encodeURIComponent
(
value
[
key
])
+
'
&
'
}
}
}
else
{
url
+=
part
+
encodeURIComponent
(
value
)
+
"
&
"
;
...
...
ruoyi-ui/src/utils/ruoyi.js
View file @
57b159eb
...
...
@@ -55,18 +55,17 @@ export function resetForm(refName) {
// 添加日期范围
export
function
addDateRange
(
params
,
dateRange
,
propName
)
{
var
search
=
params
;
search
.
params
=
{};
if
(
null
!=
dateRange
&&
''
!=
dateRange
)
{
if
(
typeof
(
propName
)
===
"
undefined
"
)
{
search
.
params
[
"
beginTime
"
]
=
dateRange
[
0
];
search
.
params
[
"
endTime
"
]
=
dateRange
[
1
];
}
else
{
search
.
params
[
"
begin
"
+
propName
]
=
dateRange
[
0
];
search
.
params
[
"
end
"
+
propName
]
=
dateRange
[
1
];
}
}
return
search
;
let
search
=
params
search
.
params
=
typeof
(
search
.
params
)
===
'
object
'
&&
search
.
params
!==
null
&&
!
Array
.
isArray
(
search
.
params
)
?
search
.
params
:
{}
dateRange
=
Array
.
isArray
(
dateRange
)
?
dateRange
:
[]
if
(
typeof
(
propName
)
===
'
undefined
'
)
{
search
.
params
[
'
beginTime
'
]
=
dateRange
[
0
]
search
.
params
[
'
endTime
'
]
=
dateRange
[
1
]
}
else
{
search
.
params
[
'
begin
'
+
propName
]
=
dateRange
[
0
]
search
.
params
[
'
end
'
+
propName
]
=
dateRange
[
1
]
}
return
search
}
// 回显数据字典
...
...
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