diff --git a/gringotts-frontend/components/constants.js b/gringotts-frontend/components/constants.js index a09116b..0065cc1 100644 --- a/gringotts-frontend/components/constants.js +++ b/gringotts-frontend/components/constants.js @@ -182,6 +182,11 @@ export const confirmationStateMapping = [ mappingItem('驳回', 'REJECT', 'bg-danger'), ] +export const checkTypeMapping = [ + mappingItem('确权审查', 'CONFIRMATION', 'bg-blue-500'), + mappingItem('授权审查', 'AUTHENTICATION', 'bg-purple-500'), +] + function api(method, url) { return { method: method, diff --git a/gringotts-frontend/pages/index/tab-check.js b/gringotts-frontend/pages/index/tab-check.js index 0292877..5dae4f4 100644 --- a/gringotts-frontend/pages/index/tab-check.js +++ b/gringotts-frontend/pages/index/tab-check.js @@ -1,4 +1,11 @@ -import {apiGet, apiPost, checkerOnly, crudCommonOptions} from "../../components/constants.js"; +import { + apiGet, + apiPost, + checkerOnly, + checkTypeMapping, + crudCommonOptions, + mappingField +} from "../../components/constants.js"; import {permissionDetailDialog} from "../../components/permission/dialog-permission.js"; export function tabCheck() { @@ -20,6 +27,12 @@ export function tabCheck() { name: 'name', label: '描述', }, + { + label: '类型', + width: 80, + align: 'center', + ...mappingField('type', checkTypeMapping) + }, { label: '操作', width: 100, @@ -29,7 +42,7 @@ export function tabCheck() { buttons: [ { type: 'action', - label: '查看', + label: '处理', level: 'link', ...permissionDetailDialog( 'parameters.confirmationId', diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/CheckingService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/CheckingService.java index 41fc773..6445e8b 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/CheckingService.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/CheckingService.java @@ -19,8 +19,14 @@ public interface CheckingService { @Value class CheckOrder { String name; + Type type; ImmutableList operations; ImmutableMap parameters; + + public enum Type { + CONFIRMATION, + AUTHENTICATION, + } } @Data diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java index b5a1f6f..eb6cf37 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java @@ -55,6 +55,7 @@ public class ConfirmationService extends SimpleServiceSupport impl ) .collect(confirmation -> new CheckOrder( StrUtil.format("资源名为「{}」的确权申请", confirmation.getTarget().getName()), + CheckOrder.Type.CONFIRMATION, Lists.immutable.of( new CheckOperation("confirmation_check_apply", "通过"), new CheckOperation("confirmation_check_reject", "拒绝", "danger")