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-01 22:16:30 +08:00
parent ff668b1887
commit 2f42a7464a
22 changed files with 291 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,14 +2,14 @@
<div class="detail-block" v-loading="loading">
<baseTitle title="需求上报"></baseTitle>
<el-form :model="formData" ref="summaryForm" :rules="rules">
<el-row gutter="15">
<el-col :span="8">
<el-form-item label="项目名称" prop="projectName" label-width="125">
<el-row gutter="14">
<el-col :span="6">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开始时间" prop="startTime" label-width="145">
<el-col :span="6">
<el-form-item label="开始时间" prop="startTime">
<el-config-provider>
<el-date-picker
v-model="formData.startTime"
@@ -22,9 +22,9 @@
</el-config-provider>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="结束时间" prop="endTime"
:title="!formData.startTime?'请先选择开始时间!':''" label-width="135">
:title="!formData.startTime?'请先选择开始时间!':''">
<el-config-provider>
<el-date-picker
v-model="formData.endTime"
@@ -39,8 +39,8 @@
</el-config-provider>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="项目类型" prop="projectType" label-width="125">
<el-col :span="6">
<el-form-item label="项目类型" prop="projectType">
<el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable>
<el-option
v-for="item in cacheStore.getDict('project_type')"
@@ -51,8 +51,8 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="研发主体" prop="rdSubject" label-width="145">
<el-col :span="6">
<el-form-item label="研发主体" prop="rdSubject">
<el-select v-model="formData.rdSubject" placeholder="请选择研发主体" clearable filterable>
<el-option
v-for="item in cacheStore.getDict('rd_subject')"
@@ -63,8 +63,8 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出资类型" prop="investmentType" label-width="135">
<el-col :span="6">
<el-form-item label="出资类型" prop="investmentType">
<el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
<el-option
v-for="item in cacheStore.getDict('invest_type')"
@@ -87,8 +87,8 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item label="所属业务板块" prop="businessSegment" label-width="125">
<el-col :span="6">
<el-form-item label="业务板块" prop="businessSegment">
<el-select v-model="formData.businessSegment" placeholder="请选择所属业务板块" clearable filterable>
<el-option
v-for="item in cacheStore.getDict('business_segment')"
@@ -99,8 +99,8 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="预期技术标准制定" prop="technicalStandard" label-width="145">
<el-col :span="6">
<el-form-item label="技术标准" prop="technicalStandard">
<el-select v-model="formData.technicalStandard" placeholder="请选择预期技术标准制定" clearable filterable>
<el-option
v-for="item in cacheStore.getDict('technical_standard')"
@@ -113,8 +113,8 @@
</el-col>
<!-- <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?!route.query.id?6:8:6">-->
<el-col :span="8">
<el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="135">
<el-col :span="6">
<el-form-item label="产学研联合" prop="industryUniversityResearch">
<el-radio-group v-model="formData.industryUniversityResearch">
<el-radio v-for="item in cacheStore.getDict('industry_university')"
:key="item.value"
@@ -124,10 +124,10 @@
</el-form-item>
</el-col>
<!-- <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?route.query.id?8:6:6">-->
</el-row>
<el-row gutter="15">
<el-col :span="8">
<el-form-item label="开展政府申报" prop="governmentDeclaration" label-width="125">
<!-- </el-row>-->
<!-- <el-row gutter="10">-->
<el-col :span="6">
<el-form-item label="开展政府申报" prop="governmentDeclaration">
<!-- :label-width="route.query.id && formData.isSpecialFund?145:!formData.isSpecialFund?145:145">-->
<el-radio-group v-model="formData.governmentDeclaration">
<el-radio v-for="item in cacheStore.getDict('government_declaration')"
@@ -138,22 +138,21 @@
</el-form-item>
</el-col>
<!-- <el-col :span="!route.query.id && formData.isSpecialFund?4:!route.query.id?12:12" v-if="!route.query.id">-->
<el-col :span="8" v-if="!route.query.id">
<el-form-item label="是否专项资金" prop="isSpecialFund" label-width="145">
<el-col :span="6" v-if="!route.query.id">
<el-form-item label="是否专项资金" prop="isSpecialFund" required>
<el-radio-group v-model="formData.isSpecialFund" @change="specialFundChange">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" v-if="route.query.id && formData.isSpecialFund">
<el-form-item label="专项资金名称" prop="specialFundId"
:label-width="route.query.id && formData.isSpecialFund?145:''">
<el-col :span="6" v-if="route.query.id && formData.isSpecialFund">
<el-form-item label="专项资金名称" prop="specialFundId">
<span>{{ formData.specialFund }}</span>
</el-form-item>
</el-col>
<el-col :span="8" v-if="!route.query.id && formData.isSpecialFund">
<el-form-item label="专项资金名称" prop="specialFundId" label-width="135">
<el-col :span="6" v-if="!route.query.id && formData.isSpecialFund">
<el-form-item label="专项资金" prop="specialFundId">
<el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
<el-option
v-for="item in specialFundOption"
@@ -164,10 +163,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" style="margin-bottom: -18px">
</el-row>
<el-row gutter="14">
<el-col :span="6" style="margin-bottom: -18px">
<!-- :label-width="!formData.isSpecialFund?!route.query.id?125:125:125">-->
<el-form-item label="知识产权状况" prop="intellectualProperty"
:label-width="route.query.id && formData.isSpecialFund?135:formData.isSpecialFund?125:route.query.id?145:135">
<el-form-item label="知识产权状况" prop="intellectualProperty">
<el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
<el-option
v-for="item in cacheStore.getDict('intellectual_property')"
@@ -178,10 +178,8 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="route.query.id && formData.isSpecialFund?24:formData.isSpecialFund?16:24"
style="margin-bottom: -18px">
<el-form-item label="预期成果形式" prop="resultForm"
:label-width="route.query.id && formData.isSpecialFund?125:formData.isSpecialFund?145:125">
<el-col :span="12" style="margin-bottom: -18px">
<el-form-item label="成果形式" prop="resultForm">
<el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable multiple>
<el-option
v-for="item in cacheStore.getDict('result_form')"
@@ -192,62 +190,62 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row gutter="15">
<el-row gutter="14">
<el-col :span="24">
<baseTitle title="预期知识产权"></baseTitle>
</el-col>
<el-col :span="8">
<el-form-item label="发明专利(项)" prop="inventionPatent" label-width="125">
<el-col :span="6">
<el-form-item label="发明专利(项)" prop="inventionPatent" label-width="105">
<el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实用性新型专利(项)" prop="newPatent" label-width="145">
<el-col :span="6">
<el-form-item label="新型专利(项)" prop="newPatent">
<el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="软件著作权(项)" prop="softwareCopyright" label-width="135">
<el-col :span="6">
<el-form-item label="软件著作权(项)" prop="softwareCopyright">
<el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="著作权(项)" prop="copyright" label-width="125">
<el-col :span="6">
<el-form-item label="著作权(项)" prop="copyright">
<el-input-number v-model="formData.copyright" placeholder="请输入著作权数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="其他(项)" prop="other" label-width="145">
<el-col :span="6">
<el-form-item label="其他(项)" prop="other" label-width="105">
<el-input-number v-model="formData.other" placeholder="请输入其他数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="经济预算(元)" prop="economicEstimate" label-width="135">
<el-col :span="6">
<el-form-item label="经济预算(元)" prop="economicEstimate">
<el-input-number v-model="formData.economicEstimate" placeholder="请输入经济预算数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="16" v-if="formData.isSpecialFund">
<el-col :span="12" v-if="formData.isSpecialFund">
<el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
<el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="现有业务描述" prop="serviceDescription" label-width="125">
</el-row>
<el-row gutter="14">
<el-col :span="12">
<el-form-item label="现有业务描述" prop="serviceDescription">
<el-input v-model="formData.serviceDescription" placeholder="请输入现有业务描述" rows="4" type="textarea"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="研发项目关键内容描述" prop="contentDescription" label-width="125">
<el-col :span="12">
<el-form-item label="研发项目关键内容描述" prop="contentDescription">
<el-input v-model="formData.contentDescription" placeholder="请输入研发项目关键内容描述" rows="4" type="textarea"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="分管领导"
label-width="125">
<el-form-item label="分管领导" label-width="120">
<el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
{{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }}
</el-button>
@@ -461,7 +459,7 @@ const handleSubmit = debounce(async (instance) => {
otherFileList.value.forEach(item => {
otherFiles.push(getFileParam(item))
})
formData.value.optionalChargeLeadership=optionalChargeLeadershipList.value
formData.value.optionalChargeLeadership = optionalChargeLeadershipList.value
if (formData.value.singleFile !== undefined) {
formData.value.singleFile = getFileParam(formData.value.singleFile)
}
@@ -515,7 +513,7 @@ const handleResubmit = debounce((instance) => {
otherFiles.push(getFileParam(item))
})
}
formData.value.optionalChargeLeadership=optionalChargeLeadershipList.value
formData.value.optionalChargeLeadership = optionalChargeLeadershipList.value
if (formData.value.isSpecialFund && formData.value.specialFund === null) {
formData.value.specialFund = getFundName(formData.value.specialFundId)
}

2
src/views/project-demand/summary/detail.vue
View File

@@ -19,7 +19,7 @@
v-model:value="auditOpinion"/>
</template>
</steps>
<opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"
<opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId" :taskUserOptionList="summaryData.taskUserOptionList"
v-model:value="auditOpinion"></opinion>
</template>