Merge branch 'master' into hotfix_erp_addMobile_1218

@@ -228,7 +228,7 @@ function getOrderList(){
            $(this).datagrid("getPanel").find("a[role='detail']").linkbutton({
            $(this).datagrid("getPanel").find("a[role='detail']").linkbutton({
                 onClick: function () {
                 onClick: function () {
                 	var orderCode = $(this).attr("dataId");
                 	var orderCode = $(this).attr("dataId");
-                    window.location.href = contextPath + "/html/orderManage/detail.html?orderCode=" + orderCode + "&ver=" + new Date().getTime();
+                    window.open(contextPath + "/html/orderManage/detail.html?orderCode=" + orderCode + "&ver=" + new Date().getTime())
                 }
                 }
             });
             });
         }
         }

@@ -254,7 +254,7 @@
                 title = "添加品牌系列";
                 title = "添加品牌系列";
                 message = "确认添加品牌系列信息吗？";
                 message = "确认添加品牌系列信息吗？";
             } else {
             } else {
-            		window.location.href = contextPath + "/html/product/productEdit.html?id=" + id;
+                window.open(contextPath + "/html/product/productEdit.html?id=" + id)
             }
             }
         }
         }