fix all

app/Http/Controllers/Admin/TableController.php

@@ -41,9 +41,9 @@ class TableController extends CommonController
     {
         $user = session('user');
         if ($user->role == 0) {
-            $data = Tablelist::where('status', '=', '0')->where('user_id', '=', $user['id'])->orderby('id', 'asc')->paginate(10);
+            $data = Tablelist::where('status', '=', '0')->where('user_id', '=', $user['id'])->orderby('id', 'asc')->paginate(20);
         } else {
-            $data = Tablelist::where('status', '=', $user->role)->orderby('id', 'asc')->paginate(10);
+            $data = Tablelist::where('status', '=', $user->role)->orderby('id', 'asc')->paginate(20);
         }
         return view('admin.table.on_table', compact('data'));
     }

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

@@ -256,7 +256,7 @@
                                             <td><input name="data50" value="{{ $value->data50 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder=""></td>
                                             <td><input name="data51" value="{{ $value->data51 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder=""></td>
                                             <td><input name="data51_1" value="{{ $value->data51_1 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder=""></td>
-                                            <td colspan="2"><textarea name="data51_2" class="form-control next" type="text" placeholder="">{{ $table->data51_2 }}</textarea></td>
+                                            <td colspan="2"><textarea name="data51_2" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder="">{{ $table->data51_2 }}</textarea></td>
                                             <td><input name="data52" value="{{ $value->data52 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder=""></td>
                                         </tr>
                                         <tr>
@@ -265,7 +265,7 @@
                                             <td><input name="data54" value="{{ $value->data54 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder=""></td>
                                             <td><input name="data55" value="{{ $value->data55 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder=""></td>
                                             <td><input name="data55_1" value="{{ $value->data55_1 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder=""></td>
-                                            <td colspan="2"><textarea name="data55_2" class="form-control next" type="text" placeholder="">{{ $table->data55_2 }}</textarea></td>
+                                            <td colspan="2"><textarea name="data55_2" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder="">{{ $table->data55_2 }}</textarea></td>
                                             <td><input name="data56" value="{{ $value->data56 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder=""></td>
                                         </tr>
                                         <tr>
@@ -277,28 +277,28 @@
                                         </tr>
                                         <tr>
                                             <td rowspan="2">住宅</td>
-                                            <td><textarea name="data57_2" class="form-control next" type="text" placeholder="">{{ $value->data57_2 }}</textarea></td>
+                                            <td><textarea name="data57_2" class="form-control  <?php echo 'next'.$h ?>" type="text" placeholder="">{{ $value->data57_2 }}</textarea></td>
                                             <td ><input name="data57" value="{{ $value->data57 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder=""></td>
                                             <td rowspan="2"><input name="data58" value="{{ $value->data58 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder="" onclick="add_money(data52,data57,data57_1,this)"></td>
                                             <td colspan="2"  rowspan="3"><input id="data59" name="data59" value="{{ $value->data59 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder="" onclick="jian(data43,data58,data62)"></td>
                                             <td colspan="2"  rowspan="3"><input id="data60" name="data60" value="{{ $value->data60 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder="" onclick="jian(data43,data58,data62)"></td>
                                         </tr>
                                         <tr>
-                                            <td ><textarea name="data57_3" class="form-control next" type="text" >{{ $value->data57_3 }}</textarea></td>
+                                            <td ><textarea name="data57_3" class="form-control <?php echo 'next'.$h ?>" type="text" >{{ $value->data57_3 }}</textarea></td>
                                             <td><input name="data57_1" value="{{ $value->data57_1 }}" class="form-control <?php echo 'next'.$h ?>" type="text" ></td>
                                         </tr>
                                         <tr>
                                             <td rowspan="2">商业</td>
-                                            <td  ><textarea name="data61_2" class="form-control next" type="text" placeholder="">{{ $value->data61_2 }}</textarea></td>
+                                            <td  ><textarea name="data61_2" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder="">{{ $value->data61_2 }}</textarea></td>
                                             <td  ><input name="data61" value="{{ $value->data61 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder=""></td>
                                             <td rowspan="2"><input name="data62" value="{{ $value->data62 }}" class="form-control <?php echo 'next'.$h ?>" type="text" placeholder="" onclick="add_money(data56,data61,data61_1,this)"></td>
                                         </tr>
                                         <tr>
