From e4b4c6dfb28832c3b828e7d425ea0531aab8c694 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 12 六月 2026 16:58:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue | 67 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue
index e4c9700..5bb666a 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue
@@ -13,7 +13,7 @@
:action="uploadUrl"
:on-success="handleUploadSuccess"
:on-error="handleUploadError"
- name="file"
+ name="files"
:show-file-list="false"
:headers="headers"
style="display: inline;margin-right: 10px"
@@ -50,10 +50,10 @@
import {ElMessageBox} from "element-plus";
import {getToken} from "@/utils/auth.js";
import {
- qualityInspectFileAdd,
- qualityInspectFileDel,
- qualityInspectFileListPage
-} from "@/api/qualityManagement/qualityInspectFile.js";
+ createAttachment,
+ deleteAttachment,
+ attachmentList
+} from "@/api/basicData/storageAttachment.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
@@ -99,7 +99,7 @@
const headers = ref({
Authorization: "Bearer " + getToken(),
});
-const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 涓婁紶鐨勫浘鐗囨湇鍔″櫒鍦板潃
+const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 涓婁紶鐨勬湇鍔″櫒鍦板潃
// 鎵撳紑寮规
const openDialog = (row) => {
@@ -113,9 +113,12 @@
getList();
};
const getList = () => {
- qualityInspectFileListPage({inspectId: currentId.value, ...page}).then(res => {
- tableData.value = res.data.records;
- page.total = res.data.total;
+ attachmentList({recordId: currentId.value, recordType: 'quality_inspect'}).then(res => {
+ tableData.value = (res.data || []).map(item => ({
+ ...item,
+ name: item.originalFilename || item.name
+ }));
+ page.total = res.data ? res.data.length : 0;
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -128,24 +131,42 @@
dialogFormVisible.value = false;
emit('close')
};
+let pendingFiles = [];
+let uploadTimer = null;
+
// 涓婁紶鎴愬姛澶勭悊
function handleUploadSuccess(res, file) {
// 濡傛灉涓婁紶鎴愬姛
- if (res.code == 200) {
- const fileRow = {}
- fileRow.name = res.data.originalName
- fileRow.url = res.data.tempPath
- uploadFile(fileRow)
+ if (res.code == 200 && res.data && res.data.length > 0) {
+ const newFiles = res.data.map(item => ({
+ ...item,
+ name: item.originalFilename || item.name
+ }));
+
+ pendingFiles = [...pendingFiles, ...newFiles];
+
+ // 闃叉姈澶勭悊锛岄伩鍏嶅鏂囦欢鍚屾椂涓婁紶瀵艰嚧鍒楄〃琚鐩�
+ if (uploadTimer) clearTimeout(uploadTimer);
+ uploadTimer = setTimeout(() => {
+ const mergedFiles = [...(tableData.value || []), ...pendingFiles];
+ const storageAttachmentDTO = {
+ recordType: 'quality_inspect',
+ recordId: currentId.value,
+ application: "file",
+ storageBlobDTOs: mergedFiles
+ };
+ createAttachment(storageAttachmentDTO).then(r => {
+ proxy.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛");
+ getList()
+ }).catch(() => {
+ proxy.$modal.msgError("鏂囦欢涓婁紶澶辫触");
+ }).finally(() => {
+ pendingFiles = []; // 閲嶇疆
+ });
+ }, 500);
} else {
proxy.$modal.msgError("鏂囦欢涓婁紶澶辫触");
}
-}
-function uploadFile(file) {
- file.inspectId = currentId.value;
- qualityInspectFileAdd(file).then(res => {
- proxy.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛");
- getList()
- })
}
// 涓婁紶澶辫触澶勭悊
function handleUploadError() {
@@ -163,7 +184,7 @@
const handleDelete = () => {
let ids = [];
if (selectedRows.value.length > 0) {
- ids = selectedRows.value.map((item) => item.id);
+ ids = selectedRows.value.map((item) => item.storageAttachmentId);
} else {
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
return;
@@ -173,7 +194,7 @@
cancelButtonText: "鍙栨秷",
type: "warning",
}).then(() => {
- qualityInspectFileDel(ids).then((res) => {
+ deleteAttachment(ids).then((res) => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
getList();
});
--
Gitblit v1.9.3