Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_platform
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
赵啸非
smart_gov_platform
Commits
3796ec0b
Commit
3796ec0b
authored
May 25, 2023
by
ww-xxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预约报表增加部门
parent
0c95ad21
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
2 deletions
+37
-2
portal-manager-ui/admin/src/api/dataAdmin.js
portal-manager-ui/admin/src/api/dataAdmin.js
+4
-1
portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/makeRecordReport.vue
...ataAdmin/components/makeRecordReport/makeRecordReport.vue
+33
-1
No files found.
portal-manager-ui/admin/src/api/dataAdmin.js
View file @
3796ec0b
...
@@ -112,7 +112,10 @@ export function getOrderList(params) {
...
@@ -112,7 +112,10 @@ export function getOrderList(params) {
export
function
getOrderinfo
(
params
)
{
export
function
getOrderinfo
(
params
)
{
return
http
.
get
(
`
${
BASEURL
}
/wechat/order_data/orderinfo`
,
params
);
return
http
.
get
(
`
${
BASEURL
}
/wechat/order_data/orderinfo`
,
params
);
}
}
// 部门列表
export
function
getDeptList
(
params
)
{
return
http
.
post
(
`
${
baseURL
}
/base/dept/list`
,
params
);
}
/**
/**
* 取件记录报表
* 取件记录报表
*/
*/
...
...
portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/makeRecordReport.vue
View file @
3796ec0b
...
@@ -28,10 +28,22 @@
...
@@ -28,10 +28,22 @@
v-model=
"searchForm.time"
v-model=
"searchForm.time"
>
>
</a-range-picker>
</a-range-picker>
<a-select
v-model=
"searchForm.sectionid"
showSearch
:option-filter-prop=
"'label'"
>
<a-select-option
value=
""
label=
"全部"
>
全部部门
</a-select-option>
<a-select-option
v-for=
"(v, key) in depList"
:key=
"key"
:value=
"v.id"
:label=
"v.name"
>
{{
v
.
name
}}
</a-select-option>
</a-select>
<a-select
v-model=
"searchForm.status"
>
<a-select
v-model=
"searchForm.status"
>
<a-select-option
value=
""
>
全部
</a-select-option>
<a-select-option
value=
""
>
全部
</a-select-option>
<a-select-option
<a-select-option
v-for=
"(v, key) in statusItem"
v-for=
"(v, key) in statusItem"
:key=
"key"
:key=
"key"
:value=
"Number(key)"
:value=
"Number(key)"
>
>
...
@@ -109,7 +121,7 @@
...
@@ -109,7 +121,7 @@
</template>
</template>
<
script
>
<
script
>
import
{
getOrderList
}
from
"
@/api/dataAdmin
"
;
import
{
getOrderList
,
getDeptList
}
from
"
@/api/dataAdmin
"
;
import
{
export2Excel
}
from
"
@/utils/js/exportExcel
"
;
import
{
export2Excel
}
from
"
@/utils/js/exportExcel
"
;
let
tHeader
=
[
let
tHeader
=
[
// 导出的表头名信息
// 导出的表头名信息
...
@@ -227,6 +239,14 @@ export default {
...
@@ -227,6 +239,14 @@ export default {
align
:
"
center
"
,
align
:
"
center
"
,
dataIndex
:
"
business_name
"
,
dataIndex
:
"
business_name
"
,
},
},
{
title
:
"
部门名称
"
,
align
:
"
center
"
,
dataIndex
:
"
section_name
"
,
customRender
:
(
text
)
=>
{
return
text
||
"
--
"
;
},
},
{
{
title
:
"
创建时间
"
,
title
:
"
创建时间
"
,
align
:
"
center
"
,
align
:
"
center
"
,
...
@@ -251,6 +271,7 @@ export default {
...
@@ -251,6 +271,7 @@ export default {
searchForm
:
{
searchForm
:
{
status
:
""
,
status
:
""
,
title
:
""
,
title
:
""
,
sectionid
:
""
,
time
:
[
time
:
[
this
.
$moment
(
new
Date
()).
format
(
"
YYYY-MM-DD
"
),
this
.
$moment
(
new
Date
()).
format
(
"
YYYY-MM-DD
"
),
this
.
$moment
(
new
Date
()).
format
(
"
YYYY-MM-DD
"
),
this
.
$moment
(
new
Date
()).
format
(
"
YYYY-MM-DD
"
),
...
@@ -263,12 +284,23 @@ export default {
...
@@ -263,12 +284,23 @@ export default {
tableSelectedKeys
:
[],
tableSelectedKeys
:
[],
tableSelectedRows
:
[],
tableSelectedRows
:
[],
tableSourceData
:
[],
tableSourceData
:
[],
depList
:[]
//部门列表
};
};
},
},
created
()
{
created
()
{
this
.
getOrderList
();
this
.
getOrderList
();
this
.
getDeptList
()
},
},
methods
:
{
methods
:
{
// 部门列表
getDeptList
(){
getDeptList
({
page
:
1
,
size
:
-
1
}).
then
(
res
=>
{
const
{
data
}
=
res
.
data
if
(
res
.
code
==
1
){
this
.
depList
=
data
}
})
},
// 获取报表数据
// 获取报表数据
async
getOrderList
(
search
=
{})
{
async
getOrderList
(
search
=
{})
{
let
res
=
await
getOrderList
({
let
res
=
await
getOrderList
({
...
...
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