diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 47b81c0e8..45679b4fa 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -434,13 +434,30 @@ class CompanyStatementPoolController extends ThinkController "info"=>$opname."成功" )); } + + protected function setOneVerifyStatus($change_status,$op_pre,$id,$mgs = "操作") + { + $dbres = $this->DBModel->field("id,verify_status,verify_log")->where("id = {$id}")->find(); + $dbres['verify_log'] = json_decode($dbres['verify_log'],true); + $dbres['verify_log'][$op_pre.'_user']=$this->admininfo["username"]; + $dbres['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s"); + $dbres['verify_log'] = json_encode($dbres['verify_log']); + $dbres['verify_status']=$change_status; + $this->DBModel->save($dbres); + addOperationLog(['op_type'=>1,'key'=>$id,"op_name"=>$mgs,'url'=>U('lists')]); + $this->ajaxReturn(array( + 'status' => 1, + "info"=>$mgs."成功" + )); + } + //打款设置 public function setPayment(){ if(!isset($_REQUEST['id'])) $this->error("参数错误"); $id = $_REQUEST['id']; $CompanyInfo = M("company_statement_info","tab_") ->alias('i') - ->field("i.id,i.pool_id,i.company_name,i.company_info,i.statement_money,p.statement_num,i.remark,p.statement_money all_money") + ->field("i.id,i.pool_id,i.company_name,i.company_info,i.statement_money,p.statement_num,i.remark,i.pay_status,p.statement_money all_money") ->join("tab_company_statement_pool p ON p.id = i.pool_id") ->where("pool_id='{$id}'") ->select(); @@ -451,9 +468,36 @@ class CompanyStatementPoolController extends ThinkController } $this->assign("CompanyInfo",$CompanyInfo); + $this->assign("id",$id); $this->display(); - - + } + //修改打款设置 + public function editPayment(){ + if(!isset($_REQUEST['info'])) $this->error("参数错误"); + $info = $_REQUEST['info']; + $CompanyInfo = M("company_statement_info","tab_"); + //循环保存 + foreach($info as $k=>$v){ + $ydata = $CompanyInfo->where("id= '{$k}'")->find(); + if($ydata['verify_status'] == 2){continue;} + + $company_info = json_decode($ydata['company_info'],true); + $company_info['ali_user'] = $v['ali_user']; + $company_info['ali_account'] = $v['ali_account']; + $savedata = [ + "company_info"=>json_encode($company_info,JSON_UNESCAPED_UNICODE), + "remark"=>$v['remark'], + "id"=>$k + ]; + if(empty($v['ali_user']) || empty($v['ali_account'])){ + $savedata['verify_status'] = -1; + }else{ + $savedata['verify_status'] = 1; + } + $CompanyInfo->save($savedata); + } + //修改状态 + $this->setOneVerifyStatus(2,"payment",$_REQUEST['pool_id'],$mgs = "打款信息提交"); } //保存备注 @@ -737,8 +781,8 @@ class CompanyStatementPoolController extends ThinkController "setUlPayment"=>"线下打款", "setPayment"=>"打款信息提交", - "editPayment"=>"打款信息编辑", - "viePayment"=>"打款详情", + "editPayment"=>"打款信息编辑", + "viePayment"=>"打款详情", 'reCount'=>"重算", 'cancelPool'=>"撤销汇总", @@ -759,7 +803,7 @@ class CompanyStatementPoolController extends ThinkController $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","editPayment"]; break; case '3': - $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","viePayment"]; + $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","editPayment","viePayment"]; break; case '4': $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","viePayment"]; diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html index 09f698766..fd4a4397c 100644 --- a/Application/Admin/View/CompanyStatementPool/lists.html +++ b/Application/Admin/View/CompanyStatementPool/lists.html @@ -217,7 +217,7 @@
- 导出 + {$_page|default=''}
@@ -409,7 +409,7 @@ var url = "{:U('setUlPayment')}"; cancelPoolAjax(url,{ids:id}); }) - $(".setPayment").on("click",function(){ + $(".setPayment,.editPayment").on("click",function(){ var id = $(this).data("id"); var url = "{:U('setPayment')}"+"&id="+id layer.open({ diff --git a/Application/Admin/View/CompanyStatementPool/setPayment.html b/Application/Admin/View/CompanyStatementPool/setPayment.html index be1e93892..9ace64b39 100644 --- a/Application/Admin/View/CompanyStatementPool/setPayment.html +++ b/Application/Admin/View/CompanyStatementPool/setPayment.html @@ -114,15 +114,28 @@ - - {$key-0+1} - {$vo.company_name} - - - {$vo.statement_num} - {$vo.statement_money} - - + + + {$key-0+1} + {$vo.company_name} + + + {$vo.statement_num} + {$vo.statement_money} + + + + + {$key-0+1} + {$vo.company_name} + {$vo.company_info.ali_user} + {$vo.company_info.ali_account} + {$vo.statement_num} + {$vo.statement_money} + {$vo.remark} + + + 合计: @@ -142,6 +155,7 @@ diff --git a/Application/Admin/View/CompanyStatementPool/viewPayment.html b/Application/Admin/View/CompanyStatementPool/viewPayment.html new file mode 100644 index 000000000..9ace64b39 --- /dev/null +++ b/Application/Admin/View/CompanyStatementPool/viewPayment.html @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号合作公司支付宝真实名称支付宝账号关联结算汇总单订单号金额(元)备注
{$key-0+1}{$vo.company_name}{$vo.statement_num}{$vo.statement_money}
{$key-0+1}{$vo.company_name}{$vo.company_info.ali_user}{$vo.company_info.ali_account}{$vo.statement_num}{$vo.statement_money}{$vo.remark}
合计:打款总金额:{$CompanyInfo[0]['all_money']}
+
+
+
+
+ 确认提交 +
+
+ + + + + + \ No newline at end of file