From a0db8ecfc7f6a560804e94b5834435ce460c00b9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 30 十二月 2025 08:16:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/en.js | 1 +
north-glass-erp/northglass-erp/src/lang/ar.js | 1 +
north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue | 6 ++++++
north-glass-erp/northglass-erp/src/lang/ru.js | 1 +
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java | 2 +-
north-glass-erp/northglass-erp/src/lang/zh.js | 1 +
north-glass-erp/northglass-erp/src/lang/kr.js | 1 +
7 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue b/north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue
index d49595b..6e2d9d0 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue
@@ -33,6 +33,7 @@
})
onMounted(() => {
+ console.log(props.rowIndex)
getFileList()
})
@@ -120,6 +121,11 @@
}
}
+ if(!props.rowIndex.orderNumber){
+ ElMessage.warning(t("order.msg.pleaseUploadPicture17"))
+ return
+ }
+
if(imgWidth.value ){
const regex = /^(0|[1-9]\d{0,2}|1000)$/
if(!regex.test(imgWidth.value)){
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 300f595..4ace8f2 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -346,6 +346,7 @@
pleaseUploadPicture14:"涓婁紶缁撴灉",
pleaseUploadPicture15:"鏂囦欢宸叉垚鍔熻浆鏍煎紡",
pleaseUploadPicture16:"涓嬭浇",
+ pleaseUploadPicture17:"姝よ鏂板琛�,璇峰厛淇濆瓨璁㈠崟鍐嶄笂浼犲浘鐗�",
},
preciseMode:'绮剧‘妯″紡',
ambiguityModels:'妯＄硦妯″紡',
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 5a3bded..8013746 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -346,6 +346,7 @@
pleaseUploadPicture14:"涓婁紶缁撴灉",
pleaseUploadPicture15:"鏂囦欢宸叉垚鍔熻浆鏍煎紡",
pleaseUploadPicture16:"涓嬭浇",
+ pleaseUploadPicture17:"姝よ鏂板琛�,璇峰厛淇濆瓨璁㈠崟鍐嶄笂浼犲浘鐗�",
},
preciseMode:'绮剧‘妯″紡',
ambiguityModels:'妯＄硦妯″紡',
diff --git a/north-glass-erp/northglass-erp/src/lang/kr.js b/north-glass-erp/northglass-erp/src/lang/kr.js
index 8e1f58f..efdfc79 100644
--- a/north-glass-erp/northglass-erp/src/lang/kr.js
+++ b/north-glass-erp/northglass-erp/src/lang/kr.js
@@ -346,6 +346,7 @@
pleaseUploadPicture14:"涓婁紶缁撴灉",
pleaseUploadPicture15:"鏂囦欢宸叉垚鍔熻浆鏍煎紡",
pleaseUploadPicture16:"涓嬭浇",
+ pleaseUploadPicture17:"姝よ鏂板琛�,璇峰厛淇濆瓨璁㈠崟鍐嶄笂浼犲浘鐗�",
},
preciseMode:'绮剧‘妯″紡',
ambiguityModels:'妯＄硦妯″紡',
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index c0fa0f6..d8ab4df 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -346,6 +346,7 @@
pleaseUploadPicture14:"涓婁紶缁撴灉",
pleaseUploadPicture15:"鏂囦欢宸叉垚鍔熻浆鏍煎紡",
pleaseUploadPicture16:"涓嬭浇",
+ pleaseUploadPicture17:"姝よ鏂板琛�,璇峰厛淇濆瓨璁㈠崟鍐嶄笂浼犲浘鐗�",
},
preciseMode:'绮剧‘妯″紡',
ambiguityModels:'妯＄硦妯″紡',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 6450a73..b7076ae 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -346,6 +346,7 @@
pleaseUploadPicture14:"涓婁紶缁撴灉",
pleaseUploadPicture15:"鏂囦欢宸叉垚鍔熻浆鏍煎紡",
pleaseUploadPicture16:"涓嬭浇",
+ pleaseUploadPicture17:"姝よ鏂板琛�,璇峰厛淇濆瓨璁㈠崟鍐嶄笂浼犲浘鐗�",
},
preciseMode:'绮剧‘妯″紡',
ambiguityModels:'妯＄硦妯″紡',
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
index d2e8300..6053a1e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
@@ -71,7 +71,7 @@
public Object updateOrderFileByOrderNumber(MultipartFile file,String name,String orderId,String orderNumber,Float width,Float height) throws IOException {
//鍒ゆ柇鏄惁瑙勫畾鐨勬牸寮忓悗缂�鍚�
- if(!isAllowedFile(name)){
+ if(!isAllowedFile(name) || orderNumber == null || orderId == null){
return null;
}
--
Gitblit v1.8.0