From 35c2e1d9b461ad48dbfd2cdeb32620fffe6fb997 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Sun, 20 Apr 2025 12:46:14 +0800 Subject: [PATCH] =?UTF-8?q?feat=20:=20=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailComponent/SummaryDetail.vue | 42 +++++----- src/views/plan/detail.vue | 20 ++--- src/views/project-demand/summary/add.vue | 76 +++++++++---------- .../mobledetail/StepsMoblie.vue | 2 +- .../mobledetail/SummaryDetailMoblie.vue | 48 ++++++------ 5 files changed, 94 insertions(+), 94 deletions(-) diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index 8c29333..d2084f2 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -16,8 +16,8 @@ - - {{ localFormData.inventionPatent }} + + {{ localFormData.newPatent }} @@ -29,62 +29,62 @@ - - {{ localFormData.softwareCopyright }} + + {{ localFormData.technicalNorms }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.newProduct }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.newProcess }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.newDevice }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.newMaterials }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.computerSoftware }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.thesis }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.researchReport }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.trademark }} - {{ localFormData.other }} + {{ localFormData.other }} diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue index 4599c17..81ac1fd 100644 --- a/src/views/plan/detail.vue +++ b/src/views/plan/detail.vue @@ -114,17 +114,17 @@ diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index b8c98a2..d6b2f94 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -277,81 +277,70 @@ - - + - - - - - - - + - - - - - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + @@ -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: '提示', diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue index 3f2f6f2..b347164 100644 --- a/src/views/project-management/mobledetail/StepsMoblie.vue +++ b/src/views/project-management/mobledetail/StepsMoblie.vue @@ -279,7 +279,7 @@ const schema = computed(() => { label: '实际经费预算', prop: 'actualEconomicEstimate', colProps: { - span: 6 + span: 24 }, component: () => (
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue index 9f863c8..73d3395 100644 --- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue +++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue @@ -17,77 +17,77 @@ - - {{ localFormData.inventionPatent }} + + {{ localFormData.newPatent }} - + {{ localFormData.softwareCopyright }} + - - {{ localFormData.softwareCopyright }} + + {{ localFormData.technicalNorms }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.newProduct }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.newProcess }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.newDevice }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.newMaterials }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.computerSoftware }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.thesis }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.researchReport }} - - {{ localFormData.softwareCopyright }} + + {{ localFormData.trademark }} - + - {{ localFormData.other }} + {{ localFormData.other }} -