diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java index 6b481897..8c216514 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java @@ -65,7 +65,7 @@ public class InvoiceController { } @Operation(summary = "删除发票信息 @author 善逸") - @GetMapping("/invoice/delete/{invoiceId}") + @GetMapping("/oa/invoice/delete/{invoiceId}") public ResponseDTO deleteInvoice(@PathVariable Long invoiceId) { return invoiceService.deleteInvoice(invoiceId); } diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java index 85d31eb4..446e1371 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java @@ -208,6 +208,8 @@ public class NoticeService { } NoticeUpdateFormVO updateFormVO = SmartBeanUtil.copy(noticeEntity, NoticeUpdateFormVO.class); + NoticeTypeVO noticeType = noticeTypeService.getByNoticeTypeId(noticeEntity.getNoticeTypeId()); + updateFormVO.setNoticeTypeName(noticeType.getNoticeTypeName()); if (!updateFormVO.getAllVisibleFlag()) { List noticeVisibleRangeList = noticeDao.queryVisibleRange(noticeId); List employeeIdList = noticeVisibleRangeList.stream().filter(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue().equals(e.getDataType())) diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview-modal/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview-modal/index.vue index 540faab3..d42d2efc 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview-modal/index.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview-modal/index.vue @@ -24,7 +24,6 @@ diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue index 5fea6abf..cf65f437 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue @@ -27,127 +27,119 @@ -
附件:
+
+ 附件: + + +
- - - diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/feedback/feedback-list.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/feedback/feedback-list.vue index 5d9c1d09..5884cffb 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/feedback/feedback-list.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/feedback/feedback-list.vue @@ -45,7 +45,7 @@