Browse Source

1、特价申请=市场活动

2、业务担保的回款日期可能为空
master
chenxuhui 7 years ago
parent
commit
8055a5e2e7
1 changed files with 10 additions and 5 deletions
  1. +10
    -5
      pages/waitForApproval/approvalDetail/approvalDetail.js

+ 10
- 5
pages/waitForApproval/approvalDetail/approvalDetail.js View File

@ -103,7 +103,7 @@ Page({
case "销售-业务担保": case "销售-业务担保":
method = businessGuaranteeMethod; method = businessGuaranteeMethod;
break; break;
case "销售-特价申请":
case "销售-市场活动":
method = specialOrderApplyMethod; method = specialOrderApplyMethod;
break; break;
} }
@ -144,7 +144,7 @@ Page({
that.businessGuarantee(array, detailInfoTemplate, formTitleTemplate); that.businessGuarantee(array, detailInfoTemplate, formTitleTemplate);
break; break;
case "销售-特价申请":
case "销售-市场活动":
formTitleTemplate = "specialOrderApplyTitleTemplate"; formTitleTemplate = "specialOrderApplyTitleTemplate";
detailInfoTemplate = "specialOrderApplyTemplate"; detailInfoTemplate = "specialOrderApplyTemplate";
that.specialOrderApply(array, detailInfoTemplate, formTitleTemplate); that.specialOrderApply(array, detailInfoTemplate, formTitleTemplate);
@ -206,6 +206,11 @@ Page({
// 业务担保数据解析 // 业务担保数据解析
businessGuarantee: function(result, infoTemplate, titleTemplate) { businessGuarantee: function(result, infoTemplate, titleTemplate) {
var backDate ='';
if (result.CashBackDate) {
backDate =timechage.formatTimeTwo(result.CashBackDate.substring(6, 19), 'Y/M/D h:m')
}
var formTitle = { var formTitle = {
//返回的订单ID //返回的订单ID
orderID: result.ID, orderID: result.ID,
@ -218,7 +223,7 @@ Page({
// 担保日期 // 担保日期
GuaranteeDate: timechage.formatTimeTwo(result.GuaranteeDate.substring(6, 19), 'Y/M/D h:m'), GuaranteeDate: timechage.formatTimeTwo(result.GuaranteeDate.substring(6, 19), 'Y/M/D h:m'),
// 承诺回款日期 // 承诺回款日期
CashBackDate: timechage.formatTimeTwo(result.CashBackDate.substring(6, 19), 'Y/M/D h:m'),
CashBackDate: backDate,
// 担保金额 // 担保金额
GuaranteeMoney: result.GuaranteeMoney, GuaranteeMoney: result.GuaranteeMoney,
} }
@ -346,7 +351,7 @@ Page({
case "销售-业务担保": case "销售-业务担保":
method = businessGuaranteeForward; method = businessGuaranteeForward;
break; break;
case "销售-特价申请":
case "销售-市场活动":
method = specialOrderApplyForward; method = specialOrderApplyForward;
break; break;
} }
@ -377,7 +382,7 @@ Page({
case "销售-业务担保": case "销售-业务担保":
method = businessGuaranteeBackward; method = businessGuaranteeBackward;
break; break;
case "销售-特价申请":
case "销售-市场活动":
method = specialOrderApplyBackward; method = specialOrderApplyBackward;
break; break;
} }


Loading…
Cancel
Save