运费计算：BUG修复

resources/views/customer/project/index.blade.php

@@ -70,7 +70,7 @@
                     <td>@{{ owner.customer_name }}</td>
                     <td>@{{ owner.user_owner_group_name }}</td>
                     <td>@{{ owner.user_work_group_name }}</td>
-                    <td><b>@{{owner.relevance.length}}</b>/5</td>
+                    <td><b>@{{owner.relevance ? owner.relevance.length : 0}}</b>/5</td>
                     <td>@{{ owner.created_at }}</td>
                     <td>@{{ owner.customer_company_name }}</td>
                     <td>@{{ owner.is_activation }}</td>

resources/views/personnel/report.blade.php

@@ -53,21 +53,38 @@
                         <label><input type="checkbox" :value="report.id" v-model="checkData"></label>
                     </td>
                     <td>@{{ i+1 }}</td>
-                    <td></td>
-                    <td></td>
-                    <td>@{{ report.ownerGroupName }}</td>
-                    <td>@{{ report.customerName }}</td>
-                    <td>@{{ report.ownerName }}</td>
+                    <td>@{{ report.countingMonth }}</td>
+                    <td>@{{ report.ownerStorageDuration }}</td>
+                    <td v-if="type == 0">@{{ report.ownerGroupName }}</td>
+                    <td v-if="type == 0">
+                        <small v-for="user in report.ownerGroupUserList">@{{ user }}</small><br>
+                    </td>
+                    <td v-if="type == 0">@{{ report.ownerName }}</td>
+                    <td v-if="type == 0">@{{ report.warehouseName }}</td>
+                    <td v-if="type == 0">@{{ report.userWorkGroupName }}</td>
+                    <td v-if="type == 0 || type == 1">@{{ report.sell }}</td>
+                    <td v-if="type == 1">@{{ report.ownerName }}</td>
+                    <td v-if="type == 1">@{{ report.warehouseName }}</td>
+                    <td v-if="type == 1 || type == 2">@{{ report.userWorkGroupName }}</td>
+                    <td v-if="type == 1">@{{ report.ownerGroupName }}</td>
+                    <td v-if="type == 2">
+                        <small v-for="user in report.userWorkGroupUserList">@{{ user }}</small><br>
+                    </td>
+                    <td v-if="type == 2">@{{ report.ownerName }}</td>
+                    <td v-if="type == 2">@{{ report.warehouseName }}</td>
+                    <td v-if="type == 2">@{{ report.principal }}</td>
+                    <td v-if="type == 2">@{{ report.sell }}</td>
                     <td>@{{ report.ownerStatus }}</td>
                     <td>@{{ report.ownerCreatedAt }}</td>
-                    <td>@{{ report.ownerStorageDuration }} 天</td>
-                    <td>@{{ report.countingMonth }}</td>
                     <td>@{{ report.dailyAverageOrderAmount }}</td>
                     <td>@{{ report.lastMonthCountingArea }}</td>
                     <td>@{{ report.currentMonthCountingArea }}</td>
-                    <td>@{{ report.ownerBillReportInitialFee }}</td>
-                    <td>@{{ report.ownerBillReportConfirmFee }}</td>
+                    <td v-if="type == 0">@{{ report.ownerBillReportInitialFee }}</td>
+                    <td v-if="type == 0 || type == 1">@{{ report.ownerBillReportConfirmFee }}</td>
+                    <td v-if="type == 2">@{{ report.ownerBillReportWorkFee }}</td>
+                    <td v-if="type == 2">@{{ report.ownerAreaReportAccountingArea }}</td>
                     <td>@{{ report.ownerBillReportConfirmUpdatedAt }}</td>
+                    <td v-if="type == 0">@{{ report.timeOut }}</td>
                 </tr>
             </table>
             {{$reports->appends($params)->links()}}