Yansen 2 years ago
parent
commit
2dbb92bbca
2 changed files with 50 additions and 17 deletions
  1. 34
    3
      src/pages/issue/index.jsx
  2. 16
    14
      src/routes/routes.jsx

+ 34
- 3
src/pages/issue/index.jsx View File

1
 import React from 'react';
1
 import React from 'react';
2
+import { Button, Badge } from 'antd';
2
 import List from '@/components/Page/List';
3
 import List from '@/components/Page/List';
3
 import { getTaIssue } from '@/service/taissue';
4
 import { getTaIssue } from '@/service/taissue';
4
 import { getTdLocType } from '@/service/tdloctype';
5
 import { getTdLocType } from '@/service/tdloctype';
5
 import { getSysOrg } from '@/service/sysorg';
6
 import { getSysOrg } from '@/service/sysorg';
6
 import { queryDict } from '@/utils/request';
7
 import { queryDict } from '@/utils/request';
7
-import { Button } from 'antd';
8
 
8
 
9
 const queryOrg = queryDict(getSysOrg, { labelKey: 'name', valueKey: 'orgId' });
9
 const queryOrg = queryDict(getSysOrg, { labelKey: 'name', valueKey: 'orgId' });
10
-const queryLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' })
10
+const queryLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
11
+
12
+const today = (new Date()).toJSON().substring(0, 10);
11
 
13
 
12
 export default (props) => {
14
 export default (props) => {
13
 
15
 
43
     },
45
     },
44
     {
46
     {
45
       title: "流程状态",
47
       title: "流程状态",
46
-      dataIndex: "processNode",
48
+      dataIndex: "bizStatus",
49
+      valueType: 'select',
47
       valueEnum: {
50
       valueEnum: {
48
         start: {
51
         start: {
49
           text: "待交办",
52
           text: "待交办",
57
           text: "已办结",
60
           text: "已办结",
58
           status: "Success",
61
           status: "Success",
59
         },
62
         },
63
+        expired: {
64
+          text: "已逾期",
65
+          status: "Error",
66
+        },
67
+        reject: {
68
+          text: "已打回",
69
+          status: "Warning",
70
+        },
60
       },
71
       },
72
+      render: (_, row) => {
73
+        if (row.processNode == 'end') {
74
+          return <Badge status="success" text="已办结" />;
75
+        } else {
76
+
77
+          if (today >= row.expireDate) {
78
+            return <Badge status="error" text="已逾期" />;
79
+          }
80
+
81
+          if ('reject' == row.processStatus) {
82
+            return <Badge status="warning" text="已打回" />;
83
+          }
84
+
85
+          if (row.processNode == 'assigned') {
86
+            return <Badge status="processing" text="已交办" />;
87
+          }
88
+
89
+          return <Badge status="default" text="待交办" />;
90
+        }
91
+      }
61
     },
92
     },
62
     {
93
     {
63
       title: "截止日期",
94
       title: "截止日期",

+ 16
- 14
src/routes/routes.jsx View File

1
 import {
1
 import {
2
-  AppstoreOutlined,
3
-  ContainerOutlined,
4
-  DesktopOutlined,
5
-  MailOutlined,
6
-  MenuFoldOutlined,
7
-  MenuUnfoldOutlined,
2
+  CommentOutlined,
8
   ProjectOutlined,
3
   ProjectOutlined,
9
   SettingOutlined,
4
   SettingOutlined,
5
+  TeamOutlined,
6
+  UsergroupAddOutlined,
7
+  BankOutlined,
8
+  GoldOutlined,
9
+  EnvironmentOutlined,
10
+  BranchesOutlined,
11
+  NodeIndexOutlined,
10
 } from '@ant-design/icons';
12
 } from '@ant-design/icons';
11
 import { Outlet } from 'react-router-dom';
13
 import { Outlet } from 'react-router-dom';
12
 import AuthLayout from "@/layouts/AuthLayout";
14
 import AuthLayout from "@/layouts/AuthLayout";
61
         element: <IssueList />,
63
         element: <IssueList />,
62
         meta: {
64
         meta: {
63
           title: '问 题 单',
65
           title: '问 题 单',
64
-          icon: <ProjectOutlined />,
66
+          icon: <CommentOutlined />,
65
         }
67
         }
66
       },
68
       },
67
       {
69
       {
90
         element: <LocTypeList />,
92
         element: <LocTypeList />,
91
         meta: {
93
         meta: {
92
           title: '点位分类',
94
           title: '点位分类',
93
-          // icon: <AppstoreOutlined />,
95
+          icon: <EnvironmentOutlined />,
94
           // permission: 'form',
96
           // permission: 'form',
95
         },
97
         },
96
       },
98
       },
110
         element: <IssueTypeList />,
112
         element: <IssueTypeList />,
111
         meta: {
113
         meta: {
112
           title: '问题分类',
114
           title: '问题分类',
113
-          // icon: <AppstoreOutlined />,
115
+          icon: <BranchesOutlined />,
114
           // permission: 'form',
116
           // permission: 'form',
115
         },
117
         },
116
       },
118
       },
129
         element: <QuestionList />,
131
         element: <QuestionList />,
130
         meta: {
132
         meta: {
131
           title: '点位问题',
133
           title: '点位问题',
132
-          // icon: <AppstoreOutlined />,
134
+          icon: <NodeIndexOutlined />,
133
           // permission: 'form',
135
           // permission: 'form',
134
         },
136
         },
135
       },
137
       },
150
         element: <User />,
152
         element: <User />,
151
         meta: {
153
         meta: {
152
           title: '人员管理',
154
           title: '人员管理',
153
-          // icon: <AppstoreOutlined />,
155
+          icon: <TeamOutlined />,
154
           // permission: 'form',
156
           // permission: 'form',
155
         },
157
         },
156
       },
158
       },
169
         element: <Role />,
171
         element: <Role />,
170
         meta: {
172
         meta: {
171
           title: '角色管理',
173
           title: '角色管理',
172
-          // icon: <AppstoreOutlined />,
174
+          icon: <UsergroupAddOutlined />,
173
           // permission: 'form',
175
           // permission: 'form',
174
         },
176
         },
175
       },
177
       },
178
         element: <OrgList />,
180
         element: <OrgList />,
179
         meta: {
181
         meta: {
180
           title: '机构管理',
182
           title: '机构管理',
181
-          // icon: <AppstoreOutlined />,
183
+          icon: <BankOutlined />,
182
           // permission: 'form',
184
           // permission: 'form',
183
         },
185
         },
184
       },
186
       },
187
         element: <PositionList />,
189
         element: <PositionList />,
188
         meta: {
190
         meta: {
189
           title: '岗位管理',
191
           title: '岗位管理',
190
-          // icon: <AppstoreOutlined />,
192
+          icon: <GoldOutlined />,
191
           // permission: 'form',
193
           // permission: 'form',
192
         },
194
         },
193
       },
195
       },