Merge branch 'hotfix/market_percentage' of wmtx/platform into release

特殊补点无法重算限制

Application/Admin/Controller/CompanyStatementController.class.php

@@ -447,7 +447,17 @@ class CompanyStatementController extends ThinkController
     {
         if(!isset($_REQUEST['ids'])) $this->error("参数错误");
         $ids = $_REQUEST['ids'];
-        $dbres = $this->DBModel->field("id,verify_status,verify_log")->where("id in ({$ids})")->select();
+        $dbres = $this->DBModel->field("id,verify_status,verify_log,withdraw_type")->where("id in ({$ids})")->select();
+        foreach ($dbres as $key => $value) {
+            if($value['withdraw_type'] == 3) {
+                $this->ajaxReturn(array(
+                    'status' => 0,
+                    "info"=>"特殊补点无法重算"
+                ));
+            }
+        }
+
+
         foreach($dbres as $k=>&$v){
             // if(in_array($v['verify_status'],[3,4])) continue; //合作方确认后不进行重算
             //重算

Application/Admin/View/CompanyStatement/lists.html

@@ -478,7 +478,7 @@
                     var opst ="[审批通过]";
                     var status = [1];
                 }else if(id=="updateStatement"){
-                    var opname = "重算金额";
+                    var opname = "重算金额(特殊补点无法重算)";
                     var opurl = "{:U('updateStatement')}";
                     var opst ="[汇总撤销,管理员审批拒绝,未进行审批,管理员审批通过]";
                     var status = [-3,-2,-1,0,1];