elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item

Browse Source
master
zhengyongxing 4 years ago
parent 2040991894 e7501be7c3
commit 8bce1bd12c
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File

22
Application/Admin/Controller/CompanyStatementPoolController.class.php
Unescape Escape View File

@ -170,7 +170,7 @@ class CompanyStatementPoolController extends ThinkController
}elseif($v['verify_status'] == 1){ }elseif($v['verify_status'] == 1){
$ts = "打款信息确认"; $ts = "打款信息确认";
}elseif($v['verify_status'] == 2){ }elseif($v['verify_status'] == 2){
$ts = "打款信息确认"; $ts = "待打款";
}elseif($v['verify_status'] == 3){ }elseif($v['verify_status'] == 3){
$ts = "打款中"; $ts = "打款中";
}elseif($v['verify_status'] == 4){ }elseif($v['verify_status'] == 4){
@ -995,7 +995,8 @@ class CompanyStatementPoolController extends ThinkController
//审批通过 //审批通过
public function verifyAgree(){ public function verifyAgree(){
$this->setVerifyStatus([1,6],2,"verify"); $this->setVerifyStatus(6,1,"payment",false);
$this->setVerifyStatus(1,2,"verify");
} }
public function verifyRefuse(){ public function verifyRefuse(){
$this->setVerifyStatus([1,6],-1,"verify"); $this->setVerifyStatus([1,6],-1,"verify");
@ -1052,7 +1053,7 @@ class CompanyStatementPoolController extends ThinkController
} }
protected function setVerifyStatus($old_status,$change_status,$op_pre) protected function setVerifyStatus($old_status,$change_status,$op_pre,$ajaxreturn=true)
{ {
if(!isset($_REQUEST['ids'])) $this->error("参数错误"); if(!isset($_REQUEST['ids'])) $this->error("参数错误");
$ids = $_REQUEST['ids']; $ids = $_REQUEST['ids'];
@ -1073,10 +1074,13 @@ class CompanyStatementPoolController extends ThinkController
$opname = $this->VerifyStatus[$change_status]; $opname = $this->VerifyStatus[$change_status];
addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>$opname,'url'=>U('lists')]); addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>$opname,'url'=>U('lists')]);
} }
$this->ajaxReturn(array( if($ajaxreturn){
'status' => 1, $this->ajaxReturn(array(
"info"=>$opname."成功" 'status' => 1,
)); "info"=>$opname."成功"
));
}
} }
protected function setOneVerifyStatus($change_status,$op_pre,$id,$mgs = "操作") protected function setOneVerifyStatus($change_status,$op_pre,$id,$mgs = "操作")
@ -1564,7 +1568,7 @@ class CompanyStatementPoolController extends ThinkController
case '-2': case '-2':
case '-1': case '-1':
case '0': case '0':
$optist = ["viewPool","reCount","cancelPool","setPayment"]; $optist = ["viewPool","reCount","cancelPool"];
break; break;
case '1': case '1':
$optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","editPayment","setUlPayment"]; $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","editPayment","setUlPayment"];
@ -1608,7 +1612,7 @@ class CompanyStatementPoolController extends ThinkController
} }
if ($info['withdraw_type'] == "特殊补点") { if ($info['withdraw_type'] == "特殊补点") {
$optist = ['viewPool','cancelPool']; $optist = array_diff($optist, ["reCount"]);
if ($info['company_type'] == 2 && $info['verify_status'] == '0') { if ($info['company_type'] == 2 && $info['verify_status'] == '0') {
array_push($optist,'editSpecialPuPool'); array_push($optist,'editSpecialPuPool');
} }

Write Preview
Loading…
Cancel
Save