From b497e2117d493edc3cef459e44ee16ef9a9b336d Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Mon, 12 Aug 2024 15:30:26 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=98=AF=E5=90=A6=E4=B8=93=E9=A1=B9=E8=B5=84?= =?UTF-8?q?=E9=87=91=20=E6=B8=85=E9=99=A4=E5=90=8E=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project-demand/summary/add.vue | 31 +++++++++++++++--------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index ad35794..a3a2144 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -355,8 +355,8 @@ const formData = ref({ }) const rules = reactive({ - projectName: [{required: true, message: '请输入项目名称', trigger: 'blur'}], - specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}], + projectName: [{required: true, message: '请输入项目名称', trigger: ['blur', 'change']}], + specialFundId: [{required: true, message: '请选择专项资金', trigger: ['blur', 'change']}], startTime: [{required: true, message: '请选择开始时间', trigger: ['blur', 'change']}], endTime: [{required: true, message: '请选择结束时间', trigger: ['blur', 'change']}], rdSubject: [{required: true, message: '请选择研发主体', trigger: ['blur', 'change']}], @@ -369,15 +369,16 @@ 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'}], - newPatent: [{required: true, message: '请输入实用性新型专利', trigger: 'blur'}], - softwareCopyright: [{required: true, message: '请输入软件著作权', trigger: 'blur'}], - copyright: [{required: true, message: '请输入著作权', trigger: 'blur'}], - other: [{required: true, message: '请输入其他', trigger: 'blur'}], - economicEstimate: [{required: true, message: '请输入经费预算', trigger: 'blur'}], - specialFundAmount: [{required: true, message: '请输入专项资金', trigger: 'blur'}], - serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: 'blur'}], - contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}] + inventionPatent: [{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']}], + other: [{required: true, message: '请输入其他', trigger: ['blur', 'change']}], + economicEstimate: [{required: true, message: '请输入经费预算', trigger: ['blur', 'change']}], + isSpecialFund: [{required: true, message: '请选择是否为专项资金', trigger: ['blur', 'change']}], + specialFundAmount: [{required: true, message: '请输入专项资金', trigger: ['blur', 'change']}], + serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: ['blur', 'change']}], + contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: ['blur', 'change']}] }) const handleShowOptionalChargeLeadershipPicker = () => { optionalChargeLeadershipPickerRef.value.showUserPicker() @@ -617,7 +618,13 @@ const init = async () => { const processInfo = () => { processStore.setDesign(null) processDiagramViewer.value = false - getProcessInfo(formData.value.isSpecialFund).then(res => { + let isSpecialFundParam=false + if(!formData.value.isSpecialFund){ + isSpecialFundParam=false + }else{ + isSpecialFundParam= formData.value.isSpecialFund + } + getProcessInfo(isSpecialFundParam).then(res => { if (res.code === 1000) { let data = res.data deploymentId.value = data.deploymentId