Merge branch 'dev' of http://git.pseer.com/platform/hp-smart into dev-ly

src/main/webapp/HP/SC/HPSC011.js

@@ -26,8 +26,8 @@ $(function () {
 });
 
 function jump(id) {
-    var herf= ctx + "\\web\\"+ "HPSC002?inqu_status-0-projId=" + id;
-    window.open(herf);
+	var herf = ctx + "\\web\\" + "HPSC002?inqu_status-0-projId=" + id + "&efParentFormEname=HPSC011";
+	window.open(herf);
 }
 
 

src/main/webapp/common/js/jsUtils.js

@@ -192,8 +192,11 @@
 			} else {
 			}
 			// 当前页面号
-			let efFormEname = __eiInfo.extAttr[EiConstant.EF_FORM_ENAME];
-			href = href + (href.indexOf("?") == -1 ? '?' : '&') + "efParentFormEname=" + efFormEname;
+			let efParentFormEname = __eiInfo.extAttr["efParentFormEname"];
+			if (!isAvailable(efParentFormEname)) {
+				efParentFormEname = __eiInfo.extAttr[EiConstant.EF_FORM_ENAME];
+			}
+			href = href + (href.indexOf("?") == -1 ? '?' : '&') + "efParentFormEname=" + efParentFormEname;
 			parameter["href"] = href;
 			popWindow = divhtml.data("kendoWindow");
 			popWindow.setOptions({