diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index 2016ad0..a035274 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -37,17 +37,6 @@ const schema = computed(() => { }) const baseForm = ref() const searchConfig = reactive([ - { - label: '项目名称', - prop: 'projectName', - component: 'el-input', - props: { - placeholder: '请输入项目名称查询', - clearable: true, - filterable: true, - checkStrictly: true - } - }, { label: '时间', prop: 'time', @@ -79,7 +68,7 @@ const searchConfig = reactive([ clearable: true, filterable: true, checkStrictly: true, - cacheKey: 'research_stage', + cacheKey: 'fee_stage', } }, { @@ -194,7 +183,6 @@ const handleUploadFee = () => { } const search = (val) => { - console.log('val', val) tableConfig.params = {...val, projectId: route.query.id} tableIns.value.refresh() } diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index cd9ee63..1abb366 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -161,7 +161,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.projectType !== null) { + if (row.projectType && row.projectType !== null && row.projectType !== undefined) { return () } else { return '--' @@ -174,7 +174,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.rdSubject !== null) { + if (row.rdSubject && row.rdSubject !== null && row.rdSubject !== undefined) { return () } else { return '--' @@ -187,7 +187,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) { + if (row.researchStage && row.researchStage !== null && row.researchStage !== undefined) { return () } else { return '--' @@ -200,7 +200,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.projectImpact !== null) { + if (row.projectImpact && row.projectImpact !== null && row.projectImpact !== undefined) { return () } else { return '--' @@ -234,7 +234,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.state !== null) { + if (row.state && row.state !== null && row.state !== undefined) { return () } else { return '--' diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue index f20c103..cf01a8d 100644 --- a/src/views/project-management/implementation/uploadFee.vue +++ b/src/views/project-management/implementation/uploadFee.vue @@ -184,4 +184,15 @@ const handleBack = () => { history.back() } +