From 97fba4a0e38c0b8455d43d2935aa996676407361 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 08 十二月 2025 16:40:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/stores/sd/companySet/洛阳北玻.js | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
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 370ba60..4d43dde 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,6 +3,12 @@
export default defineStore('companyInfo', {
state: () => ({
+ position:{
+ outside:'(鍐�)',
+ inside:'(澶�)',
+ },
+ edgingType:true,//浜у搧鍒涘缓纾ㄨ竟绫诲瀷鏄惁蹇呴��
+ hollow:'+',//浜у搧鍒涘缓涓┖鐢�+鍙锋垨鏄熷彿
notChangeProduct:false,//澶╂触true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚潪鏈汉鍒涘缓鐨勪骇鍝佷笉鑳戒慨鏀�
timeOut:false,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚彂璐ц秴鏃舵敼鍙樺閫夋鐘舵�侀鑹�
connectMes:false,//甯稿窞,涔変箤true锛屽叾浠杅alse锛屾樉绀鸿鍗曟姤宸ヨ浆绉绘槸鍚﹀惎鐢�
@@ -10,13 +16,15 @@
address:'娲涢槼鍥藉楂樻柊鎶�鏈紑鍙戝尯',
telephone:'0379-64312861',
fax:'0379-64332066',
- errorArea:0.4,
+ errorArea:0.5,
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
msg:'basicData.msg.range99999Dec2'
},
orderIdType:'day',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:姣忓勾鐢熸垚
+ orderIdTypeLetter:'NG',//璁㈠崟鍙峰墠闈㈠瓧姣�
+ orderIdTypeMantissa:2,//璁㈠崟鍙峰熬鏁颁繚鐣欎綅鏁� orderIdTypeLetter闀垮害+orderIdTypeMantissa =4
deliveryIdType:'day',
deliveryDate:15,//璁㈠崟鍒涘缓閫佽揣鏃ユ湡 澶╂触7澶╋紝甯稿窞7澶╋紝涔変箤15澶╋紝鏂扮枂15澶�
columnName:'鍥惧彿',
@@ -38,6 +46,14 @@
deliveryOutbound: false,//鍙戣揣榛樿鍑哄簱
flowCardMerge: 0,//娴佺▼鍗″悎鐗囨墦鍗�
printBtn:1,//鎵撳嵃鐣岄潰涓変釜鎸夐挳涓槸鍚︽樉绀烘爣绛炬墦鍗扮浉鍏虫寜閽紝0鏄剧ず甯稿窞锛�1澶╂触鍏跺畠涓嶆樉绀�
+ materialOutboundColor:true,//搴撳瓨鏌ヨ鍏ュ簱瓒呰繃涓�瀹氭椂闂存敼鍙橀鑹诧紝娲涢槼true锛屽叾浠杅alse
+ storageBtn:true,//鏄惁鏄剧ず鎶ュ伐鍏ュ簱鐩稿叧鍐呭锛屾礇闃硉rue锛屽叾浠杅alse
+ teamsType:true,//鏄惁寮�鍚彮缁勪笅鎷夋锛屾礇闃硉rue锛屽叾浠杅alse
+ alienFunction:false,//鏄惁寮�鍚紓褰㈠姛鑳斤紝鏆傛椂閮芥槸false
+ replenishQRCode:1,//鏄惁琛ョ墖浜岀淮鐮佹槸鍚︽媶鍒嗗眰,1鎷嗗垎锛�2涓嶆媶
+ soleQRCode:false,//娴佺▼鍗″悎骞朵簩缁寸爜鏄剧ず鍗曞眰锛屼箟涔宼rue.鍏跺畠false
+ reportTime:"08:00",//娆＄牬銆佷骇閲忔姤琛ㄩ粯璁ゆ椂闂�
+ processFontSize:false,//娴佺▼鍗″姞宸ヨ姹傚瓧浣撳姞澶�
//澶╂触
printLabel: {
custom: (item1) => {
@@ -95,7 +111,7 @@
},
},
hideButton:'true',//娴佺▼鍗℃墦鍗扮晫闈㈡寜閽槸鍚︽樉绀�
- getSelectFlowCard:1,//娴佺▼鍗℃墦鍗版煡璇㈡槸鍚﹀悎骞� 1鍚堝苟2涓嶅悎骞�
+ getSelectFlowCard:2,//娴佺▼鍗℃墦鍗版煡璇㈡槸鍚﹀悎骞� 1鍚堝苟2涓嶅悎骞�
columnsLabel:2,//涓�琛屼袱鍒楁垚鍝佹爣绛� 1鏂扮枂涓�琛屼袱鍒楁垚鍝佹爣绛撅紝2鍏跺畠
},
--
Gitblit v1.8.0