修复html无法打印

修复流程手动选人无法提交
修复流程撤回导致状态错误

app/Gdoo/Index/Controllers/WorkflowController.php

@@ -269,6 +269,7 @@ class WorkflowController extends DefaultController
 
                 foreach ($next_logs as $next_log) {
                     if ($next_log['option'] > 0) {
+                        $next_log['status'] = 1;
                         $next_log['remark'] = $remark;
                         $next_log['run_status'] = 'recall';
                         $next_log['updated_id'] = $auth['id'];
@@ -720,6 +721,7 @@ class WorkflowController extends DefaultController
 
         $users = DB::table('user')->get(['id', 'name'])->keyBy('id');
         $res = [];
+
         foreach($rows as $row) {
 
             if (isset($step_ids[$row['step_id']])) {
@@ -729,16 +731,19 @@ class WorkflowController extends DefaultController
             }
 
             $user_ids = explode(',', $row['user_ids']);
+
             $unames = [];
             foreach($user_ids as $user_id) {
+                if ($user_id > 0) {
                     $unames[] = $users[$user_id]['name'];
                 }
+            }
             $row['user_name'] = join(',', $unames);
             $res[] = $row;
         }
 
         return view('model/flowLog', [
-            'rows' => $rows,
+            'rows' => $res,
         ]);
     }
 

app/Gdoo/Model/Form.php

@@ -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'],
                     ]);

app/Gdoo/Model/Grid.php

@@ -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')

resources/views/model/flowAudit.blade.php

@@ -29,7 +29,7 @@
         <tr>
             <td align="right">审核人</td>
             <td align="left">
-                <div id="step_next_user"></div>
+                <div id="step_next_user_html"></div>
             </td>
         </tr>
 
@@ -74,7 +74,7 @@
     $me.on('click', '.step_next_type', function() {
         
         $('#step_next', $me).empty();
-        $('#step_next_user', $me).empty();
+        $('#step_next_user_html', $me).empty();
         $('#step_inform_user', $me).empty();
 
         if (this.value == 'reject') {
@@ -115,7 +115,7 @@
     function step_next_id(step_id) {
         if (step_id > 0) {
             // 审核人
-            $('#step_next_user', $me).html(users[step_id]);
+            $('#step_next_user_html', $me).html(users[step_id]);
             // 知会人
             $('#step_inform_user', $me).html(informs[step_id]);
             // 短信提醒