From 7ca6e58cb69cb1fa88df4b8779ad0de8ff01a210 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 01 四月 2026 17:42:40 +0800
Subject: [PATCH] 军泰伟业 1.军泰伟业-库存管理增加库位 2.军泰伟业-生产入库要审核，加个入库审核菜单，入库数量，库位，通过不通过
---
src/views/basicData/product/index.vue | 127 +++++++++++++++++++++++++++++++++++++----
1 files changed, 113 insertions(+), 14 deletions(-)
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index 62550ae..6f1fed3 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -145,7 +145,7 @@
:on-success="handleDrawingUploadSuccess"
:on-remove="handleDrawingRemove"
:before-upload="handleDrawingBeforeUpload"
- :limit="1"
+ :limit="5"
accept=".pdf,.jpg,.jpeg,.png,.dwg"
list-type="picture-card"
>
@@ -172,6 +172,7 @@
:limit="1"
accept=".xlsx,.xls"
:action="importUpload.url"
+ :http-request="importUpload.httpRequest"
:headers="importUpload.headers"
:before-upload="importUpload.beforeUpload"
:on-success="importUpload.onSuccess"
@@ -198,6 +199,7 @@
<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";
@@ -259,6 +261,11 @@
minWidth: 100,
},
{
+ label: "宸ヨ壓璺嚎",
+ prop: "routeName",
+ minWidth: 100,
+ },
+ {
label: "浜у搧灞炴��",
prop: "productType",
width: 100,
@@ -309,12 +316,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 +411,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 +459,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 +478,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,13 +602,14 @@
console.log('涓婁紶鎴愬姛鍝嶅簲', response);
console.log('response.data', response.data);
if (response.code === 200) {
- modelForm.value.tempFileIds = [response.data?.tempId];
- modelForm.value.salesLedgerFiles = [{
+ // 鏀寔澶氭枃浠讹紝杩藉姞鍒版暟缁�
+ 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 || "涓婁紶澶辫触");
@@ -529,8 +617,24 @@
};
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(() => {
@@ -586,11 +690,6 @@
}
:deep(.el-upload--picture-card) {
- width: 148px;
- height: 148px;
-}
-
-:deep(.el-upload-list__item) {
width: 148px;
height: 148px;
}
--
Gitblit v1.9.3