GGican 8 years ago
parent
commit
b52573678a

+ 3 - 2
app/Http/Controllers/Admin/TableController.php

xqd xqd
@@ -217,6 +217,8 @@ class TableController extends CommonController
 //    $table_id 表格类型id
     public function create(Requests\TableRequest $request, $table_type_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', 'sub_description');
         $data = $input;
@@ -225,8 +227,7 @@ class TableController extends CommonController
         if($input['project_name'] == null ||$input['project_name'] == ''){
             $all['project_id'] = 0;
         }
-        $all['project_id'] = Project::where('project_name','=',$input['project_name'])->first()->id;
-
+        $all['project_id'] = $input['project_name']!=''?Project::where('project_name','=',$input['project_name'])->first()->id:'6';
 //        save child_table
         if (isset($request)) {
             $request['status'] = '1';

+ 9 - 7
resources/views/admin/sta/sta_all.blade.php

xqd xqd xqd xqd xqd
@@ -4,7 +4,6 @@
 
         <link rel="stylesheet" href="{{asset('css/style.css')}}">
 
-
         <div class="row">
             <div class="col-md-12" id="print">
                 <div class="box box-primary">
@@ -14,6 +13,14 @@
                     <div class="box-body">
                         <table class="table table-bordered">
                             <thead>
+                            <tr>
+                                <td colspan="31" style="font-size: 25px; text-align: center">街坊项目拆迁统计表</td>
+                            </tr>
+                            <tr>
+                                @for($i=1;$i<32;$i++)
+                                    <td>{{ $i }}</td>
+                                @endfor
+                            </tr>
                             <tr>
                                 <th>合同编号</th>
                                 <th>姓名</th>
@@ -83,7 +90,7 @@
                                     <td></td>
                                     <td>{{ $value->sub_description }}</td>
                                 </tr>
-                                @endforeach
+                            @endforeach
                             @foreach($table[2] as $key=>$value)
                                 <tr>
                                     <td>{{ $value->num }}</td>
@@ -367,11 +374,9 @@
                             </tbody>
                         </table>
                     </div>
-                    {{-- /.boc-body--}}
                 </div>
             </div>
         </div>
-
         <button class="btn btn-success" onclick="printed('print')">打印</button>
 
         <script>
@@ -387,9 +392,6 @@
                 document.body.innerHTML = oldstr;
                 return false;
             }
-            function excel(){
-                saveAs
-            }
         </script>
 
 

+ 2 - 2
resources/views/admin/table/on_table.blade.php

xqd
@@ -60,8 +60,8 @@
                                         <td>{{ $list->used }}</td>
                                         <td><a href="{{ url('/table/'.$list->id.'/edit' )}}" class="btn btn-primary btn-sm">
                                                 <i class="fa fa-pencil"></i> 编辑</a>
-                                            {{--<a href="javascript:;" onclick="del_user({{ $list->id }})" class="btn btn-danger btn-sm article-delete">--}}
-                                                {{--<i  class="fa fa-trash-o"></i> 删除</a>--}}
+                                            <a href="javascript:;" onclick="del_user({{ $list->id }})" class="btn btn-danger btn-sm article-delete">
+                                                <i  class="fa fa-trash-o"></i> 删除</a>
                                         </td>
                                     </tr>
                                 @endforeach

+ 4 - 4
resources/views/admin/table/table_eight.blade.php

xqd xqd
@@ -69,9 +69,9 @@
                                     </tr>
                                     <tr>
                                         <td>产权性质</td>
-                                        <td colspan="3"><input name="chanquan" class="form-control" type="text" placeholder=""></td>
+                                        <td colspan="3"><input name="chanquan" class="form-control" type="text" placeholder="必填项"></td>
                                         <td>用 途</td>
-                                        <td colspan="4"><input name="used" class="form-control" type="text" placeholder=""></td>
+                                        <td colspan="4"><input name="used" class="form-control" type="text" placeholder="必填项"></td>
                                     </tr>
                                     <tr>
                                         <td>证件名称</td>
@@ -162,12 +162,12 @@
                                         <td>庭院补偿额</td>
                                         <td>总面积</td>
                                         <td><input name="all_area" class="form-control" type="text" placeholder=""></td>
-                                        <td colspan="3"><textarea name="25_1" class="form-control"></textarea></td>
+                                        <td colspan="3"><textarea name="data25_1" class="form-control"></textarea></td>
                                         <td colspan="3"><input name="data25" class="form-control" type="text" placeholder="小写" value="0" onchange="NoToChinese(this.value,data251)"></td>
                                     </tr>
                                     <tr>
                                         <td>停产停业损失补偿额</td>
-                                        <td colspan="5"><textarea name="27_1" class="form-control"></textarea></td>
+                                        <td colspan="5"><textarea name="data27_1" class="form-control"></textarea></td>
                                         <td  colspan="3"><input name="data27" class="form-control" type="text" placeholder="小写" value="0" onchange="NoToChinese(this.value,data271)"></td>
                                     </tr>
                                     <tr>