fix : 修复页面细节

This commit is contained in:
2024-05-31 20:56:58 +08:00
parent 5a1e1848cb
commit 5ae8e4be78
32 changed files with 550 additions and 167 deletions

View File

@@ -29,13 +29,35 @@
/>
</el-config-provider>
</el-form-item>
<el-row>
<el-col :span="5">
<el-form-item label="是否专项资金" prop="isSpecialFund">
<el-radio-group v-model="formData.isSpecialFund" size="mini">
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-if="formData.isSpecialFund">
<el-form-item label="专项资金" prop="specialFund">
<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-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<baseTitle title="征集说明"></baseTitle>
<Tinymce v-if="showTinymce" image-url="/notice/file" file-url="/notice/file"
v-model:value="formData.collectExplain" height="300" />
v-model:value="formData.collectExplain" />
<baseTitle title="申请文件"></baseTitle>
<file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/>
<fvTable style="width: 100%;max-height: 200px" v-if="showTable"
<fvTable style="width: 100%;max-height: 650px;" v-if="showTable"
:tableConfig="tableConfig" :data="formData.fileList"
:isSettingCol="false" :pagination="false">
<template #empty>
@@ -74,6 +96,7 @@ import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
import {useRoute, useRouter} from 'vue-router'
import {getSubCompOpt} from '@/api/user/user.js'
import {useTagsView} from '@/stores/tagsview.js'
import {getFundOption} from "@/api/special-fund";
const tagsViewStore = useTagsView()
const authStore = useAuthStore()
@@ -87,7 +110,8 @@ const formData = ref({
collectType: '',
deadline: '',
collectExplain: '',
fileList: []
fileList: [],
isSpecialFund:false
})
const showTinymce = ref(true)
const routerName = ref(router.currentRoute.value.name)
@@ -99,6 +123,7 @@ const typeOption = ref([
}
])
const companyOption = ref([])
const specialFundOption = ref([])
const form = ref(null)
const fileList = ref([])
const loading = ref(false)
@@ -111,6 +136,7 @@ const rules = reactive({
companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}],
collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}],
deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}],
specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
})
const tableConfig = reactive({
@@ -178,8 +204,10 @@ const compositeParam = (item) => {
let tag = ''
if (!formData.value.collectType && routerName.value === 'Requirement/add') {
tag = '需求征集'
}else if(routerName.value === 'Requirement/edit'){
}else if(!formData.value.collectType &&routerName.value === 'Requirement/edit'){
tag = '需求征集'
}if (formData.value.collectType) {
tag = formData.value.collectType
}
return {
fileId: item.id,
@@ -205,6 +233,8 @@ const getFile = (val) => {
const init = async () => {
const res = await getSubCompOpt()
companyOption.value = res.data
const resFund = await getFundOption()
specialFundOption.value = resFund.data
getWorkflowInfo().then(res => {
ElNotification({
title: '提示',
@@ -247,7 +277,9 @@ const submitParam = (item) => {
requirementId: item.requirementId ? item.requirementId : 0,
requirementName: item.requirementName,
fileList: files,
deploymentId: processInstanceData.value.deploymentId
deploymentId: processInstanceData.value.deploymentId,
isSpecialFund:item.isSpecialFund,
specialFund:item.specialFund
}
}
const handleSubmit = async (instance) => {
@@ -334,7 +366,9 @@ onMounted(async () => {
:deep(.el-empty__description) {
margin-top: 0;
}
:deep(.el-table--fit ){
height: 400px;
}
.add-block {
//display: flex;
//justify-content: space-between;