fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by ZhongW
Commit 4a4dbad19576fabafebbb7efb005778137ba5833 1 parent ffe87d60

申请销售价 和申请销售价时间 和现有价格展示

Inline Side-by-side
Showing 2 changed files with 9 additions and 4 deletions
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 <a id="import-btn" href="javascript:;" class="btn btn-primary">批量导入</a> 82 <a id="import-btn" href="javascript:;" class="btn btn-primary">批量导入</a>
83 </div> 83 </div>
84 84
85 - <div class="panel-col" style="margin: 0 0 0 12px;width:15%;"> 85 + <div class="panel-col" style="margin: 0 0 0 12px;width:25%;">
86 <a id="batch_pass_btn" href="javascript:;" class="btn btn-success">通过</a> 86 <a id="batch_pass_btn" href="javascript:;" class="btn btn-success">通过</a>
87 <a id="batch_reject_btn" href="javascript:;" class="btn btn-danger">驳回</a> 87 <a id="batch_reject_btn" href="javascript:;" class="btn btn-danger">驳回</a>
88 <a id="batch_audit_btn" href="javascript:;" class="btn btn-primary">批量审核</a> 88 <a id="batch_audit_btn" href="javascript:;" class="btn btn-primary">批量审核</a>
@@ -327,12 +327,17 @@ var g = new common.grid({ @@ -327,12 +327,17 @@ var g = new common.grid({
327 return html; 327 return html;
328 }}, 328 }},
329 {display: '申请信息', render: function(item) { 329 {display: '申请信息', render: function(item) {
330 - var html = '<p>申请销售价:'+'<br>'+ 0 +'</p>';  
331 - html += '<p>申请销售价生效时间:'+'<br>'+ 0 +'</p>'; 330 + var html = '<p>申请销售价:'+'<br>'+ item.expectSalesPrice +'</p>';
  331 + html += '<p>申请销售价生效时间:'+'<br>'+ item.expectSalesPriceDate +'</p>';
332 return html; 332 return html;
333 }}, 333 }},
334 {display: '状态', render: function(item) { 334 {display: '状态', render: function(item) {
335 - return TABENUM.statusStr[item.checkState]; 335 +
  336 + var html = '<p>'+TABENUM.statusStr[item.checkState]+'</p>';
  337 + if(item.dealComment!="undefined"){
  338 + html += '<p><font color="red">'+item.dealComment +'</font></p>';
  339 + }
  340 + return html;
336 }}, 341 }},
337 {display: '违规类型', render: function(item) { 342 {display: '违规类型', render: function(item) {
338 return item.illegalType; 343 return item.illegalType;