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

feat : 需求上报新增字段

Browse Source
This commit is contained in:
dj
2025-04-20 12:46:14 +08:00
parent fe3a15fcbd
commit 35c2e1d9b4
5 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/components/DetailComponent/SummaryDetail.vue
View File

@@ -16,8 +16,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="专利(项)" prop="inventionPatent">
<span>{{ localFormData.inventionPatent }}</span>
<el-form-item label="专利(项)" prop="newPatent">
<span>{{ localFormData.newPatent }}</span>
</el-form-item>
</el-col>
@@ -29,62 +29,62 @@
<el-col :span="6">
<el-form-item label="技术标准(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="技术标准(项)" prop="technicalNorms">
<span>{{ localFormData.technicalNorms }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="新产品(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="新产品(项)" prop="newProduct">
<span>{{ localFormData.newProduct }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="新工艺(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="新工艺(项)" prop="newProcess">
<span>{{ localFormData.newProcess }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="新装置(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="新装置(项)" prop="newDevice">
<span>{{ localFormData.newDevice }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="新材料(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="新材料(项)" prop="newMaterials">
<span>{{ localFormData.newMaterials }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="计算机软件(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="计算机软件(项)" prop="computerSoftware">
<span>{{ localFormData.computerSoftware }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="论文论著(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="论文论著(项)" prop="thesis">
<span>{{ localFormData.thesis }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="研究报告(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="研究报告(项)" prop="researchReport">
<span>{{ localFormData.researchReport }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="商标(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="商标(项)" prop="trademark">
<span>{{ localFormData.trademark }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="其他(项)" prop="other">
<span>{{ localFormData.other }}</span>
<span style="white-space: pre-wrap">{{ localFormData.other }}</span>
</el-form-item>
</el-col>
</el-row>

20
src/views/plan/detail.vue
View File

@@ -114,17 +114,17 @@
<el-table-column prop="prospectiveIntellectualProperty" label="预期知识产权" align="center" width="190">
<template #default="scope">
<div style="text-align: left">
专利（{{ scope.row.inventionPatent ? scope.row.inventionPatent : 0 }}）项，<br>
专利（{{ scope.row.newPatent ? scope.row.newPatent : 0 }}）项，<br>
软件著作权（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
技术标准（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
新产品（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
新工艺（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
新装置（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
新材料（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
计算机软件（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
论文论著（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
研究报告（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
商标（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
技术标准（{{ scope.row.technicalNorms ? scope.row.technicalNorms : 0 }}）项，<br>
新产品（{{ scope.row.newProduct ? scope.row.newProduct : 0 }}）项，<br>
新工艺（{{ scope.row.newProcess ? scope.row.newProcess : 0 }}）项，<br>
新装置（{{ scope.row.newDevice ? scope.row.newDevice : 0 }}）项，<br>
新材料（{{ scope.row.newMaterials ? scope.row.newMaterials : 0 }}）项，<br>
计算机软件（{{ scope.row.computerSoftware ? scope.row.computerSoftware : 0 }}）项，<br>
论文论著（{{ scope.row.thesis ? scope.row.thesis : 0 }}）项，<br>
研究报告（{{ scope.row.researchReport ? scope.row.researchReport : 0 }}）项，<br>
商标（{{ scope.row.trademark ? scope.row.trademark : 0 }}）项，<br>
其他 {{ scope.row.other ? scope.row.other : 0 }}
</div>
</template>

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

@@ -277,81 +277,70 @@
</el-form-item>
</el-col>
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'0':'-40px'}" >
<el-form-item label="专利(项)" prop="inventionPatent">
<el-input-number v-model="formData.inventionPatent" placeholder="请输入专利数量" :controls="false"
<el-form-item label="专利(项)" prop="newPatent">
<el-input-number v-model="formData.newPatent" placeholder="请输入专利数量" :controls="false"
@change="changeCollectData"/>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="新型专利(项)" prop="newPatent">-->
<!-- <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利数量" :controls="false"-->
<!-- @change="changeCollectData"-->
<!-- style="width: 100%"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'0'}">
<el-form-item label="软件著作权(项)" prop="softwareCopyright">
<el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权数量" :controls="false"
@change="changeCollectData"/>
</el-form-item>
</el-col>
<!-- <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'0'}">-->
<!-- <el-form-item label="著作权(项)" prop="copyright">-->
<!-- <el-input-number v-model="formData.copyright" placeholder="请输入著作权数量" :controls="false"-->
<!-- @change="changeCollectData"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'-40px'}">
<el-form-item label="技术标准(项)" prop="copyright">
<el-input-number v-model="formData.copyright" placeholder="请输入技术标准数量" :controls="false"
<el-form-item label="技术标准(项)" prop="technicalNorms">
<el-input-number v-model="formData.technicalNorms" placeholder="请输入技术标准数量" :controls="false"
@change="changeCollectData"/>
</el-form-item>
</el-col>
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'0':'0'}">
<el-form-item label="新产品(项)" prop="copyright">
<el-input-number v-model="formData.copyright" placeholder="请输入新产品数量" :controls="false"
<el-form-item label="新产品(项)" prop="newProduct">
<el-input-number v-model="formData.newProduct" placeholder="请输入新产品数量" :controls="false"
@change="changeCollectData"/>
</el-form-item>
</el-col>
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'0':'-40px'}">
<el-form-item label="新工艺(项)" prop="copyright">
<el-input-number v-model="formData.copyright" placeholder="请输入新工艺数量" :controls="false"
<el-form-item label="新工艺(项)" prop="newProcess">
<el-input-number v-model="formData.newProcess" placeholder="请输入新工艺数量" :controls="false"
@change="changeCollectData"/>
</el-form-item>
</el-col>
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'0'}">
<el-form-item label="新装置(项)" prop="copyright">
<el-input-number v-model="formData.copyright" placeholder="请输入新装置数量" :controls="false"
<el-form-item label="新装置(项)" prop="newDevice">
<el-input-number v-model="formData.newDevice" placeholder="请输入新装置数量" :controls="false"
@change="changeCollectData"/>
</el-form-item>
</el-col>
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'-40px'}">
<el-form-item label="新材料(项)" prop="copyright">
<el-input-number v-model="formData.copyright" placeholder="请输入新材料数量" :controls="false"
<el-form-item label="新材料(项)" prop="newMaterials">
<el-input-number v-model="formData.newMaterials" placeholder="请输入新材料数量" :controls="false"
@change="changeCollectData"/>
</el-form-item>
</el-col>
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'0':'0'}">
<el-form-item label="计算机软件(项)" prop="copyright">
<el-input-number v-model="formData.copyright" placeholder="请输入计算机软件数量" :controls="false"
<el-form-item label="计算机软件(项)" prop="computerSoftware">
<el-input-number v-model="formData.computerSoftware" placeholder="请输入计算机软件数量" :controls="false"
@change="changeCollectData"/>
</el-form-item>
</el-col>
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'0':'-40px'}">
<el-form-item label="论文论著(项)" prop="copyright">
<el-input-number v-model="formData.copyright" placeholder="请输入论文论著数量" :controls="false"
<el-form-item label="论文论著(项)" prop="thesis">
<el-input-number v-model="formData.thesis" placeholder="请输入论文论著数量" :controls="false"
@change="changeCollectData"/>
</el-form-item>
</el-col>
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'0'}">
<el-form-item label="研究报告(项)" prop="copyright">
<el-input-number v-model="formData.copyright" placeholder="请输入研究报告数量" :controls="false"
<el-form-item label="研究报告(项)" prop="researchReport">
<el-input-number v-model="formData.researchReport" placeholder="请输入研究报告数量" :controls="false"
@change="changeCollectData"/>
</el-form-item>
</el-col>
<el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'-40px'}">
<el-form-item label="商标(项)" prop="copyright">
<el-input-number v-model="formData.copyright" placeholder="请输入商标数量" :controls="false"
<el-form-item label="商标(项)" prop="trademark">
<el-input-number v-model="formData.trademark" placeholder="请输入商标数量" :controls="false"
@change="changeCollectData"/>
</el-form-item>
</el-col>
@@ -494,11 +483,22 @@ const rules = reactive({
industryUniversityResearch: [{required: true, message: '请选择产学研联合', trigger: ['blur', 'change']}],
governmentDeclaration: [{required: true, message: '请选择开展政府申报', trigger: ['blur', 'change']}],
intellectualProperty: [{required: true, message: '请选择知识产权归属', trigger: ['blur', 'change']}],
inventionPatent: [{required: true, message: '请输入发明专利数量', trigger: ['blur', 'change']}],
// newPatent: [{required: true, message: '请输入实用性新型专利数量', trigger: ['blur', 'change']}],
newPatent: [{required: true, message: '请输入专利数量', trigger: ['blur', 'change']}],
technicalNorms: [{required: true, message: '请输入技术标准数量', trigger: ['blur', 'change']}],
softwareCopyright: [{required: true, message: '请输入软件著作权数量', trigger: ['blur', 'change']}],
// copyright: [{required: true, message: '请输入著作权数量', trigger: ['blur', 'change']}],
other: [{required: true, message: '请输入其他数量', trigger: ['blur', 'change']}],
newProduct: [{required: true, message: '请输入新产品数量', trigger: ['blur', 'change']}],
newProcess: [{required: true, message: '请输入新工艺数量', trigger: ['blur', 'change']}],
newMaterials: [{required: true, message: '请输入新材料数量', trigger: ['blur', 'change']}],
newDevice: [{required: true, message: '请输入新装备数量', trigger: ['blur', 'change']}],
computerSoftware: [{required: true, message: '请输入计算机软件数量', trigger: ['blur', 'change']}],
thesis: [{required: true, message: '请输入论文论著数量', trigger: ['blur', 'change']}],
researchReport: [{required: true, message: '请输入研究报告数量', trigger: ['blur', 'change']}],
trademark: [{required: true, message: '请输入商标数量', trigger: ['blur', 'change']}],
other: [{required: true, message: '请输入其他项数量', trigger: ['blur', 'change']}],
economicEstimate: [{required: true, message: '请输入预估经费预算', trigger: ['blur', 'change']}],
isSpecialFund: [{required: true, message: '请选择是否为专项资金', trigger: ['blur', 'change']}],
isWithinBudget: [{required: true, message: '请选择是否在预算内', trigger: ['blur', 'change']}],
@@ -798,7 +798,7 @@ const handleResubmit = debounce((instance) => {
fileList: otherFiles,
requirementId: route.query.id ? route.query.id : formData.value.requirementId ? formData.value.requirementId : '-1'
}
// console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
console.log('重新提交params', params)
resubmitReported(params).then(res => {
ElNotification({
title: '提示',

2
src/views/project-management/mobledetail/StepsMoblie.vue
View File

@@ -279,7 +279,7 @@ const schema = computed(() => {
label: '实际经费预算',
prop: 'actualEconomicEstimate',
colProps: {
span: 6
span: 24
},
component: () => (
<div>

48
src/views/project-management/mobledetail/SummaryDetailMoblie.vue
View File

@@ -17,77 +17,77 @@
</el-col>
<el-col :span="24">
<el-form-item label="专利(项)" prop="inventionPatent">
<span>{{ localFormData.inventionPatent }}</span>
<el-form-item label="专利(项)" prop="newPatent">
<span>{{ localFormData.newPatent }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="软件著作权(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="技术标准(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="技术标准(项)" prop="technicalNorms">
<span>{{ localFormData.technicalNorms }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="新产品(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="新产品(项)" prop="newProduct">
<span>{{ localFormData.newProduct }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="新工艺(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="新工艺(项)" prop="newProcess">
<span>{{ localFormData.newProcess }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="新装置(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="新装置(项)" prop="newDevice">
<span>{{ localFormData.newDevice }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="新材料(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="新材料(项)" prop="newMaterials">
<span>{{ localFormData.newMaterials }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="计算机软件(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="计算机软件(项)" prop="computerSoftware">
<span>{{ localFormData.computerSoftware }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="论文论著(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="论文论著(项)" prop="thesis">
<span>{{ localFormData.thesis }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="研究报告(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="研究报告(项)" prop="researchReport">
<span>{{ localFormData.researchReport }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="商标(项)" prop="softwareCopyright">
<span>{{ localFormData.softwareCopyright }}</span>
<el-form-item label="商标(项)" prop="trademark">
<span>{{ localFormData.trademark }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="其他(项)" prop="other">
<span>{{ localFormData.other }}</span>
<span style="white-space: pre-wrap">{{ localFormData.other }}</span>
</el-form-item>
</el-col>
</el-row>
<baseTitle title="项目描述"></baseTitle>
<el-row gutter="20" style="margin-bottom: -18px;margin-left: 5px;">