From 178c86a7512efb35c718ffb68989a9d14700a51f Mon Sep 17 00:00:00 2001 From: zyx Date: Thu, 1 Oct 2020 14:43:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=92=A4=E9=94=80=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=80=E5=9B=9E=E5=AE=A1=E6=A0=B8=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AggregateFinanceStatementController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 0bac1a77d..758c9b75e 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -836,7 +836,7 @@ class AggregateFinanceStatementController extends ThinkController $optist = ["viewStatement"]; break; case '-3': - $optist = ["viewStatement","editStatement","addRemark","viewRemark","editRemark"]; + $optist = ["viewStatement","cancelVerify","addRemark","viewRemark","editRemark"]; break; case '-1': $optist = ["viewStatement","cancelVerify","addRemark","viewRemark","editRemark"]; From 52f4cbacb997e514b33c2d71026729755f24d82c Mon Sep 17 00:00:00 2001 From: zyx Date: Thu, 1 Oct 2020 15:27:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AggregateFinanceStatementController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 758c9b75e..ae6ea4ed4 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -200,7 +200,7 @@ class AggregateFinanceStatementController extends ThinkController "statement_info"=>json_encode($statement_info,JSON_UNESCAPED_UNICODE), "admin_name"=>$admininfo['username'], "admin_id"=>$admininfo['uid'], - "verify_status"=>1, + "verify_status"=>0, "create_time"=>time() ); $id = $_REQUEST['statement_id']; @@ -836,16 +836,16 @@ class AggregateFinanceStatementController extends ThinkController $optist = ["viewStatement"]; break; case '-3': - $optist = ["viewStatement","cancelVerify","addRemark","viewRemark","editRemark"]; + $optist = ["viewStatement","addRemark","viewRemark","editRemark"]; break; case '-1': $optist = ["viewStatement","cancelVerify","addRemark","viewRemark","editRemark"]; break; case '0': - $optist = ["viewStatement"]; + $optist = ["viewStatement","editStatement"]; break; case '1': - $optist = ["viewStatement","editStatement","cancelApply"]; + $optist = ["viewStatement","cancelApply"]; break; case '2': $optist = ["viewStatement","cancelVerify","addRemark","viewRemark","editRemark"]; From c692e51fa73be5454a60ae5248395e736de6e17b Mon Sep 17 00:00:00 2001 From: zyx Date: Thu, 1 Oct 2020 15:31:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AggregateFinanceStatementController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index ae6ea4ed4..8a6f1fda0 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -200,7 +200,7 @@ class AggregateFinanceStatementController extends ThinkController "statement_info"=>json_encode($statement_info,JSON_UNESCAPED_UNICODE), "admin_name"=>$admininfo['username'], "admin_id"=>$admininfo['uid'], - "verify_status"=>0, + "verify_status"=>1, "create_time"=>time() ); $id = $_REQUEST['statement_id']; From 2c5889cd50a43789458f22dbb41d0fe1bdf8ce04 Mon Sep 17 00:00:00 2001 From: zyx Date: Thu, 1 Oct 2020 15:41:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AggregateFinanceStatementController.class.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 8a6f1fda0..202a0055f 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -190,6 +190,11 @@ class AggregateFinanceStatementController extends ThinkController $this->error("参数错误"); } + if ($_REQUEST['is_edit']) { + $verify_status = 0; + } else { + $verify_status = 1; + } //拼凑数据 $adddata = array( "pay_money"=>$data_count['pay_money'], @@ -200,7 +205,7 @@ class AggregateFinanceStatementController extends ThinkController "statement_info"=>json_encode($statement_info,JSON_UNESCAPED_UNICODE), "admin_name"=>$admininfo['username'], "admin_id"=>$admininfo['uid'], - "verify_status"=>1, + "verify_status"=>$verify_status, "create_time"=>time() ); $id = $_REQUEST['statement_id']; @@ -290,7 +295,8 @@ class AggregateFinanceStatementController extends ThinkController "first_party_info"=>$first_party_info, "second_party_info"=>$second_party_info, "statement_info"=>$statement_info, - "statement_count"=>array("pay_money"=>$dbres['pay_money'],"ratio_money"=>$dbres['ratio_money']) + "statement_count"=>array("pay_money"=>$dbres['pay_money'],"ratio_money"=>$dbres['ratio_money']), + "is_edit"=>1, ); $this->assign("data",$senddata); From 041006e1b4be9f824ca2c0e0a6d2ea49080e66ef Mon Sep 17 00:00:00 2001 From: zyx Date: Thu, 1 Oct 2020 15:57:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AggregateFinanceStatementController.class.php | 6 +++++- .../Admin/View/AggregateFinanceStatement/editStatement.html | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 202a0055f..2fb7f7874 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -190,6 +190,10 @@ class AggregateFinanceStatementController extends ThinkController $this->error("参数错误"); } + if (!$_REQUEST['first_partner_id']) { + $this->error("编辑失败，聚合公司绑定关系未添加，请添加公司绑定关系后重算"); + } + if ($_REQUEST['is_edit']) { $verify_status = 0; } else { @@ -453,7 +457,7 @@ class AggregateFinanceStatementController extends ThinkController if (!$value['first_party_info']) { $this->ajaxReturn(array( 'status' => 1, - "info"=>"审批失败，存在没有绑定关系的对账单，请绑定关系后重算" + "info"=>"审批失败，聚合公司绑定关系未添加，请添加公司绑定关系后重算" )); } diff --git a/Application/Admin/View/AggregateFinanceStatement/editStatement.html b/Application/Admin/View/AggregateFinanceStatement/editStatement.html index 0a4759a80..309cef1f3 100644 --- a/Application/Admin/View/AggregateFinanceStatement/editStatement.html +++ b/Application/Admin/View/AggregateFinanceStatement/editStatement.html @@ -684,7 +684,7 @@ window.parent.reload(); },350); }else{ - alert("添加失败，请联系管理员") + alert(data.info) } }); //发送添加请求