hawind
/
gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改表单的流程意见逻辑

This commit is contained in:
乐风 2021-05-25 21:48:42 +08:00
parent e9abf8483e
commit d0e2b35320
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Gdoo/Index/Controllers/WorkflowController.php
View File

@ -126,9 +126,7 @@ class WorkflowController extends DefaultController
} }
} }
} else { } else {
if ($gets['remark'] != '') { $gets['step_remark'][$step_id] = $gets['remark'];
$gets['step_remark'][$step_id] = $gets['remark'];
}
} }
// 转到步骤条件检查 // 转到步骤条件检查

38
app/Gdoo/Model/Form.php
View File

@ -2138,25 +2138,6 @@ class Form
if ($terminate == true) { if ($terminate == true) {
// 更新表单的流程意见
$step_remark = $gets['step_remark'];
if (not_empty($step_remark)) {
foreach ($step_remark as $step_id => $remark) {
// 审核操作无审核意见
if ($remark == '') {
$remark = $gets['step_next_type'] == 'back' ? '退回' : '同意';
}
RunStep::where('run_id', $run_id)->where('step_id', $step_id)->update([
'run_remark' => $remark,
'run_updated_id' => $auth['id'],
'run_updated_by' => $auth['name'],
'run_updated_at' => time(),
]);
}
}
// 更新主表 // 更新主表
if ($id) { if ($id) {
DB::table($table)->where('id', $id)->update($master); DB::table($table)->where('id', $id)->update($master);
@ -2591,6 +2572,25 @@ class Form
DB::table('model_run_log')->whereIn('id', $step_back_inform)->delete(); DB::table('model_run_log')->whereIn('id', $step_back_inform)->delete();
} }
// 更新表单的流程意见
$step_remark = $gets['step_remark'];
if (not_empty($step_remark)) {
foreach ($step_remark as $step_id => $remark) {
// 审核操作无审核意见
if ($remark == '') {
$remark = $gets['step_next_type'] == 'back' ? '退回' : '同意';
}
RunStep::where('run_id', $run_id)->where('step_id', $step_id)->update([
'run_remark' => $remark,
'run_updated_id' => $auth['id'],
'run_updated_by' => $auth['name'],
'run_updated_at' => time(),
]);
}
}
// 更新办理序号 // 更新办理序号
$_run['index'] = $run_index; $_run['index'] = $run_index;