GGican %!s(int64=8) %!d(string=hai) anos
pai
achega
70f2c3b019

+ 182 - 85
app/Http/Controllers/Admin/TableController.php

xqd
@@ -248,106 +248,203 @@ class TableController extends CommonController
         switch ($user->role) {
             case 1:
                 $data['hesuan'] = $user->surname;
+                $status['hesuan'] = $user->surname;
+                $child_data['hesuan'] = $user->surname;
                 break;
             case 2:
                 $data['fuhe'] = $user->surname;
+                $status['fuhe'] = $user->surname;
+                $child_data['fuhe'] = $user->surname;
                 break;
             case 3:
                 $data['chushen'] = $user->surname;
+                $status['chushen'] = $user->surname;
+                $child_data['chushen'] = $user->surname;
                 break;
             case 4:
                 $data['jianshen'] = $user->surname;
+                $status['jianshen'] = $user->surname;
+                $child_data['jianshen'] = $user->surname;
                 break;
         }
-//        0:未提交 1已核算  2已复核 3已提交 4:已初审 5:已复审 6已监审
+//        0:未提交 1待核算  2待复核 3待初审 4:待监审 5:待提交 6已完成
         $find = Tablelist::find($table_id);
-        //提交一次,在原status值上加1
+        //提交一次,在原status值上加1,状态大于0的只增加status的值,其他不更新
         $data['status'] = $find['status'] + 1;
         $child_data['status'] = $find['status'] + 1;
