From 9f586e46e1021e75a7442bca92103ba80c5e18a2 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 13 十一月 2024 17:05:39 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 32b5e15..d554e22 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"
@@ -22,7 +22,7 @@
calculateType:1,//璁㈠崟璁＄畻鏂瑰紡
reportType:2,//鎶ュ伐鏄惁鏌ヨ鏍峰搧璁㈠崟2鏌ヨ锛�1涓嶆煡璇�
qualityInsStatus:2,//璺ㄥ伐搴忚川妫�瀹℃牳锛�1涓嶉渶瑕侊紝2闇�瑕�
- remarkSwitch:1,//娴佺▼鍗′笂鏄惁鏄剧ず鍏跺畠澶囨敞锛�1鏄剧ず锛�2涓嶆樉绀�
+ remarkSwitch:2,//娴佺▼鍗′笂鏄惁鏄剧ず鍏跺畠澶囨敞锛�1鏄剧ず锛�2涓嶆樉绀�
icon:"",//鍟嗘爣鍙傛暟
longSide:null,//璁㈠崟鍒涘缓鏈�闀胯竟鎻愮ず棰滆壊 null涓嶆彁绀洪鑹�
//澶╂触
@@ -75,14 +75,14 @@
},
printFlowCard: {//娴佺▼鍗℃墦鍗版牱寮�
- patch:'琛�',
- lackOf:'娆�',
+ patch:'姝ｅ搧',
+ lackOf:'娆″搧',
processingNote: (itemtextarea) => {
return ``
},
},
hideButton:'true',//娴佺▼鍗℃墦鍗扮晫闈㈡寜閽槸鍚︽樉绀�
- getSelectFlowCard:1,//娴佺▼鍗℃墦鍗版煡璇㈡槸鍚﹀悎骞� 1鍚堝苟2涓嶅悎骞�
+ getSelectFlowCard:2,//娴佺▼鍗℃墦鍗版煡璇㈡槸鍚﹀悎骞� 1鍚堝苟2涓嶅悎骞�
columnsLabel:2,//涓�琛屼袱鍒楁垚鍝佹爣绛� 1鏂扮枂涓�琛屼袱鍒楁垚鍝佹爣绛撅紝2鍏跺畠
},
--
Gitblit v1.8.0