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

fix : 修复细节

Browse Source
This commit is contained in:
odjbin
2024-06-02 19:42:33 +08:00
parent 9ad29c3a13
commit 6bb97b4a1d
11 changed files with 172 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,24 +8,25 @@
<el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="5">-->
<!-- <el-form-item label="是否专项资金" prop="isSpecialFund">-->
<!-- <el-radio-group v-model="formData.isSpecialFund" >-->
<!-- <el-radio :label="true">是</el-radio>-->
<!-- <el-radio :label="false">否</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="5">
<el-form-item label="是否专项资金" prop="isSpecialFund">
<el-radio-group v-model="formData.isSpecialFund">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="专项资金" prop="specialFund" v-if="formData.isSpecialFund">
<el-select v-model="formData.specialFund" placeholder="请选择专项资金" clearable filterable>
<el-option
v-for="item in specialFundOption"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<!-- <span>{{ getSpecialFundName(formData.specialFund) }}</span>-->
<el-select v-model="formData.specialFund" placeholder="请选择专项资金" clearable filterable>
<el-option
v-for="item in specialFundOption"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -33,8 +34,9 @@
<el-config-provider>
<el-date-picker
v-model="formData.startTime"
type="datetime"
type="date"
placeholder="开始时间"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
/>
@@ -46,10 +48,13 @@
<el-config-provider>
<el-date-picker
v-model="formData.endTime"
type="datetime"
type="date"
placeholder="结束时间"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
:disabled="!formData.startTime"
:disabled-date="disabledDate"
/>
</el-config-provider>
</el-form-item>
@@ -243,7 +248,7 @@
<script setup lang="jsx">
import {debounce} from 'lodash'
import {getDetail, getProcessInfo, requirementReported, resubmitReported} from "./api";
import {ElMessage, ElNotification} from "element-plus";
import {ElNotification} from "element-plus";
import {useTagsView} from '@/stores/tagsview.js'
import {useCacheStore} from '@/stores/cache.js'
import {useProcessStore} from '@/stores/processStore.js';
@@ -272,21 +277,22 @@ const formData = ref({
industryUniversityResearch: '0',
governmentDeclaration: '0',
})
const rules = reactive({
projectName: [{required: true, message: '请输入项目名称', trigger: 'blur'}],
specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
startTime: [{required: true, message: '请选择开始时间', trigger: 'blur'}],
rdSubject: [{required: true, message: '请输入研发主体', trigger: 'blur'}],
projectType: [{required: true, message: '请选择项目类型', trigger: 'blur'}],
endTime: [{required: true, message: '请选择结束时间', trigger: 'blur'}],
investmentType: [{required: true, message: '请选择出资类型', trigger: 'blur'}],
projectImpact: [{required: true, message: '请选择项目影响', trigger: 'blur'}],
businessSegment: [{required: true, message: '请选择所属业务板块', trigger: 'blur'}],
resultForm: [{required: true, message: '请选择预期成果形式', trigger: 'blur'}],
technicalStandard: [{required: true, message: '请选择预期技术标准制定', trigger: 'blur'}],
industryUniversityResearch: [{required: true, message: '请选择产学研联合', trigger: 'blur'}],
governmentDeclaration: [{required: true, message: '请选择开展政府申报', trigger: 'blur'}],
intellectualProperty: [{required: true, message: '请选择知识产权状况', trigger: 'blur'}],
startTime: [{required: true, message: '请选择开始时间', trigger: ['blur', 'change']}],
endTime: [{required: true, message: '请选择结束时间', trigger: ['blur', 'change']}],
rdSubject: [{required: true, message: '请选择研发主体', trigger: ['blur', 'change']}],
projectType: [{required: true, message: '请选择项目类型', trigger: ['blur', 'change']}],
investmentType: [{required: true, message: '请选择出资类型', trigger: ['blur', 'change']}],
projectImpact: [{required: true, message: '请选择项目影响', trigger: ['blur', 'change']}],
businessSegment: [{required: true, message: '请选择所属业务板块', trigger: ['blur', 'change']}],
resultForm: [{required: true, message: '请选择预期成果形式', trigger: ['blur', 'change']}],
technicalStandard: [{required: true, message: '请选择预期技术标准制定', trigger: ['blur', 'change']}],
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'}],
@@ -297,16 +303,33 @@ const rules = reactive({
serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: 'blur'}],
contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}]
})
const disabledDate = (time) => {
return time.getTime() < new Date(formData.value.startTime).getTime();
}
const getIsFund = async () => {
getFormInfo(route.query.id).then(res => {
if (!route.query.id) return;
loading.value = true
await getFormInfo(route.query.id).then(res => {
if (res.code === 1000) {
loading.value = false
formData.value.isSpecialFund = res.data.isSpecialFund
if(res.data.isSpecialFund){
if (res.data.isSpecialFund) {
formData.value.specialFund = Number(res.data.specialFund)
}
}
})
}
const getSpecialFundName = (val) => {
let label
specialFundOption.value.forEach(item => {
if (item.value == val) {
label = item.label
}
})
return label
}
const compositeParam = (item, type) => {
let tag = ''
if (name.value === 'Summary/add' || name.value === 'Summary/edit') {
@@ -346,7 +369,13 @@ const getFileParam = (item) => {
const handleSubmit = debounce(async (instance) => {
if (!instance) return
instance.validate(async (valid, fields) => {
if (!valid) return
if (!valid) {
return ElNotification({
title: '提示',
message: '请完善数据,再提交!',
type: 'error'
})
}
let singleFile = {}
if (file.value.fileId !== undefined) {
singleFile = {
@@ -388,12 +417,13 @@ const handleSubmit = debounce(async (instance) => {
// }
let params = {
...formData.value,
isSpecialFund:false,
isSpecialFund: formData.value.isSpecialFund ? formData.value.isSpecialFund : false,
deploymentId: deploymentId.value,
fileList: otherFiles,
singleFile: singleFile,
requirementId: route.query.id
requirementId: route.query.id ? route.query.id : '-1'
}
console.log('params', params)
if (JSON.stringify(singleFile) === "{}") {
attachment.value.validate()
ElNotification({
@@ -402,10 +432,9 @@ const handleSubmit = debounce(async (instance) => {
type: 'error'
})
return;
}else {
} else {
attachment.value.clearValidate()
}
console.log('params', params)
let res = await requirementReported(params)
ElNotification({
title: '提示',
@@ -446,7 +475,7 @@ const handleResubmit = debounce(() => {
deploymentId: deploymentId.value,
fileList: otherFiles,
singleFile: singleFile,
requirementId: route.query.id
requirementId: route.query.id ? route.query.id : '-1'
}
if (JSON.stringify(singleFile) === "{}") {
attachment.value.validate()
@@ -456,7 +485,7 @@ const handleResubmit = debounce(() => {
type: 'error'
})
return;
}else {
} else {
attachment.value.clearValidate()
}
console.log('重新提交params', params)