odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 需求上报详情删除重复项,优化台账上方基础信息排版,表格内容少时固定宽度,驳回弹窗'重新提交'改为'发起节点'

Browse Source
This commit is contained in:
odjbin
2024-08-06 15:06:29 +08:00
parent ab191e940b
commit 33e6ad37b9
15 changed files with 191 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/views/project-management/implementation/account.vue
View File

@@ -1,11 +1,11 @@
<template>
<view style="overflow-y: scroll">
<view style="overflow-y: scroll;">
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<baseTitle title="表格更新数据" style="margin-top: -10px"></baseTitle>
<fvForm :schema="tableUpdateData" @getInstance="(e)=>tableUpdateFormData = e"></fvForm>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
<baseTitle title="研发台账明细" style="margin-top: -10px"></baseTitle>
<fvForm :schema="tableUpdateData" @getInstance="(e)=>tableUpdateFormData = e" style="margin-left: 15px"></fvForm>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
<div style="display: flex">
<div style="display: flex;margin-left: 15px" >
<el-button color="#DED0B2" @click="exportExcelHandler">导出</el-button>
<import-excel :projectId="projectId" v-if="buttonShow" @success="importTheExpenseLedger"/>
<el-button color="#DED0B2" v-if="buttonShow" @click="handleImportTemplateDownload">模板下载</el-button>
@@ -244,22 +244,22 @@ const tableUpdateData = computed(() => {
},
labelWidth:'left'
},
{
label: '项目开始时间',
prop: 'startTime',
colProps: {
span: 6
},
labelWidth:'left'
},
{
label: '项目预计持续时间',
prop: 'endTime',
colProps: {
span: 6
},
labelWidth:'left'
},
// {
// label: '项目开始时间',
// prop: 'startTime',
// colProps: {
// span: 6
// },
// labelWidth:'left'
// },
// {
// label: '项目预计持续时间',
// prop: 'endTime',
// colProps: {
// span: 6
// },
// labelWidth:'left'
// },
{
label: '项目开展方式',
prop: 'projectDevelopmentWay',
@@ -268,14 +268,14 @@ const tableUpdateData = computed(() => {
},
labelWidth:'left'
},
{
label: '项目预算',
prop: 'projectBudgetDescription',
colProps: {
span: 24
},
labelWidth:'left'
},
// {
// label: '项目预算',
// prop: 'projectBudgetDescription',
// colProps: {
// span: 24
// },
// labelWidth:'left'
// },
{
label: '项目总体完成率',
prop: 'projectCompletionRate',
@@ -548,11 +548,29 @@ onActivated(() => {
min-height: 400px !important;
}
:deep(.el-form-item__label-wrap){
margin-left: 0!important;
margin-left: 15px!important;
}
:deep(.el-form-item__content){
.el-input{
width: 100%!important;
}
}
.search-form {
padding-top: 0!important;
}
:deep(.el-table__header){
.is-leaf:first-child{
.cell{
margin-left: -20px!important;
}
}
}
:deep(.el-table__body){
.el-table__cell:first-child{
.cell{
margin-left: -10px!important;
}
}
}
</style>

7
src/views/project-management/implementation/index.vue
View File

@@ -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 <span>{toThousands(row.economicEstimate)}</span>
}
@@ -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 <span>{row.taskNode}</span>
@@ -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) {