Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Admin/TableController.php

@@ -243,14 +243,26 @@ class TableController extends CommonController
             'level.required'=>'残疾等级不能为空！',
             'canji_num.required'=>'残疾证号不能为空！',
         ];
+        $rules2 = [
+            'property'=>'required',
+            'used'=>'required',
+        ];
+        $msg2 = [
+            'property.required'=>'产权性质不能为空！',
+            'used.required'=>'用途不能为空！'
+        ];
         $validator1 = Validator::make($all,$rules1,$msg1);
         $validator = Validator::make($all,$rules,$msg);
-        if($table_type_id == '8'||$table_type_id == '9'||$table_type_id == '7'||$table_type_id == '1'){
+        $validator2 = Validator::make($all,$rules2,$msg2);
+        if($table_type_id == '8'||$table_type_id == '9'||$table_type_id == '7'){
             if(!$validator->passes()) return back()->withErrors($validator);
         }
         if($table_type_id == '3'){
             if(!$validator1->passes()) return back()->withErrors($validator1);
         }
+        if($table_type_id == '1'){
+            if(!$validator2->passes()) return back()->withErrors($validator2);
+        }
 
         $all['user_id'] = $this->user->id ;
         if($input['project_name'] == null ||$input['project_name'] == ''){
@@ -1061,7 +1073,7 @@ FROM table_nine WHERE status > 5 GROUP BY bzc_name');
                     ];
 
                     $table[1] = Table_one::query()
-                        ->groupBy('bzc_addr')
+                        ->groupBy('num')
                         ->selectRaw('num')
                         ->selectRaw('bzc_addr')
                         ->selectRaw('bzc_name')
@@ -1075,7 +1087,7 @@ FROM table_nine WHERE status > 5 GROUP BY bzc_name');
                         ->get();
 
                     $table[2] = Table_two::query()
-                        ->groupBy('bzc_addr')
+                        ->groupBy('num')
                         ->selectRaw('bzc_addr')
                         ->selectRaw('num')
                         ->selectRaw('bzc_name')
@@ -1086,7 +1098,7 @@ FROM table_nine WHERE status > 5 GROUP BY bzc_name');
                         ->get();
 
                     $table[3] = Table_three::query()
-                        ->groupBy('bzc_addr')
+                        ->groupBy('num')
                         ->selectRaw('bzc_addr')
                         ->selectRaw('num')
                         ->selectRaw('bzc_name')
@@ -1100,7 +1112,7 @@ FROM table_nine WHERE status > 5 GROUP BY bzc_name');
                         ->get();
 
                     $table[4] = Table_four::query()
-                        ->groupBy('bzc_addr')
+                        ->groupBy('num')
                         ->selectRaw('bzc_addr')
                         ->selectRaw('num')
                         ->selectRaw('bzc_name')
@@ -1115,7 +1127,7 @@ FROM table_nine WHERE status > 5 GROUP BY bzc_name');
                         ->get();
 
                     $table[5] = Table_five::query()
-                        ->groupBy('bzc_addr')
+                        ->groupBy('num')
                         ->selectRaw('bzc_addr')
                         ->selectRaw('num')
                         ->selectRaw('bzc_name')
@@ -1127,7 +1139,7 @@ FROM table_nine WHERE status > 5 GROUP BY bzc_name');
                         ->get();
 
                     $table[6] = Table_six::query()
-                        ->groupBy('bzc_addr')
+                        ->groupBy('num')
                         ->selectRaw('bzc_addr')
                         ->selectRaw('num')
                         ->selectRaw('bzc_name')
@@ -1143,7 +1155,7 @@ FROM table_nine WHERE status > 5 GROUP BY bzc_name');
                         ->get();
 
                     $table[7] = Table_seven::query()
-                        ->groupBy('bzc_addr')
+                        ->groupBy('num')
                         ->selectRaw('bzc_addr')
                         ->selectRaw('num')
                         ->selectRaw('bzc_name')
@@ -1162,7 +1174,7 @@ FROM table_nine WHERE status > 5 GROUP BY bzc_name');
                         ->get();
 
                     $table[8] = Table_eight::query()
-                        ->groupBy('bzc_addr')
+                        ->groupBy('num')
                         ->selectRaw('bzc_addr')
                         ->selectRaw('num')
                         ->selectRaw('bzc_name')
@@ -1189,7 +1201,7 @@ FROM table_nine WHERE status > 5 GROUP BY bzc_name');
 
 
                     $table[9] = Table_nine::query()
-                        ->groupBy('bzc_addr')
+                        ->groupBy('num')
                         ->selectRaw('bzc_addr')
                         ->selectRaw('num')
                         ->selectRaw('bzc_name')
@@ -1218,6 +1230,46 @@ FROM table_nine WHERE status > 5 GROUP BY bzc_name');
         return view('admin.table.table_eight_add',['table_type_id'=>'10']);
     }
 
