修复html无法打印

修复流程手动选人无法提交修复流程撤回导致状态错误
2021-04-01 10:53:28 +08:00
parent 54bcc3b4de
commit 27effe8a47
5 changed files with 183 additions and 154 deletions
@@ -2383,6 +2383,7 @@ class Form
                    'run_status' => $gets['step_next_type'],
                    'updated_id' => $auth['id'],
                    'updated_at' => time(),
+                    'run_index' => 0,
                    'status' => 1,
                ];

@@ -2473,6 +2474,7 @@ class Form
            ->where('run_id', $run_id)
            ->where('id', $run_log['id'])
            ->update([
+                'status' => 1,
                'run_status' => $gets['step_next_type'],
                'remark' => $gets['remark'],
            ]);
@@ -2486,6 +2488,7 @@ class Form
                    ->where('option', 1)
                    ->where('id', $log['id'])
                    ->update([
+                        'status' => 1,
                        'run_status' => $gets['step_next_type'],
                        'remark' => $gets['remark'],
                    ]);
@@ -64,7 +64,7 @@ class Grid
                $var1 = DB::table('model_run_log')
                ->leftJoin('model_run', 'model_run.id', '=', 'model_run_log.run_id')
                ->where('model_run_log.option', 1)
-                ->where('model_run_log.updated_id', 0)
+                ->where('model_run_log.status', 0)
                ->where('model_run_log.bill_id', $header['bill_id'])
                ->whereRaw('model_run.data_id in ('.$ids.')')
                ->orderBy('model_run_log.option', 'desc')