-        $re = Tablelist::where('id', $table_id)->update($data);
-        switch($find->table_id){
-            case 1:
-                if($re == 1) {
-                    Table_one::where('id',$find->child_table_id)->update($child_data);
-                    return redirect('/on_table');
-                }else
-                {
-                    return back()->withErrors('提交失败,请检查后重试');
-                }
-            break;
-            case 2:
-                if($re == 1) {
-                    Table_two::where('id',$find->child_table_id)->update($child_data);
-                    return redirect('/on_table');
-                }else
-                {
-                    return back()->withErrors('提交失败,请检查后重试');
-                }
-                break;
-            case 3:
-                if($re == 1) {
-                    Table_three::where('id',$find->child_table_id)->update($child_data);
-                    return redirect('/on_table');
-                }else
-                {
-                    return back()->withErrors('提交失败,请检查后重试');
-                }
-                break;
-            case 4:
-                if($re == 1) {
-                    Table_four::where('id',$find->child_table_id)->update($child_data);
-                    return redirect('/on_table');
-                }else
-                {
-                    return back()->withErrors('提交失败,请检查后重试');
-                }
-                break;
-            case 5:
-                if($re == 1) {
-                    Table_five::where('id',$find->child_table_id)->update($child_data);
-                    return redirect('/on_table');
-                }else
-                {
-                    return back()->withErrors('提交失败,请检查后重试');
-                }
-                break;
-            case 6:
-                if($re == 1) {
-                    Table_six::where('id',$find->child_table_id)->update($child_data);
-                    return redirect('/on_table');
-                }else
-                {
-                    return back()->withErrors('提交失败,请检查后重试');
-                }
-                break;
-            case 7:
-                if($re == 1) {
-                    Table_seven::where('id',$find->child_table_id)->update($child_data);
-                    return redirect('/on_table');
-                }else
-                {
-                    return back()->withErrors('提交失败,请检查后重试');
-                }
-                break;
-            case 8:
-                if($re == 1) {
-                    Table_eight::where('id',$find->child_table_id)->update($child_data);
-                    return redirect('/on_table');
-                }else
-                {
-                    return back()->withErrors('提交失败,请检查后重试');
-                }
-                break;
-            case 9:
-                if($re == 1) {
-                    Table_nine::where('id',$find->child_table_id)->update($child_data);
-                    return redirect('/on_table');
-                }else
-                {
-                    return back()->withErrors('提交失败,请检查后重试');
-                }
-                break;
+        $status['status'] = $find['status'] + 1;
+        if($find->status==0){
+            $re = Tablelist::where('id', $table_id)->update($data);
+            switch($find->table_id){
+                case 1:
+                    if($re == 1) {
+                        Table_one::where('id',$find->child_table_id)->update($child_data);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 2:
+                    if($re == 1) {
+                        Table_two::where('id',$find->child_table_id)->update($child_data);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 3:
+                    if($re == 1) {
+                        Table_three::where('id',$find->child_table_id)->update($child_data);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 4:
+                    if($re == 1) {
+                        Table_four::where('id',$find->child_table_id)->update($child_data);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 5:
+                    if($re == 1) {
+                        Table_five::where('id',$find->child_table_id)->update($child_data);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 6:
+                    if($re == 1) {
+                        Table_six::where('id',$find->child_table_id)->update($child_data);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 7:
+                    if($re == 1) {
+                        Table_seven::where('id',$find->child_table_id)->update($child_data);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 8:
+                    if($re == 1) {
+                        Table_eight::where('id',$find->child_table_id)->update($child_data);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 9:
+                    if($re == 1) {
+                        Table_nine::where('id',$find->child_table_id)->update($child_data);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+            }
+        }else{
+            $re = Tablelist::where('id', $table_id)->update($status);
+            switch($find->table_id){
+                case 1:
+                    if($re == 1) {
+                        Table_one::where('id',$find->child_table_id)->update($status);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 2:
+                    if($re == 1) {
+                        Table_two::where('id',$find->child_table_id)->update($status);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 3:
+                    if($re == 1) {
+                        Table_three::where('id',$find->child_table_id)->update($status);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 4:
+                    if($re == 1) {
+                        Table_four::where('id',$find->child_table_id)->update($status);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 5:
+                    if($re == 1) {
+                        Table_five::where('id',$find->child_table_id)->update($status);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 6:
+                    if($re == 1) {
+                        Table_six::where('id',$find->child_table_id)->update($status);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 7:
+                    if($re == 1) {
+                        Table_seven::where('id',$find->child_table_id)->update($status);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 8:
+                    if($re == 1) {
+                        Table_eight::where('id',$find->child_table_id)->update($status);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+                case 9:
+                    if($re == 1) {
+                        Table_nine::where('id',$find->child_table_id)->update($status);
+                        return redirect('/on_table');
+                    }else
+                    {
+                        return back()->withErrors('提交失败,请检查后重试');
+                    }
+                    break;
+            }
         }
+
     }
 
     public function delete($table_id)

+ 2 - 1
app/Http/routes.php

xqd
@@ -25,7 +25,8 @@ Route::group(['namespace'=>'Admin','middleware'=>['admin.login']],function() {
     Route::get('/search/show', 'IndexController@search_show');
     Route::any('/upload','CommonController@upload');
 
-    Route::get('/table','TableController@index');
+//    Route::get('/table','TableController@index');
+    Route::get('/table','TableController@on_table');
     Route::get('/on_table','TableController@on_table');
     Route::get('/table/{id}','TableController@show');
     Route::get('/table/{id}/edit','TableController@edit');

+ 3 - 3
resources/views/admin/errors.blade.php

xqd
@@ -1,13 +1,13 @@
 @if (count($errors) > 0)
     <div class="alert alert-danger">
-        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+        {{--<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>--}}
         @if(is_object($errors))
             @foreach($errors->all() as $error)
-                <strong>{{ $error }}!</strong>
+                <strong style="color: #950000">{{ $error }}</strong>
             @endforeach
         @elseif(is_array($errors))
             @foreach($errors as $error)
-                <strong>{{ $error }}!</strong>
+                <strong style="color: red">{{ $error }}</strong>
             @endforeach
         @else
             <strong>{{ $errors }}!</strong>

+ 2 - 2
resources/views/admin/left-sidebar.blade.php

xqd xqd
@@ -109,7 +109,7 @@
             @if(Request::url()==url('/table/1')||Request::url()==url('/table/2')||Request::url()==url('/table/3')||
                     Request::url()==url('/table/4')||Request::url()==url('/table/5')||Request::url()==url('/table/6')||
                     Request::url()==url('/table/7')||Request::url()==url('/table/8')||Request::url()==url('/table/9')||
-                    Request::url()==url('/on_table'))
+                    Request::url()==url('/on_table')||Request::url()==url('/table'))
                     active
                     @endif">
                 <a href="#">
@@ -157,7 +157,7 @@
                         </ul>
                     </li>
                     <li class="
-                    @if(Request::url()==url('/on_table'))
+                    @if(Request::url()==url('/on_table')||Request::url()==url('/table'))
                      active
                     @endif
                     "><a href="{{ url('/on_table') }}"><i class="fa fa-circle-o"></i>待办案件</a></li>