Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

YL

2021-11-05 c66f140b65802469b204c516dcdf31a368963b5f

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/grf/Æ÷¾ß´¦Àí³ö¿âµ¥.grf

@@ -27,10 +27,10 @@
               Format='yyyy/MM/dd'
            End
            Item
               Name='调出仓库'
               Name='部门'
            End
            Item
               Name='调入仓库'
               Name='仓库'
            End
            Item
               Name='发出单位'
@@ -50,13 +50,13 @@
               Name='规格型号'
            End
            Item
               Name='单位'
               Name='计量单位'
            End
            Item
               Name='数量'
               Name='实收数量'
            End
            Item
               Name='备注'
               Name='表体备注'
            End
            Item
               Name='制单人'
@@ -217,7 +217,7 @@
                  Charset=134
               End
               WordWrap=T
               DataField='单位'
               DataField='计量单位'
            End
            Item
               Column='Column9'
@@ -229,7 +229,7 @@
               End
               WordWrap=T
               ShrinkFontToFit=T
               DataField='数量'
               DataField='实收数量'
            End
            Item
               Column='Column12'
@@ -239,7 +239,7 @@
                  Weight=400
                  Charset=134
               End
               DataField='备注'
               DataField='表体备注'
            End
         End
      End
@@ -391,7 +391,7 @@
               Width=5.42396
               Height=0.396875
               TextAlign=MiddleCenter
               Text='器具其他出库单'
               Text='器具处理出库单'
            End
            Item
               Type=MemoBox
@@ -620,7 +620,7 @@
                  Bold=T
                  Charset=134
               End
               DataField='调入仓库'
               DataField='仓库'
            End
            Item
               Type=MemoBox
@@ -671,7 +671,7 @@
               Top=3.81
               Width=5.21229
               Height=0.582083
               DataField='调出仓库'
               DataField='部门'
            End
         End
         RepeatOnPage=T
@@ -722,7 +722,7 @@
                           Width=2.59292
                           Height=0.396875
                           TextAlign=MiddleCenter
                           DataField='数量'
                           DataField='实收数量'
                        End
                     End
                     ColSpan=2