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

fix : 征集说明/专项资金介绍换行格式, 需求征集列表页搜索框间距, 切换账号层级, 需求上报4种情况排版

Browse Source
This commit is contained in:
odjbin
2024-08-10 22:48:46 +08:00
parent 433f0bc712
commit 3dbaf21281
5 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/DetailComponent/CollectionDetail.vue
View File

@@ -35,7 +35,7 @@
</el-col>
<el-col :span="24" style="margin-bottom: -15px">
<el-form-item label="征集说明">
<div v-if="formData.collectExplain" v-html="formData.collectExplain">
<div v-if="formData.collectExplain" v-html="formData.collectExplain" style="white-space: pre-wrap;">
</div>
<div v-else>--</div>
</el-form-item>
@@ -190,4 +190,19 @@ watch(() => props.processViewer, (newVal) => {
display: -webkit-box;
-webkit-box-orient: vertical;
}
:deep(.el-table__header) {
.is-leaf:first-child {
.cell {
margin-left: -53px !important;
}
}
}
:deep(.el-table__body) {
.el-table__cell:first-child {
.cell {
margin-left: -26px !important;
}
}
}
</style>

2
src/components/DetailComponent/SpecialFundDetail.vue
View File

@@ -22,7 +22,7 @@
<el-col :span="24">
<el-form-item>
<el-card style="width: 100%">
<div v-html="formData.introduce">
<div style="white-space: pre-wrap">{{formData.introduce}}
</div>
</el-card>
</el-form-item>

2
src/layout/navbar/index.vue
View File

@@ -200,7 +200,7 @@ const handleLogout = () => {
position: absolute;
width: 280px;
right: 0;
z-index: 300;
z-index: 3000;
top: 54px;
padding: 5px 0;
border-radius: 4px;

4
src/views/project-demand/requirement/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-form ref="formRef" :model="selectForm" class="search-form select-form" style="margin-top: 18px;">
<el-row gutter="20">
<el-row >
<el-col :span="5">
<el-form-item prop="requirementName" label="征集名称">
<el-input v-model="selectForm.requirementName" placeholder="请输入征集名称" clearable @keyup.enter.native="getList"/>
@@ -31,7 +31,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" :offset="1">
<el-form-item>
<el-button color="#DED0B2" @click="getList">搜索</el-button>
<el-button @click="handleReset">重置</el-button>

26
src/views/project-demand/summary/add.vue
View File

@@ -2,20 +2,20 @@
<div class="detail-block" v-loading="loading">
<baseTitle title="项目基本信息"></baseTitle>
<el-form :model="formData" ref="summaryForm" :rules="rules" label-width="120" :scroll-to-error="true">
<el-row gutter="40" style="margin-bottom: -18px">
<el-row gutter="25" style="margin-bottom: -18px">
<el-col :span="6">
<el-form-item label="承办单位" :label-width="route.query.id && formData.isSpecialFund?135:120">
<el-form-item label="承办单位" >
<Tooltip :content="authStore.userinfo?.subCompanyName" placement="bottom-start" width="240" textAlign="left">
</Tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="项目名称" prop="projectName" >
<el-form-item label="项目名称" prop="projectName" :label-width="route.query.id && formData.isSpecialFund?160:120">
<el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="开始时间" prop="startTime" label-width="135">
<el-form-item label="开始时间" prop="startTime" label-width="160">
<el-config-provider>
<el-date-picker
v-model="formData.startTime"
@@ -58,7 +58,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="研发主体" prop="rdSubject" :label-width="route.query.id && formData.isSpecialFund?135:120">
<el-form-item label="研发主体" prop="rdSubject" :label-width="route.query.id && formData.isSpecialFund?160:120">
<el-select v-model="formData.rdSubject" placeholder="请选择研发主体" clearable filterable>
<el-option
v-for="item in cacheStore.getDict('rd_subject')"
@@ -70,7 +70,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="出资类型" prop="investmentType" label-width="135">
<el-form-item label="出资类型" prop="investmentType" label-width="160">
<el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
<el-option
v-for="item in cacheStore.getDict('invest_type')"
@@ -119,12 +119,12 @@
</el-col>
<!-- <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?!route.query.id?6:8:6">-->
<el-col :span="6">
<el-form-item label="经费预算" prop="economicEstimate" :label-width="route.query.id && formData.isSpecialFund?135:120">
<el-form-item label="经费预算(元)" prop="economicEstimate" :label-width="route.query.id && formData.isSpecialFund?160:120">
<el-input-number v-model="formData.economicEstimate" placeholder="请输入经费预算数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="135">
<el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="160">
<el-select v-model="formData.industryUniversityResearch" clearable>
<el-option
v-for="item in cacheStore.getDict('industry_university')"
@@ -184,12 +184,12 @@
</el-form-item>
</el-col>
<el-col :span="6" v-if="formData.isSpecialFund">
<el-form-item label="申请总部专项资金" prop="specialFundAmount" label-width="135">
<el-form-item label="申请总部专项资金(元)" prop="specialFundAmount" label-width="160">
<el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="部门分管领导" required prop="" :label-width="route.query.id && formData.isSpecialFund?135:120">
<el-form-item label="部门分管领导" required prop="" :label-width="route.query.id && formData.isSpecialFund?160:120">
<el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
{{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }}
</el-button>
@@ -220,7 +220,7 @@
</el-col>
<el-col :span="6">
<!-- :label-width="!formData.isSpecialFund?!route.query.id?125:125:125">-->
<el-form-item label="知识产权状况" prop="intellectualProperty" label-width="135">
<el-form-item label="知识产权状况" prop="intellectualProperty" label-width="160">
<el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
<el-option
v-for="item in cacheStore.getDict('intellectual_property')"
@@ -242,12 +242,12 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="软件著作权(项)" prop="softwareCopyright" :label-width="route.query.id && formData.isSpecialFund?135:120">
<el-form-item label="软件著作权(项)" prop="softwareCopyright" :label-width="route.query.id && formData.isSpecialFund?160:120">
<el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="著作权(项)" prop="copyright" label-width="135">
<el-form-item label="著作权(项)" prop="copyright" label-width="160">
<el-input-number v-model="formData.copyright" placeholder="请输入著作权数量" :controls="false"/>
</el-form-item>
</el-col>