fix : 修复费用分摊复制功能、数字框默认值为null、项目归档显示是哪个流程的上传附件

This commit is contained in:
2024-06-14 13:04:37 +08:00
parent 6d56c4702b
commit f240016e44
11 changed files with 523 additions and 75 deletions

View File

@@ -1,7 +1,7 @@
<template>
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<baseTitle title="上传附件"></baseTitle>
<baseTitle :title="getName()+'-上传附件'"></baseTitle>
<el-card style="width: 100%;margin: 15px 0">
<file-upload @getFile="getFile" />
<fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
@@ -102,25 +102,21 @@ const getBaseInfo = async () => {
}
getBaseInfo()
const compositeParam = (item) => {
let tag=''
const getName=()=>{
switch (route.query.name) {
case '00':
tag='需求征集'
break
return '需求征集'
case '10':
tag='需求上报'
break
return '需求上报'
case '20':
tag='项目立项'
break
return '项目立项'
case '40':
tag='项目实施'
break
return '项目实施'
case '50':
tag='项目归档'
break
return '项目归档'
}
}
const compositeParam = (item) => {
return {
fileId: item.id,
size: item.size,
@@ -128,7 +124,7 @@ const compositeParam = (item) => {
fileType: item.fileType,
url: item.url,
newFile: true,
tag: tag,
tag: getName(),
}
}
const getFile = (val) => {

View File

@@ -13,8 +13,14 @@
@getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
:preview="name === 'Phase/edit'"/>
<div class="approval-record">
<baseTitle title="流程"></baseTitle>
<process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
<div style="display: flex;align-items: center;margin-bottom: 20px">
<baseTitle title="流程图"></baseTitle>
<el-switch
v-model="changeDiagram"
style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
/>
</div>
<process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
</div>
<div class="oper-page-btn">
<el-button color="#DED0B2" v-if="name==='Phase/change'" @click="handleSubmit">提交</el-button>
@@ -34,6 +40,7 @@ import {useTagsView} from '@/stores/tagsview.js'
import {computed, ref} from "vue";
import {getBaseInfoApi} from "@/components/steps/api";
const changeDiagram = ref(false)
const tagsViewStore = useTagsView()
const router = useRouter()
const route = useRoute()

View File

@@ -1,7 +1,7 @@
<template>
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<baseTitle title="标签名称"></baseTitle>
<baseTitle title="项目实施-上传附件"></baseTitle>
<el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">
<el-form-item label="标签名称" prop="tagName">
<el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px" v-if="showInput"/>
@@ -87,9 +87,10 @@ const tableConfig = reactive({
align: 'center'
},
{
prop: 'tag',
prop: 'size',
label: '文件大小',
align: 'center'
align: 'center',
currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
},
{
prop: 'oper',