loustwo 4 лет назад
Родитель
Сommit
062d2f0181
1 измененных файлов с 31 добавлено и 30 удалено
  1. 31 30
      resources/views/order/workOrder/index.blade.php

+ 31 - 30
resources/views/order/workOrder/index.blade.php

@@ -203,6 +203,7 @@
                                         </button>
                                     @endcan
                                 </td>
+                                <td v-text="item.created_at"></td>
                                 <td>
                                     <span v-text="item.issue_type_name"></span>
                                 </td>
@@ -220,7 +221,6 @@
                                         <span v-text="logistic_number"></span>
                                     </div>
                                 </td>
-                                <td v-text="item.created_at"></td>
                                 <td v-text="item.status"></td>
                                 <td v-text="item.creator ? item.creator.name : ''"></td>
                                 <td v-text="item.result_explain ? item.result_explain: item.remark"></td>
@@ -308,24 +308,6 @@
                                         @include('order.workOrder._issue_logs')
                                     </td>
                                 @endcan
-                                <td class="container" style="min-width: 500px">
-                                    <div class="row">
-                                        @can('订单管理-工单处理-删除')
-                                            <div class="col-2 ">
-                                                <div class="header-alert">
-                                                    <button type="button"
-                                                            class="btn btn-sm btn-outline-danger"
-                                                            @click="destroy(item,i)">
-                                                        删除
-                                                    </button>
-                                                </div>
-                                            </div>
-                                        @endcan
-                                        <div class="col-10 m-0 ">
-                                            @include('order.workOrder._work_order_details')
-                                        </div>
-                                    </div>
-                                </td>
                                 @can('订单管理-工单处理-宝时编辑')
                                     <td>
                                         <input type="number" class="form-control form-control-sm"
@@ -386,6 +368,25 @@
                                         </select>
                                     </td>
                                 @endcan
+                                <td class="container" style="min-width: 500px">
+                                    <div class="row">
+                                        @can('订单管理-工单处理-删除')
+                                            <div class="col-2 ">
+                                                <div class="header-alert">
+                                                    <button type="button"
+                                                            class="btn btn-sm btn-outline-danger"
+                                                            @click="destroy(item,i)">
+                                                        删除
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        @endcan
+                                        <div class="col-10 m-0 ">
+                                            @include('order.workOrder._work_order_details')
+                                        </div>
+                                    </div>
+                                </td>
+
                             </tr>
                         </template>
                         </tbody>
@@ -816,6 +817,7 @@
                 let column = [
                     {name: 'id', value: '工单号', neglect: true},
                     {name: 'operation', value: '操作', neglect: true},
+                    {name: 'created_at', value: '创建时间', neglect: true},
                     {name: 'work_type', value: '工单类型', neglect: true},
                     {name: 'process_progress', value: '当前进度', neglect: true},
                     {name: 'owner', value: '客户', neglect: true},
@@ -823,7 +825,6 @@
                     {name: 'client_no', value: '客户订单号'},
                     {name: 'logistic_name', value: '承运人'},
                     {name: 'logistic_numbers', value: '快递单号'},
-                    {name: 'created_at', value: '创建时间', neglect: true},
                     {name: 'status', value: '当前处理人', neglect: true},
                     {name: 'creator', value: '创建人'},
                     {name: 'remark', value: '情况说明'},
@@ -841,6 +842,16 @@
                         name: 'order_issue_log', value: '问题件处理结果'
                     },
                         @endcan
+                        @can('订单管理-工单处理-宝时编辑')
+                    {
+                        name: 'logistic_indemnity_money', value: '承运商赔偿金额'
+                    },
+                    {name: 'logistic_express_remission', value: '承运商快递减免'},
+                    {name: 'bao_shi_indemnity_money', value: '宝时赔偿金额'},
+                    {name: 'bao_shi_express_remission', value: '宝时快递减免'},
+                    {name: 'user_work_groups', value: '仓库组责任方'},
+                    {name: 'user_owner_group', value: '项目组责任方'},
+                    @endcan
                     {
                         name: 'ab_operation', type: 'multi', title: "其他操作", rows: [
                                 @can('订单管理-工单处理-删除')
@@ -855,16 +866,6 @@
                             @endcan
                         ], neglect: true
                     },
-                        @can('订单管理-工单处理-宝时编辑')
-                    {
-                        name: 'logistic_indemnity_money', value: '承运商赔偿金额'
-                    },
-                    {name: 'logistic_express_remission', value: '承运商快递减免'},
-                    {name: 'bao_shi_indemnity_money', value: '宝时赔偿金额'},
-                    {name: 'bao_shi_express_remission', value: '宝时快递减免'},
-                    {name: 'user_work_groups', value: '仓库组责任方'},
-                    {name: 'user_owner_group', value: '项目组责任方'},
-                    @endcan
                 ];
                 new Header({
                     el: "table",