-                                            <td ><textarea name="data61_3" class="form-control next" type="text" > {{ $value->data61_3 }}</textarea></td>
+                                            <td ><textarea name="data61_3" class="form-control <?php echo 'next'.$h ?>" type="text" > {{ $value->data61_3 }}</textarea></td>
                                             <td ><input name="data61_1" value="{{ $value->data61_1 }}" class="form-control <?php echo 'next'.$h ?>" type="text" ></td>
-                                            <td colspan="2"><a id="nextid" onclick="nextPage()"></a></td>
+                                            <td colspan="2"><a id="nextid" onclick="nextPage(0)"></a></td>
                                             <td colspan="2">
-                                                <textarea name="data61_4" class="form-control next" type="text">{{ $value->data61_4 }}</textarea>
+                                                <textarea name="data61_4" class="form-control <?php echo 'next'.$h ?>" type="text">{{ $value->data61_4 }}</textarea>
                                                 <input type="hidden" name="json" id="json">
                                                 <input type="hidden" name="hours" id="hours">
                                             </td>
@@ -400,7 +400,7 @@
                 }).on('changeDate',function(){
                     $(".datetimepicker").hide();
                 });
-                function nextPage(){
+                function nextPage(num){
                     var json = [];
                     var chae = $('#data59').val();
                     //差额不够时隐藏下一页
@@ -422,6 +422,8 @@
 
                     console.log(jsons);
 
+                    if(num == 0) alert('已转下一页刷新，请继续填写表单');
+
                     return jsons;
                 }
                 var jsons = [];

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

@@ -94,7 +94,7 @@
                                         <td rowspan="2">可置换住宅面积（㎡）</td>
                                         <td rowspan="2">可置换商业面积（㎡）</td>
                                         <td rowspan="2" >单价（元/㎡）</td>
-                                        <td  colspan="3" rowspan="2" >房务补偿额（元）</td>
+                                        <td  colspan="3" rowspan="2" >房屋补偿额（元）</td>
                                     </tr>
                                     <tr>
                                         <td></td>
@@ -156,19 +156,19 @@
                                     <tr>
                                         <td>装修补偿额</td>
                                         <td colspan="5"><textarea name="data26_1" class="form-control"></textarea></td>
-                                        <td  colspan="3"><input name="data26" class="form-control" type="text" placeholder="小写" value="0" onchange="NoToChinese(this.value,data261)"></td>
+                                        <td  colspan="3"><input name="data26" class="form-control" type="text" placeholder="小写" value="0"></td>
                                     </tr>
                                     <tr>
                                         <td>庭院补偿额</td>
                                         <td>总面积</td>
                                         <td><input name="all_area" class="form-control" type="text" placeholder=""></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>
+                                        <td colspan="3"><input name="data25" class="form-control" type="text" placeholder="小写" value="0"></td>
                                     </tr>
                                     <tr>
                                         <td>停产停业损失补偿额</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>
+                                        <td  colspan="3"><input name="data27" class="form-control" type="text" placeholder="小写" value="0"></td>
                                     </tr>
                                     <tr>
                                         <td rowspan="6">构筑物及其他补偿金</td>
@@ -292,7 +292,7 @@
                                     <tr>
                                         <td ><textarea name="data61_3" class="form-control next" type="text" ></textarea></td>
                                         <td ><input name="data61_1" class="form-control next" type="text" ></td>
-                                        <td colspan="2"><a id="nextid" onclick="nextPage()">转下页</a></td>
+                                        <td colspan="2"><a id="nextid" onclick="nextPage(0)">转下页</a></td>
                                         <td colspan="2">
                                             <textarea name="data61_4" class="form-control next" type="text"></textarea>
                                             <input type="hidden" name="json" id="json">
@@ -380,7 +380,7 @@
                         var jsons = []; // 所有的回迁房数据
                         var hours = 0;  // 回迁房套数
 
-                        function nextPage(){
+                        function nextPage(num){
                             var json = {};
                             var chae = $('#data59').val();
                             //差额不够时隐藏下一页
@@ -395,17 +395,18 @@
 
                             //赋值下一页的总金额
                             $('#data43').val(chae);
+                            NoToChinese(chae);
 
                             jsons.push(json);
                             console.log(jsons);
                             hours += 1;
                             $('#hours').val(hours);
-                            alert('已转下一页刷新，请继续填写表单');
+                            if(num == 0) alert('已转下一页刷新，请继续填写表单');
                             return jsons;
                         }
 
                         $('form').submit(function(){
-                            var jsons  = nextPage();
+                            var jsons  = nextPage(1);
                             var temp = JSON.stringify(jsons);
 
                             $('#json').val(temp);
@@ -485,7 +486,7 @@
                                 document.getElementById('nextid').style.display = "inline";
                             }
                         }
-                        function NoToChinese(num,to) {
+                        function NoToChinese(num) {
                             if (!/^\d*(\.\d*)?$/.test(num)) { alert("Number is wrong!"); return "Number is wrong!"; }
                             var AA = new Array("零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖");
                             var BB = new Array("", "拾", "佰", "仟", "萬", "億", "点", "");
@@ -507,7 +508,7 @@
                                 for (var i = 0; i < a[1].length; i++) re += AA[a[1].charAt(i)];
                             }
 
-                            $(to).val(re);
+                            $('#data431').val(re);
                         }
                         function get_change(one,two,three,four,five,add){
                             if ($(one).val() == ''){$(one).val(0);}
@@ -544,7 +545,7 @@
                             $('#data431').val(re);
                         }
                         function printed(printpage){
-                            $('#bottom_button').hide();
+                            $('#bottom_butdata431ton').hide();
                             var headstr = "<html><head><title></title></head><body>";
                             var footstr = "</body>";
                             var newstr = document.all.item(printpage).innerHTML;

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

@@ -83,7 +83,7 @@
                                     <td colspan="5">
                                         <input disabled id="total_money1" class="form-control" type="text" placeholder="大写">
                                     </td>
-                                    <td colspan="2"><input name="total_money" class="form-control next" type="text" placeholder="小写" onchange="NoToChinese(this.value)" >(元)</td>
+                                    <td colspan="2"><input id="total_money" name="total_money" class="form-control next" type="text" placeholder="小写" onchange="NoToChinese(this.value)" >(元)</td>
                                 </tr>
                                 <tr>
                                     <td rowspan="4" colspan="2">货币化安置</td>
@@ -121,7 +121,7 @@
                                     </td>
                                     <td><input name="money_bus_price" value="0" class="form-control next" type="text" placeholder=""></td>
 
-                                    <td><a id="nextid" onclick="nextPage()">转下页</a></td>
+                                    <td><a id="nextid" onclick="nextPage(0)">转下页</a></td>
                                     <td><input name="other" value=" " class="form-control next" type="text" placeholder="">
                                         <input type="hidden" name="json" id="json">
                                         <input type="hidden" name="hours" id="hours">
@@ -271,7 +271,7 @@
 
                 var jsons = []; // 所有的回迁房数据
                 var hours = 0;  // 回迁房套数
-                function nextPage(){
+                function nextPage(num){ //num阻止alert()弹窗
                     var json = {};
                     var chae = $('#money_home_tchae').val();
                     //差额不够时隐藏下一页
@@ -286,17 +286,18 @@
 
                     //赋值下一页的总金额
                     $('#total_money').val(chae);
+                    NoToChinese(chae);
 
                     jsons.push(json);
                     console.log(jsons);
                     hours += 1;
                     $('#hours').val(hours);
-                    alert('已转下一页刷新，请继续填写表单');
+                    if(num == 0) alert('已转下一页刷新，请继续填写表单');
                     return jsons;
                 }
 
                 $('form').submit(function(){
-                    var jsons  = nextPage();
+                    var jsons  = nextPage(1);
                     var temp = JSON.stringify(jsons);
 
                     $('#json').val(temp);