+//驳回功能
+    public function back(Request $request)
+    {
+        if(!$table = Tablelist::find($request->table_id)) return back()->withErrors('驳回失败');
+
+        if(!$table->update(['status'=>'0'])) return back()->withErrors('驳回失败');
+
+        switch($request->table_type_id){
+            case 1:
+                if(!$status = Table_one::find($table->child_table_id)) return back()->withErrors('驳回失败');
+                if(!$status->update(['status'=>$status->status-1])) return back()->withErrors('驳回失败');
+            break;
+            case 2:
+                if(!Table_two::find($table->child_table_id)->update(['status'=>'0'])) return back()->withErrors('驳回失败');
+                break;
+            case 3:
+                if(!Table_three::find($table->child_table_id)->update(['status'=>'0'])) return back()->withErrors('驳回失败');
+                break;
+            case 4:
+                if(!Table_four::find($table->child_table_id)->update(['status'=>'0'])) return back()->withErrors('驳回失败');
+                break;
+            case 5:
+                if(!Table_five::find($table->child_table_id)->update(['status'=>'0'])) return back()->withErrors('驳回失败');
+                break;
+            case 6:
+                if(!Table_six::find($table->child_table_id)->update(['status'=>'0'])) return back()->withErrors('驳回失败');
+                break;
+            case 7:
+                if(!Table_seven::find($table->child_table_id)->update(['status'=>'0'])) return back()->withErrors('驳回失败');
+                break;
+            case 8:
+                if(!Table_eight::find($table->child_table_id)->update(['status'=>'0'])) return back()->withErrors('驳回失败');
+                break;
+            case 9:
+                if(!Table_nine::find($table->child_table_id)->update(['status'=>'0'])) return back()->withErrors('驳回失败');
+                break;
+        }
+
+        return redirect('/on_table');
+    }
 
 }
 

app/Http/routes.php

@@ -66,6 +66,9 @@ Route::group(['namespace'=>'Admin','middleware'=>['admin.login']],function() {
     Route::get('print/{id}','PrintController@printed');
     Route::get('print_table','PrintController@print_table');
 
+    //back
+    Route::get('back','TableController@back');
+
 });
 
 Route::any('/login', 'Admin\IndexController@login');

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

@@ -351,6 +351,7 @@
                                         @else
                                             <button id="sub" type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_id) }}'" class="btn btn-primary">
                                                 提交</button>
+                                                <a href="{{ url('/back/?table_type_id='.$table_type_id.'&table_id='.$table_id) }}" class="btn btn-danger">驳回</a>
                                         @endif
                                     @endif
                                     <a href="{{ url('/on_table') }}" class="btn btn-info">返回</a>

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

@@ -186,6 +186,7 @@
                                         @else
                                             <button id="sub" type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_id) }}'" class="btn btn-primary">
                                                 提交</button>
+                                                <a href="{{ url('/back/?table_type_id='.$table_type_id.'&table_id='.$table_id) }}" class="btn btn-danger">驳回</a>
                                         @endif
                                     @endif
                                     <a href="{{ url('/on_table') }}" class="btn btn-info">返回</a>

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

@@ -154,6 +154,7 @@
                                         @else
                                             <button id="sub" type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_id) }}'" class="btn btn-primary">
                                                 提交</button>
+                                                <a href="{{ url('/back/?table_type_id='.$table_type_id.'&table_id='.$table_id) }}" class="btn btn-danger">驳回</a>
                                         @endif
                                     @endif
                                     <a href="{{ url('/on_table') }}" class="btn btn-info">返回</a>

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

