Skip to content

T
tl_estate
Commit c40cad9a authored by hujun's avatar hujun
Browse files
Options

撤销时间

parent 92995c78
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 10 deletions
application/index/controller/Finance.php
View file @ c40cad9a
...@@ -100,7 +100,7 @@ class Finance extends Basic ...@@ -100,7 +100,7 @@ class Finance extends Basic
$check_status = $this->params['check_status']; $check_status = $this->params['check_status'];
$fields = 'a.id,a.create_time,a.trade_type,d.internal_title, $fields = 'a.id,a.create_time,a.trade_type,d.internal_title,
d.internal_address,a.commission,a.practical_fee,a.scale_fee,a.order_no, d.internal_address,a.commission,a.practical_fee,a.scale_fee,a.order_no,
a.order_id,content,a.house_number,a.is_open,a.agent_id,a.submit_agent_name, a.order_id,content,a.house_number,a.is_open,a.agent_id,a.submit_agent_name,a.backout_time,
a.price,a.audit_level,e.id as partial_commission_id,b.user_phone,b.user_name,a.report_id'; a.price,a.audit_level,e.id as partial_commission_id,b.user_phone,b.user_name,a.report_id';
$where['a.father_id'] = 0; $where['a.father_id'] = 0;
...@@ -185,6 +185,7 @@ class Finance extends Basic ...@@ -185,6 +185,7 @@ class Finance extends Basic
$where['a.status'] = 20; $where['a.status'] = 20;
$where['a.audit_level'] = 0; $where['a.audit_level'] = 0;
$is_show = 0; $is_show = 0;
$order = 'a.backout_time DESC';
break; break;
case 6 : case 6 :
//成交报告列表-已撤销 //成交报告列表-已撤销
...@@ -196,18 +197,21 @@ class Finance extends Basic ...@@ -196,18 +197,21 @@ class Finance extends Basic
$where['a.status'] = 20; $where['a.status'] = 20;
$where['a.audit_level'] = 1; $where['a.audit_level'] = 1;
$is_show = 0; $is_show = 0;
$order = 'a.backout_time DESC';
break; break;
case 8 : case 8 :
//成交报告列表-待撤销-第二级审核 //成交报告列表-待撤销-第二级审核
$where['a.status'] = 20; $where['a.status'] = 20;
$where['a.audit_level'] = 2; $where['a.audit_level'] = 2;
$is_show = 0; $is_show = 0;
$order = 'a.backout_time DESC';
break; break;
case 9 : case 9 :
//成交报告列表-待撤销-第三级审核 //成交报告列表-待撤销-第三级审核
$where['a.status'] = 20; $where['a.status'] = 20;
$where['a.audit_level'] = 3; $where['a.audit_level'] = 3;
$is_show = 0; $is_show = 0;
$order = 'a.backout_time DESC';
break; break;
case 10 : case 10 :
//成交报告列表-全部 //成交报告列表-全部
...@@ -310,6 +314,7 @@ class Finance extends Basic ...@@ -310,6 +314,7 @@ class Finance extends Basic
foreach ($list_data as $k => $v) { foreach ($list_data as $k => $v) {
$list_data[$k]['income_money'] = $m_real->sumField('money', ['bargain_id' => $v['id'], 'is_del' => 0]); $list_data[$k]['income_money'] = $m_real->sumField('money', ['bargain_id' => $v['id'], 'is_del' => 0]);
$list_data[$k]['user_phone'] = substr_replace($list_data[$k]['user_phone'], '****', 3, 4); $list_data[$k]['user_phone'] = substr_replace($list_data[$k]['user_phone'], '****', 3, 4);
$list_data[$k]['backout_time'] = empty($v['backout_time'])? '':$v['backout_time'];
} }
$data['data']['list'] = $list_data; $data['data']['list'] = $list_data;
...@@ -2724,10 +2729,13 @@ class Finance extends Basic ...@@ -2724,10 +2729,13 @@ class Finance extends Basic
return $this->response(101, '收款存在调整，不能撤销！'); return $this->response(101, '收款存在调整，不能撤销！');
} }
$params['content'] = trim($this->params['content']); //撤销原因 $update_data['status'] = 20;
$m_financial = new OFinancialAudit(); $update_data['audit_level'] = 0;
$result = $m_financial->backOutUpdate($this->params['bargain_id'], $params); $update_data['content'] = trim($this->params['content']); //撤销原因
$update_data['backout_time'] = date('Y-m-d H:i:s');
$where[] = ['EXP', 'id='.$this->params['bargain_id'].' or father_id='.$this->params['bargain_id']];
$where['status'] = ['in', '10,11,12,13'];
$result = $this->m_bargain->updateBargainByWhere($update_data, $where);
if ($result) { if ($result) {
$check = $this->updatePerformanceAll($this->params['bargain_id']); $check = $this->updatePerformanceAll($this->params['bargain_id']);
if ($check['status'] == 'fail') { if ($check['status'] == 'fail') {
...@@ -2748,6 +2756,7 @@ class Finance extends Basic ...@@ -2748,6 +2756,7 @@ class Finance extends Basic
$financial_data['audit_level'] = 0; $financial_data['audit_level'] = 0;
$financial_data['remark'] = empty($this->params['content']) ? "" : $this->params['content']; $financial_data['remark'] = empty($this->params['content']) ? "" : $this->params['content'];
$financial_data['audit_id'] = $this->userId; $financial_data['audit_id'] = $this->userId;
$m_financial = new OFinancialAudit();
$m_financial->addAudit($financial_data); $m_financial->addAudit($financial_data);
$msg = '撤销成功'; $msg = '撤销成功';
} else { } else {
......
application/index/controller/OfficeBargain.php
View file @ c40cad9a
...@@ -78,7 +78,7 @@ class OfficeBargain extends Basic ...@@ -78,7 +78,7 @@ class OfficeBargain extends Basic
$check_status = $this->params['check_status']; $check_status = $this->params['check_status'];
$fields = 'a.id,a.create_time,a.trade_type,f.title, $fields = 'a.id,a.create_time,a.trade_type,f.title,
f.address,a.commission,a.practical_fee,a.scale_fee,a.order_no, f.address,a.commission,a.practical_fee,a.scale_fee,a.order_no,
a.order_id,content,a.house_number,a.is_open,a.agent_id,a.submit_agent_name, a.order_id,content,a.house_number,a.is_open,a.agent_id,a.submit_agent_name,a.backout_time,
a.price,a.audit_level,e.id as partial_commission_id,b.user_phone,b.user_name,a.report_id'; a.price,a.audit_level,e.id as partial_commission_id,b.user_phone,b.user_name,a.report_id';
$where['a.father_id'] = 0; $where['a.father_id'] = 0;
...@@ -288,6 +288,7 @@ class OfficeBargain extends Basic ...@@ -288,6 +288,7 @@ class OfficeBargain extends Basic
foreach ($list_data as $k=>$v) { foreach ($list_data as $k=>$v) {
$list_data[$k]['income_money'] = $m_real->sumField('money',['bargain_id'=>$v['id'], 'is_del'=>0]); $list_data[$k]['income_money'] = $m_real->sumField('money',['bargain_id'=>$v['id'], 'is_del'=>0]);
$list_data[$k]['user_phone'] = substr_replace($list_data[$k]['user_phone'], '****', 3, 4); $list_data[$k]['user_phone'] = substr_replace($list_data[$k]['user_phone'], '****', 3, 4);
$list_data[$k]['backout_time'] = empty($v['backout_time'])? '':$v['backout_time'];
} }
$data['data']['list'] = $list_data; $data['data']['list'] = $list_data;
...@@ -1411,9 +1412,13 @@ class OfficeBargain extends Basic ...@@ -1411,9 +1412,13 @@ class OfficeBargain extends Basic
return $this->response(101, '收款存在调整，不能撤销！'); return $this->response(101, '收款存在调整，不能撤销！');
} }
$params['content'] = trim($this->params['content']); //撤销原因 $update_data['status'] = 20;
$m_financial = new OfficeOFinancialAudit(); $update_data['audit_level'] = 0;
$result = $m_financial->backOutUpdate($this->params['bargain_id'], $params); $update_data['content'] = trim($this->params['content']); //撤销原因
$update_data['backout_time'] = date('Y-m-d H:i:s');
$where[] = ['EXP', 'id='.$this->params['bargain_id'].' or father_id='.$this->params['bargain_id']];
$where['status'] = ['in', '10,11,12,13'];
$result = $this->m_bargain->updateBargainByWhere($update_data, $where);
if ($result) { if ($result) {
$check = $this->updatePerformanceAll($this->params['bargain_id']); $check = $this->updatePerformanceAll($this->params['bargain_id']);
...@@ -1435,6 +1440,7 @@ class OfficeBargain extends Basic ...@@ -1435,6 +1440,7 @@ class OfficeBargain extends Basic
$financial_data['audit_level'] = 0; $financial_data['audit_level'] = 0;
$financial_data['remark'] = empty($this->params['content']) ? "" : $this->params['content']; $financial_data['remark'] = empty($this->params['content']) ? "" : $this->params['content'];
$financial_data['audit_id'] = $this->userId; $financial_data['audit_id'] = $this->userId;
$m_financial = new OfficeOFinancialAudit();
$m_financial->addAudit($financial_data); $m_financial->addAudit($financial_data);
$msg = '撤销成功'; $msg = '撤销成功';
} else { } else {
......
public/resource/template/wait_backout_shop_template_tpl.html
View file @ c40cad9a
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
[% for(var item in it["list"]){ %] [% for(var item in it["list"]){ %]
<tr data-id="[%= it['list'][item]['id'] %]" data-orderid="[%= it['list'][item]['order_id'] %]"> <tr data-id="[%= it['list'][item]['id'] %]" data-orderid="[%= it['list'][item]['order_id'] %]">
<td class="text-center" >[%= it["list"][item]['id'] %]</td> <td class="text-center" >[%= it["list"][item]['id'] %]</td>
<td class="text-center" width="10%">[%= it["list"][item]['create_time'] %]</td> <td class="text-center" width="10%">[%= it["list"][item]['backout_time'] %]</td>
<td class="text-center" width="10%">[%= it["list"][item]['create_time'] %]</td> <td class="text-center" width="10%">[%= it["list"][item]['create_time'] %]</td>
<td class="text-left">[%= it["list"][item]['internal_address'] %]</td> <td class="text-left">[%= it["list"][item]['internal_address'] %]</td>
<td class="text-center">[%= it["list"][item]['house_number'] %]</td> <td class="text-center">[%= it["list"][item]['house_number'] %]</td>
......
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