Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Home/Controller/FinanceController.class.php

@@ -567,7 +567,7 @@ class FinanceController extends BaseController
     }
 
     //审核拒绝 重新审核
-    public function renewReview($id)
+    public function renewReview()
     {
         //是否是会长
         $this->purview();
@@ -581,6 +581,29 @@ class FinanceController extends BaseController
             $this->ajaxReturn($data);
         }
 
-        $id = intval($id);
+        $id = intval(I('id', 0));
+        $data = M('withdraw', 'tab_')->find($id);
+        if (empty($data) || $data['status'] != -1) {
+            $data['status'] = 0;
+            $data['msg'] = '数据异常';
+            $this->ajaxReturn($data);
+        }
+        if ($data['promote_id'] != $this->loginPromote['id']) {
+            $data['status'] = 0;
+            $data['msg'] = '权限异常';
+            $this->ajaxReturn($data);
+        }
+
+        $save['status'] = 0;
+        $save['id'] = $id;
+        $res = M('withdraw', 'tab_')->save($save);
+        if ($res === false) {
+            $data['status'] = 0;
+            $data['msg'] = '提交失败';
+        } else {
+            $data['status'] = 1;
+            $data['msg'] = '提交成功';
+        }
+        $this->ajaxReturn($data);
     }
 }

Application/Home/View/default/Finance/withdrawRecord.html

@@ -174,9 +174,9 @@
                       <if condition="$vo['status'] eq 2">
                           <a data-href="{:U('download/Remittancecer',['id'=>$vo['id']])}" class="ajax-get">汇款证明</a>
                         <elseif condition="$vo['status'] eq -1"/>
-                        <a href="{:U('settlementOrder', array('id'=>$vo['id']))}" style="color: #0bb20c;">重新审核</a>
+                        <span class="renew-review" data-id="{$vo['id']}" style="color: #0bb20c;cursor: pointer;">重新审核</span>
                       </if>
-                      <a href="{:U('renewReview', array('id'=>$vo['id']))}">结算单</a>
+                      <a href="{:U('settlementOrder', array('id'=>$vo['id']))}">结算单</a>
                     </td>
                   </tr>
                 </volist>
@@ -269,6 +269,30 @@
           });
 
           $(".select_gallery").select2();
+
+          $('.renew-review').click(function () {
+             var id = parseInt($(this).attr('data-id'));
+
+              $.ajax({
+                  type: 'post',
+                  url: '{:U("renewReview")}',
+                  dataType: 'json',
+                  data: {id:id},
+                  success: function (data) {
+                      if (data.status == 1) {
+                          layer.msg(data.msg, {icon: 1});
+                          setTimeout(function(){
+                              window.location.reload();
+                          },2000);
+                      } else {
+                          layer.msg(data.msg, {icon: 5});
+                      }
+                  },
+                  error: function (result) {
+                      layer.msg('网络异常', {icon: 5});
+                  }
+              });
+          });
       });
   </script>