表格导出和字段名

app/Http/Controllers/OrderIssueController.php

@@ -141,7 +141,7 @@ class OrderIssueController extends Controller
         }else{
             $sqlList = app('orderIssueService')->getSqlList(['id'=>$request->data]);
         }
-        $post = Http::post(config('go.export.url'),['type'=>'orderIssue','sqlList'=>json_encode($sqlList)]);
+        $post = Http::post(config('go.export.url'),['type'=>'orderIssue','sqlList'=>json_encode($sqlList),'createFormat'=>'merge']);
         if ($post->status() == 500){
             throw new Exception($post->header("Msg"));
         }

resources/views/order/issue/index.blade.php

@@ -118,7 +118,7 @@
                         {{--                        @endcannot--}}
                         <th class="three-layer bg-whit  align-middle" rowspan="2" style="min-width: 115px">情况说明</th>
                         <th class="three-layer   align-middle" rowspan="2" style="min-width: 115px">问题类别</th>
-                        <th class="three-layer  align-middle" colspan="3" style="min-width: 115px">处理结果</th>
+                        <th class="three-layer  align-middle" colspan="4" style="min-width: 155px">处理结果</th>
                         @cannot('订单管理-问题件-客户不可见')
                             <th class="three-layer  align-middle" rowspan="2" v-if="!isShowSecondOrderInfo" style="width:50px">展开</th>
                             <th class="three-layer  align-middle" rowspan="2" v-if="isShowSecondOrderInfo" style=" min-width: 120px;">二次客户订单号</th>
@@ -151,6 +151,8 @@
                         <th  style="min-width: 75px">操作类型</th>
                         <th  style="min-width: 120px">说明</th>
                         <th  style="min-width: 100px">操作者</th>
+                        <th  style="min-width: 170px">时间</th>
+                        <th ></th>
                         @cannot('订单管理-问题件-客户不可见')
                             <th  v-if="isShowSecondOrderInfo" style="min-width: 100px">条码</th>
                             <th  v-if="isShowSecondOrderInfo" style="min-width: 100px">商品名</th>
@@ -344,7 +346,7 @@
                         </td>
 
                         {{--处理结果--}}
-                        <td class=" m-0 p-0 log-td child-layer-3" valign="middle" align="center" v-on:mouseover="showAddBtn($event)" v-on:mouseleave="hideAddBtn($event)" colspan="3">
+                        <td class=" m-0 p-0 log-td child-layer-3" valign="middle" align="center" v-on:mouseover="showAddBtn($event)" v-on:mouseleave="hideAddBtn($event)" colspan="4">
                             <div class="addLogDiv row m-0 p-0 form-group" :id="'AddLog_'+orderIssue.id" style="display: none;">
                                 <input type="hidden" name="id" :value="orderIssue.id">
                                 <div style="width: 45px"></div>
@@ -368,7 +370,8 @@
                                         v-on:mouseover="showDelBtn($event)" v-on:mouseleave="hideDelBtn($event)" >
                                         <td style="min-width: 75px">@{{ log.type }}</td>
                                         <td style="min-width: 200px">@{{ log.content }}</td>
-                                        <td style="min-width: 120px">@{{ log.user.name }}</td>
+                                        <td class="text-muted" style="min-width: 120px">@{{ log.user.name }}</td>
+                                        <td class="text-muted" style="min-width: 170px">@{{ log.created_at }}</td>
                                         <td style="" class="m-0 p-0 border-0">
                                             <button type="button" class="btn btn-sm btn-outline-danger m-0 del-btn invisible" @click="deleteOrderIssueLog(log.id,orderIssue.id)">删</button>
                                         </td>

webpack.mix.js

@@ -24,3 +24,4 @@ mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200918.js
 mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200826b.js');
 
 mix.copy('resources/sound/','public/sound');
+