Commit 8808ae54 by 张宸

报表修改

parent 36c8d526
...@@ -74,11 +74,6 @@ export const asyncRouterMap = [{ ...@@ -74,11 +74,6 @@ export const asyncRouterMap = [{
path: 'welfareScheme', path: 'welfareScheme',
name: 'welfareScheme', name: 'welfareScheme',
component: () => import('@views/hhr-view/packageUpgrade/welfareScheme.vue') component: () => import('@views/hhr-view/packageUpgrade/welfareScheme.vue')
},
{
path: 'hhrReport',
name: 'hhrReport',
component: () => import('@views/hhr-report/hhrReport.vue')
} }
] ]
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="5" :sm="12"> <a-col :md="12" :sm="12">
<a-form-item label="时间选择:"> <a-form-item label="时间选择:">
<a-range-picker @change="onChange" /> <a-range-picker @change="onChange" />
</a-form-item> </a-form-item>
...@@ -110,6 +110,10 @@ ...@@ -110,6 +110,10 @@
] ]
, ,
rowdata: parameter => { rowdata: parameter => {
let params = {
pageNo: parameter.pageNo,
pageSize: parameter.pageSize
}
let obj = cloneObject(this.queryParam) let obj = cloneObject(this.queryParam)
//表示 //表示
return reportList(Object.assign(params,obj)).then(res => { return reportList(Object.assign(params,obj)).then(res => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment