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

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC001.xml

@@ -44,7 +44,7 @@
 			PROJ_TYPE = #projType#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME LIKE ('%$#projName#$%')
+			PROJ_NAME LIKE ('%$projName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="status">
 			STATUS = #status#

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml

@@ -78,7 +78,7 @@
 			PRDT_NAME LIKE ('%$#prdtName#$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME LIKE ('%$#projName#$%')
+			PROJ_NAME LIKE ('%$projName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="status">
 			STATUS = #status#

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml

@@ -37,7 +37,7 @@
 			PROJ_CODE = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME LIKE ('%$#projName#$%')
+			PROJ_NAME LIKE ('%$projName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="planInfoNo">
 			PLAN_INFO_NO = #planInfoNo#

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC011.xml

@@ -44,7 +44,7 @@
 			PROJ_TYPE = #projType#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME LIKE ('%$#projName#$%')
+			PROJ_NAME LIKE ('%$projName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="status">
 			STATUS = #status#

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

@@ -144,7 +144,13 @@ $(function () {
              */
             onSave: function (e) {
                 // 不向后台保存
-
+                var tree = $("#materialTree").data("kendoTreeView");
+                var inInfo = new EiInfo();
+                EiCommunicator.send("HPSC002", "queryTreeNode", inInfo, {//传入参数
+                    onSuccess: function (inInfo) {
+                        tree.reload("root");//更新树
+                    }
+                });
             },
             /**
              * 点击Grid删除按钮时触发的事件
@@ -154,13 +160,13 @@ $(function () {
             onDelete: function (e) {
                 // 不向后台保存
                 console.log(e)
-                // var tree = $("#materialTree").data("kendoTreeView");
-                // var inInfo = new EiInfo();
-                // EiCommunicator.send("HPSC002", "queryTreeNode", inInfo, {//传入参数
-                //     onSuccess: function (inInfo) {
-                //         tree.reload("root");//更新树
-                //     }
-                // });
+                var tree = $("#materialTree").data("kendoTreeView");
+                var inInfo = new EiInfo();
+                EiCommunicator.send("HPSC002", "queryTreeNode", inInfo, {//传入参数
+                    onSuccess: function (inInfo) {
+                        tree.reload("root");//更新树
+                    }
+                });
             },
             toolbarConfig: {
                 hidden: false, // true时，不显示功能按钮，但保留setting导出按钮