Authored by xuhongyun

Merge branch 'dev_2.2' into test

... ... @@ -445,7 +445,9 @@ var g = new common.grid({
}},
{display: '申请信息', render: function(item) {
var html = '<p>申请销售价:'+'<br>'+ item.expectSalesPrice +'</p>';
html += '<p>申请销售价生效时间:'+'<br>'+ item.expectSalesPriceDate +'</p>';
html += '<p>申请销售价生效时间:'+'<br>'+ item.expectSalesPriceDate +'</p>';
if(item.cgpriceEndTime) html += '<p>申请销售价结束时间:'+'<br>'+ item.cgpriceEndTime +'</p>';
return html;
}},
{display: '状态', render: function(item) {
... ...