Merge branch 'dev_变价优化' into grey

@@ -189,16 +189,18 @@ var t = new common.tab2({
                         g.options.columns[15].hidden = false;
                         g.options.columns[11].hidden = true;
 						
-						 if (authority == 2) {
-						     g.options.columns[17].hidden = false;
                         $("#batch_pass_btn").show(); 
                         $("#batch_reject_btn").show(); 
                         $("#batch_audit_btn").show(); 
-                             $("#batch_audit_to_third_btn").show();
+                        g.options.columns[17].hidden = false;
+						 /*if (authority == 2) {
+						     g.options.columns[17].hidden = false;
+                             
+                             //$("#batch_audit_to_third_btn").show();
                          }
 					     else {
-						     g.options.columns[17].hidden = true;
-                         }
+						     
+                         }*/
                     }
                     break;  
                /*case 'toThirdAuditNum':
@@ -860,9 +862,9 @@ var priceToThirdCheck = {
 
 // 驳回
 var priceReject = {
-    toast: function(content, fn) {
-        var url = "/goods/price/reject"
-        if(fn().currentState == '102' ){
+    toast: function(content, fn,state) {
+        var url = "/goods/price/reject";
+        if(state == '102' ){
             url = "/goods/price/reject1"
         }
         var $this = $(this);
@@ -918,7 +920,7 @@ $(document).on("click", ".audit-reject-btn", function() {
             dealComment: reason
         };
     }
-    priceReject.toast.call(this, $("#template3").html(), data);
+    priceReject.toast.call(this, $("#template3").html(), data,item.checkState);
 });
 
 //批量通过
@@ -964,7 +966,7 @@ $(document).on("click", "#batch_pass_btn", function() {
 
 //批量驳回
 $(document).on("click", "#batch_reject_btn", function() {
-
+    var checkState="";
     var count = 0,
         selectedArr = g.selected,
         len = selectedArr.length,
@@ -985,6 +987,7 @@ $(document).on("click", "#batch_reject_btn", function() {
         if (len > 0) {
             $.each(selectedArr, function(i, value) {
                 planIdList.push(value['planId']);
+                checkState = value['checkState'];
             });
         }
         var result=function(){
@@ -998,7 +1001,7 @@ $(document).on("click", "#batch_reject_btn", function() {
                     planIdList:JSON.stringify(planIdList)
             }; 
         }
-        priceReject.toast.call(this, $("#template3").html(), result);
+        priceReject.toast.call(this, $("#template3").html(), result,checkState);
     }else{
         common.util.__tip('请选择待驳回的记录', 'warning');
         return;