From 53bc276bdc4aaefc2a2ecadc472f2c2f18e93490 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 十一月 2025 16:53:57 +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 |   15 +++++++++++++--
 1 files changed, 13 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 e51f9d2..a803204 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,7 +16,7 @@
         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})?)$/,//姝e垯0.00-99999.99
             //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//姝e垯0.00-9999.99
@@ -41,6 +47,11 @@
         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) => {
@@ -98,7 +109,7 @@
                 },
             },
             hideButton:'true',//娴佺▼鍗℃墦鍗扮晫闈㈡寜閽槸鍚︽樉绀�
-            getSelectFlowCard:1,//娴佺▼鍗℃墦鍗版煡璇㈡槸鍚﹀悎骞�  1鍚堝苟2涓嶅悎骞�
+            getSelectFlowCard:2,//娴佺▼鍗℃墦鍗版煡璇㈡槸鍚﹀悎骞�  1鍚堝苟2涓嶅悎骞�
             columnsLabel:2,//涓�琛屼袱鍒楁垚鍝佹爣绛� 1鏂扮枂涓�琛屼袱鍒楁垚鍝佹爣绛撅紝2鍏跺畠
         },
 

--
Gitblit v1.8.0