@@ -333,6 +333,7 @@
                                         @else
                                             <button id="sub" type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_id) }}'" class="btn btn-primary">
                                                 提交</button>
+                                                <a href="{{ url('/back/?table_type_id='.$table_type_id.'&table_id='.$table_id) }}" class="btn btn-danger">驳回</a>
                                         @endif
                                     @endif
                                     <a href="{{ url('/on_table') }}" class="btn btn-info">返回</a>

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

@@ -292,6 +292,7 @@
                                     @else
                                         <button id="sub" type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_id) }}'" class="btn btn-primary">
                                             提交</button>
+                                            <a href="{{ url('/back/?table_type_id='.$table_type_id.'&table_id='.$table_id) }}" class="btn btn-danger">驳回</a>
                                     @endif
                                 @endif
                                 <a href="{{ url('/on_table') }}" class="btn btn-info">返回</a>

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

@@ -304,6 +304,7 @@
                                         @else
                                             <button id="sub" type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_id) }}'" class="btn btn-primary">
                                                 提交</button>
+                                                <a href="{{ url('/back/?table_type_id='.$table_type_id.'&table_id='.$table_id) }}" class="btn btn-danger">驳回</a>
                                         @endif
                                     @endif
                                     <a href="{{ url('/on_table') }}" class="btn btn-info">返回</a>

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

@@ -171,6 +171,7 @@
                                         @else
                                             <button id="sub" type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_id) }}'" class="btn btn-primary">
                                                 提交</button>
+                                                <a href="{{ url('/back/?table_type_id='.$table_type_id.'&table_id='.$table_id) }}" class="btn btn-danger">驳回</a>
                                         @endif
                                     @endif
                                     <a href="{{ url('/on_table') }}" class="btn btn-info">返回</a>

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

@@ -177,6 +177,7 @@
                                         @else
                                             <button id="sub" type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_id) }}'" class="btn btn-primary">
                                                 提交</button>
+                                                <a href="{{ url('/back/?table_type_id='.$table_type_id.'&table_id='.$table_id) }}" class="btn btn-danger">驳回</a>
                                         @endif
                                     @endif
                                     <a href="{{ url('/on_table') }}" class="btn btn-info">返回</a>

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

@@ -211,6 +211,7 @@
                                         @else
                                             <button id="sub" type="submit" onclick="javascript:this.form.action='{{ url('/table/sub/'.$table_id) }}'" class="btn btn-primary">
                                                 提交</button>
+                                                <a href="{{ url('/back/?table_type_id='.$table_type_id.'&table_id='.$table_id) }}" class="btn btn-danger">驳回</a>
                                         @endif
                                     @endif
                                     <a href="{{ url('/on_table') }}" class="btn btn-info">返回</a>

resources/views/admin/print/print_all.blade.php

@@ -35,9 +35,8 @@
 </head>
 <body>
 <div id="vue">
-
     <div id="print">
-        <table cellspacing="0" cellpadding="0" width="990" align="center">
+        <table cellspacing="0" cellpadding="0" width="990" align="center" min-height="350">
             <tbody>
             <tr>
                 <td colspan="4">
@@ -75,7 +74,7 @@
         </table>
 
         <table id="page_one" border="1" cellspacing="0" cellpadding="0" width="990" align="center"
-               class="t1" style="font-size:14px; margin-top:15px;min-height:600px">
+               class="t1" style="font-size:14px; margin-top:15px;min-height:580px">
             <tbody>
             <tr class="heads_tr">
                 @for($i=1;$i<12;$i++)
@@ -110,8 +109,44 @@
         </table>
 
 
+         <table cellspacing="0" cellpadding="0" width="990" align="center" min-height="350" style=" margin-top: 97px;">
+            <tbody>
+            <tr>
+                <td colspan="4">
+                    <table cellspacing="0" cellpadding="0" width="900" align="center">
+                        <tbody>
+                        <tr>
+                            <td>
+                                <h2 class="orderTitle1">
+                                    <center>街坊项目拆迁成本统计表</center>
+                                </h2>
+                            </td>
+                            <td>
+                                <span style="float:right"><h2 class="orderTitle1"></h2></span>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+          <table cellspacing="0" cellpadding="0" width="900" align="center" >
+            <tbody>
+            <tr>
+                <td width="79" align="right" valign="top"></td>
+                <td width="185" valign="top"></td>
+                <td colspan="2"></td>
+            </tr>
+            <tr>
+                <td align="right" valign="top"></td>
+                <td valign="top"></td>
+                <td align="right" valign="top"> 单位：㎡、元、套</td>
+            </tr>
+            </tbody>
+        </table>
         <table id="page_two" border="1" cellspacing="0" cellpadding="0" width="990" align="center" class="t1"
