diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue index 24b2a05..5057855 100644 --- a/src/components/steps/index.vue +++ b/src/components/steps/index.vue @@ -118,7 +118,7 @@ const schema = computed(() => { } }, { - label: '所属公司', + label: '征集公司', prop: 'affiliatedCompany', colProps: { span: 12 diff --git a/src/utils/matterTree.js b/src/utils/matterTree.js index 6698582..e3fb4ac 100644 --- a/src/utils/matterTree.js +++ b/src/utils/matterTree.js @@ -1,13 +1,13 @@ export const matterTree = (array,data, id) => { if (id) { - for (let i = 0; i < data.length; i++) { - if (data[i].value == id) { - array.push(data[i].label); + data.forEach(item => { + if (item.value == id) { + array.push(item.label); } - if (data[i].children && data[i].children.length > 0) { - matterTree(array,data[i].children,id) + if (item.children && item.children.length > 0) { + matterTree(array,item.children,id) } - } + }) return array; } } diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index 11ff89f..0c6f586 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -243,6 +243,7 @@ const showCompany = () => { } const selected = (select) => { + formData.value.companyIds=[] for (let val of select) { formData.value.companyIds.push(val.value) } @@ -368,7 +369,6 @@ const submitParam = (item) => { } } const handleSubmit = async (instance) => { - console.log('submitParam(formData.value)', submitParam(formData.value)) if (!instance) return instance.validate(async (valid) => { if (!valid) { @@ -415,16 +415,14 @@ const getCompanyOptionItem = (val) => { if (val !== undefined) { val.forEach(item => { matterTree(companyNameArray.value, companyOption.value, item) - companyNameArray.value.forEach(companyItem => { - newObj = { - label: companyItem, - value: item - } - newArray.push(newObj) - }) + }) + companyNameArray.value.forEach(companyItem => { + newObj = { + label: companyItem + } + newArray.push(newObj) }) } - return newArray; } const getDetailInfo = async () => { @@ -460,7 +458,7 @@ const handleDelete = (row) => { }) if (res.code === 1000) { formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1); - showTable.value = formData.value.fileList.length !== 0; + // showTable.value = formData.value.fileList.length !== 0; } }); } diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue index 4a68881..3ffd676 100644 --- a/src/views/project-demand/requirement/index.vue +++ b/src/views/project-demand/requirement/index.vue @@ -77,7 +77,7 @@ const tableConfig = reactive({ }, { prop: 'companyName', - label: '所属公司', + label: '征集公司', align: 'center', currentRender: ({row, index}) => (
{row.companyName}
) diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue index 8099ef4..73aea25 100644 --- a/src/views/project-management/filing/attachment.vue +++ b/src/views/project-management/filing/attachment.vue @@ -48,7 +48,7 @@ const schema = computed(() => { } }, { - label: '所属公司', + label: '征集公司', prop: 'affiliatedCompany', colProps: { span: 12 diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue index dcae27b..fad0044 100644 --- a/src/views/project-management/filing/index.vue +++ b/src/views/project-management/filing/index.vue @@ -144,7 +144,7 @@ const tableConfig = reactive({ }, { prop: 'affiliatedCompany', - label: '所属公司', + label: '征集公司', align: 'center' }, { diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue index 80198f4..e9a4163 100644 --- a/src/views/project-management/filing/upload.vue +++ b/src/views/project-management/filing/upload.vue @@ -54,7 +54,7 @@ const schema = computed(() => { } }, { - label: '所属公司', + label: '征集公司', prop: 'affiliatedCompany', colProps: { span: 12 diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue index 45bb082..b1b62a0 100644 --- a/src/views/project-management/implementation/attachment.vue +++ b/src/views/project-management/implementation/attachment.vue @@ -64,7 +64,7 @@ const schema = computed(() => { } }, { - label: '所属公司', + label: '征集公司', prop: 'affiliatedCompany', colProps: { span: 12 diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index 170a57d..3798475 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -147,7 +147,7 @@ const tableConfig = reactive({ }, { prop: 'affiliatedCompany', - label: '所属公司', + label: '征集公司', align: 'center' }, { diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue index e38b0e7..f71e6d6 100644 --- a/src/views/project-management/implementation/phase.vue +++ b/src/views/project-management/implementation/phase.vue @@ -83,7 +83,7 @@ const schema = computed(() => { } }, { - label: '所属公司', + label: '征集公司', prop: 'affiliatedCompany', colProps: { span: 12 diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue index 93bf09c..f4469f9 100644 --- a/src/views/project-management/implementation/phaseDetail.vue +++ b/src/views/project-management/implementation/phaseDetail.vue @@ -47,7 +47,7 @@ const schema = computed(() => { } }, { - label: '所属公司', + label: '征集公司', prop: 'affiliatedCompany', colProps: { span: 12 diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue index f8498e9..1215e8a 100644 --- a/src/views/project-management/implementation/share.vue +++ b/src/views/project-management/implementation/share.vue @@ -38,7 +38,7 @@ const schema = computed(() => { } }, { - label: '所属公司', + label: '征集公司', prop: 'affiliatedCompany', colProps: { span: 12 diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue index 262e2d1..ba3c132 100644 --- a/src/views/project-management/implementation/upload.vue +++ b/src/views/project-management/implementation/upload.vue @@ -38,6 +38,7 @@ import {useTagsView} from '@/stores/tagsview.js' import {uploadFileList} from "@/api/project-manage/attachment"; import {computed, ref} from "vue"; import {getBaseInfoApi} from "@/components/steps/api"; +import {downloadFile,deleteFile} from "@/api/project-demand"; const tagsViewStore = useTagsView() const route = useRoute() @@ -68,7 +69,7 @@ const schema = computed(() => { } }, { - label: '所属公司', + label: '征集公司', prop: 'affiliatedCompany', colProps: { span: 12 @@ -110,10 +111,14 @@ const tableConfig = reactive({ prop: 'oper', label: '操作', align: 'center', + showOverflowTooltip: false, currentRender: ({row, index}) => { return (
handleDownload(row)}>下载 + handleDelete(row)}/>
) } @@ -126,6 +131,28 @@ const name = ref(router.currentRoute.value.name) const rules = reactive({ tagName: [{required: true, message: '请输入标签名称', trigger: ['blur', 'change']}], }) +const handleDelete = (row) => { + deleteFile(row.fileId).then(res => { + ElNotification({ + title: '提示', + message: res.msg, + type: res.code === 1000 ? 'success' : 'error' + }) + if (res.code === 1000) { + fileList.value.splice(fileList.value.findIndex((item) => item.id === row.fileId), 1); + } + }); +} + +const handleDownload = (row) => { + downloadFile(row.fileId).then(res => { + const blob = new Blob([res]) + let a = document.createElement('a') + a.href = URL.createObjectURL(blob) + a.download = row.originalFileName + a.click() + }) +} const getBaseInfo = async () => { try { const {code, data} = await getBaseInfoApi(route.query.id) diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue index dff4c25..65f766c 100644 --- a/src/views/project-management/implementation/uploadFee.vue +++ b/src/views/project-management/implementation/uploadFee.vue @@ -117,7 +117,7 @@ const schema = computed(() => { } }, { - label: '所属公司', + label: '征集公司', prop: 'affiliatedCompany', colProps: { span: 12 diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue index 1593ab8..d238277 100644 --- a/src/views/project-management/initiation/index.vue +++ b/src/views/project-management/initiation/index.vue @@ -141,7 +141,7 @@ const tableConfig = reactive({ }, { prop: 'affiliatedCompany', - label: '所属公司', + label: '征集公司', align: 'center' }, { diff --git a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue index 41a3e89..95cbd3f 100644 --- a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue +++ b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue @@ -18,7 +18,7 @@ - + {{ getCompanyName(formData.companyIds) }} diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue index 61f119d..91cbdf3 100644 --- a/src/views/project-management/mobledetail/StepsMoblie.vue +++ b/src/views/project-management/mobledetail/StepsMoblie.vue @@ -119,7 +119,7 @@ const schema = computed(() => { } }, { - label: '所属公司', + label: '征集公司', prop: 'affiliatedCompany', colProps: { span: 24