From bc27a83848d558091f84e4505c6b0b304fcd07e1 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 1 Jun 2024 19:05:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BA=94=E4=B8=AA=E9=99=84=E4=BB=B6=E4=B8=8A?=
=?UTF-8?q?=E4=BC=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../project-demand/requirement/upload.vue | 42 +++++++-----------
src/views/project-demand/summary/upload.vue | 42 +++++++-----------
.../project-management/filing/attachment.vue | 22 +++++++---
.../project-management/filing/upload.vue | 43 +++++++------------
.../implementation/upload.vue | 21 ++++++---
.../project-management/initiation/upload.vue | 43 +++++++------------
6 files changed, 91 insertions(+), 122 deletions(-)
diff --git a/src/views/project-demand/requirement/upload.vue b/src/views/project-demand/requirement/upload.vue
index ca3f0ae..c19ab91 100644
--- a/src/views/project-demand/requirement/upload.vue
+++ b/src/views/project-demand/requirement/upload.vue
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -16,7 +16,7 @@
- 提交
+ 提交
@@ -29,7 +29,6 @@ const tagsViewStore = useTagsView()
const route = useRoute()
const router = useRouter()
const fileList = ref([])
-const tagsOption = ref([])
const formData = ref({
tagName:''
})
@@ -53,7 +52,7 @@ const tableConfig = reactive({
align: 'center'
},
{
- prop: 'tag',
+ prop: 'size',
label: '文件大小',
align: 'center'
},
@@ -72,28 +71,21 @@ const tableConfig = reactive({
]
})
const showTable = ref(true)
-const tagForm = ref()
const name = ref(router.currentRoute.value.name)
const rules = reactive({
tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
})
const compositeParam = (item) => {
- tagsOption.value.forEach(item => {
- if (item.value == formData.value.tagName) {
- formData.value.tagName = item.label
- }
- })
return {
fileId: item.id,
size: item.size,
originalFileName: item.originalFilename,
fileType: item.fileType,
url: item.url,
- tag: formData.value.tagName,
+ tag:'需求征集'
}
}
const getFile = (val) => {
- console.log('上传文件', val)
showTable.value = false
let fileObj = compositeParam(val)
fileList.value.push(fileObj)
@@ -103,21 +95,18 @@ const getFile = (val) => {
}
const getFileParam = (item) => {
return {
- fileId: item.fileId
+ fileId: item.fileId,
+ tag:item.tag
}
}
-const handleSubmit = async (instance) => {
- if (!instance) return
- instance.validate(async (valid) => {
- if (!valid) return
+const handleSubmit = async () => {
let files = []
fileList.value.forEach(item => {
files.push(getFileParam(item))
})
let params = {
- fileList: files,
+ mosrUserFileDtoList: files,
projectId: route.query.id,
- tag: formData.value.tagName
}
console.log('params', params)
let res = await uploadRequirementAttachment(params)
@@ -135,7 +124,6 @@ const handleSubmit = async (instance) => {
}
})
}
- })
}
diff --git a/src/views/project-demand/summary/upload.vue b/src/views/project-demand/summary/upload.vue
index b6cdd2b..82cfdee 100644
--- a/src/views/project-demand/summary/upload.vue
+++ b/src/views/project-demand/summary/upload.vue
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -16,7 +16,7 @@
- 提交
+ 提交
@@ -29,7 +29,6 @@ const tagsViewStore = useTagsView()
const route = useRoute()
const router = useRouter()
const fileList = ref([])
-const tagsOption = ref([])
const formData = ref({
tagName:''
})
@@ -53,7 +52,7 @@ const tableConfig = reactive({
align: 'center'
},
{
- prop: 'tag',
+ prop: 'size',
label: '文件大小',
align: 'center'
},
@@ -72,28 +71,21 @@ const tableConfig = reactive({
]
})
const showTable = ref(true)
-const tagForm = ref()
const name = ref(router.currentRoute.value.name)
const rules = reactive({
tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
})
const compositeParam = (item) => {
- tagsOption.value.forEach(item => {
- if (item.value == formData.value.tagName) {
- formData.value.tagName = item.label
- }
- })
return {
fileId: item.id,
size: item.size,
originalFileName: item.originalFilename,
fileType: item.fileType,
url: item.url,
- tag: formData.value.tagName,
+ tag:'需求上报',
}
}
const getFile = (val) => {
- console.log('上传文件', val)
showTable.value = false
let fileObj = compositeParam(val)
fileList.value.push(fileObj)
@@ -103,21 +95,18 @@ const getFile = (val) => {
}
const getFileParam = (item) => {
return {
- fileId: item.fileId
+ fileId: item.fileId,
+ tag:item.tag
}
}
-const handleSubmit = async (instance) => {
- if (!instance) return
- instance.validate(async (valid) => {
- if (!valid) return
+const handleSubmit = async () => {
let files = []
fileList.value.forEach(item => {
files.push(getFileParam(item))
})
let params = {
- fileList: files,
+ mosrUserFileDtoList: files,
projectId: route.query.id,
- tag: formData.value.tagName
}
console.log('params', params)
let res = await uploadCollectAttachment(params)
@@ -135,7 +124,6 @@ const handleSubmit = async (instance) => {
}
})
}
- })
}
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index 1d03c38..7653e0d 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -127,12 +127,22 @@ const changeFileList = (res) => {
}
}
const upload = () => {
- router.push({
- name: switchUpload(activeName.value),
- query: {
- id: route.query.id
- }
- })
+ if(activeName.value==='3'){
+ router.push({
+ name: 'Implementation/upload',
+ query: {
+ id: route.query.id,
+ type:'3'
+ }
+ })
+ }else {
+ router.push({
+ name: switchUpload(activeName.value),
+ query: {
+ id: route.query.id
+ }
+ })
+ }
}
const switchUpload=(index)=>{
switch (index) {
diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue
index c42d020..ca6a791 100644
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -16,7 +16,7 @@
- 提交
+ 提交
@@ -29,7 +29,6 @@ const tagsViewStore = useTagsView()
const route = useRoute()
const router = useRouter()
const fileList = ref([])
-const tagsOption = ref([])
const formData = ref({
tagName:''
})
@@ -53,7 +52,7 @@ const tableConfig = reactive({
align: 'center'
},
{
- prop: 'tag',
+ prop: 'size',
label: '文件大小',
align: 'center'
},
@@ -72,28 +71,21 @@ const tableConfig = reactive({
]
})
const showTable = ref(true)
-const tagForm = ref()
const name = ref(router.currentRoute.value.name)
const rules = reactive({
tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
})
const compositeParam = (item) => {
- tagsOption.value.forEach(item => {
- if (item.value == formData.value.tagName) {
- formData.value.tagName = item.label
- }
- })
return {
fileId: item.id,
size: item.size,
originalFileName: item.originalFilename,
fileType: item.fileType,
url: item.url,
- tag: formData.value.tagName,
+ tag: '项目归档',
}
}
const getFile = (val) => {
- console.log('上传文件', val)
showTable.value = false
let fileObj = compositeParam(val)
fileList.value.push(fileObj)
@@ -103,23 +95,19 @@ const getFile = (val) => {
}
const getFileParam = (item) => {
return {
- fileId: item.fileId
+ fileId: item.fileId,
+ tag:item.tag
}
}
-const handleSubmit = async (instance) => {
- if (!instance) return
- instance.validate(async (valid) => {
- if (!valid) return
+const handleSubmit = async () => {
let files = []
fileList.value.forEach(item => {
files.push(getFileParam(item))
})
let params = {
- fileList: files,
+ mosrUserFileDtoList: files,
projectId: route.query.id,
- tag: formData.value.tagName
}
- console.log('params', params)
let res = await uploadFilingAttachment(params)
ElNotification({
title: '提示',
@@ -135,7 +123,6 @@ const handleSubmit = async (instance) => {
}
})
}
- })
}
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index 179b922..3e91923 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -160,12 +160,21 @@ const handleSubmit = async (instance) => {
})
if (res.code === 1000) {
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
- await router.push({
- name: 'Implementation/attachment',
- query:{
- id: route.query.id
- }
- })
+ if(route.query.type=='3'){
+ await router.push({
+ name: 'Filing/attachment',
+ query:{
+ id: route.query.id
+ }
+ })
+ }else {
+ await router.push({
+ name: 'Implementation/attachment',
+ query:{
+ id: route.query.id
+ }
+ })
+ }
}
})
}
diff --git a/src/views/project-management/initiation/upload.vue b/src/views/project-management/initiation/upload.vue
index 02c7da2..bc765ed 100644
--- a/src/views/project-management/initiation/upload.vue
+++ b/src/views/project-management/initiation/upload.vue
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -16,7 +16,7 @@
- 提交
+ 提交
@@ -29,7 +29,6 @@ const tagsViewStore = useTagsView()
const route = useRoute()
const router = useRouter()
const fileList = ref([])
-const tagsOption = ref([])
const formData = ref({
tagName:''
})
@@ -53,7 +52,7 @@ const tableConfig = reactive({
align: 'center'
},
{
- prop: 'tag',
+ prop: 'size',
label: '文件大小',
align: 'center'
},
@@ -72,28 +71,21 @@ const tableConfig = reactive({
]
})
const showTable = ref(true)
-const tagForm = ref()
const name = ref(router.currentRoute.value.name)
const rules = reactive({
tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
})
const compositeParam = (item) => {
- tagsOption.value.forEach(item => {
- if (item.value == formData.value.tagName) {
- formData.value.tagName = item.label
- }
- })
return {
fileId: item.id,
size: item.size,
originalFileName: item.originalFilename,
fileType: item.fileType,
url: item.url,
- tag: formData.value.tagName,
+ tag: '项目立项',
}
}
const getFile = (val) => {
- console.log('上传文件', val)
showTable.value = false
let fileObj = compositeParam(val)
fileList.value.push(fileObj)
@@ -103,23 +95,19 @@ const getFile = (val) => {
}
const getFileParam = (item) => {
return {
- fileId: item.fileId
+ fileId: item.fileId,
+ tag:item.tag
}
}
-const handleSubmit = async (instance) => {
- if (!instance) return
- instance.validate(async (valid) => {
- if (!valid) return
+const handleSubmit = async () => {
let files = []
fileList.value.forEach(item => {
files.push(getFileParam(item))
})
let params = {
- fileList: files,
+ mosrUserFileDtoList: files,
projectId: route.query.id,
- tag: formData.value.tagName
}
- console.log('params', params)
let res = await uploadInitiationAttachment(params)
ElNotification({
title: '提示',
@@ -135,7 +123,6 @@ const handleSubmit = async (instance) => {
}
})
}
- })
}