diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 0ad225a..ec42aa4 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -56,7 +56,7 @@ - + + + - - - - + + + + - - - + + + + + + + @@ -257,7 +258,10 @@ const deploymentId = ref() const showTable = ref(true) const otherFileList = ref([]) const file = ref({}) -const formData = ref({}) +const formData = ref({ + industryUniversityResearch:0, + governmentDeclaration:0, +}) const rules = reactive({ projectName: [{required: true, message: '请输入名称', trigger: 'blur'}], specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}], @@ -339,43 +343,43 @@ const handleSubmit = async (instance) => { otherFileList.value.forEach(item => { otherFiles.push(getFileParam(item)) }) - let params = { - "specialFund": "2", - "projectName": "重新提交全流程测试2024520", - "startTime": "2024-05-24 00:00:00", - "endTime": "2024-05-29 00:00:00", - "projectType": "3", - "investmentType": "3", - "businessSegment": "2", - "technicalStandard": "2", - "governmentDeclaration": "2", - "inventionPatent": "3", - "newPatent": "3", - "economicEstimate": "3", - "other": "3", - "copyright": "3", - "softwareCopyright": "3", - "industryUniversityResearch": "2", - "intellectualProperty": "00", - "resultForm": "3", - "projectImpact": "3", - "rdSubject": "3", - // "affiliatedCompanyId": formData.value.affiliatedCompanyId, - "serviceDescription": "3", - "contentDescription": "3", - "specialFundAmount": "3", - deploymentId: deploymentId.value, - "singleFile": singleFile, - "fileList": otherFiles, - "requirementId":route.query.id - } // let params = { - // ...formData.value, + // "specialFund": "2", + // "projectName": "重新提交全流程测试2024520", + // "startTime": "2024-05-24 00:00:00", + // "endTime": "2024-05-29 00:00:00", + // "projectType": "3", + // "investmentType": "3", + // "businessSegment": "2", + // "technicalStandard": "2", + // "governmentDeclaration": 0, + // "inventionPatent": "3", + // "newPatent": "3", + // "economicEstimate": "3", + // "other": "3", + // "copyright": "3", + // "softwareCopyright": "3", + // "industryUniversityResearch": 0, + // "intellectualProperty": "00", + // "resultForm": "3", + // "projectImpact": "3", + // "rdSubject": "3", + // // "affiliatedCompanyId": formData.value.affiliatedCompanyId, + // "serviceDescription": "3", + // "contentDescription": "3", + // "specialFundAmount": "3", // deploymentId: deploymentId.value, - // fileList: otherFiles, - // singleFile: singleFile, - // requirementId: route.query.id + // "singleFile": singleFile, + // "fileList": otherFiles, + // "requirementId":route.query.id // } + let params = { + ...formData.value, + deploymentId: deploymentId.value, + fileList: otherFiles, + singleFile: singleFile, + requirementId: route.query.id + } let res = await requirementReported(params) ElNotification({ title: '提示', diff --git a/src/views/tool/dict/index.vue b/src/views/tool/dict/index.vue index 13f5831..554b479 100644 --- a/src/views/tool/dict/index.vue +++ b/src/views/tool/dict/index.vue @@ -385,7 +385,7 @@ const restDataForm = () => { state: "1", // isDefault:0, isType: true, - theme: 'dark', + theme: 'plain', listClass: 'primary', }; };