-               style="font-size:14px; margin-top: 97px;min-height: 700px;">
+               style="font-size:14px;min-height: 560px;">
             <tbody>
             <tr class="heads_tr">
                 @for($k=12;$k<23;$k++)
@@ -144,8 +179,48 @@
         </table>
 
 
+
+
+
+            <table cellspacing="0" cellpadding="0" width="990" align="center" min-height="350" style=" margin-top: 97px;">
+            <tbody>
+            <tr>
+                <td colspan="4">
+                    <table cellspacing="0" cellpadding="0" width="900" align="center">
+                        <tbody>
+                        <tr>
+                            <td>
+                                <h2 class="orderTitle1">
+                                    <center>街坊项目拆迁成本统计表</center>
+                                </h2>
+                            </td>
+                            <td>
+                                <span style="float:right"><h2 class="orderTitle1"></h2></span>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+          <table cellspacing="0" cellpadding="0" width="900" align="center" >
+            <tbody>
+            <tr>
+                <td width="79" align="right" valign="top"></td>
+                <td width="185" valign="top"></td>
+                <td colspan="2"></td>
+            </tr>
+            <tr>
+                <td align="right" valign="top"></td>
+                <td valign="top"></td>
+                <td align="right" valign="top"> 单位：㎡、元、套</td>
+            </tr>
+            </tbody>
+        </table>
+
         <table id="page_three" border="1" cellspacing="0" cellpadding="0" width="990" align="center" class="t1"
-               style="font-size:14px; margin-top: 97px;min-height: 700px;">
+               style="font-size:14px; min-height: 560px;">
             <tbody>
             <tr class="heads_tr">
                 @for($j=23;$j<32;$j++)

resources/views/admin/print/table_1_eight.blade.php

@@ -36,7 +36,7 @@
 			</tr> 
 		</tbody>
 	</table> 	
-	<table border="1" cellspacing="0" cellpadding="0" width="980" align="center" style="margin-top:10px;">
+	<table border="1" cellspacing="0" cellpadding="0" width="980" align="center" style="margin-top:10px;min-height:1200px;">
 		<tr height="25">
 			<td  colspan="3" align="center">被征收人姓名</td>
 			<td  align="center" colspan="4">{{ $table->bzc_name }}</td>

resources/views/admin/print/table_2_nine.blade.php

@@ -41,7 +41,7 @@
 			</tr> 
 		</tbody>
 	</table> 	
-	<table border="1" cellspacing="0" cellpadding="0" width="990" align="center" style="margin-top:10px;">
+	<table border="1" cellspacing="0" cellpadding="0" width="990" align="center" style="margin-top:10px; min-height:1200px;">
 		<tr height="40">
 			<td colspan="2" align="center">被征收人姓名</td>
 			<td  align="center" colspan="3">{{ $table->bzc_name }}</td>

resources/views/admin/print/table_4_one.blade.php

@@ -15,7 +15,7 @@
 </head>
 <body>
    <div id="print">
- 	<table cellspacing="0" cellpadding="0" width="980" align="center"> 
+ 	<table cellspacing="0" cellpadding="0" width="800" align="center"> 
 		<tbody>
 			<tr> 
 				<td colspan="4"> 
@@ -35,7 +35,7 @@
 			</tr> 
 		</tbody>
 	</table> 	
-	<table cellspacing="0" cellpadding="0" width="980" align="center"> 
+	<table cellspacing="0" cellpadding="0" width="800" align="center"> 
 		<tbody>
 			<tr> 
 			 <td width="500">
@@ -45,32 +45,32 @@
 			</tr> 
 		</tbody>
 	</table> 	
