fix many table_bug

app/Http/Controllers/Admin/TableController.php

@@ -77,7 +77,13 @@ class TableController extends CommonController
             $data['bzc_area'] = 0;
         }
         if($data['house_type'] == null){
-            $data['house_type'] = '默认:住房';
+            $data['house_type'] = '未填';
+        }
+        if($data['bzc_cardid'] == null){
+            $data['house_type'] = '未填';
+        }
+        if($data['table_time'] == null){
+            $data['table_time'] = date('y-m-d h:i:s',time());
         }
         $data['status'] = '0';
         $data['user_id'] = $user->id;
@@ -88,7 +94,7 @@ class TableController extends CommonController
         if($re){
             return redirect('/on_table');
         }else{
-            return back()->with('errors','保存失败请重试!');
+            return back()->withErrors('errors','保存失败请重试!');
         }
 
 //        把数据转化为json
@@ -127,7 +133,7 @@ class TableController extends CommonController
     public function submit(Request $request,$table_id)
     {
         $user = session('user');
-        $input = $request->only('project_name','bzc_name','bzc_cardid','bzc_addr','bzc_area','house_type','bzc_tel','used','num','table_time,description');
+        $input = $request->only('project_name','bzc_name','bzc_cardid','bzc_addr','bzc_area','house_type','bzc_tel','used','num','table_time','sub_description');
         $data = $input;
 
         $data['user_id'] = $user->id;
@@ -185,6 +191,19 @@ class TableController extends CommonController
     public function edit($table_id)
     {
         $table = Tablelist::find($table_id);
+        $temp = [
+            'project_name' => $table->project_name,
+            'bzc_name' => $table->bzc_name,
+            'bzc_cardid' => $table->bzc_cardid,
+            'bzc_addr' => $table->bzc_addr,
+            'bzc_area' => $table->bzc_area,
+            'house_type' => $table->house_type,
+            'bzc_tel' => $table->bzc_tel,
+            'used' => $table->used,
+            'num' => $table->num,
+            'table_time' => $table->table_time,
+            'sub_description' => $table->sub_description
+        ];
         $table_type_id = $table['table_id'];
         $json = json_decode($table['json'],true);
         $table = json_encode($table);
@@ -192,6 +211,17 @@ class TableController extends CommonController
         $table = array_merge($table,$json);
         $user = session('user');
         $table['judge']=$user->role;
+        $table['project_name'] = $temp['project_name'];
+        $table['bzc_name'] = $temp['bzc_name'];
+        $table['bzc_cardid'] = $temp['bzc_cardid'];
+        $table['bzc_addr'] = $temp['bzc_addr'];
+        $table['bzc_area'] = $temp['bzc_area'];
+        $table['house_type'] = $temp['house_type'];
+        $table['bzc_tel'] = $temp['bzc_tel'];
+        $table['used'] = $temp['used'];
+        $table['num'] = $temp['num'];
+        $table['table_time'] = $temp['table_time'];
+        $table['sub_description'] = $temp['sub_description'];
         $table = (object)$table;
 
         if($table_type_id == 1){

resources/views/admin/edit_table/table_eight.blade.php

@@ -152,6 +152,7 @@
                             <div class="col-sm-2">项目名称：</div>
                             <div class="col-sm-7">
                                 <select name="project_name" class="form-control">
+                                    <option value=" "></option>
                                     @foreach($project as $data)
                                         <option value="{{ $data->project_name }}"
                                                 @if($table->project_name == $data->project_name) selected @endif
@@ -343,7 +344,7 @@
                                     <tr>
                                         <td rowspan="2" colspan="2">征收人<br><textarea name="zc" style="width: 80%;height: 100px;">{{ $table->zc }}</textarea></td>
                                         <td colspan="2">被征收人<input name="bzc" value="{{ $table->bzc }}" class="form-control" type="text" placeholder=""></td>
-                                        <td colspan="2">代理人<input name="daili" value="{{ $tbale->daili }}" class="form-control" type="text" placeholder=""></td>
+                                        <td colspan="2">代理人<input name="daili" value="{{ $table->daili }}" class="form-control" type="text" placeholder=""></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4">签约时间：<input name="table_time" value="{{ $table->table_time }}" class="form-control" type="text" placeholder=""></td>

resources/views/admin/edit_table/table_five.blade.php

@@ -152,6 +152,7 @@
                             <div class="col-sm-2">项目名称：</div>
                             <div class="col-sm-7">
                                 <select name="project_name" class="form-control">
+                                    <option value=" "></option>
                                     @foreach($project as $data)
                                         <option value="{{ $data->project_name }}"
                                                 @if($table->project_name == $data->project_name) selected @endif
@@ -205,7 +206,7 @@
                                     </tr>
                                     <tr>
                                         <td><input name="yuqi_time3" value="{{ $table->yuqi_time3 }}" class="form-control" type="text" placeholder=""></td>
-                                        <td><input name="yuqi_mothe3" value="{{ $table->yuqi_mothed3 }}" class="form-control" type="text" placeholder=""></td>
+                                        <td><input name="yuqi_mothe3" value="{{ $table->yuqi_mothe3 }}" class="form-control" type="text" placeholder=""></td>
                                         <td><input name="buzu3" value="{{ $table->buzu3 }}" class="form-control" type="text" placeholder=""></td>
                                         <td><input name="total3" value="{{ $table->total3 }}" class="form-control" type="text" placeholder=""></td>
                                     </tr>

resources/views/admin/edit_table/table_four.blade.php

@@ -152,6 +152,7 @@
                             <div class="col-sm-2">项目名称：</div>
                             <div class="col-sm-7">
                                 <select name="project_name" class="form-control">
+                                    <option value=" "></option>
                                     @foreach($project as $data)
                                         <option value="{{ $data->project_name }}"
                                                 @if($table->project_name == $data->project_name) selected @endif
@@ -197,7 +198,7 @@
                                     </tr>
                                     <tr>
                                         <td>同住奖励金</td>
-                                        <td colspan="3"><input name="tongj" value="{{ $atble->tongj }}" class="form-control" type="text" placeholder=""></td>
+                                        <td colspan="3"><input name="tongj" value="{{ $table->tongj }}" class="form-control" type="text" placeholder=""></td>
                                     </tr>
                                     <tr>
                                         <td>奖励总金额</td>

resources/views/admin/edit_table/table_nine.blade.php

@@ -152,6 +152,7 @@
                             <div class="col-sm-2">项目名称：</div>
                             <div class="col-sm-7">
                                 <select name="project_name" class="form-control">
+                                    <option value=" "></option>
                                     @foreach($project as $data)
                                         <option value="{{ $data->project_name }}"
                                                 @if($table->project_name == $data->project_name) selected @endif

resources/views/admin/edit_table/table_one.blade.php

@@ -154,7 +154,8 @@
                         <div class="col-sm-2" style="text-align: right">项目名称：</div>
                         <div class="col-sm-7">
                             <select name="project_name" class="form-control">
-                                @foreach($project as $data)
+                                <option value=" "></option>
+                            @foreach($project as $data)
                                     <option value="{{ $data->project_name }}"
                                             @if($table->project_name == $data->project_name) selected @endif
                                     >{{ $data->project_name }}</option>

resources/views/admin/edit_table/table_seven.blade.php

@@ -152,6 +152,7 @@
                             <div class="col-sm-2">项目名称：</div>
                             <div class="col-sm-7">
                                 <select name="project_name" class="form-control">
+                                    <option value=" "></option>
                                     @foreach($project as $data)
                                         <option value="{{ $data->project_name }}"
                                                 @if($table->project_name == $data->project_name) selected @endif

resources/views/admin/edit_table/table_six.blade.php

@@ -152,6 +152,7 @@
                             <div class="col-sm-2">项目名称：</div>
                             <div class="col-sm-7">
                                 <select name="project_name" class="form-control">
+                                    <option value=" "></option>
                                     @foreach($project as $data)
                                         <option value="{{ $data->project_name }}"
                                                 @if($table->project_name == $data->project_name) selected @endif

resources/views/admin/edit_table/table_three.blade.php

@@ -152,6 +152,7 @@
                             <div class="col-sm-2">项目名称：</div>
                             <div class="col-sm-7">
                                 <select name="project_name" class="form-control">
+                                    <option value=" "></option>
                                     @foreach($project as $data)
                                         <option value="{{ $data->project_name }}"
                                                 @if($table->project_name == $data->project_name) selected @endif
@@ -187,7 +188,7 @@
                                         <td>等级</td>
                                         <td><input name="level" value="{{ $table->level }}" class="form-control" type="text" placeholder=""></td>
                                         <td>残疾证号</td>
-                                        <td><input name="canjim_num" value="{{ $table->canji_num }}" class="form-control" type="text" placeholder=""></td>
+                                        <td><input name="canji_num" value="{{ $table->canji_num }}" class="form-control" type="text" placeholder=""></td>
                                     </tr>
                                     <tr>
                                         <td>常住人口</td>

resources/views/admin/edit_table/table_two.blade.php

@@ -152,6 +152,7 @@
                             <div class="col-sm-2">项目名称：</div>
                             <div class="col-sm-7">
                                 <select name="project_name" class="form-control">
+                                    <option value=" "></option>
                                     @foreach($project as $data)
                                         <option value="{{ $data->project_name }}"
                                                 @if($table->project_name == $data->project_name) selected @endif

resources/views/admin/table/table_three.blade.php

@@ -146,6 +146,10 @@
                         <h3>海勃湾区残疾人房屋征收补贴审批确认单</h3><br>
                     </div>
                     <form action="" method="post">
+
+                        <input type="hidden" name="bzc_cardid" class="form-control" placeholder="">
+                        <input type="hidden" name="table_time" class="form-control" placeholder="">
+
                         {{ csrf_field() }}
                     <div id="example2_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
                         <div class="row">
@@ -176,7 +180,8 @@
                                     </tr>
                                     <tr>
                                         <td>姓 名</td>
-                                        <td><input name="bzc_name" class="form-control" type="text" placeholder=""></td>
+                                        <td><input name="bzc_name" class="form-control" type="text" placeholder="">
+                                        </td>
                                         <td>住 址</td>
                                         <td colspan="3"><input name="bzc_addr" class="form-control" type="text" placeholder=""></td>
                                     </tr>
@@ -184,9 +189,9 @@
                                         <td>残疾类别</td>
                                         <td><input name="canji_type" class="form-control" type="text" placeholder=""></td>
                                         <td>等级</td>
-                                        <td><input name="lavel" class="form-control" type="text" placeholder=""></td>
+                                        <td><input name="level" class="form-control" type="text" placeholder=""></td>
                                         <td>残疾证号</td>
-                                        <td><input name="canjim_num" class="form-control" type="text" placeholder=""></td>
+                                        <td><input name="canji_num" class="form-control" type="text" placeholder=""></td>
                                     </tr>
                                     <tr>
                                         <td>常住人口</td>
@@ -220,7 +225,7 @@
                                     <tr>
                                         <td>发证单位审核意见</td>
                                         <td colspan="2"><textarea name="fazheng" style="width: 80%;height: 200px;" placeholder="盖章"></textarea>
-                                        <br>时 间：<input name="d=fazheng_time" class="form-control" type="text" placeholder=""></td>
+                                        <br>时 间：<input name="fazheng_time" class="form-control" type="text" placeholder=""></td>
                                         <td>征收实施单位审批意见</td>
                                         <td colspan="2"><textarea name="zc" style="width: 80%;height: 200px;" placeholder="盖章"></textarea>
                                         <br>时 间：<input name="zc_time" class="form-control" type="text" placeholder=""></td>