From 62e9986b6d2d20e61a3b65745af33165c9f1534b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 07 四月 2026 10:01:14 +0800
Subject: [PATCH] 军泰 1.产品维护上传修改
---
src/views/basicData/product/index.vue | 269 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 250 insertions(+), 19 deletions(-)
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index 62550ae..a084226 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -144,10 +144,11 @@
:data="upload.data"
:on-success="handleDrawingUploadSuccess"
:on-remove="handleDrawingRemove"
+ :on-preview="handleDrawingPreview"
:before-upload="handleDrawingBeforeUpload"
- :limit="1"
+ :limit="5"
accept=".pdf,.jpg,.jpeg,.png,.dwg"
- list-type="picture-card"
+ list-type="text"
>
<el-icon class="avatar-uploader-icon"><Plus /></el-icon>
<template #tip>
@@ -156,6 +157,29 @@
</div>
</template>
</el-upload>
+ <div v-if="drawingFileList.length" class="drawing-preview-list">
+ <div
+ v-for="file in drawingFileList"
+ :key="file.uid || file.id || file.name"
+ class="drawing-preview-card"
+ @click="handleDrawingPreview(file)"
+ >
+ <img
+ v-if="isImageFile(file)"
+ :src="getDrawingFileUrl(file)"
+ :alt="file.name"
+ class="drawing-preview-image"
+ />
+ <div
+ v-else
+ class="drawing-preview-placeholder"
+ :class="`is-${getDrawingFileExtension(file)}`"
+ >
+ {{ getDrawingFileExtension(file).toUpperCase() }}
+ </div>
+ <div class="drawing-preview-name">{{ file.name }}</div>
+ </div>
+ </div>
</el-form-item>
</el-form>
</FormDialog>
@@ -172,6 +196,7 @@
:limit="1"
accept=".xlsx,.xls"
:action="importUpload.url"
+ :http-request="importUpload.httpRequest"
:headers="importUpload.headers"
:before-upload="importUpload.beforeUpload"
:on-success="importUpload.onSuccess"
@@ -193,15 +218,18 @@
</template>
</el-upload>
</FormDialog>
+ <filePreview ref="filePreviewRef" />
</div>
</template>
<script setup>
import { ref, reactive, onMounted } from "vue";
+import axios from "axios";
import { ElMessageBox } from "element-plus";
import { Plus } from "@element-plus/icons-vue";
import { getToken } from "@/utils/auth.js";
import FormDialog from "@/components/Dialog/FormDialog.vue";
+import filePreview from "@/components/filePreview/index.vue";
import {
addOrEditProductModel,
delProduct,
@@ -213,6 +241,7 @@
const { proxy } = getCurrentInstance();
const importUploadRef = ref(null);
+const filePreviewRef = ref(null);
const modelDia = ref(false);
const importDia = ref(false);
@@ -259,6 +288,16 @@
minWidth: 100,
},
{
+ label: "宸ヨ壓璺嚎",
+ prop: "routeName",
+ minWidth: 100,
+ },
+ {
+ label: "瀛愰」鏁伴噺",
+ prop: "subItemCount",
+ minWidth: 100,
+ },
+ {
label: "浜у搧灞炴��",
prop: "productType",
width: 100,
@@ -269,6 +308,16 @@
return typeMap[String(v)] || "info";
},
},
+ {
+ label: "鍒涘缓鏃堕棿",
+ prop: "createTime",
+ width: 120,
+ },
+ {
+ label: "淇敼鏃堕棿",
+ prop: "updateTime",
+ width: 120,
+ },
{
dataType: "action",
label: "鎿嶄綔",
@@ -309,12 +358,79 @@
});
const { modelForm, modelRules } = toRefs(data);
+const downloadImportErrorFile = (blob, filename = "import-error.xlsx") => {
+ const downloadElement = document.createElement("a");
+ const href = window.URL.createObjectURL(blob);
+ downloadElement.href = href;
+ downloadElement.download = filename;
+ document.body.appendChild(downloadElement);
+ downloadElement.click();
+ document.body.removeChild(downloadElement);
+ window.URL.revokeObjectURL(href);
+};
+
+const tryParseJsonBlob = async (blob) => {
+ try {
+ const text = await blob.text();
+ if (!text || !text.trim()) {
+ return null;
+ }
+ return JSON.parse(text);
+ } catch (_) {
+ return null;
+ }
+};
+
const importUpload = reactive({
title: "浜у搧瀵煎叆",
open: false,
url: import.meta.env.VITE_APP_BASE_API + "/basic/product/import",
headers: { Authorization: "Bearer " + getToken() },
isUploading: false,
+ httpRequest: async (options) => {
+ const { file, onProgress, onSuccess, onError } = options;
+ importUpload.isUploading = true;
+ const formData = new FormData();
+ formData.append("file", file);
+ try {
+ const response = await axios({
+ url: importUpload.url,
+ method: "post",
+ headers: {
+ ...importUpload.headers,
+ "Content-Type": "multipart/form-data",
+ },
+ data: formData,
+ responseType: "blob",
+ onUploadProgress: (progressEvent) => {
+ const total = progressEvent.total || 1;
+ const percent = Math.round((progressEvent.loaded * 100) / total);
+ onProgress?.({ percent }, file);
+ },
+ });
+ importUpload.isUploading = false;
+ const blob = response.data;
+ // Contract: success => empty response body; failure => binary error file.
+ if (!blob || blob.size === 0) {
+ onSuccess?.({ code: 200, msg: "import success" }, file);
+ return;
+ }
+ const json = await tryParseJsonBlob(blob);
+ if (json) {
+ if (String(json.code) === "200" || json.success === true) {
+ onSuccess?.(json, file);
+ } else {
+ onError?.(new Error(json.msg || json.message || "import failed"), file);
+ }
+ return;
+ }
+ downloadImportErrorFile(blob);
+ onError?.(new Error("import failed, error file downloaded"), file);
+ } catch (error) {
+ importUpload.isUploading = false;
+ onError?.(error, file);
+ }
+ },
beforeUpload: (file) => {
const isExcel = file.name.endsWith('.xlsx') || file.name.endsWith('.xls');
const isLt10M = file.size / 1024 / 1024 < 10;
@@ -337,7 +453,7 @@
onSuccess: (response, file, fileList) => {
console.log('涓婁紶鎴愬姛', response, file, fileList);
importUpload.isUploading = false;
- if (response.code === 200) {
+ if (String(response?.code) === "200" || response?.success === true) {
proxy.$modal.msgSuccess("瀵煎叆鎴愬姛");
importDia.value = false;
if (importUploadRef.value) {
@@ -385,7 +501,14 @@
modelForm.value = { ...data };
modelForm.value.tempFileIds = data.tempFileIds || [];
modelForm.value.salesLedgerFiles = data.salesLedgerFiles || [];
- if (data.drawingFile) {
+ // 澶勭悊鍥剧焊鏂囦欢鍙嶆樉
+ if (data.salesLedgerFiles && data.salesLedgerFiles.length > 0) {
+ drawingFileList.value = data.salesLedgerFiles.map(file => ({
+ id: file.id, // 甯︿笂id鐢ㄤ簬鍒犻櫎鏃惰皟鐢ㄦ帴鍙�
+ name: file.name,
+ url: file.url
+ }));
+ } else if (data.drawingFile) {
drawingFileList.value = [{
name: data.drawingFile.split('/').pop(),
url: data.drawingFile
@@ -397,7 +520,13 @@
const submitModelForm = () => {
modelFormRef.value.validate((valid) => {
if (valid) {
- addOrEditProductModel(modelForm.value).then((res) => {
+ // 鏋勫缓鎻愪氦鏁版嵁锛岀‘淇� routeId 涓虹┖鏃朵紶 null锛屽悓鏃舵竻绌� routeName
+ const submitData = {
+ ...modelForm.value,
+ routeId: modelForm.value.routeId || 0,
+ routeName: modelForm.value.routeId ? modelForm.value.routeName : null
+ };
+ addOrEditProductModel(submitData).then((res) => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeModelDia();
getModelList();
@@ -515,22 +644,68 @@
console.log('涓婁紶鎴愬姛鍝嶅簲', response);
console.log('response.data', response.data);
if (response.code === 200) {
- modelForm.value.tempFileIds = [response.data?.tempId];
- modelForm.value.salesLedgerFiles = [{
+ file.url = response.data?.tempPath || file.url;
+ file.name = response.data?.originalName || file.name;
+ file.tempId = response.data?.tempId;
+ // 鏀寔澶氭枃浠讹紝杩藉姞鍒版暟缁�
+ modelForm.value.tempFileIds.push(response.data?.tempId);
+ modelForm.value.salesLedgerFiles.push({
tempId: response.data?.tempId,
originalName: response.data?.originalName || file.name,
tempPath: response.data?.tempPath,
type: response.data?.type || 13
- }];
+ });
proxy.$modal.msgSuccess("涓婁紶鎴愬姛");
} else {
proxy.$modal.msgError(response.msg || "涓婁紶澶辫触");
}
};
+const getDrawingFileUrl = (file) => {
+ return file.url || file.response?.data?.tempPath || file.tempPath || "";
+};
+
+const getDrawingFileName = (file) => {
+ return file.name || file.originalName || getDrawingFileUrl(file).split("/").pop() || "";
+};
+
+const getDrawingFileExtension = (file) => {
+ const name = getDrawingFileName(file).split("?")[0];
+ const nameParts = name.split(".");
+ return nameParts.length > 1 ? nameParts.pop().toLowerCase() : "file";
+};
+
+const isImageFile = (file) => {
+ return ["jpg", "jpeg", "png", "gif", "bmp", "webp"].includes(getDrawingFileExtension(file));
+};
+
+const handleDrawingPreview = (file) => {
+ const fileUrl = getDrawingFileUrl(file);
+ if (!fileUrl) {
+ return;
+ }
+ filePreviewRef.value?.open(fileUrl);
+};
+
const handleDrawingRemove = (file) => {
- modelForm.value.tempFileIds = [];
- modelForm.value.salesLedgerFiles = [];
+ // 濡傛灉鏄紪杈戞ā寮忎笅宸插瓨鍦ㄧ殑鏂囦欢锛堝甫鏈塱d锛夛紝璋冪敤鍒犻櫎鎺ュ彛
+ if (file.id) {
+ delLedgerFile({ id: file.id }).then(res => {
+ if (res.code === 200) {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }
+ }).catch(err => {
+ console.error("鍒犻櫎鏂囦欢澶辫触锛�", err);
+ });
+ }
+ // 浠庢暟缁勪腑绉婚櫎瀵瑰簲鐨勬枃浠�
+ const index = modelForm.value.salesLedgerFiles.findIndex(item =>
+ item.tempId === file.response?.data?.tempId || item.tempId === file.tempId
+ );
+ if (index > -1) {
+ modelForm.value.tempFileIds.splice(index, 1);
+ modelForm.value.salesLedgerFiles.splice(index, 1);
+ }
};
onMounted(() => {
@@ -579,20 +754,76 @@
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
- width: 148px;
- height: 148px;
+ width: 88px;
+ height: 88px;
text-align: center;
- line-height: 148px;
+ line-height: 88px;
}
-:deep(.el-upload--picture-card) {
- width: 148px;
- height: 148px;
+:deep(.el-upload--text) {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 88px;
+ height: 88px;
+ border: 1px dashed #dcdfe6;
+ border-radius: 8px;
}
-:deep(.el-upload-list__item) {
- width: 148px;
- height: 148px;
+:deep(.el-upload-list--text) {
+ margin-top: 8px;
+}
+
+.drawing-preview-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 12px;
+ margin-top: 12px;
+}
+
+.drawing-preview-card {
+ width: 120px;
+ cursor: pointer;
+}
+
+.drawing-preview-image,
+.drawing-preview-placeholder {
+ width: 120px;
+ height: 120px;
+ border: 1px solid #dcdfe6;
+ border-radius: 8px;
+ background: #f5f7fa;
+}
+
+.drawing-preview-image {
+ object-fit: cover;
+}
+
+.drawing-preview-placeholder {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 24px;
+ font-weight: 600;
+ color: #606266;
+}
+
+.drawing-preview-placeholder.is-pdf {
+ color: #f56c6c;
+ background: #fef0f0;
+}
+
+.drawing-preview-placeholder.is-dwg {
+ color: #409eff;
+ background: #ecf5ff;
+}
+
+.drawing-preview-name {
+ margin-top: 6px;
+ font-size: 12px;
+ line-height: 1.4;
+ color: #606266;
+ word-break: break-all;
}
:deep(.el-upload__tip) {
--
Gitblit v1.9.3