From c2e8facf26a66f589f84080b22b78e0f61b0c8bb Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 27 十二月 2021 23:20:13 +0800
Subject: [PATCH] SRM送货单上 预计到货日期，批次号，物流单号设为不是必填项（根据系统参数判断安瑞为必填，其他为非必填）

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/条码.grf |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/\346\235\241\347\240\201.grf" "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/\346\235\241\347\240\201.grf"
index 7af465b..4ec4843 100644
--- "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/\346\235\241\347\240\201.grf"
+++ "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/\346\235\241\347\240\201.grf"
@@ -62,6 +62,9 @@
 				Item
 					Name='澶栫鍖呰鏁�'
 				End
+				Item
+					Name='HShortNumber'
+				End
 			End
 		End
 		Items Column
@@ -71,7 +74,7 @@
 			End
 		End
 		Object ColumnContent
-			Height=6.00604
+			Height=6.19125
 			RowsPerPage=1
 			Items ColumnContentCell
 				Item
@@ -82,10 +85,10 @@
 						Item
 							Type=ShapeBox
 							Name='ShapeBox1'
-							Left=0.211667
+							Left=0.396875
 							Top=0.211667
 							Width=8.59896
-							Height=5.58271
+							Height=5.97958
 						End
 						Item
 							Type=MemoBox
@@ -202,10 +205,10 @@
 						Item
 							Type=MemoBox
 							Name='MemoBox10'
-							Left=4.57729
-							Top=4.20688
-							Width=2.40771
-							Height=0.582083
+							Left=0.608542
+							Top=5.3975
+							Width=2.59292
+							Height=0.608542
 							Object Font
 								Name='瀹嬩綋'
 								Weight=400
@@ -225,7 +228,7 @@
 								Weight=400
 								Charset=134
 							End
-							DataField='鐗╂枡浠ｇ爜'
+							DataField='HShortNumber'
 						End
 						Item
 							Type=FieldBox
@@ -288,7 +291,7 @@
 							Name='FieldBox6'
 							Left=1.98438
 							Top=4.78896
-							Width=2.80458
+							Width=6.40292
 							Height=0.608542
 							Object Font
 								Name='瀹嬩綋'
@@ -306,7 +309,7 @@
 							Height=3.01625
 							BarcodeType=QRCode
 							CaptionPosition=None
-							Text='[#鐗╂枡缂栫爜#@#鐗╂枡鍚嶇О#@#瑙勬牸鍨嬪彿#@#鏁伴噺#@#鐢熶骇鏃ユ湡#@#澶辨晥鏃ユ湡#@#鎵规鍙�#@#渚涘簲鍟嗗悕绉�#@#閲囪喘璁㈠崟鍙�#]'
+							Text='[#鏉＄爜缂栧彿#]'
 						End
 						Item
 							Type=FieldBox
@@ -339,10 +342,10 @@
 						Item
 							Type=FieldBox
 							Name='FieldBox9'
-							Left=6.00604
-							Top=4.20688
-							Width=2.38125
-							Height=0.582083
+							Left=2.19604
+							Top=5.3975
+							Width=2.40771
+							Height=0.608542
 							Object Font
 								Name='瀹嬩綋'
 								Weight=400

--
Gitblit v1.9.1