Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

@@ -95,7 +95,7 @@ function ajaxSave(productSkn, yohoCoin, auditorId, salesPrice){
             "auditorId": auditorId
         }
     },function(rs){
-        freshYohoCoinRowData(rs.data);
+        freshYohoCoinRowData(rs.data, yohoCoin);
     });
 }
 
@@ -228,7 +228,7 @@ function checkAuditor(auditor){
 }
 
 //保存单行数据刷新
-function freshYohoCoinRowData(data){
+function freshYohoCoinRowData(data, needAuditCoin){
     var productSkn = data.productSkn;
     var yohoCoin = data.returnCoin;
     var status = data.coinStatus;
@@ -241,7 +241,7 @@ function freshYohoCoinRowData(data){
     SknDom.find(".coinStatus").html(ENUM.status[status]);
 
     var OperatInfoHtml = "<p>操作人："+ founderName +"</p>";
-    if(status == 1 && auditorId) OperatInfoHtml += "<p>审核人："+ ENUM.auditor[auditorId] +"</p>";
+    if(status == 1 && auditorId) OperatInfoHtml += "<p>审核金额："+ needAuditCoin +"</p><p>审核人："+ ENUM.auditor[auditorId] +"</p>";
     OperatInfoHtml += "<div style='color: #999; font-size: 12px'>"+ updateTime + "</div>";
     SknDom.find(".OperatInfo").html(OperatInfoHtml);
 

@@ -62,7 +62,7 @@ var COLUMNS = {
             {display: '执行返币金额', name: 'returnCoin', render: function(item) {
                 return item.productPrice.returnCoin;
             }},
-            {display: '审核返币金额', name: 'returnCoin', render: function(item) {
+            {display: '审核返币金额', name: 'needAuditCoin', render: function(item) {
                 return item.productPrice.needAuditCoin;
             }},
             {display: '状态', name: 'status', render: function(item) {
@@ -101,7 +101,10 @@ var COLUMNS = {
             }},
             {display: '吊牌价', name: 'retailPrice'},
             {display: '销售价', name: 'salesPrice'},
-            {display: '审核返币金额', name: 'returnCoin', render: function(item) {
+            {display: '执行返币金额', name: 'returnCoin', render: function(item) {
+                return item.productPrice.returnCoin;
+            }},
+            {display: '审核返币金额', name: 'needAuditCoin', render: function(item) {
                 return item.productPrice.needAuditCoin;
             }},
             {display: '状态', name: 'status', render: function(item) {

@@ -244,7 +244,7 @@
                 </td>
                 <td class="left OperatInfo" style="width: 12%">
                     [[if productPrice.founderName]]<p>操作人：[[productPrice.founderName]]</p>[[/if]]
-                    [[if productPrice.coinStatus == 1 && productPrice.auditorId]]<p>审核人：[[auditorName]]</p>[[/if]]
+                    [[if productPrice.coinStatus == 1 && productPrice.auditorId]]<p>审核金额：[[productPrice.needAuditCoin]]</p><p>审核人：[[auditorName]]</p>[[/if]]
                     [[if productPrice.auditDt]]<div style="color: #999; font-size: 12px;">[[updateTime]]</div>[[/if]]
                 </td>
                 <td class="operation" style="width: 5%">