Authored by caoyan

Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/ufo-platform into test6.8.2

... ... @@ -279,7 +279,7 @@ function getToBeJudgedList(){
return "<a role='pass' dataId='"+ rowData.id + "'" + " orderCode='"+rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important;'>鉴定通过</a>"+
"<a role='reject' dataId='"+ rowData.id + "'" + " skup='"+rowData.skup +"' style='margin-left:10px;background-color: #d9534f !important;'>鉴定不通过</a>";
} else if (rowData.status == 17) {
return "<a role='reback' dataId='"+ rowData.id + "'" + " orderCode='"+rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important;'>寄回</a>";
return "<a role='reback' dataId='"+ rowData.id + "'" + " skup='"+rowData.skup +"' style='margin-left:10px;background-color: #5cb85c !important;'>寄回</a>";
}
}
}]],
... ... @@ -330,8 +330,8 @@ function getToBeJudgedList(){
$(this).datagrid("getPanel").find("a[role='reback']").linkbutton({
onClick: function () {
var buyerOrderCode = $(this).attr("orderCode");
$("#buyerOrderCode").val(buyerOrderCode);
var skup = $(this).attr("skup");
$("#skup").val(skup);
addRebackPage($(this).attr("dataId"));
}
});
... ...