From ceb1dea2b24d5c3216816f42fd0e514613656416 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 08 十二月 2025 16:11:04 +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 |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

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 1628b09..3aa51c4 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,12 @@
 export default defineStore('companyInfo', {
 
     state: () => ({
+        position:{
+            outside:'(鍐�)',
+            inside:'(澶�)',
+        },
+        edgingType:false,//浜у搧鍒涘缓纾ㄨ竟绫诲瀷鏄惁蹇呴��
+        hollow:'*',
         notChangeProduct:false,//澶╂触true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚潪鏈汉鍒涘缓鐨勪骇鍝佷笉鑳戒慨鏀�
         timeOut:true,//閲戝崕true锛屽叾浠杅alse锛屾槸鍚﹀紑鍚彂璐ц秴鏃舵敼鍙樺閫夋鐘舵�侀鑹�
         connectMes:true,//甯稿窞,涔変箤true锛屽叾浠杅alse锛屾樉绀鸿鍗曟姤宸ヨ浆绉绘槸鍚﹀惎鐢�
@@ -16,7 +22,9 @@
             //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//姝e垯0.00-9999.99
             msg:'basicData.msg.range99999Dec2'
         },
-        orderIdType:'year',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:姣忓勾鐢熸垚
+        orderIdType:'day',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:姣忓勾鐢熸垚
+        orderIdTypeLetter:'R',//璁㈠崟鍙峰墠闈㈠瓧姣�
+        orderIdTypeMantissa:3,//璁㈠崟鍙峰熬鏁颁繚鐣欎綅鏁�  orderIdTypeLetter闀垮害+orderIdTypeMantissa =4
         deliveryIdType:'day',//鍚庣鐢熸垚鍙戣揣鍗曞彿绫诲瀷锛宒ay:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
         deliveryDate:15,//璁㈠崟鍒涘缓閫佽揣鏃ユ湡 澶╂触7澶╋紝甯稿窞7澶╋紝涔変箤15澶╋紝鏂扮枂15澶�
         columnName:'鍥惧彿',//鎵撳嵃鐢熶骇鍗曟椂闇�瑕佹樉绀虹殑鍒楀悕锛屾病鏈変负绌�
@@ -39,6 +47,14 @@
         flowCardMerge: 0,//娴佺▼鍗″悎鐗囨墦鍗帮紝1鍚堝苟锛屽叾浠栦笉鍚堝苟
         printBtn:1,//鎵撳嵃鐣岄潰涓変釜鎸夐挳涓槸鍚︽樉绀烘爣绛炬墦鍗扮浉鍏虫寜閽紝0鏄剧ず甯稿窞锛�1澶╂触鍏跺畠涓嶆樉绀�
         printNumber:true,//澶氶�夎鍗曟墦鍗版祦绋嬪崱鏄惁鏄剧ず鍙充笂瑙掑簭鍙蜂箟涔宖alse,鍏跺畠true
+        materialOutboundColor:false,//搴撳瓨鏌ヨ鍏ュ簱瓒呰繃涓�瀹氭椂闂存敼鍙橀鑹诧紝娲涢槼true锛屽叾浠杅alse
+        storageBtn:false,//鏄惁鏄剧ず鎶ュ伐鍏ュ簱鐩稿叧鍐呭锛屾礇闃硉rue锛屽叾浠杅alse
+        teamsType:true,//鏄惁寮�鍚彮缁勪笅鎷夋锛屾礇闃硉rue锛屽叾浠杅alse
+        alienFunction:false,//鏄惁寮�鍚紓褰㈠姛鑳斤紝鏆傛椂閮芥槸false
+        replenishQRCode:1,//鏄惁琛ョ墖浜岀淮鐮佹槸鍚︽媶鍒嗗眰,1鎷嗗垎锛�2涓嶆媶
+        soleQRCode:true,//娴佺▼鍗″悎骞朵簩缁寸爜鏄剧ず鍗曞眰锛屼箟涔宼rue.鍏跺畠false
+        reportTime:"08:00",//娆$牬銆佷骇閲忔姤琛ㄩ粯璁ゆ椂闂�
+        processFontSize:false,//娴佺▼鍗″姞宸ヨ姹傚瓧浣撳姞澶�
         //澶╂触
         printLabel: {
             custom: (item1) => {

--
Gitblit v1.8.0