-	<table border="1" cellspacing="0" cellpadding="0" width="980" align="center" style="margin-top:10px;">
-		<tr height="50">
+	<table border="1" cellspacing="0" cellpadding="0" width="800" align="center" style="margin-top:10px; min-height: 800px; ">
+		<tr >
 			<td width="140" align="center">被征收人姓名</td>
 			<td align="center" colspan="2">{{ $table->bzc_name }}</td>
 			<td width="140" align="center">被征收房屋地址</td>
 			<td colspan="3" align="center">{{ $table->bzc_addr }}</td>
 		</tr>
-		<tr height="50">
+		<tr >
 			<td width="140" align="center">联系电话</td>
 			<td colspan="2" align="center">{{ $table->bzc_tel }}</td>
 			<td width="140" align="center">被征收人身份证号</td>
 			<td colspan="3" align="center">{{ $table->bzc_cardid }}</td>
 		</tr>
-		<tr height="50">
+		<tr >
 			<td width="140" align="center">产权性质</td>
 			<td  align="center" colspan="2">{{ $table->property }}</td>
 			<td width="140" align="center">用途</td>
 			<td colspan="3" align="center">{{ $table->used }}</td>
 		</tr>
-		<tr height="50">
+		<tr >
 			<td width="140" align="center">拆迁补偿总金额</td>
 			<td  align="center" width="140" colspan="3">大写</td>
 			<td width="140" align="center" colspan="2">{{ $table->total_money }}</td>
 			<td width="140" align="center">元</td>
 		</tr>
-		<tr height="50">
+		<tr >
 			<td width="140" align="center" rowspan="4">货币化安置</td>
 			<td  align="center" width="140">房屋类别</td>
 			<td width="140" align="center">购买存量房面积（㎡）</td>
@@ -79,7 +79,7 @@
 			<td width="140" align="center">应退差额（元）</td>
 			<td width="140" align="center">应缴差额 （元）</td>
 		</tr>
-		<tr height="50">
+		<tr >
 			<td width="140" rowspan="2" align="center">住宅</td>
 			<td  align="center" width="140" >{{ $table->home_area }}</td>
 			<td  align="center" width="140" >{{$table->money_home_dprice}}</td>
@@ -87,44 +87,44 @@
 			<td  align="center" width="140" rowspan="3">{{ $table->money_home_tchae }}</td>
 			<td  align="center" width="140" rowspan="3" >{{ $table->money_home_jchae }}</td>
 		</tr>
-		<tr height="50">
+		<tr >
 			<td  align="center" width="140" >{{ $table->home_area2 }}</td>
 			<td  align="center" width="140" >{{ $table->money_home_dprice2 }}</td>
 			<td  align="center" width="140" >{{ $table->money_home_price2 }}</td>
 		</tr>
-		<tr height="50">
+		<tr >
 			<td width="140" align="center" >商业</td>
 			<td  align="center" width="140" >{{ $table->money_bus_area }}</td>
 			<td  align="center" width="140" >{{ $table->money_bus_dprice }}</td>
 			<td  align="center" width="140" >{{ $table->money_bus_price }}</td>
 		</tr>
-		<tr height="50">
+		<tr >
 		    <td width="140" align="center" >购买房屋位置</td>
 			<td width="140" align="center" colspan="6">{{ $table->home_addr }}</td>
 		</tr>
-		<tr height="50">
+		<tr >
 			<td width="140" align="center" rowspan="2" >征收实施单位（章）</td>
 			<td width="140" align="center" >被征收人（签字）</td>
 			<td width="140" align="center" colspan="2"></td>
 			<td width="140" align="center" >代理人（签字）</td>
 			<td width="140" align="center" colspan="2"></td>
 		</tr>
-		<tr height="50">
+		<tr >
 			<td width="140" align="center" >签约时间</td>
 			<td  align="center" colspan="5" ></td>
 		</tr>
 	</table>
-	<table cellspacing="0" cellpadding="0" width="980" align="center" >
+	<table cellspacing="0" cellpadding="0" width="800" align="center" >
 			<tr border="0" height="50">
 			<td colspan="2" >核算（签字):</td>
 			<td width="140"  colspan="3" align="center" >初审（签字）：</td>
 			<td width="140" align="center" colspan="2" > 监审（签字）： </td>
