From 878ed5e0ecc3215ffbb12f8d1246633a40dbd2d7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 13 八月 2025 08:16:51 +0800
Subject: [PATCH] 添加配置文件 订单创建是否必选
---
north-glass-erp/northglass-erp/src/stores/sd/companySet/洛阳北玻.js | 3 ++-
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/stores/sd/companySet/金华天成.js | 1 +
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 4 ++++
north-glass-erp/northglass-erp/src/lang/ru.js | 1 +
north-glass-erp/northglass-erp/src/stores/sd/companySet/新疆恒鑫.js | 1 +
north-glass-erp/northglass-erp/src/stores/sd/companySet/常州吉利.js | 1 +
north-glass-erp/northglass-erp/src/lang/zh.js | 1 +
north-glass-erp/northglass-erp/src/lang/kr.js | 1 +
north-glass-erp/northglass-erp/src/stores/sd/companySet/天津北玻.js | 1 +
11 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 5bb7a53..d16c8a3 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -71,6 +71,7 @@
copy:'澶嶅埗',
msg:{
max255:'兀丿禺賱 255 丨乇賮賸丕 賰丨丿 兀賯氐賶',
+ max10:"鏈�澶氳緭鍏�10涓瓧绗�",
range99999Dec2:
'賷乇噩賶 廿丿禺丕賱 乇賯賲 亘賷賳 0 賵99999 亘丨丿 兀賯氐賶 乇賯賲賷賳 毓卮乇賷賷賳',
range99999Dec3:
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index d9cb0ff..444600c 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -71,6 +71,7 @@
copy:'Copy',
msg:{
max255:"The value contains a maximum of 255 characters",
+ max10:"鏈�澶氳緭鍏�10涓瓧绗�",
range99999Dec2:
"Please enter a number between 0 and 99999 with a maximum of two decimals",
range99999Dec3:
diff --git a/north-glass-erp/northglass-erp/src/lang/kr.js b/north-glass-erp/northglass-erp/src/lang/kr.js
index a185c37..e41a6ab 100644
--- a/north-glass-erp/northglass-erp/src/lang/kr.js
+++ b/north-glass-erp/northglass-erp/src/lang/kr.js
@@ -71,6 +71,7 @@
copy:'欤茧 氤奠牅',
msg:{
max255:"斓滊寑 255鞛� 鞛呺牓 臧�電�",
+ max10:"鏈�澶氳緭鍏�10涓瓧绗�",
range99999Dec2:
"0攵�韯� 99,999旯岇鞚� 靾瀽 鞛呺牓. 靻岇垬鞝� 霊橃Ц 鞛愲Μ旯岇 項堨毄",
range99999Dec3:
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 383657a..0113559 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -71,6 +71,7 @@
copy:'澶嶅埗',
msg:{
max255:"袙胁械写懈褌械 255 褋懈屑胁芯谢芯胁.",
+ max10:"鏈�澶氳緭鍏�10涓瓧绗�",
range99999Dec2:
"袙胁械写懈褌械 褔懈褋谢芯 屑械卸写褍 0 - 99999 懈 褋芯褏褉邪薪懈褌械 写芯 写胁褍褏 写械褋褟褌懈褔薪褘褏 蟹薪邪泻芯胁.",
range99999Dec3:
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index f5a83b3..e44de48 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -71,6 +71,7 @@
copy:'澶嶅埗',
msg:{
max255:"鏈�澶氳緭鍏�255涓瓧绗�",
+ max10:"鏈�澶氳緭鍏�10涓瓧绗�",
range99999Dec2:
"璇疯緭鍏�0-99999涔嬮棿鐨勬暟瀛楋紝鏈�澶氫繚鐣欎袱浣嶅皬鏁�",
range99999Dec3:
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
index 552f169..b3aae09 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {
state: () => ({
+ edgingType:false,//浜у搧鍒涘缓纾ㄨ竟绫诲瀷鏄惁蹇呴��
hollow:'*',
notChangeProduct:true,//澶╂触true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚潪鏈汉鍒涘缓鐨勪骇鍝佷笉鑳戒慨鏀�
timeOut:false,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚秴鏃舵敼鍙樺閫夋鐘舵��
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
index 5b3f999..ea41eae 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {
state: () => ({
+ edgingType:false,//浜у搧鍒涘缓纾ㄨ竟绫诲瀷鏄惁蹇呴��
hollow:'*',
notChangeProduct:false,//澶╂触true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚潪鏈汉鍒涘缓鐨勪骇鍝佷笉鑳戒慨鏀�
timeOut:false,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚秴鏃舵敼鍙樺閫夋鐘舵��
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
index ebeea7e..2e2809d 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {
state: () => ({
+ edgingType:false,//浜у搧鍒涘缓纾ㄨ竟绫诲瀷鏄惁蹇呴��
hollow:'*',
notChangeProduct:false,//澶╂触true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚潪鏈汉鍒涘缓鐨勪骇鍝佷笉鑳戒慨鏀�
timeOut:false,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚秴鏃舵敼鍙樺閫夋鐘舵��
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
index a121662..bd51cce 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
@@ -3,7 +3,8 @@
export default defineStore('companyInfo', {
state: () => ({
- hollow:'+',
+ edgingType:true,//浜у搧鍒涘缓纾ㄨ竟绫诲瀷鏄惁蹇呴��
+ hollow:'+',//浜у搧鍒涘缓涓┖鐢�+鍙锋垨鏄熷彿
notChangeProduct:false,//澶╂触true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚潪鏈汉鍒涘缓鐨勪骇鍝佷笉鑳戒慨鏀�
timeOut:false,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚彂璐ц秴鏃舵敼鍙樺閫夋鐘舵�侀鑹�
connectMes:false,//甯稿窞,涔変箤true锛屽叾浠杅alse锛屾樉绀鸿鍗曟姤宸ヨ浆绉绘槸鍚﹀惎鐢�
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
index be56825..7a97aeb 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {
state: () => ({
+ edgingType:false,//浜у搧鍒涘缓纾ㄨ竟绫诲瀷鏄惁蹇呴��
hollow:'*',
notChangeProduct:false,//澶╂触true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚潪鏈汉鍒涘缓鐨勪骇鍝佷笉鑳戒慨鏀�
timeOut:true,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚彂璐ц秴鏃舵敼鍙樺閫夋鐘舵�侀鑹�
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 238ae4a..4158621 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -191,6 +191,10 @@
],
//琛ㄥ崟楠岃瘉
editRules: {
+ edgingType: [
+ { required: company.edgingType},
+ { min: 0, max: 10, message: t('basicData.msg.max10') }
+ ],
buildingNumber: [
{ required: false},
{ min: 0, max: 255, message: t('basicData.msg.max255') }
--
Gitblit v1.8.0