diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue index b4345020..758d893c 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue @@ -207,7 +207,7 @@ 上传 @@ -403,6 +403,7 @@ const userList = ref([]) // 用户列表 const uploadUrl = ref(import.meta.env.VITE_UPLOAD_BATCH_URL) const matUploadRef = ref(); const matUploadFiles = ref([]); +const matUploadData = ref({ businessType: 'STORAGE', businessId: formData.value.id, businessFileType: 'MATERIAL' }) const matUploadChange = (file, files) => { matUploadFiles.value = files; refreshAttachments(files, 'MATERIAL') @@ -417,7 +418,7 @@ const refreshAttachments = (files, type) => { } // 排序 formData.value.attachments.sort((v1, v2) => { - return v1.businessFileType == v2.businessFileType ? 0 : 1; + return (v1.createTime - v2.createTime) > 0 }) } // 删除附件 @@ -480,7 +481,7 @@ const submitForm = async () => { await StorageMatApi.createStorageMatBatch(dataMats, storageid.value) //附件信息保存 - matUploadFiles.value = { 'businessType': 'STORAGE', 'businessId': storageid, 'businessFileType': '' } + matUploadData.value.businessId = storageid matUploadRef.value!.submit() message.success(t(commonResult)) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue index 684d3d95..0bc8d180 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue @@ -189,7 +189,7 @@ 上传 @@ -385,6 +385,7 @@ const userList = ref([]) // 用户列表 const uploadUrl = ref(import.meta.env.VITE_UPLOAD_BATCH_URL) const matUploadRef = ref(); const matUploadFiles = ref([]); +const matUploadData = ref({ businessType: 'STORAGE', businessId: formData.value.id, businessFileType: 'MATERIAL' }) const matUploadChange = (file, files) => { matUploadFiles.value = files; refreshAttachments(files, 'MATERIAL') @@ -397,9 +398,9 @@ const refreshAttachments = (files, type) => { file.createTime = new Date(); formData.value.attachments.push(file); } - // 排序 - formData.value.attachments.sort((v1, v2) => { - return v1.businessFileType == v2.businessFileType ? 0 : 1; + // 排序 + formData.value.attachments.sort((v1, v2) => { + return (v1.createTime - v2.createTime) > 0 }) } // 删除附件 @@ -479,7 +480,7 @@ const submitForm = async () => { await StorageMatApi.createStorageMatBatch(dataMats, storageid.value) //附件信息保存 - matUploadFiles.value = { 'businessType': 'STORAGE', 'businessId': storageid, 'businessFileType': '' } + matUploadData.value.businessId = storageid matUploadRef.value!.submit() message.success(t(commonResult))