From 7104751e2f26872d4891d01d42ee88cf19715d01 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 17:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/stores/sd/companySet/新疆恒鑫.js | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
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 3e65f6b..d37ce78 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,12 +3,14 @@
export default defineStore('companyInfo', {
state: () => ({
- connectMes:false,//甯稿窞true锛屽叾浠杅alse锛屾樉绀鸿鍗曟姤宸ヨ浆绉绘槸鍚﹀惎鐢�
+ notChangeProduct:false,//澶╂触true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚潪鏈汉鍒涘缓鐨勪骇鍝佷笉鑳戒慨鏀�
+ timeOut:false,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚秴鏃舵敼鍙樺閫夋鐘舵��
+ connectMes:false,//甯稿窞,涔変箤true锛屽叾浠杅alse锛屾樉绀鸿鍗曟姤宸ヨ浆绉绘槸鍚﹀惎鐢�
companyName: '鏂扮枂鎭掗懌鐜荤拑绉戞妧鏈夐檺鍏徃',
address:'鏂扮枂浜斿娓犲伐涓氬洯鍏靛洟鏂板瀷寤烘潗宸ヤ笟鍥尯宸ヤ竴璺�11鍙烽檮1鍙�',
telephone:'13419168999',
fax:'',
- errorArea:0.4,
+ errorArea:0.4,//缁撶畻闈㈢Н璇樊
widHeiLength:{//璁㈠崟瀹介珮闀垮害
regexp:/^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/,//姝ｅ垯0.00-99999.99
//regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//姝ｅ垯0.00-9999.99
@@ -17,24 +19,27 @@
orderIdType:'year',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:鎸夊勾鐢熸垚
deliveryIdType:'day',//鍚庣鐢熸垚鍙戣揣鍗曞彿绫诲瀷锛宒ay:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
deliveryDate:15,//璁㈠崟鍒涘缓閫佽揣鏃ユ湡 澶╂触7澶╋紝甯稿窞7澶╋紝涔変箤15澶╋紝鏂扮枂15澶�
- columnName:'鍥惧彿',
+ columnName:'鍥惧彿',//鎵撳嵃鐢熶骇鍗曟椂闇�瑕佹樉绀虹殑鍒楀悕锛屾病鏈変负绌�
selectOrderReviewShow:true, //璁㈠崟棣栭〉鍔犲伐鍗曞鏍告寜閽槸鍚︽樉绀�
productName:"product_name",//浜у搧鍒涘缓鏃堕噸澶嶉獙璇侊紝鈥榩roduct_abbreviation鈥�
decValue:2,//璁㈠崟淇濈暀浣嶆暟锛屽ぉ娲�3浣�,甯稿窞2浣�
- label:1,//鏍囩绫诲瀷 1鏄ぉ娲� 2鏄父宸�
+ label:1,//鏍囩绫诲瀷,甯稿窞涓�2锛屽叾浠栦负1
calculateType:2,//璁㈠崟璁＄畻鏂瑰紡
reportType:1,//鎶ュ伐鏄惁鏌ヨ鏍峰搧璁㈠崟2鏌ヨ锛�1涓嶆煡璇�
qualityInsStatus:1,//璺ㄥ伐搴忚川妫�瀹℃牳锛�1.涓嶉渶瑕侊紝2.闇�瑕�
remarkSwitch:2,//娴佺▼鍗′笂鏄惁鏄剧ず鍏跺畠澶囨敞锛�1鏄剧ず锛�2涓嶆樉绀�
- icon:"濂ラ涔呴��",//鍟嗘爣鍙傛暟
+ icon:"濂ラ涔呴��",//鍟嗘爣鍙傛暟锛屾病鏈変负绌�
printShowTitle:true,//娴佺▼鍗¤嚜瀹氫箟鎵撳嵃鏄惁鏄剧ず鏍囩
longSide:null,//璁㈠崟鍒涘缓鏈�闀胯竟鎻愮ず棰滆壊
showDeliveryCreator:true,//鍙戣揣鍗曞垱寤轰汉鍏堟樉绀烘垨鑰呭悗鏄剧ず false鍚庢樉绀�
- deliveryRemark: ['澶囨敞:鏈壒鐜荤拑涓轰紭绛夊悎鏍煎搧锛岃鍦ㄥ嵏璐ф椂,褰撻潰娑堢偣楠屾敹銆佸鏈夎川閲忛棶棰樺湪涓�鍛ㄥ唴涓庢湰鍏徃鑱旂郴,鍚﹀垯姒備笉璐熻矗锛�'],
- deliveryOutbound: false,//鍙戣揣榛樿鍑哄簱
- flowCardMerge: 0,//娴佺▼鍗″悎鐗囨墦鍗�
+ deliveryRemark: ['澶囨敞:鏈壒鐜荤拑涓轰紭绛夊悎鏍煎搧锛岃鍦ㄥ嵏璐ф椂,褰撻潰娑堢偣楠屾敹銆佸鏈夎川閲忛棶棰樺湪涓�鍛ㄥ唴涓庢湰鍏徃鑱旂郴,鍚﹀垯姒備笉璐熻矗锛�'],//鎵撳嵃鍙戣揣鍗曠殑澶囨敞
+ deliveryOutbound: false,//鍙戣揣榛樿鍑哄簱,榛樿鍑哄簱涓簍rue
+ flowCardMerge: 0,//娴佺▼鍗″悎鐗囨墦鍗帮紝1鍚堝苟锛屽叾浠栦笉鍚堝苟
printBtn:1,//鎵撳嵃鐣岄潰涓変釜鎸夐挳涓槸鍚︽樉绀烘爣绛炬墦鍗扮浉鍏虫寜閽紝0鏄剧ず甯稿窞锛�1澶╂触鍏跺畠涓嶆樉绀�
-
+ printNumber:true,//澶氶�夎鍗曟墦鍗版祦绋嬪崱鏄惁鏄剧ず鍙充笂瑙掑簭鍙蜂箟涔宖alse,鍏跺畠true
+ materialOutboundColor:false,//搴撳瓨鏌ヨ鍏ュ簱瓒呰繃涓�瀹氭椂闂存敼鍙橀鑹诧紝娲涢槼true锛屽叾浠杅alse
+ storageBtn:false,//鏄惁鏄剧ず鎶ュ伐鍏ュ簱鐩稿叧鍐呭锛屾礇闃硉rue锛屽叾浠杅alse
+ teamsType:false,//鏄惁寮�鍚彮缁勪笅鎷夋锛屾礇闃硉rue锛屽叾浠杅alse
//澶╂触
printLabel: {
custom: (item1) => {
--
Gitblit v1.8.0