Commit effa0c50 authored by hujun's avatar hujun

开业审核

parent b6a59484
...@@ -4987,24 +4987,22 @@ class Finance extends Basic ...@@ -4987,24 +4987,22 @@ class Finance extends Basic
switch ($this->params['check_status']) { switch ($this->params['check_status']) {
case 1 : case 1 :
//财务一审 //财务一审
$where['a.status'] = 2;
$where['b.status'] = 2; $where['b.status'] = 2;
$status_string = '总监审核'; $status_string = '财务一审';
break; break;
case 2 : case 2 :
//财务二审 //财务二审
$where['a.status'] = 3;
$where['b.status'] = 3; $where['b.status'] = 3;
$status_string = '财务二审'; $status_string = '财务二审';
break; break;
case 3 : case 3 :
//未审核 //未审核
$where['a.status'] = 0; $where[] = ['EXP', 'b.status is null'];
$status_string = '未审核';break; $status_string = '未审核';break;
case 4 : case 4 :
//总监 //总监
$where['a.status'] = 1;
$where['b.status'] = 1; $where['b.status'] = 1;
$status_string = '总监通过';
break; break;
} }
...@@ -5126,10 +5124,14 @@ class Finance extends Basic ...@@ -5126,10 +5124,14 @@ class Finance extends Basic
$excel_data = []; $excel_data = [];
foreach ($list as $k=>$v) { foreach ($list as $k=>$v) {
$log_where['open_id'] = $v['id'];
$log_where['is_del'] = 0;
$log_where['status'] = 1;
$disc_time = $m_pay_open_log->getFieldOneValue('create_time', $log_where);
if ($v['status'] == 3) { if ($v['status'] == 3) {
$log_where['open_id'] = $v['id']; $pay_log_data = $m_pay_log->selectPayLogByOrderNo('create_time', ['id'=>$v['pay_log_id']]);
$log_where['is_del'] = 0; $check_time = isset($pay_log_data[0]['create_time']) ? $pay_log_data[0]['create_time'] : '';
$check_time = $m_pay_open_log->getFieldOneValue('create_time', $log_where);
} else { } else {
$check_time = ''; $check_time = '';
} }
...@@ -5146,7 +5148,7 @@ class Finance extends Basic ...@@ -5146,7 +5148,7 @@ class Finance extends Basic
'house_id' => $v['house_id'], 'house_id' => $v['house_id'],
'house_address' => $v['house_address'], 'house_address' => $v['house_address'],
'status_string' => $status_string, 'status_string' => $status_string,
'disc_time' => $v['disc_time'], 'disc_time' => $disc_time,
'check_time' => $check_time 'check_time' => $check_time
]; ];
} }
......
...@@ -292,9 +292,9 @@ Route::group('index', [ ...@@ -292,9 +292,9 @@ Route::group('index', [
'delRefund' => ['index/Finance/delRefund', ['method' => 'POST']],//删除退款 'delRefund' => ['index/Finance/delRefund', ['method' => 'POST']],//删除退款
'recoveryBargain' => ['index/Finance/recoveryBargain', ['method' => 'POST']],//撤销列表-恢复成交报告 'recoveryBargain' => ['index/Finance/recoveryBargain', ['method' => 'POST']],//撤销列表-恢复成交报告
'payCheckList' => ['index/Finance/payCheckList', ['method' => 'GET']],//收款开业审核-视图 'payCheckList' => ['index/Finance/payCheckList', ['method' => 'GET']],//收款开业审核-视图
'payCheckListOne/:check_status' => ['index/Finance/payCheckList', ['method' => 'GET'], ['check_status' => 0]],//收款开业审核-财务一审 'payCheckListOne/:check_status' => ['index/Finance/payCheckList', ['method' => 'GET'], ['check_status' => 1]],//收款开业审核-财务一审
'payCheckListTwo/:check_status' => ['index/Finance/payCheckList', ['method' => 'GET'], ['check_status' => 1]],//收款开业审核-财务二审 'payCheckListTwo/:check_status' => ['index/Finance/payCheckList', ['method' => 'GET'], ['check_status' => 2]],//收款开业审核-财务二审
'payCheckListNo/:check_status' => ['index/Finance/payCheckList', ['method' => 'GET'], ['check_status' => 2]],//收款开业审核-未审核 'payCheckListNo/:check_status' => ['index/Finance/payCheckList', ['method' => 'GET'], ['check_status' => 3]],//收款开业审核-未审核
'payCheckListAll' => ['index/Finance/payCheckList', ['method' => 'GET']],//收款开业审核-全部 'payCheckListAll' => ['index/Finance/payCheckList', ['method' => 'GET']],//收款开业审核-全部
'payCheckListDisc/:check_status' => ['index/Finance/payCheckList', ['method' => 'GET'], ['check_status' => 4]],//收款开业审核-总监 'payCheckListDisc/:check_status' => ['index/Finance/payCheckList', ['method' => 'GET'], ['check_status' => 4]],//收款开业审核-总监
'delPayCheck' => ['index/Finance/delPayCheck', ['method' => 'POST']],//删除收款开业审核 'delPayCheck' => ['index/Finance/delPayCheck', ['method' => 'POST']],//删除收款开业审核
......
...@@ -21,19 +21,19 @@ define(['doT', 'text!temp/open_check_template_tpl.html', 'css!style/home.css', ' ...@@ -21,19 +21,19 @@ define(['doT', 'text!temp/open_check_template_tpl.html', 'css!style/home.css', '
$('.choose_btn1').hide(); $('.choose_btn1').hide();
}; };
//判断权限 财务一级 //判断权限 财务一级
if(check_auth('/index/payCheckListOne/0')){ if(check_auth('/index/payCheckListOne/1')){
$('.choose_btn2').show(); $('.choose_btn2').show();
}else{ }else{
$('.choose_btn2').hide(); $('.choose_btn2').hide();
}; };
//判断权限 财务二级 //判断权限 财务二级
if(check_auth('index/payCheckListTwo/1')){ if(check_auth('index/payCheckListTwo/2')){
$('.choose_btn3').show(); $('.choose_btn3').show();
}else{ }else{
$('.choose_btn3').hide(); $('.choose_btn3').hide();
}; };
//判断权限 未审核 //判断权限 未审核
if(check_auth('index/payCheckListNo/2')){ if(check_auth('index/payCheckListNo/3')){
$('.choose_btn4').show(); $('.choose_btn4').show();
}else{ }else{
$('.choose_btn4').hide(); $('.choose_btn4').hide();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment