From e134006794956560a82fcb72cf698ff412326344 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Sun, 1 Dec 2024 11:59:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(web):=20=E5=A2=9E=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gringotts-frontend/pages/index/tab-check.js | 28 +++++++++++++------ .../web/domain/check/entity/CheckOrder.java | 1 + 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/gringotts-frontend/pages/index/tab-check.js b/gringotts-frontend/pages/index/tab-check.js index ff8dc0d..dc4e77d 100644 --- a/gringotts-frontend/pages/index/tab-check.js +++ b/gringotts-frontend/pages/index/tab-check.js @@ -7,7 +7,7 @@ import { mappingField, operationField, stringField, - timeField + timeField, } from "../../components/constants.js"; import {permissionDetailDialog} from "../../components/permission/dialog-permission.js"; @@ -19,6 +19,7 @@ export function tabCheck() { reload: true, body: [ { + name: 'check_order_list', type: 'crud', api: apiGet('${base}/check_order/list'), ...crudCommonOptions(), @@ -46,20 +47,31 @@ export function tabCheck() { type: 'action', label: '同意', actionType: 'ajax', - api: apiGet('${base}/check_order/operation/${checkOrderId}/APPLY') + close: true, + api: apiGet('${base}/check_order/operation/${checkOrderId}/APPLY'), + reload: 'check_order_list', }, { type: 'action', label: '拒绝', actionType: 'ajax', - api: apiGet('${base}/check_order/operation/${checkOrderId}/REJECT') - } - ] + close: true, + api: apiGet('${base}/check_order/operation/${checkOrderId}/REJECT'), + reload: 'check_order_list', + }, + ], ), }, + { + visibleOn: '${over}', + type: 'action', + label: '查看', + level: 'link', + ...permissionDetailDialog('parameters.confirmationId'), + }, ]), - ] - } - ] + ], + }, + ], } } \ No newline at end of file diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java index 7cad94f..609c7a0 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java @@ -36,6 +36,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; @Table(name = Constants.TABLE_PREFIX + "check_order") @NamedEntityGraph(name = "check_order.list", attributeNodes = { @NamedAttributeNode(value = "createdUser"), + @NamedAttributeNode(value = "modifiedUser"), }) @NamedEntityGraph(name = "check_order.detail", attributeNodes = { @NamedAttributeNode(value = "createdUser"),