Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev

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

@@ -6,17 +6,14 @@ $(function () {
         $("#HGWD001").css("padding-bottom", "8px")
         sessionStorage.removeItem("__user_id__")
         setTimeout(() => {
-            resultGrid.dataSource.page(1);
            // 显示授权按钮
            showAuthButton();
         }, 1000);
         // 查询
-        $("#QUERY").on("click", function (e) {
-            resultGrid.dataSource.page(1);
-        });
-        $("#QUERY1").on("click", function (e) {
-            result1Grid.dataSource.page(1);
-        });
+        $("#QUERY").on("click", query);
+
+        $("#QUERY1").on("click", query1);
+
         $("#QUERY2").on("click", function (e) {
             result2Grid.dataSource.page(1);
         });
@@ -528,6 +525,10 @@ let query = function () {
     resultGrid.dataSource.page(1);
 }
 
+let query1 = function () {
+	result1Grid.dataSource.page(1);
+}
+
 /**
  * 新增组织机构回调
  */

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

@@ -77,7 +77,7 @@
 				</div>
 			</EF:EFRegion>
 			<EF:EFRegion id="result" title="明细信息" fitHeight="true">
-				<EF:EFGrid blockId="result" autoDraw="no" showCount="true" height="74vh" sort="all"
+				<EF:EFGrid blockId="result" autoDraw="no" autoBind="false" showCount="true" height="74vh" sort="all"
 				           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"/>
@@ -126,16 +126,17 @@
 		</div>
 	</EF:EFRegion>
 	<EF:EFRegion id="result1" title="明细信息" >
-		<EF:EFGrid blockId="result1" autoDraw="override" isFloat="true" checkMode="row" queryMethod="query1">
+		<EF:EFGrid blockId="result1" autoDraw="override" autoBind="false" isFloat="true" checkMode="row"
+		           queryMethod="query1">
 			<EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="parentId" cname="上级ID" hidden="true"/>
 			<EF:EFComboColumn ename="projCode" cname="项目名称" blockName="proj_record_block_id"
-							  columnTemplate="#=textField#" itemTemplate="#=textField#"
-							  textField="textField" valueField="valueField"
-							  maxLength="16" readonly="true" width="200" required="true"
-							  align="left" filter="contains" sort="true"/>
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#"
+			                  textField="textField" valueField="valueField"
+			                  maxLength="16" readonly="true" width="200" required="true"
+			                  align="left" filter="contains" sort="true"/>
 			<EF:EFColumn ename="projName" cname="项目名称" width="160" enable="true" readonly="true" align="left"
-						 required="true" hidden="true"/>
+			             required="true" hidden="true"/>
 			<EF:EFComboColumn ename="fileType" cname="目录类型" width="100" align="center" readonly="false" required="true"
 							  defaultValue="20">
 				<EF:EFCodeOption codeName="hggp.hgwd.fileType"/>
@@ -157,11 +158,12 @@
 		</div>
 	</EF:EFRegion>
 	<EF:EFRegion id="result2" title="明细信息" >
-		<EF:EFGrid blockId="result2" autoDraw="override" isFloat="true" checkMode="single" queryMethod="query2">
+		<EF:EFGrid blockId="result2" autoDraw="override" autoBind="false" isFloat="true" checkMode="single"
+		           queryMethod="query2">
 			<EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="parentId" cname="上级ID" hidden="true"/>
 			<EF:EFComboColumn ename="projCode" cname="项目名称" blockName="proj_record_block_id"
-							  columnTemplate="#=textField#" itemTemplate="#=textField#"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#"
 							  textField="textField" valueField="valueField"
 							  maxLength="16" readonly="true" width="200" required="true"
 							  align="left" filter="contains" sort="true"/>