-		</tr>
-		<tr border="0">
-			<td   colspan="2" >复核（签字):</td>
-			<td width="140"  colspan="3" align="center" >初审（签字）：</td>
-			<td width="140" align="center" colspan="2" > 监审（签字）： </td>
-		</tr>
+			</tr>
+			<tr border="0">
+				<td   colspan="2" >复核（签字):</td>
+				<td width="140"  colspan="3" align="center" >初审（签字）：</td>
+				<td width="140" align="center" colspan="2" > 监审（签字）： </td>
+			</tr>
 	</table>
  </div>
 

resources/views/admin/print/table_5_six.blade.php

@@ -35,7 +35,7 @@
 			</tr> 
 		</tbody>
 	</table> 	
-	<table cellspacing="0" cellpadding="0" width="980" align="center"> 
+	<table cellspacing="0" cellpadding="0" width="800" align="center"> 
 		<tbody>
 			<tr> 
 			 <td width="500">
@@ -45,18 +45,18 @@
 			</tr> 
 		</tbody>
 	</table> 	
-	<table border="1" cellspacing="0" cellpadding="0" width="980" align="center" style="margin-top:10px;">
+	<table border="1" cellspacing="0" cellpadding="0" width="800" align="center" style="min-height:800px; margin-top:10px;">
 		<tr height="50">
 			<td width="140" align="center">被征收人姓名</td>
 			<td  align="center" colspan="2">{{ $table->bzc_name }}</td>
 			<td width="140" align="center">被征收房屋地址</td>
-			<td colspan="3">{{ $table->bzc_addr }}</td>
+			<td colspan="3" align="center">{{ $table->bzc_addr }}</td>
 		</tr>
 		<tr height="50">
 			<td width="140" align="center">联系电话</td>
 			<td  align="center" colspan="2">{{ $table->bzc_tel }}</td>
 			<td width="140" align="center">被征收人身份证号</td>
-			<td colspan="3">{{ $table->bzc_cardid }}</td>
+			<td colspan="3" align="center">{{ $table->bzc_cardid }}</td>
 		</tr>
 		<tr height="50">
 			<td width="140" align="center" colspan="2" rowspan="2">临时安置费</td>
@@ -107,7 +107,7 @@
 			<td  align="center" colspan="5" ></td>
 		</tr>
 	</table>
-	<table cellspacing="0" cellpadding="0" width="980" align="center" >
+	<table cellspacing="0" cellpadding="0" width="800" align="center" >
 			<tr border="0" height="50">
 			<td colspan="2" >核算（签字):</td>
 			<td width="140"  colspan="3" align="center" >初审（签字）：</td>

resources/views/admin/print/table_6_four.blade.php

@@ -34,7 +34,7 @@
 			</tr> 
 		</tbody>
 	</table> 	
-	<table border="1" cellspacing="0" cellpadding="0" width="980" align="center" style="margin-top:10px;">
+	<table border="1" cellspacing="0" cellpadding="0" width="980" align="center" style="margin-top:10px; min-height:1200px;">
 		<tr height="50">
 			<td width="140" align="center">被征收人姓名</td>
 			<td  align="center" colspan="2">{{ $table->bzc_name }}</td>

resources/views/admin/print/table_7_two.blade.php

@@ -119,7 +119,7 @@
 		</tr>
 		<tr height="100">
 			<td width="460"  colspan="3" style="vertical-align:top;">
-			 <p style="vertical-align:top;">工作组意见：经我们核实，该违章户已按要求自行完成违章建筑的拆除，同意
+			 <p style="vertical-align:top; line-height:30px;">工作组意见：经我们核实，该违章户已按要求自行完成违章建筑的拆除，同意 &nbsp;&nbsp; &nbsp;&nbsp;
      发放自行拆除费用。</p>
 			 <p style="vertical-align:bottom; text-align:right;">   年  &nbsp;&nbsp;   月 &nbsp;&nbsp;    日&nbsp;&nbsp;&nbsp;&nbsp; </p></td>
 			<td  colspan="3" style="vertical-align:top;">

resources/views/admin/print/table_8_three.blade.php

@@ -35,7 +35,7 @@
 			</tr> 
 		</tbody>
 	</table> 	
