From a372fa392ba8f5454d69c96dd2e9647e043191b8 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期一, 19 五月 2025 22:30:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide
---
management/src/pages/appeal-management/statistics/index.jsx | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/management/src/pages/appeal-management/statistics/index.jsx b/management/src/pages/appeal-management/statistics/index.jsx
index 85e061f..cc99e94 100644
--- a/management/src/pages/appeal-management/statistics/index.jsx
+++ b/management/src/pages/appeal-management/statistics/index.jsx
@@ -7,14 +7,12 @@
import { getList } from './service';
const Account = () => {
- const actionRef = useRef();
const access = useAccess();
- const formRef = useRef();
const columns = [
{
title: '述求号',
- dataIndex: 'reportUserName',
+ dataIndex: 'serialNumber',
order: 8,
},
{
@@ -29,30 +27,30 @@
},
{
title: '申请人',
- dataIndex: 'name',
+ dataIndex: 'applyUserName',
order: 5,
},
{
title: '申请时间',
- dataIndex: 'name',
+ dataIndex: 'applyTime',
hideInTable: true,
valueType: 'dateRange',
order: 3,
},
{
title: '审批时间',
- dataIndex: 'name',
+ dataIndex: 'examineTime',
valueType: 'dateRange',
order: 2,
},
{
title: '审批人',
- dataIndex: 'name',
+ dataIndex: 'examineUserName',
order: 4,
},
{
title: '驳回理由',
- dataIndex: 'contactNumber',
+ dataIndex: 'remark',
hideInSearch: true,
},
{
@@ -64,11 +62,13 @@
1: '延期办理',
2: '超时办理',
3: '已办结',
- 4: '上报待审核',
+ 4: '群众撤销',
+ 5: '上报待审核',
+ 6: '上级驳回',
+ 7: '延期待审核',
+ 8: '已评价',
+ 9: '延期驳回',
},
- render: (text, record) => {
- return Number(record.status) == 0 ? '正在办理' : record.status == 1 ? '延期办理' : record.status == 2 ? '超时办理' : record.status == 3 ? '已办结' : record.status == 4 ? '上报待审核' : '已办结';
- }
},
{
title: '操作',
@@ -102,20 +102,16 @@
>
<ProTable
rowKey="id"
- actionRef={actionRef}
columns={columns}
- formRef={formRef}
request={async (params) => {
-
- if (params.time && params.time.length > 0) {
- params.startTime = moment(params.time[0]).format('YYYY-MM-DD HH:mm:ss');
- params.endTime = moment(params.time[1]).format('YYYY-MM-DD 23:59:59');
- delete params.time
- } else {
- delete params.startTime
- delete params.endTime
+ if (params.applyTime && params.applyTime.length > 0) {
+ params.applyTime = moment(params.applyTime[0]).format('YYYY-MM-DD') +
+ ' - ' + moment(params.applyTime[1]).format('YYYY-MM-DD')
}
-
+ if (params.examineTime && params.examineTime.length > 0) {
+ params.examineTime = moment(params.examineTime[0]).format('YYYY-MM-DD') +
+ ' - ' + moment(params.examineTime[1]).format('YYYY-MM-DD')
+ }
return buildProTableDataSource(getList, params);
}}
--
Gitblit v1.7.1