Merge remote-tracking branch 'origin/dev' into dev

src/main/webapp/HG/YX/HGYX001A.jsp

@@ -72,25 +72,25 @@
     <EF:EFRegion id="result" title="明细信息">
         <EF:EFGrid blockId="result" autoDraw="override"  isFloat="true">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
-            <EF:EFComboColumn ename="inventType" cname="存货类型" enable="true" width="120" align="center" required="true"
+            <EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="120" align="center" required="true"
                               blockName="invent_type_box_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
                               filter="contains">
             </EF:EFComboColumn>
-            <EF:EFComboColumn ename="inventCode" cname="存货名称" enable="true" width="120" align="center" required="true"
+            <EF:EFComboColumn ename="inventCode" cname="存货名称" enable="false" width="120" align="center" required="true"
                               blockName="invent_code_box_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
                               filter="contains">
             </EF:EFComboColumn>
-            <EF:EFComboColumn ename="spec" cname="规格" enable="true" width="120" align="center" required="true"
+            <EF:EFComboColumn ename="spec" cname="规格" enable="false" width="120" align="center" required="true"
                               blockName="spec_box_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
                               filter="contains">
             </EF:EFComboColumn>
             <EF:EFColumn ename="inventRecordId" cname="规格ID" width="120" enable="true" readonly="true" align="center" hidden="true" maxLength="50"/>
-            <EF:EFColumn ename="length" cname="长度(MM)" enable="true" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/>
-            <EF:EFColumn ename="width" cname="宽度(MM)" enable="true" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/>
-            <EF:EFColumn ename="thick" cname="厚度(MM)" enable="true" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/>
+            <EF:EFColumn ename="length" cname="长度(MM)" enable="false" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/>
+            <EF:EFColumn ename="width" cname="宽度(MM)" enable="false" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/>
+            <EF:EFColumn ename="thick" cname="厚度(MM)" enable="false" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/>
             <EF:EFColumn ename="quantity" cname="数量" width="120" enable="true" format="{0:N0}" editType="text"
                          displayType="0.000" sort="true" align="right"
                          data-regex="/^-?[0-9]{1,15}$/" maxLength="20" required="true"