Authored by Lixiaodi

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

... ... @@ -521,7 +521,8 @@ function getToBeReceiveListOrJudgedList(platformWaybillShowFlag,paramStatusStr,p
var skup = $(this).attr("skup");
$("#skup").val(skup);
var order_code = $(this).attr("order_code");
addRejectPage($(this).attr("dataId"),order_code);
var reason = $(this).attr("reason");
addRejectPage($(this).attr("dataId"),order_code,reason);
}
});
... ... @@ -679,7 +680,7 @@ function getTableColumn(platformWaybillShowFlag) {
operateButton += "<a role='queryCheckNotPass' dataId='"+ rowData.id +"' style='margin-left:10px;background-color: #5bc0de !important;color: #fff !important;'>查看质检图片</a>";
}
return operateButton;
} else if (rowData.status == 13||rowData.status == 17||rowData.status == 20||rowData.status == 21||rowData.status == 22) {
} else if (rowData.status == 13||rowData.status == 17||rowData.status == 20||rowData.status == 21||rowData.status == 22||rowData.status == 23) {
var operateButton="";
if(rowData.platformWaybillCode){
operateButton += "<a role='platform_waybill_viewExpress' order_code='"+ rowData.orderCode + "' style='margin-left:10px;background-color: #5cb85c !important;'>查看物流</a>";
... ... @@ -688,7 +689,18 @@ function getTableColumn(platformWaybillShowFlag) {
if(rowData.status == 17){
roleName="reback_cause_of_buyer_cancel"
}
operateButton += "<a role='"+roleName+"' dataId='"+ rowData.id + "'" +" order_code='"+rowData.orderCode +"'"+ " skup='"+rowData.skup +"' style='margin-left:10px;background-color: #5cb85c !important;'>寄回</a>";
var reason = rowData.status == 17 ? "发货后买家取消"
: rowData.status == 20 ? "质检不通过"
: rowData.status == 21 ? "瑕疵不接受"
: rowData.status == 22 ? "瑕疵确认超时"
: rowData.status == 23 ? "无法鉴定"
: "鉴定不通过";
operateButton += "<a role='"+roleName
+ "' dataId='"+ rowData.id
+ "' order_code='"+rowData.orderCode
+ "' skup='"+rowData.skup
+ "' reason='"+reason
+ "' style='margin-left:10px;background-color: #5cb85c !important;'>寄回</a>";
}
if (rowData.containMp4Flag) {
... ... @@ -1067,13 +1079,13 @@ function addRebackPage(id,orderCode) {
//鉴定不通过后退回商品
function addRejectPage(id,orderCode) {
function addRejectPage(id,orderCode,reason) {
var div = $("<div id='rejectDiv'>").appendTo($(document.body));
var url = contextPath + "/html/judgeCenter/reject.html?time_version=" + new Date().getTime();;
var url = contextPath + "/html/judgeCenter/reject.html?time_version=" + new Date().getTime();
$(div).myDialog({
width: "50%",
height: "60%",
title: "商品寄回(鉴定不通过)",
title: "商品寄回(" + reason ? reason : "鉴定不通过"+ ")",
href: url,
modal: true,
collapsible: true,
... ...