-	<table cellspacing="0" cellpadding="0" width="980" align="center"> 
+	<table cellspacing="0" cellpadding="0" width="800" align="center"> 
 		<tbody>
 			<tr> 
 			 <td width="500">
@@ -45,12 +45,12 @@
 			</tr> 
 		</tbody>
 	</table> 	
-	<table border="1" cellspacing="0" cellpadding="0" width="980" align="center" style="margin-top:10px;">
+	<table border="1" cellspacing="0" cellpadding="0" width="800" align="center" style="margin-top:10px; min-height:820px;">
 		<tr height="50">
 			<td width="140" align="center">姓名</td>
 			<td  align="center" colspan="2">{{ $table->bzc_name }}</td>
 			<td width="140" align="center">住址：</td>
-			<td colspan="3">{{ $table->bzc_addr }}</td>
+			<td colspan="3"  align="center">{{ $table->bzc_addr }}</td>
 		</tr>
 		<tr height="50">
 			<td width="140" align="center">残疾类别</td>
@@ -109,7 +109,7 @@
 			<td width="140" align="center" colspan="3" ></td>
 		</tr>
 	</table>
-	<table cellspacing="0" cellpadding="0" width="980" align="center" >
+	<table cellspacing="0" cellpadding="0" width="800" align="center" >
 			<tr border="0" height="50">
 			<td colspan="2" >核算（签字):</td>
 			<td width="140"  colspan="3" align="center" >初审（签字）：</td>

resources/views/admin/print/table_9_five.blade.php

@@ -15,7 +15,7 @@
 </head>
 <body>
    <div id="print">
-		<table cellspacing="0" cellpadding="0" width="900" align="center">
+		<table cellspacing="0" cellpadding="0" width="800" align="center">
 			<tbody>
 				<tr> 
 					<td colspan="2">
@@ -31,18 +31,18 @@
 			</tbody>
 		</table> 
 		
-	<table border="1" cellspacing="0" cellpadding="0" width="980" align="center" style="margin-top:10px;">
+	<table border="1" cellspacing="0" cellpadding="0" width="800" align="center" style="margin-top:10px;min-height:800px;">
 		<tr height="50">
 			<td width="140" align="center">被拆迁户姓名</td>
 			<td width="140" align="center" >{{ $table->bzc_name }}</td>
 			<td width="140" align="center">被拆迁人房屋地址</td>
-			<td colspan="2">{{ $table->bzc_addr }}</td>
+			<td colspan="2" align="center">{{ $table->bzc_addr }}</td>
 		</tr>
 		<tr height="50">
 			<td width="140" align="center">联系电话</td>
 			<td width="140" align="center" >{{ $table->bzc_tel }}</td>
 			<td width="140" align="center">被拆迁人身份证号</td>
-			<td colspan="2">{{ $table->bzc_cardid }}</td>
+			<td colspan="2" align="center">{{ $table->bzc_cardid }}</td>
 		</tr>
 		<tr height="50">
 			<td width="140" align="center">逾期开始时间</td>
@@ -90,18 +90,19 @@
 			<td  align="center" width="140" colspan="4">{{ $table->yueding }}</td>
 		</tr>
 		<tr height="50">
-			<td width="140" a
+			<td  align="center" rowspan="2" >被拆迁人（章）</td>
+			<td  align="center" >被拆迁人（签字）</td>
+			<td width="140" align="center"  ></td>
+			<td width="140" align="center" >代理人（签字）</td>
+			<td width="140" align="center"  ></td>
+		</tr>
 		<tr height="50">
 			<td  align="center"  >签约时间</td>
 			<td width="140" align="center" colspan="4" >    年    月    日</td>
 		</tr>
 	</table>
-	<table cellspacing="0" cellpadding="0" width="980" align="center" >lign="center" rowspan="2">拆迁人（章）</td>
-			<td  align="center"  >被拆迁人（签字）</td>
-			<td width="140" align="center"  ></td>
-			<td width="140" align="center" >代理人（签字）</td>
-			<td width="140" align="center"  ></td>
-		</tr>
+	<table cellspacing="0" cellpadding="0" width="800" align="center" >
+
 			<tr border="0" height="50">
 			<td colspan="2" >核算（签字):</td>
 			<td width="140"  colspan="3" align="center" >初审（签字）：</td>