diff --git a/src/api/review/project.ts b/src/api/review/project.ts index 26c074c7e..abf44efd1 100644 --- a/src/api/review/project.ts +++ b/src/api/review/project.ts @@ -38,6 +38,7 @@ export interface ReviewMeetingProjectPageReqVO { projectTitle?: string agendaCategory?: string reporter?: string + reviewResult?: 'PASS' | 'REJECT' reviewDate?: string } @@ -50,6 +51,7 @@ export interface ReviewProjectPageReqVO { agendaCategory?: string reporter?: string reporterUnit?: string + reviewResult?: 'PASS' | 'REJECT' reviewDate?: string } diff --git a/src/views/project/project/index.vue b/src/views/project/project/index.vue index 21b8a4daf..4089193e7 100644 --- a/src/views/project/project/index.vue +++ b/src/views/project/project/index.vue @@ -2,29 +2,29 @@
- + - + - + - + - + - + - 搜索 - 重置 + 搜索 + 重置 @@ -481,4 +481,13 @@ onMounted(() => { :deep(.el-form-item) { margin-bottom: 12px; } + +:deep(.search-form .el-input__wrapper), +:deep(.search-form .el-select__wrapper) { + min-height: 40px; +} + +:deep(.search-form .el-input__inner) { + line-height: 40px; +} diff --git a/src/views/review/meeting/AllProjectList.vue b/src/views/review/meeting/AllProjectList.vue index 906b25f9a..417ef1923 100644 --- a/src/views/review/meeting/AllProjectList.vue +++ b/src/views/review/meeting/AllProjectList.vue @@ -8,6 +8,7 @@ - + + + + + { queryParams.agendaCategory = undefined queryParams.reporter = undefined queryParams.reporterUnit = undefined + queryParams.reviewResult = undefined queryParams.reviewDate = undefined handleQuery() } @@ -353,16 +364,34 @@ onMounted(async () => { .search-input-sm { width: 120px; } +:deep(.search-meeting-select), +:deep(.search-input), +:deep(.search-input-sm) { + height: 40px; +} :deep(.search-meeting-select .el-input__wrapper), :deep(.search-input .el-input__wrapper), :deep(.search-input-sm .el-input__wrapper) { - height: 40px; + min-height: 40px; border-radius: 6px; border-color: #dcdedf; } +:deep(.search-meeting-select .el-select__wrapper), +:deep(.search-input .el-select__wrapper), +:deep(.search-input-sm .el-select__wrapper) { + min-height: 40px; + border-radius: 6px; + border-color: #dcdedf; +} +:deep(.search-meeting-select.el-date-editor), +:deep(.search-input.el-date-editor), +:deep(.search-input-sm.el-date-editor) { + min-height: 40px; +} :deep(.search-meeting-select .el-input__inner), :deep(.search-input .el-input__inner), :deep(.search-input-sm .el-input__inner) { + line-height: 40px; font-size: 15px; color: #333; } diff --git a/src/views/review/meeting/index.vue b/src/views/review/meeting/index.vue index d9f1114a5..82917ce3a 100644 --- a/src/views/review/meeting/index.vue +++ b/src/views/review/meeting/index.vue @@ -7,6 +7,7 @@