Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart

src/main/webapp/HG/KC/HGKC005A.js

@@ -65,11 +65,11 @@ let select = function () {
         return;
     }
     for (let i = 0; i < rows.length; i++) {
-        let entityAmount = rows[i]['entityAmount'];
-        if (!isPositiveInteger(entityAmount)) {
-            message("勾选的第" + (i + 1) + "行实物数量必须是大于0的整数");
-            return;
-        }
+        // let entityAmount = rows[i]['entityAmount'];
+        // if (!isPositiveInteger(entityAmount)) {
+        //     message("勾选的第" + (i + 1) + "行实物数量必须是大于0的整数");
+        //     return;
+        // }
     }
     JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据生成盘点单吗? ", {
         ok: function () {

src/main/webapp/HG/WD/HGWD001.jsp

@@ -81,7 +81,7 @@
 			</EF:EFRegion>
 			<EF:EFRegion id="result" title="明细信息" fitHeight="true">
 				<EF:EFGrid blockId="result" autoDraw="no" autoBind="false" showCount="true" checkMode="row"
-				           sort="single" serviceName="HGWD099" queryMethod="query" deleteMethod="delete">
+				           height="69vh" sort="single" serviceName="HGWD099" queryMethod="query" deleteMethod="delete">
 					<EF:EFColumn ename="id" cname="ID" hidden="true"/>
 					<EF:EFColumn ename="docId" cname="文件ID" enable="false" width="180" hidden="true"/>
 					<EF:EFColumn ename="operator" cname="操作" enable="false" width="150" align="center" sort="false"/>