fix : 修复页面细节

This commit is contained in:
2024-05-23 17:52:48 +08:00
parent 7e70c9271f
commit 31a12e566a
2 changed files with 24 additions and 26 deletions

View File

@@ -48,14 +48,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属公司" prop="affiliatedCompanyId"> <el-form-item label="所属公司" prop="affiliatedCompanyId">
<el-select v-model="formData.affiliatedCompanyId" placeholder="请选择所属公司" clearable filterable> <el-tree-select v-model="formData.affiliatedCompanyId" :data="companyOption" style="width: 100%;"
<el-option filterable clearable :check-strictly="true" multiple/>
v-for="item in companyOption"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -221,7 +215,8 @@
</el-form> </el-form>
<AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList" <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
@getAttachment="getAttachment" @getAttachment="getAttachment"
@getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Summary/edit'"/> @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
:preview="name === 'Summary/edit'"/>
<!-- <fvForm :schema="schame" @getInstance="getInstance"></fvForm>--> <!-- <fvForm :schema="schame" @getInstance="getInstance"></fvForm>-->
<div class="approval-record"> <div class="approval-record">
<baseTitle title="流程"></baseTitle> <baseTitle title="流程"></baseTitle>
@@ -246,12 +241,13 @@ import {useCacheStore} from '@/stores/cache.js'
import {useProcessStore} from '@/stores/processStore.js'; import {useProcessStore} from '@/stores/processStore.js';
import {getSubCompOpt} from "@/api/user/user"; import {getSubCompOpt} from "@/api/user/user";
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'; import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
const cacheStore = useCacheStore() const cacheStore = useCacheStore()
const processStore = useProcessStore() const processStore = useProcessStore()
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
const attachment = ref() const attachment = ref()
const name=ref(router.currentRoute.value.name) const name = ref(router.currentRoute.value.name)
const loading = ref(false) const loading = ref(false)
const processDiagramViewer = ref(false) const processDiagramViewer = ref(false)
const tagsViewStore = useTagsView() const tagsViewStore = useTagsView()
@@ -290,7 +286,7 @@ const rules = reactive({
}) })
const compositeParam = (item, type) => { const compositeParam = (item, type) => {
let tag = '' let tag = ''
if ( name.value=== 'Summary/add'||name.value === 'Summary/edit') { if (name.value === 'Summary/add' || name.value === 'Summary/edit') {
tag = '需求上报' tag = '需求上报'
} }
return { return {
@@ -302,8 +298,8 @@ const compositeParam = (item, type) => {
tag: tag tag: tag
} }
} }
const getEditOtherFile=(val)=>{ const getEditOtherFile = (val) => {
console.log('getEditOtherFile',val) console.log('getEditOtherFile', val)
} }
const getAttachment = (val) => { const getAttachment = (val) => {
console.log('上传文件getAttachment', val) console.log('上传文件getAttachment', val)
@@ -369,13 +365,15 @@ const handleSubmit = async (instance) => {
"specialFundAmount": "3", "specialFundAmount": "3",
deploymentId: deploymentId.value, deploymentId: deploymentId.value,
"singleFile": singleFile, "singleFile": singleFile,
"files": otherFiles, "fileList": otherFiles,
"requirementId":route.query.id "requirementId":route.query.id
} }
// ...formData.value, // let params = {
// ...formData.value,
// deploymentId: deploymentId.value, // deploymentId: deploymentId.value,
// fileList: files, // fileList: otherFiles,
// requirementId:102 // singleFile: singleFile,
// requirementId: route.query.id
// } // }
let res = await requirementReported(params) let res = await requirementReported(params)
ElNotification({ ElNotification({
@@ -395,31 +393,31 @@ const handleResubmit = () => {
let singleFile = {} let singleFile = {}
let otherFiles = [] let otherFiles = []
let fileArray let fileArray
if(name.value === 'Summary/edit'){ if (name.value === 'Summary/edit') {
singleFile = { singleFile = {
fileId: attachment.value.singleFile.fileId fileId: attachment.value.singleFile.fileId
} }
fileArray=attachment.value.allFileList fileArray = attachment.value.allFileList
}else { } else {
if (file.value.fileId !== undefined) { if (file.value.fileId !== undefined) {
singleFile = { singleFile = {
fileId: file.value.fileId fileId: file.value.fileId
} }
} }
fileArray=otherFileList.value fileArray = otherFileList.value
} }
fileArray.forEach(item => { fileArray.forEach(item => {
otherFiles.push(getFileParam(item)) otherFiles.push(getFileParam(item))
}) })
//todo requirementId //todo requirementId
let params={ let params = {
...formData.value, ...formData.value,
deploymentId: deploymentId.value, deploymentId: deploymentId.value,
fileList: otherFiles, fileList: otherFiles,
singleFile: singleFile, singleFile: singleFile,
requirementId: route.query.id requirementId: route.query.id
} }
console.log('重新提交params',params) console.log('重新提交params', params)
resubmitReported(params).then(res => { resubmitReported(params).then(res => {
ElNotification({ ElNotification({
title: '提示', title: '提示',
@@ -443,7 +441,7 @@ const getDetailInfo = async () => {
}) })
if (res.code === 1000) { if (res.code === 1000) {
formData.value = res.data.formData formData.value = res.data.formData
loading.value=false loading.value = false
} }
}) })
} }
@@ -474,7 +472,7 @@ const init = async () => {
onMounted(async () => { onMounted(async () => {
await init() await init()
if (route.query.projectId) { if (route.query.projectId) {
loading.value=true loading.value = true
await getDetailInfo() await getDetailInfo()
} }
}) })

View File

@@ -13,7 +13,7 @@ export const fileUp = (url, data) => {
export const requirementReported = (data) => { export const requirementReported = (data) => {
return request({ return request({
url: '/workflow/mosr/requirement/collect/reported', url: '/workflow/mosr/requirement/reported',
method: "post", method: "post",
data: data data: data
}); });