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

Merge pull request 'master' (#697) from master into prod

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/697
This commit is contained in:
odjbin
2024-08-12 07:30:49 +00:00
parent 04d62635f8 1bdb1e6739
commit 8408697b57
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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