mkm/dev_oa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

办公审批、发票审批、报销审批撤销bug

Browse Source
This commit is contained in:
hdm 2022-03-02 14:28:23 +08:00
parent 8f5f21442f
commit c699c9c399
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/finance/controller/Expense.php
View File

@ -174,6 +174,7 @@ class Expense extends BaseController
$param['income_month'] = isset($param['income_month']) ? strtotime(urldecode($param['income_month'])) : 0; $param['income_month'] = isset($param['income_month']) ? strtotime(urldecode($param['income_month'])) : 0;
$param['expense_time'] = isset($param['expense_time']) ? strtotime(urldecode($param['expense_time'])) : 0; $param['expense_time'] = isset($param['expense_time']) ? strtotime(urldecode($param['expense_time'])) : 0;
$param['check_status'] = 1; $param['check_status'] = 1;
$param['check_step_sort'] = 0;
$flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list'); $flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list');
$flow = unserialize($flow_list); $flow = unserialize($flow_list);
if (!empty($param['id']) && $param['id'] > 0) { if (!empty($param['id']) && $param['id'] > 0) {

1
app/finance/controller/Invoice.php
View File

@ -184,6 +184,7 @@ class Invoice extends BaseController
$param = get_params(); $param = get_params();
if (request()->isAjax()) { if (request()->isAjax()) {
$param['check_status'] = 1; $param['check_status'] = 1;
$param['check_step_sort'] = 0;
$flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list'); $flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list');
$flow = unserialize($flow_list); $flow = unserialize($flow_list);
if ($param['type'] == 1) { if ($param['type'] == 1) {

1
app/oa/controller/Approve.php
View File

@ -177,6 +177,7 @@ class Approve extends BaseController
if ($param['id'] > 0) { if ($param['id'] > 0) {
$param['update_time'] = time(); $param['update_time'] = time();
$param['check_status'] = 0; $param['check_status'] = 0;
$param['check_step_sort'] = 0;
Db::name('FlowStep')->where(['action_id'=>$param['id'],'type'=>1,'delete_time'=>0])->update(['delete_time'=>time()]); Db::name('FlowStep')->where(['action_id'=>$param['id'],'type'=>1,'delete_time'=>0])->update(['delete_time'=>time()]);
Db::name('FlowRecord')->where(['action_id'=>$param['id'],'type'=>1,'delete_time'=>0])->update(['delete_time'=>time()]); Db::name('FlowRecord')->where(['action_id'=>$param['id'],'type'=>1,'delete_time'=>0])->update(['delete_time'=>time()]);