From 33e6ad37b9d8c3399eb66b7a3277a9cabc300fa8 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Tue, 6 Aug 2024 15:06:29 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D=E9=A1=B9?= =?UTF-8?q?,=E4=BC=98=E5=8C=96=E5=8F=B0=E8=B4=A6=E4=B8=8A=E6=96=B9?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E6=8E=92=E7=89=88,?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=86=85=E5=AE=B9=E5=B0=91=E6=97=B6=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E5=AE=BD=E5=BA=A6,=E9=A9=B3=E5=9B=9E=E5=BC=B9?= =?UTF-8?q?=E7=AA=97'=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4'=E6=94=B9?= =?UTF-8?q?=E4=B8=BA'=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DetailComponent/Opinion.vue | 3 + .../DetailComponent/SummaryDetail.vue | 131 ++++---------- src/components/steps/index.vue | 5 +- src/views/expense-management/ledger/index.vue | 5 +- src/views/plan/index.vue | 8 +- .../project-demand/requirement/index.vue | 13 +- src/views/project-demand/summary/index.vue | 5 + src/views/project-management/filing/index.vue | 7 + .../implementation/account.vue | 78 +++++---- .../implementation/index.vue | 7 + .../project-management/initiation/index.vue | 7 + .../mobledetail/StepsMoblie.vue | 2 +- .../mobledetail/SummaryDetailMoblie.vue | 162 +++++------------- src/views/special-fund/index.vue | 29 +++- src/views/workflow/common/OperationRender.vue | 2 +- 15 files changed, 191 insertions(+), 273 deletions(-) diff --git a/src/components/DetailComponent/Opinion.vue b/src/components/DetailComponent/Opinion.vue index 88fd390..32de2d8 100644 --- a/src/components/DetailComponent/Opinion.vue +++ b/src/components/DetailComponent/Opinion.vue @@ -22,6 +22,9 @@ +
- - + + - - {{ localFormData.projectName }} - - - - - {{ localFormData.startTime }} - - - - - {{ localFormData.endTime }} - - - - - {{ filterDict(cacheStore.getDict('project_type'), localFormData.projectType) }} - - - - - {{ filterDict(cacheStore.getDict('rd_subject'), localFormData.rdSubject) }} - - - - - {{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }} - - - - - - {{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }} - - - - - {{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }} - - - - - {{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }} - - - - - {{ toThousands(localFormData.economicEstimate) }} - - - - - {{ - filterDict(cacheStore.getDict('industry_university'), localFormData.industryUniversityResearch) - }} - - - - - {{ - filterDict(cacheStore.getDict('government_declaration'), localFormData.governmentDeclaration) - }} - - - - - {{ - localFormData.specialFundId === 0 ? localFormData.specialFund : changeName(fundOption, localFormData.specialFundId) - }} - - - - - {{ toThousands(localFormData.specialFundAmount) }} - - - - - {{ localFormData.optionalChargeLeadership?.map(item=>item.name).join()||'--' }} - - - - - - - - {{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }} @@ -128,10 +41,9 @@ - - - - + + + {{ localFormData.serviceDescription }} @@ -142,11 +54,12 @@ {{ localFormData.contentDescription }} - - - + + + > + - + @@ -154,9 +67,9 @@ - - - + + +
- +
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index 20f1969..e47bd03 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -174,6 +174,7 @@ const tableConfig = reactive({ prop: 'projectType', label: '项目类型', align: 'center', + width: 100, showOverflowTooltip: false, currentRender: ({row, index}) => { if (row.projectType && row.projectType !== null && row.projectType !== undefined) { @@ -187,6 +188,7 @@ const tableConfig = reactive({ prop: 'rdSubject', label: '研发主体', align: 'center', + width: 100, showOverflowTooltip: false, currentRender: ({row, index}) => { if (row.rdSubject && row.rdSubject !== null && row.rdSubject !== undefined) { @@ -200,6 +202,7 @@ const tableConfig = reactive({ prop: 'researchStage', label: '研发阶段', align: 'center', + width: 100, showOverflowTooltip: false, currentRender: ({row, index}) => { if (row.researchStage && row.researchStage !== null && row.researchStage !== undefined) { @@ -213,6 +216,7 @@ const tableConfig = reactive({ prop: 'projectImpact', label: '项目影响', align: 'center', + width: 100, showOverflowTooltip: false, currentRender: ({row, index}) => { if (row.projectImpact && row.projectImpact !== null && row.projectImpact !== undefined) { @@ -226,6 +230,7 @@ const tableConfig = reactive({ prop: 'economicEstimate', label: '经费预算(元)', align: 'center', + width: 150, currentRender:({row})=>{ return {toThousands(row.economicEstimate)} } @@ -242,6 +247,7 @@ const tableConfig = reactive({ prop: 'approveName', label: '当前审批节点', align: 'center', + width: 120, currentRender: ({row, index}) => { if(row.state=='3'||row.state=='4'){ return {row.taskNode} @@ -256,6 +262,7 @@ const tableConfig = reactive({ prop: 'state', label: '状态', align: 'center', + width: 100, showOverflowTooltip: false, currentRender: ({row, index}) => { if (row.state && row.state !== null && row.state !== undefined) { diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue index c52659a..6c6be6a 100644 --- a/src/views/project-management/initiation/index.vue +++ b/src/views/project-management/initiation/index.vue @@ -169,6 +169,7 @@ const tableConfig = reactive({ prop: 'projectType', label: '项目类型', align: 'center', + width: 100, showOverflowTooltip: false, currentRender: ({row, index}) => { if (row.projectType !== null) { @@ -182,6 +183,7 @@ const tableConfig = reactive({ prop: 'rdSubject', label: '研发主体', align: 'center', + width: 100, showOverflowTooltip: false, currentRender: ({row, index}) => { if (row.rdSubject !== null) { @@ -195,6 +197,7 @@ const tableConfig = reactive({ prop: 'projectImpact', label: '项目影响', align: 'center', + width: 100, showOverflowTooltip: false, currentRender: ({row, index}) => { if (row.projectImpact !== null) { @@ -208,6 +211,7 @@ const tableConfig = reactive({ prop: 'economicEstimate', label: '经费预算(元)', align: 'center', + width: 150, currentRender:({row})=>{ return {toThousands(row.economicEstimate)} } @@ -224,6 +228,7 @@ const tableConfig = reactive({ prop: 'approveName', label: '当前审批节点', align: 'center', + width: 120, currentRender: ({row, index}) => { if(row.state=='3'||row.state=='4'){ return {row.taskNode} @@ -243,6 +248,7 @@ const tableConfig = reactive({ prop: 'state', label: '状态', align: 'center', + width: 100, showOverflowTooltip: false, currentRender: ({row, index}) => { if (row.state !== null) { @@ -257,6 +263,7 @@ const tableConfig = reactive({ label: '操作', align: 'center', fixed:'right', + width: 100, showOverflowTooltip: false, currentRender: ({row, index}) => { let btn = [] diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue index e5b3ddf..01ca25a 100644 --- a/src/views/project-management/mobledetail/StepsMoblie.vue +++ b/src/views/project-management/mobledetail/StepsMoblie.vue @@ -1,6 +1,6 @@