前端

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

@@ -99,7 +99,9 @@
                     <td width="100" align="center">@{{ value.wuzheng_area }}</td>
                     <td width="100" align="center">@{{ value.fangbu }}</td>
                     <td width="100" align="center"></td>
-                    <td width="100" align="center">@{{ value.tingyuan }} @{{value.kongyuan}}</td>
+
+                    <td width="100" align="center">@{{ value.tingyuan | isNaN + value.kongyuan | isNaN }}</td>
+
                     <td width="100" align="center">@{{ value.zhuangxiu }}</td>
                 </tr>
             </template>
@@ -124,16 +126,16 @@
             <template v-for="value of list">
                 <tr>
                     <td width="100" align="center">@{{ value.gouzhu}}</td>
-                    <td width="100" align="center">@{{ value.tingchan }} @{{ value.tingye }}</td>
-                    <td width="100" align="center">@{{ value.linshibu }} @{{ value.anzhi }}</td>
-                    <td width="100" align="center">@{{ value.banqianbu }} @{{ value.anzhi }}</td>
+                    <td width="100" align="center">@{{ value.tingchan | isNaN + value.tingye | isNaN }}</td>
+                    <td width="100" align="center">@{{ value.linshibu |isNaN + value.anzhi | isNaN }}</td>
+                    <td width="100" align="center">@{{ value.banqianbu |isNaN + value.anzhi | isNaN}}</td>
                     <td width="100" align="center">@{{ value.dibu }}</td>
                     <td width="100" align="center">@{{ value.quanj }}</td>
                     <td width="100" align="center">@{{ value.chaj }}</td>
                     <td width="100" align="center">@{{ value.chaichuje }}</td>
-                    <td width="100" align="center">@{{ value.canbu }} @{{ value.other }}</td>
+                    <td width="100" align="center">@{{ value.canbu |isNaN+ value.other| isNaN}} </td>
                     <td width="100"
-                        align="center">@{{ value.total_money }} @{{ value.total }} @{{ value.zongj }} @{{ value.yuqij }} @{{ value.chaiqian }}</td>
+                        align="center">@{{ value.total_money | isNaN + value.total | isNaN + value.zongj | isNaN + value.yuqij | isNaN+ value.chaiqian | isNaN}}</td>
                     <td width="100" align="center">@{{ value.hours }}</td>
                 </tr>
             </template>
@@ -163,8 +165,8 @@
                     <td width="100" align="center">@{{ value.huiqian_home_area }}</td>
                     <td width="100" align="center">@{{ value.huiqian_shang_area }}</td>
                     <td width="100" align="center">@{{ value.huiqian }}</td>
-                    <td width="100" align="center">@{{ value.money_home_jchae }} @{{ value.yingjiao }}</td>
-                    <td width="100" align="center">@{{ value.money_home_tchae }} @{{ value.yingtui }}</td>
+                    <td width="100" align="center">@{{ value.money_home_jchae |isNaN + value.yingjiao | isNaN }}</td>
+                    <td width="100" align="center">@{{ value.money_home_tchae |isNaN + value.yingtui | isNaN}}</td>
                     <td width="100" align="center">@{{ value.created_at }}</td>
                     <td width="100" align="center"></td>
                     <td width="100" align="center">@{{ value.sub_description }}</td>
@@ -206,7 +208,36 @@
 
     var count_list = [], show_list = [], state = 0;
 
-    for (var t in table)for (var v in table[t])count_list.push(table[t][v]);
+    var count_length = 0;
+
+    //数组合并
+
+    for (var t in table)
+
+        for (var v in table[t]) {
+
+            if (typeof (count_list[table[t][v].num]) != 'undefined')  count_list[table[t][v].num] = Object.assign(count_list[table[t][v].num], table[t][v]);
+
+            else {
+
+                count_list[table[t][v].num] = table[t][v];
+
+                count_length++;
+
+            }
+
+        }
+
+
+    //数组重排
+    var tmp_arr = [];
+
+    for (var key in count_list)
+
+        tmp_arr.push(count_list[key]);
+
+    count_list = tmp_arr;
+
 
     var vm = new Vue({
 
@@ -220,11 +251,17 @@
 
             next: function () {
 
-                vm.has_prev = true;
+                for (var key in count_list)
+
+                    show_list.push(count_list[key]);
+
 
                 if (state % 20 == 0 && state != 0) {
 
                     show_list.splice(0, show_list.length);
+
+                    vm.has_prev = true;
+
                 }
 
                 for (var i = 0; i < 20 && state < count_list.length - 1; i++) {
@@ -241,7 +278,7 @@
 
             prev: function () {
 
-                if(state<=20)return ;
+                if (state <= 20)return;
 
                 show_list.splice(0, show_list.length);
 
@@ -253,6 +290,14 @@
 
                 }
 
+            }
+        },
+        filters: {
+            isNaN: function (value) {
+
+                if (!value) return 0;
+                return value;
+
             }
         }