Yansen 2 years ago
parent
commit
d73241140d
2 changed files with 92 additions and 84 deletions
  1. 3
    3
      src/pages/roles/list.jsx
  2. 89
    81
      src/routes/routes.jsx

+ 3
- 3
src/pages/roles/list.jsx View File

@@ -61,10 +61,10 @@ export default (props) => {
61 61
     startLoading();
62 62
     const data = { name: inText };
63 63
 
64
-    if (currentRef.current) {
64
+    if (current) {
65 65
       // 修改角色
66
-      updateRole(currentRef.current.id, data).then(res => {
67
-        setList(list.map(x => x.id === currentRef.current.id ? res : x));
66
+      updateRole(current.id, data).then(res => {
67
+        setList(list.map(x => x.id === current.id ? res : x));
68 68
         cancelLoading();
69 69
         hideModel();
70 70
       }).catch(() => {

+ 89
- 81
src/routes/routes.jsx View File

@@ -60,6 +60,7 @@ import StatisCharts from "@/pages/statis/charts";
60 60
  *    noSiderBar: 布尔值, 如果为 true, 将没有左侧菜单栏
61 61
  *    noFooter: 布尔值, 如果为 true, 将没有底部 footer
62 62
  *    target: 字符串, 如果为 _blank, 将在新窗口打开
63
+ *    permission: 对应服务器端权限名称
63 64
  * }
64 65
  */
65 66
 
@@ -69,6 +70,7 @@ export const authRoutes = [
69 70
     element: <Container />,
70 71
     meta: {
71 72
       title: "军供任务",
73
+      permission: 'task',
72 74
     },
73 75
     children: [
74 76
       {
@@ -80,6 +82,7 @@ export const authRoutes = [
80 82
         element: <GuaranteeTaskList />,
81 83
         meta: {
82 84
           title: "军供通报",
85
+          permission: 'guaranteeTask',
83 86
         },
84 87
       },
85 88
       {
@@ -87,6 +90,7 @@ export const authRoutes = [
87 90
         element: <GuaranteeTaskEdit />,
88 91
         meta: {
89 92
           title: "任务配置",
93
+          permission: 'guaranteeTask.edit',
90 94
         },
91 95
       },
92 96
       {
@@ -97,6 +101,7 @@ export const authRoutes = [
97 101
           noLayout: true,
98 102
           target: "_blank",
99 103
           title: "任务执行",
104
+          permission: 'guaranteeTask.print',
100 105
         },
101 106
       },
102 107
       {
@@ -104,6 +109,7 @@ export const authRoutes = [
104 109
         element: <GuaranteeTaskEvaluate />,
105 110
         meta: {
106 111
           title: "任务评价",
112
+          permission: 'guaranteeTask.evaluate',
107 113
         },
108 114
       },
109 115
       {
@@ -112,6 +118,7 @@ export const authRoutes = [
112 118
         meta: {
113 119
           title: "任务评价",
114 120
           hideInMenu: true,
121
+          permission: 'guaranteeTask.evaluate.list',
115 122
         },
116 123
       },
117 124
     ],
@@ -121,6 +128,7 @@ export const authRoutes = [
121 128
     element: <Container />,
122 129
     meta: {
123 130
       title: "库存物资",
131
+      permission: 'stock',
124 132
     },
125 133
     children: [
126 134
       {
@@ -132,6 +140,7 @@ export const authRoutes = [
132 140
         element: <DishList />,
133 141
         meta: {
134 142
           title: "菜肴管理",
143
+          permission: 'dish',
135 144
         },
136 145
       },
137 146
       {
@@ -140,6 +149,7 @@ export const authRoutes = [
140 149
         meta: {
141 150
           hideInMenu: true,
142 151
           title: "菜肴维护",
152
+          permission: 'dish.edit',
143 153
         },
144 154
       },
145 155
       {
@@ -147,6 +157,7 @@ export const authRoutes = [
147 157
         element: <PackageList />,
148 158
         meta: {
149 159
           title: "套餐管理",
160
+          permission: 'package',
150 161
         },
151 162
       },
152 163
       {
@@ -154,6 +165,7 @@ export const authRoutes = [
154 165
         element: <StockList />,
155 166
         meta: {
156 167
           title: "库存列表",
168
+          permission: 'stock.list',
157 169
         },
158 170
       },
159 171
       {
@@ -161,6 +173,63 @@ export const authRoutes = [
161 173
         element: <StockEdit />,
162 174
         meta: {
163 175
           title: "库存维护",
176
+          permission: 'stock.edit',
177
+        },
178
+      },
179
+    ],
180
+  },
181
+  {
182
+    path: "purchase",
183
+    element: <Container />,
184
+    meta: {
185
+      title: "采购管理",
186
+      permission: 'purchase',
187
+    },
188
+    children: [
189
+      {
190
+        index: true,
191
+        element: <Navigate to="plan/list" replace />,
192
+      },
193
+      {
194
+        path: "plan/list",
195
+        element: <PurchasePlanList type="plan" />,
196
+        meta: {
197
+          title: "采购计划",
198
+          permission: 'purchase.plan',
199
+        },
200
+      },
201
+      {
202
+        path: "plan/edit",
203
+        element: <PurchasePlanEdit />,
204
+        meta: {
205
+          title: "采购计划维护",
206
+          hideInMenu: true,
207
+          permission: 'purchase.plan.edit',
208
+        },
209
+      },
210
+      {
211
+        path: "bill/list",
212
+        element: <PurchasePlanList type="bill" />,
213
+        meta: {
214
+          title: "采购账单",
215
+          permission: 'purchase.bill',
216
+        },
217
+      },
218
+      {
219
+        path: "bill/edit",
220
+        element: <PurchaseBillEdit />,
221
+        meta: {
222
+          title: "采购账单维护",
223
+          hideInMenu: true,
224
+          permission: 'purchase.bill.edit',
225
+        },
226
+      },
227
+      {
228
+        path: "inStore/list",
229
+        element: <PurchasePlanList type="inStore" />,
230
+        meta: {
231
+          title: "采购入库",
232
+          permission: 'purchase.instore',
164 233
         },
165 234
       },
166 235
     ],
@@ -170,6 +239,7 @@ export const authRoutes = [
170 239
     element: <Container />,
171 240
     meta: {
172 241
       title: "公告文件",
242
+      permission: 'cms',
173 243
     },
174 244
     children: [
175 245
       {
@@ -181,6 +251,7 @@ export const authRoutes = [
181 251
         element: null,
182 252
         meta: {
183 253
           title: "本站信息",
254
+          permission: 'station',
184 255
         },
185 256
       },
186 257
       {
@@ -188,6 +259,7 @@ export const authRoutes = [
188 259
         element: <RotationChartList />,
189 260
         meta: {
190 261
           title: "公告管理",
262
+          permission: 'rotationChart',
191 263
         },
192 264
       },
193 265
       {
@@ -196,6 +268,7 @@ export const authRoutes = [
196 268
         meta: {
197 269
           title: "公告维护",
198 270
           hideInMenu: true,
271
+          permission: 'rotationChart.edit',
199 272
         },
200 273
       },
201 274
       {
@@ -204,21 +277,7 @@ export const authRoutes = [
204 277
         meta: {
205 278
           title: "公告详情",
206 279
           hideInMenu: true,
207
-        },
208
-      },
209
-      {
210
-        path: "rotationChart/introduction",
211
-        element: <RotationChartIntroduction />,
212
-        meta: {
213
-          title: "本站信息简介",
214
-        },
215
-      },
216
-      {
217
-        path: "rotationChart/introduction/edit",
218
-        element: <RotationChartIntroductionEdit />,
219
-        meta: {
220
-          hideInMenu: true,
221
-          title: "本站信息简介维护",
280
+          permission: 'rotationChart.detail',
222 281
         },
223 282
       },
224 283
       {
@@ -226,6 +285,7 @@ export const authRoutes = [
226 285
         element: <RegulationList />,
227 286
         meta: {
228 287
           title: "规章制度",
288
+          permission: 'regulation',
229 289
         },
230 290
       },
231 291
       {
@@ -234,6 +294,7 @@ export const authRoutes = [
234 294
         meta: {
235 295
           hideInMenu: true,
236 296
           title: "规章制度维护",
297
+          permission: 'regulation.edit',
237 298
         },
238 299
       },
239 300
       {
@@ -241,6 +302,7 @@ export const authRoutes = [
241 302
         element: <EmergencyPlanList />,
242 303
         meta: {
243 304
           title: "应急预案",
305
+          permission: 'emergency-plan',
244 306
         },
245 307
       },
246 308
       {
@@ -249,6 +311,7 @@ export const authRoutes = [
249 311
         meta: {
250 312
           title: "应急预案维护",
251 313
           hideInMenu: true,
314
+          permission: 'emergency-plan.edit',
252 315
         },
253 316
       },
254 317
       {
@@ -257,6 +320,7 @@ export const authRoutes = [
257 320
         meta: {
258 321
           title: "应急预案详情",
259 322
           hideInMenu: true,
323
+          permission: 'emergency-plan.detail',
260 324
         },
261 325
       },
262 326
 
@@ -265,6 +329,7 @@ export const authRoutes = [
265 329
         element: <FilesList />,
266 330
         meta: {
267 331
           title: "文件管理",
332
+          permission: 'files',
268 333
         },
269 334
       },
270 335
     ],
@@ -276,71 +341,15 @@ export const authRoutes = [
276 341
       title: "数据分析",
277 342
       noSiderBar: true,
278 343
       noFooter: true,
344
+      permission: 'static',
279 345
     },
280 346
   },
281
-  {
282
-    path: "purchase",
283
-    element: <Container />,
284
-    meta: {
285
-      title: "采购管理",
286
-    },
287
-    children: [
288
-      {
289
-        index: true,
290
-        element: <Navigate to="plan/list" replace />,
291
-      },
292
-      {
293
-        path: "plan/list",
294
-        element: <PurchasePlanList type="plan" />,
295
-        meta: {
296
-          title: "采购计划",
297
-        },
298
-      },
299
-      {
300
-        path: "plan/edit",
301
-        element: <PurchasePlanEdit />,
302
-        meta: {
303
-          title: "采购计划维护",
304
-          hideInMenu: true,
305
-        },
306
-      },
307
-      {
308
-        path: "bill/list",
309
-        element: <PurchasePlanList type="bill" />,
310
-        meta: {
311
-          title: "采购账单",
312
-        },
313
-      },
314
-      {
315
-        path: "bill/edit",
316
-        element: <PurchaseBillEdit />,
317
-        meta: {
318
-          title: "采购账单维护",
319
-          hideInMenu: true,
320
-        },
321
-      },
322
-      {
323
-        path: "inStore/list",
324
-        element: <PurchasePlanList type="inStore" />,
325
-        meta: {
326
-          title: "采购入库",
327
-        },
328
-      },
329
-      {
330
-        path: "inStore/edit",
331
-        element: <PurchaseInStoreEdit />,
332
-        meta: {
333
-          title: "采购入库维护",
334
-          hideInMenu: true,
335
-        },
336
-      },
337
-    ],
338
-  },
339 347
   {
340 348
     path: "system",
341 349
     element: <Container />,
342 350
     meta: {
343 351
       title: "系统管理",
352
+      permission: 'system',
344 353
     },
345 354
     children: [
346 355
       {
@@ -366,6 +375,7 @@ export const authRoutes = [
366 375
         element: <StockClassificationList />,
367 376
         meta: {
368 377
           title: "库存分类",
378
+          permission: 'stockClassification',
369 379
         },
370 380
       },
371 381
       {
@@ -374,6 +384,7 @@ export const authRoutes = [
374 384
         meta: {
375 385
           title: "库存分类维护",
376 386
           hideInMenu: true,
387
+          permission: 'stockClassification.edit',
377 388
         },
378 389
       },
379 390
       {
@@ -381,6 +392,7 @@ export const authRoutes = [
381 392
         element: <StockLog />,
382 393
         meta: {
383 394
           title: "库存日志",
395
+          permission: 'stock.log',
384 396
         },
385 397
       },
386 398
       {
@@ -388,6 +400,7 @@ export const authRoutes = [
388 400
         element: <Roles />,
389 401
         meta: {
390 402
           title: "角色管理",
403
+          permission: 'role',
391 404
         },
392 405
       },
393 406
       {
@@ -395,6 +408,7 @@ export const authRoutes = [
395 408
         element: <UserList />,
396 409
         meta: {
397 410
           title: "用户管理",
411
+          permission: 'user',
398 412
         },
399 413
       },
400 414
       {
@@ -403,6 +417,7 @@ export const authRoutes = [
403 417
         meta: {
404 418
           hideInMenu: true,
405 419
           title: "系统用户编辑",
420
+          permission: 'user.edit',
406 421
         },
407 422
       },
408 423
       {
@@ -410,14 +425,7 @@ export const authRoutes = [
410 425
         element: <MessageList />,
411 426
         meta: {
412 427
           title: "消息列表",
413
-        },
414
-      },
415
-      {
416
-        path: "message/detail",
417
-        element: <MessageDetail />,
418
-        meta: {
419
-          title: "消息详情",
420
-          hideInMenu: true,
428
+          permission: 'message',
421 429
         },
422 430
       },
423 431
       {