文本信息 导出问题修复

app/WorkOrder.php

@@ -152,20 +152,6 @@ class WorkOrder extends Model
                 }
             }]);
         }]);
-//
-//        $query->with(['type','owner', 'creator', 'order' => function ($query) {
-//            /** @var $query Builder */
-//            $query->with(['packages','owner', 'issue'=>function($query){
-//                /** @var $query Builder */
-//                $query->with(['issueType','logs'=>function($query){
-//                    if (Gate::denies('订单管理-问题件-客户不可见')){
-//                        $query->with('user')->orderByDesc('created_at');
-//                    } else{
-//                        $query->with('user')->where('tag','=',0)->orderByDesc('created_at');
-//                    }
-//                }]);
-//            }, 'logistic']);
-//        }, 'reviewer','issueType']);
     }
 
 }

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

@@ -302,27 +302,27 @@
                 let column = [
                     {name: 'no', value: '序号', neglect: true},
                     {name: 'operation', value: '操作', neglect: true},
-                    {name: 'status', value: '状态'},
-                    {name: 'owner', value: '货主'},
-                    {name: 'client_code', value: '订单号'},
-                    {name: 'logisticName', value: '承运商'},
+                    {name: 'status', value: '状态',neglect: true},
+                    {name: 'owner', value: '货主',neglect: true},
+                    {name: 'client_code', value: '订单号',neglect: true},
+                    {name: 'logisticName', value: '承运商',neglect: true},
                     {name: 'logisticNumber', value: '快递单号'},
                     {name: 'issueType', value: '问题件类型'},
-                    {name: 'workOrderInfo', value: '问题描述'},
-                    {name: 'result_explain', value: '情况说明'},
+                    {name: 'workOrderInfo', value: '问题描述',neglect: true},
+                    {name: 'result_explain', value: '情况说明',neglect: true},
                     {name: 'orderIssueType', value: '问题件类别'},
                     {
                         name: 'orderIssueProcessLogs', type: 'multi', title: "处理结果", rows: [
                             {value: "内容", col: "4"},
                             {value: "操作人", col: "4"},
                             {value: "时间", col: "4"},
-                        ]
+                        ],neglect: true
                     },
                     {name: 'Info', value: '物流跟踪信息', neglect: true},
-                    {name: 'creator', value: '创建人'},
-                    {name: 'submit_at', value: '提交时间'},
-                    {name: 'reviewer', value: '审核人'},
-                    {name: 'review_at', value: '审核时间'},
+                    {name: 'creator', value: '创建人',neglect: true},
+                    {name: 'submit_at', value: '提交时间',neglect: true},
+                    {name: 'reviewer', value: '审核人',neglect: true},
+                    {name: 'review_at', value: '审核时间',neglect: true},
                 ];
 
                 new Header({
@@ -445,7 +445,8 @@
                     if (!item.order) return '';
                     if (!item.order.packages) return '';
                     let message = '';
-                    switch (item.issue_order_type) {
+                    let issue_type = item.issue_type? item.issue_type.name : '';
+                    switch (issue_type) {
                         case '拦截':
                             message = this.interceptMessage(item);
                             break;
@@ -482,6 +483,7 @@
                     let logistic_code = item.order.logistic.code;
                     let adder = item.order.consignee_name + ' ' + item.order.consignee_phone + ' '
                         + item.order.province + ' ' + item.order.city + ' ' + item.order.district + ' ' + item.order.address;
+
                     item.order.packages.forEach(node => {
                         if (logistic_code.includes('SF')) { // 顺丰订单
                             message += node.logistic_number + ' ——改信息: ' + item.remark + ',运费到付或月结' + '\n';