diff --git a/Application/Admin/Controller/AggregateRelationController.class.php b/Application/Admin/Controller/AggregateRelationController.class.php index 010e2d504..a94f0fea4 100644 --- a/Application/Admin/Controller/AggregateRelationController.class.php +++ b/Application/Admin/Controller/AggregateRelationController.class.php @@ -299,7 +299,7 @@ class AggregateRelationController extends AdminController $dbres = $this->DBlogModel->field("id,status,verify_log")->where("id in ({$ids})")->select(); foreach($dbres as $k=>&$v){ if($v['status'] != 1) continue; - $v['verify_log'] = json_decode($v['verify_log'],true); +// $v['verify_log'] = json_decode($v['verify_log'],true); $v['verify_log']['admin_user']=$this->admininfo["username"]; $v['verify_log']['admin_time']=date("Y-m-d H:i:s"); $v['verify_log'] = json_encode($v['verify_log']); @@ -317,8 +317,9 @@ class AggregateRelationController extends AdminController if(!isset($_REQUEST['ids'])) $this->error("参数错误"); $ids = $_REQUEST['ids']; $dbres = $this->DBlogModel->field("*")->where("id in ({$ids})")->select(); + foreach($dbres as $k=>&$v){ - if($v['status'] != 1) continue; + if($v['status'] != 1 && $v['status'] != 0) continue; $v['verify_log'] = json_decode($v['verify_log'],true); $v['verify_log']['admin_user']=$this->admininfo["username"]; $v['verify_log']['admin_time']=date("Y-m-d H:i:s"); @@ -739,8 +740,8 @@ class AggregateRelationController extends AdminController { $mentBtn = [ - "marketAgree"=>"市场部审批通过", - "marketRefuse"=>"市场部审核拒绝", +// "marketAgree"=>"市场部审批通过", +// "marketRefuse"=>"市场部审核拒绝", "adminAgree"=>"管理员审核通过", "adminRefuse"=>"管理员审核拒绝" ]; diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html index e5ae3599a..43f80cc77 100644 --- a/Application/Admin/View/AggregateFinanceStatement/lists.html +++ b/Application/Admin/View/AggregateFinanceStatement/lists.html @@ -445,7 +445,7 @@ //重算金额 $("#updateStatement").on("click",function(){ var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { - if($(elem).data("status") == 0 || $(elem).data("status") == 1 || $(elem).data("status") == -1){ + if($(elem).data("status") == 0 || $(elem).data("status") == 1 || $(elem).data("status") == -1 || $(elem).data("status") == -3){ return $(elem).val(); }else{ flag = true; diff --git a/Application/Admin/View/AggregateRelation/lists.html b/Application/Admin/View/AggregateRelation/lists.html index 1aef9b512..ea253b666 100644 --- a/Application/Admin/View/AggregateRelation/lists.html +++ b/Application/Admin/View/AggregateRelation/lists.html @@ -150,7 +150,7 @@ 开票内容 收款方 创建记录 - 市场部审批 + 管理员审批 备注 操作 @@ -182,17 +182,17 @@ {$data.create} - - -
- {$data.market} -
- -
- {$data.market} -
-
- + + + + + + + + + + +
@@ -341,7 +341,7 @@ $(function(){ var flag = false; var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { - if($(elem).data("status") != status){ + if($(elem).data("status") != 0 && $(elem).data("status") != 1 ){ flag = true; }else{ return $(elem).val();