-
@@ -186,10 +195,11 @@
结算金额 |
结算流水 |
创建记录 |
+
管理员审核 |
审批状态 |
+
汇总状态 |
对外发起 |
合作确认 |
-
汇总状态 |
操作 |
@@ -204,7 +214,7 @@
- |
+ |
{$data.company_name} |
{$data.company_belong} |
{$data.valid} |
@@ -215,6 +225,17 @@
{$data.create} |
+
+ {$data.admin}
+
+
+
+ {$data.admin}
+
+
+ |
+
+
{$data.verify}
@@ -224,10 +245,8 @@
|
- {$data.launch} |
- {$data.confirm} |
-
+
{$data.pool}
@@ -237,6 +256,8 @@
|
+ {$data.launch} |
+ {$data.confirm} |
{$vo}
@@ -244,7 +265,7 @@
|
- | 合计 | 结算总金额: {$count.statement_money} 结算总流水: {$count['platform_amount']} (补点不重复统计在内) |
+ | 合计 | 结算总金额: {$count.statement_money} 结算总流水: {$count['platform_amount']} (补点不重复统计在内) |
@@ -386,7 +407,7 @@
//设置对账网址
var order_url = window.location.protocol+"//"+window.location.host+"/admin.php?s=/Public/cp_login.html";
- $("#order_url").html("流程说明：结算自动生成对账单--->财务审核对账单--->发起对外对账--->合作方进行确认--->进入报销流程【合作方确认地址:"+order_url+"】");
+ $("#order_url").html("流程说明：结算自动生成对账单--->管理员审核--->财务审核对账单--->发起汇总 / 确认流程: 发起对外对账--->合作方进行确认【合作方确认地址:"+order_url+"】");
$("#updateNewStatement").on("click",function(){
layer.confirm("新增结算需要花费2分钟左右时间,并且只计算一个月内的新增结算,请勿在中途关闭页面,无需新增结算请取消",{title:false}, function(index){
@@ -428,33 +449,38 @@
});
});
- $("#verifyAgree,#verifyRefuse,#launch,#pool,#updateStatement").on("click",function(){
+ $("#adminAgree,#adminRefuse,#verifyAgree,#verifyRefuse,#pool,#updateStatement").on("click",function(){
var id = $(this).attr("id");
- if(id == "verifyAgree"){
- var opname = "审批通过";
- var opurl = "{:U('verifyAgree')}";
+ if(id == "adminAgree"){
+ var opname = "管理员审批通过";
+ var opurl = "{:U('adminAgree')}";
+ var opst ="[未进行审批]";
+ var status = [0];
+ }else if(id=="adminRefuse"){
+ var opname = "管理员审批拒绝";
+ var opurl = "{:U('adminRefuse')}";
var opst ="[未进行审批]";
var status = [0];
+ }else if(id == "verifyAgree"){
+ var opname = "审批通过";
+ var opurl = "{:U('verifyAgree')}";
+ var opst ="[管理员审批通过]";
+ var status = [1];
}else if(id=="verifyRefuse"){
var opname = "审批拒绝";
var opurl = "{:U('verifyRefuse')}";
- var opst ="[未进行审批]";
- var status = [0];
- }else if(id=="launch"){
- var opname = "对外发起";
- var opurl = "{:U('launch')}";
- var opst ="[审批通过]";
+ var opst ="[管理员审批通过]";
var status = [1];
}else if(id=="pool"){
var opname = "发起汇总";
var opurl = "{:U('pool')}";
- var opst ="[合作方确认]";
- var status = [3];
+ var opst ="[审批通过]";
+ var status = [2];
}else if(id=="updateStatement"){
var opname = "重算金额";
var opurl = "{:U('updateStatement')}";
- var opst ="[汇总撤销,审批拒绝,未进行审批,审批通过,对外发起]";
- var status = [-2,-1,0,1,2];
+ var opst ="[汇总撤销,管理员审批拒绝,审批拒绝,未进行审批,管理员审批通过,审批通过]";
+ var status = [-3,-2,-1,0,1,2];
var confirm = true;
}
var confirm = confirm ? confirm :false;
@@ -521,6 +547,49 @@
});
}
})
+ $("#launch").on("click",function(){
+ var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
+ if($(elem).data("confirm") == 0){
+ return $(elem).val();
+ }
+ }).get();
+ if(text.length < 1){
+ layer.msg("
" + '无需要进行[对外发起]的申请,仅[未发起]状态可以进行[对外发起]操作');
+ return;
+ }
+ text = text.join(",");
+ layer.confirm('【警告】[对外发起]将不可回退，如需继续请点击确认', {
+ btn: ['确认','取消'],
+ title:false
+ }, function(index){
+ layer.close(index);
+ _doAgreeApply();
+ });
+ function _doAgreeApply(){
+ //执行
+ layer.load(2);
+ $.ajax({
+ type: "POST",
+ url: "{:U('launch')}",
+ dataType: 'json',
+ async: true,
+ data: {ids:text},
+ success:function(data){
+ layer.closeAll('loading');
+ if(data.status==1){
+ layer.msg("
" + data.info + "");
+ setTimeout(function(){
+ window.location.reload();
+ },1500);
+ }else{
+ layer.msg("
" + data.info + "");
+ return false;
+ }
+ }
+ });
+ }
+
+ })
$("#export").click(function () {
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html
index d83953056..d40073fee 100644
--- a/Application/Admin/View/CompanyStatementPool/lists.html
+++ b/Application/Admin/View/CompanyStatementPool/lists.html
@@ -102,6 +102,15 @@
+