From cd715fbf98da76712fce164ed803bcf787199d28 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 2 Jun 2024 11:04:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E3=80=81=E9=87=91=E9=A2=9D=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E4=B8=BA=E5=85=83=E3=80=81=E9=A1=B9=E7=9B=AE=E5=AE=9E=E6=96=BD?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E4=B8=8A=E4=BC=A0=E8=B4=B9=E7=94=A8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/svg/account.svg | 1 + src/assets/svg/fee.svg | 1 + src/assets/svg/fee_share.svg | 1 + src/assets/svg/filing.svg | 1 + src/assets/svg/home.svg | 1 + src/assets/svg/implementation.svg | 1 + src/assets/svg/initiation.svg | 1 + src/assets/svg/project.svg | 1 + src/assets/svg/project_requirement.svg | 1 + src/assets/svg/requirement.svg | 1 + src/assets/svg/special_fund.svg | 1 + src/assets/svg/summary.svg | 1 + src/components/DetailComponent/Opinion.vue | 6 +- .../DetailComponent/SummaryDetail.vue | 4 +- src/stores/permisstion.js | 2 +- src/views/project-demand/requirement/add.vue | 2 +- src/views/project-demand/summary/add.vue | 4 +- src/views/project-demand/summary/index.vue | 6 +- src/views/project-management/filing/index.vue | 8 +-- .../implementation/account.vue | 24 ++++++-- .../implementation/index.vue | 8 +-- .../implementation/share.vue | 30 +++++----- .../implementation/uploadFee.vue | 56 +++++++------------ .../project-management/initiation/index.vue | 8 +-- src/views/special-fund/add.vue | 2 +- src/views/special-fund/index.vue | 8 +-- 26 files changed, 94 insertions(+), 86 deletions(-) create mode 100644 src/assets/svg/account.svg create mode 100644 src/assets/svg/fee.svg create mode 100644 src/assets/svg/fee_share.svg create mode 100644 src/assets/svg/filing.svg create mode 100644 src/assets/svg/home.svg create mode 100644 src/assets/svg/implementation.svg create mode 100644 src/assets/svg/initiation.svg create mode 100644 src/assets/svg/project.svg create mode 100644 src/assets/svg/project_requirement.svg create mode 100644 src/assets/svg/requirement.svg create mode 100644 src/assets/svg/special_fund.svg create mode 100644 src/assets/svg/summary.svg diff --git a/src/assets/svg/account.svg b/src/assets/svg/account.svg new file mode 100644 index 0000000..1d55bd9 --- /dev/null +++ b/src/assets/svg/account.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/fee.svg b/src/assets/svg/fee.svg new file mode 100644 index 0000000..b7150ff --- /dev/null +++ b/src/assets/svg/fee.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/fee_share.svg b/src/assets/svg/fee_share.svg new file mode 100644 index 0000000..e8d6c11 --- /dev/null +++ b/src/assets/svg/fee_share.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/filing.svg b/src/assets/svg/filing.svg new file mode 100644 index 0000000..054af3b --- /dev/null +++ b/src/assets/svg/filing.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/home.svg b/src/assets/svg/home.svg new file mode 100644 index 0000000..611af35 --- /dev/null +++ b/src/assets/svg/home.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/implementation.svg b/src/assets/svg/implementation.svg new file mode 100644 index 0000000..16d645a --- /dev/null +++ b/src/assets/svg/implementation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/initiation.svg b/src/assets/svg/initiation.svg new file mode 100644 index 0000000..3dc5a33 --- /dev/null +++ b/src/assets/svg/initiation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/project.svg b/src/assets/svg/project.svg new file mode 100644 index 0000000..666f388 --- /dev/null +++ b/src/assets/svg/project.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/project_requirement.svg b/src/assets/svg/project_requirement.svg new file mode 100644 index 0000000..0b597a6 --- /dev/null +++ b/src/assets/svg/project_requirement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/requirement.svg b/src/assets/svg/requirement.svg new file mode 100644 index 0000000..e1d1a11 --- /dev/null +++ b/src/assets/svg/requirement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/special_fund.svg b/src/assets/svg/special_fund.svg new file mode 100644 index 0000000..c9c74b9 --- /dev/null +++ b/src/assets/svg/special_fund.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/summary.svg b/src/assets/svg/summary.svg new file mode 100644 index 0000000..cc0ef0a --- /dev/null +++ b/src/assets/svg/summary.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/DetailComponent/Opinion.vue b/src/components/DetailComponent/Opinion.vue index 4e6738b..638d049 100644 --- a/src/components/DetailComponent/Opinion.vue +++ b/src/components/DetailComponent/Opinion.vue @@ -51,12 +51,16 @@ const back = () => { router.push({name: 'Filing'}) break; case 'Implementation/detail': - if (route.query.step === '20') { + if (route.query.step === '10') { + router.push({name: 'Summary'}) + } else if (route.query.step === '20') { router.push({name: 'Initiation'}) } else if (route.query.step === '40') { router.push({name: 'Implementation'}) } else if (route.query.step === '50') { router.push({name: 'Filing'}) + }else if (route.query.step === '00') { + router.push({name: 'Requirement'}) } break; case 'Summary/detail': diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index 32a2e35..0d98534 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -98,12 +98,12 @@ - + {{ localFormData.economicEstimate }} - + {{ localFormData.specialFundAmount }} diff --git a/src/stores/permisstion.js b/src/stores/permisstion.js index 626c3f2..d428383 100644 --- a/src/stores/permisstion.js +++ b/src/stores/permisstion.js @@ -158,4 +158,4 @@ export const usePermisstionStroe = defineStore('permisstion', () => { removeMenu, setIsSuccessReq } -}) \ No newline at end of file +}) diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index 9ae3ca5..70fe35b 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -25,7 +25,7 @@ v-model="formData.deadline" type="datetime" placeholder="截止时间" - value-format="YYYY-MM-DD HH:mm:ss" + value-format="YYYY-MM-DD" /> diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index b6929a5..10bf9ec 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -199,12 +199,12 @@ - + - + diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index f81e0e4..29c8619 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -99,7 +99,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.state !== null) { + if (row.projectType !== null) { return () } else { return '--' @@ -112,7 +112,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.state !== null) { + if (row.rdSubject !== null) { return () } else { return '--' @@ -125,7 +125,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.state !== null) { + if (row.projectImpact !== null) { return () } else { return '--' diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue index 4630052..41f778f 100644 --- a/src/views/project-management/filing/index.vue +++ b/src/views/project-management/filing/index.vue @@ -156,7 +156,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.state !== null) { + if (row.projectType !== null) { return () } else { return '--' @@ -169,7 +169,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.state !== null) { + if (row.rdSubject !== null) { return () } else { return '--' @@ -182,7 +182,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.state !== null) { + if (row.projectImpact !== null) { return () } else { return '--' @@ -191,7 +191,7 @@ const tableConfig = reactive({ }, { prop: 'economicEstimate', - label: '经济概算(万元)', + label: '经济概算(元)', align: 'center' }, { diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index 225a954..e3bca82 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -89,10 +89,6 @@ const tableConfig = reactive({ align: 'center' }, { - prop: 'projectName', - label: '项目名称', - align: 'center' - },{ prop: 'time', label: '时间', align: 'center' @@ -100,12 +96,28 @@ const tableConfig = reactive({ { prop: 'projectCost', label: '项目费用', - align: 'center' + align: 'center', + currentRender: ({row, index}) => { + if (row.projectCost !== null) { + return () + } else { + return '--' + } + } }, { prop: 'researchStage', label: '研发阶段', - align: 'center' + align: 'center', + currentRender: ({row, index}) => { + console.log('row.researchStage',row.researchStage) + if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) { + console.log('ull',row.researchStage) + return () + } else { + return '--' + } + } }, { prop: 'digest', diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index ea7ceb7..386677f 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.state !== null) { + if (row.projectType !== null) { return () } else { return '--' @@ -174,7 +174,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.state !== null) { + if (row.rdSubject !== null) { return () } else { return '--' @@ -187,7 +187,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if (row.state !== null) { + if (row.projectImpact !== null) { return () } else { return '--' @@ -196,7 +196,7 @@ const tableConfig = reactive({ }, { prop: 'economicEstimate', - label: '经济概算(万元)', + label: '经济概算(元)', align: 'center' }, { diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue index 9d34ac6..2fdac5c 100644 --- a/src/views/project-management/implementation/share.vue +++ b/src/views/project-management/implementation/share.vue @@ -8,7 +8,7 @@ diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue index 22acfec..3d65ea2 100644 --- a/src/views/project-management/implementation/uploadFee.vue +++ b/src/views/project-management/implementation/uploadFee.vue @@ -2,14 +2,6 @@ - - -