Merge remote-tracking branch 'origin/master'

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

@@ -50,7 +50,7 @@
                                 </select>                            </div>
                             <div class="col-sm-1">编号：</div>
                             <div class="col-sm-2">
-                                <input style="margin: 0px;" name="num" class="form-control" type="text" placeholder="必填项">
+                                <input style="margin: 0px;" name="num" class="form-control" type="text" placeholder="必填项" value="{{ $table->num }}">
                             </div><br><br>
                         </div>
                         <div class="row">

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

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

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

@@ -24,7 +24,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="700">
@@ -34,7 +34,7 @@
 			</tr> 
 		</tbody>
 	</table> 	
-	<table border="1" cellspacing="0" cellpadding="0" width="980" align="center" style="margin-top:10px; min-height:1200px;">
+	<table border="1" cellspacing="0" cellpadding="0" width="800" align="center" style="margin-top:10px; min-height:750px;">
 		<tr height="50">
 			<td width="140" align="center">被征收人姓名</td>
 			<td  align="center" colspan="2">{{ $table->bzc_name }}</td>
@@ -59,7 +59,7 @@
 			<td width="140" align="center">元</td>
 		</tr>
 		<tr height="50">
-			<td  width="140" align="center" >{{ $tabel->jine }}</td>
+			<td  width="140" align="center" >{{ $table->jine }}</td>
 			<td  align="center" colspan="4">{{ $table->tongj }}</td>
 			<td width="140" align="center">元</td>
 		</tr>
@@ -82,7 +82,7 @@
 		</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_7_two.blade.php

@@ -127,6 +127,18 @@
 			 <p style="vertical-align:bottom; text-align:right;">   年  &nbsp;&nbsp;   月 &nbsp;&nbsp;    日&nbsp;&nbsp;&nbsp;&nbsp; </p></td>
 		</tr>
 	</table>
+	<table cellspacing="0" cellpadding="0" width="980" 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>
+	</table>
  </div>
   <div align="center" style="margin-top:20px;margin-left:"> 
      <input class="print_button" type="button" id="datasubmit" value="确认打印" name="submit" onclick="printed()">

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

@@ -241,11 +241,11 @@
                         result = parseFloat($(total).val()) - ( parseFloat($(I).val())+parseFloat($(P).val())+parseFloat($(Q).val()) );
                         result = Math.round(result);
                         if(result >= 0){
-                            $('#money_home_jchae').val(result);
-                            $('#money_home_tchae').val('');
-                        }else{
+                            $('#money_home_tchae').val(result);
                             $('#money_home_jchae').val('');
-                            $('#money_home_tchae').val(result*(-1));
+                        }else{
+                            $('#money_home_tchae').val('');
+                            $('#money_home_jchae').val(result*(-1));
                         }
                     }