diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index 7dff89c..8c29333 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -16,25 +16,72 @@ - + {{ localFormData.inventionPatent }} - - - {{ localFormData.newPatent }} - - + {{ localFormData.softwareCopyright }} + + - - {{ localFormData.copyright }} + + {{ localFormData.softwareCopyright }} + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + {{ localFormData.other }} diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue index 258fa59..4599c17 100644 --- a/src/views/plan/detail.vue +++ b/src/views/plan/detail.vue @@ -114,11 +114,18 @@ diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index bac6601..b8c98a2 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -475,6 +475,7 @@ const formData = ref({ isSpecialFund: false, industryUniversityResearch: '1', governmentDeclaration: '1', + other: '无', resultForm: [] }) @@ -494,9 +495,9 @@ const rules = reactive({ 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']}], softwareCopyright: [{required: true, message: '请输入软件著作权数量', trigger: ['blur', 'change']}], - copyright: [{required: true, message: '请输入著作权数量', trigger: ['blur', 'change']}], + // copyright: [{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']}], diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue index 56ae005..9f863c8 100644 --- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue +++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue @@ -17,25 +17,71 @@ - + {{ localFormData.inventionPatent }} - - - {{ localFormData.newPatent }} - - + {{ localFormData.softwareCopyright }} + - - {{ localFormData.copyright }} + + {{ localFormData.softwareCopyright }} + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + + + + {{ localFormData.softwareCopyright }} + + + {{ localFormData.other }}