FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00
Code Packages Releases Activity

modify the el-=cascader in page of NoticeCommitForm

Browse Source
This commit is contained in:
cccccyb
2023-06-04 20:17:43 +08:00
parent 279c4bfc67
commit b8ad05b4a1
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pinnacle/src/main/java/com/cfive/pinnacle/controller/NoticeController.java
View File

@@ -69,7 +69,7 @@ public class NoticeController {
@PreAuthorize("hasAuthority('notice:self:get')") @PreAuthorize("hasAuthority('notice:self:get')")
public ResponseResult<List<Notice>> selectByUserId(Integer readStatus,String title, String type, String startTime, String endTime) { public ResponseResult<List<Notice>> selectByUserId(Integer readStatus,String title, String type, String startTime, String endTime) {
List<Notice> noticesByUserId = noticeReceiveService.selectByUserId(readStatus, title.trim(), type.trim(), startTime.trim(), endTime.trim()); List<Notice> noticesByUserId = noticeReceiveService.selectByUserId(readStatus, title.trim(), type.trim(), startTime.trim(), endTime.trim());
Integer code = noticesByUserId != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR; int code = noticesByUserId != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
String msg = noticesByUserId != null ? "" : "数据查询失败，请重试！"; String msg = noticesByUserId != null ? "" : "数据查询失败，请重试！";
return ResponseResult.build(code, msg, noticesByUserId); return ResponseResult.build(code, msg, noticesByUserId);
} }

9
ui/src/components/notice/NoticeCommitForm.vue
View File

@@ -84,7 +84,13 @@
}}</span> }}</span>
<span v-if="scope.node.level === 2">{{ <span v-if="scope.node.level === 2">{{
((scope.node.value = scope.data.id), ((scope.node.value = scope.data.id),
(scope.node.label = scope.data.username)) (scope.node.label = scope.data.staff
? scope.data.staff.lastName +
scope.data.staff.firstName +
'(' +
scope.data.username +
')'
: scope.data.username))
}}</span> }}</span>
</template> </template>
</el-cascader> </el-cascader>
@@ -140,7 +146,6 @@ export default {
content: [{ required: true, message: '请填写公告内容', trigger: 'blur' }], content: [{ required: true, message: '请填写公告内容', trigger: 'blur' }],
receivers: [ receivers: [
{ {
type: 'array',
required: true, required: true,
message: '请选择公告接收者', message: '请选择公告接收者',
trigger: 'change' trigger: 'change'

8
ui/src/store/notice.ts
View File

@@ -201,8 +201,8 @@ export const useNoticeStore = defineStore('notice', {
this.departmentList = response.data.data this.departmentList = response.data.data
}) })
}, },
handleAddNotice(addFormData: IAddNoticeData) { async handleAddNotice(addFormData: IAddNoticeData) {
void request.post('/notice', addFormData).then((response) => { await request.post('/notice', addFormData).then((response) => {
if (response.data.code === DATABASE_SAVE_OK) { if (response.data.code === DATABASE_SAVE_OK) {
this.dialogAddVisible = false this.dialogAddVisible = false
ElMessage({ ElMessage({
@@ -218,8 +218,8 @@ export const useNoticeStore = defineStore('notice', {
}) })
this.selectAllNotice(1, 5, '', '', '', '', []) this.selectAllNotice(1, 5, '', '', '', '', [])
}, },
handleUpdateNotice(updateNotice: IAddNoticeData) { async handleUpdateNotice(updateNotice: IAddNoticeData) {
void request.put('/notice', updateNotice).then((response) => { await request.put('/notice', updateNotice).then((response) => {
if (response.data.code === DATABASE_UPDATE_OK) { if (response.data.code === DATABASE_UPDATE_OK) {
this.dialogEditVisible = false this.dialogEditVisible = false
this.editFlag = false this.editFlag = false