工单 问题件 页面修改

app/Filters/WorkOrderFilters.php

@@ -43,7 +43,8 @@ class WorkOrderFilters
         'is_end',
         'status',
         'process_progress',
-        'order_issue_log'
+        'order_issue_log',
+        'log_content'
     ];
     protected $array_filter;
     protected $params = [];
@@ -320,6 +321,17 @@ class WorkOrderFilters
         $this->queryBuilder->whereIn('order_id',$order_issue_query);
     }
 
+    public function log_content($log_content)
+    {
+        $order_issue_process_log_query = OrderIssueProcessLog::query()->selectRaw('order_id')->where('content', 'like', $log_content);
+        if (!array_key_exists('addtime',$this->params) ) {
+            $order_issue_process_log_query->where('created_at', '>=', Carbon::now()->subDays(31));
+        } else {
+            $order_issue_process_log_query->where('created_at', '>=', Carbon::now()->subDays($this->params['addtime']));
+        }
+        $this->queryBuilder->whereIn('order_id', $order_issue_process_log_query);
+    }
+
     public function status($status){
         $status_list = [];
         if ($status == '承运商处理'){

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

@@ -189,10 +189,6 @@
                         <th class="three-layer bg-whit  align-middle" rowspan="2" style="min-width: 180px">情况说明</th>
                         <th class="three-layer align-middle" rowspan="2" style="min-width: 115px">问题类别</th>
                         <th class="three-layer align-middle" colspan="4" style="min-width: 155px">处理结果</th>
-
-                        <th class="three-layer align-middle " rowspan="2"
-                            style="max-width: 500px;min-width: 400px;">快递路由
-                        </th>
                         @cannot('订单管理-问题件-客户不可见')
                             <th class="three-layer  align-middle" rowspan="2"
                                 style="width:50px">@{{ isShowSecondOrderInfo ? '隐藏':'展开' }}
@@ -716,33 +712,7 @@
                         {{--情况说明 结束--}}
 
                         {{--客户编辑 开启--}}
-                        <td>
-                            <div class="alert alert-light " v-for="(item,i) in orderIssue.order.packages">
-                                <div class="text-left">
-                                    <span v-text="item.logistic_number"></span>
-                                    <span class="float-right" v-if="item['transfer_status'].length === 0">暂无路由信息</span>
-                                    <button type="button" class="btn btn-sm btn-outline-primary float-right" v-if="item['transfer_status'].length > 0 && selectOrderPackage!==item.id" @click="selectOrderPackage = item.id">展开</button>
-                                    <button type="button" class="btn btn-sm btn-outline-primary float-right" v-if="selectOrderPackage === item.id" @click="selectOrderPackage = null">收起</button>
-                                </div>
-                                <div class="text-left" v-if="selectOrderPackage === item.id">
-                                    <div v-for="transfer in item['transfer_status']">
-                                        <div >
-                                            <hr>
-                                            <span class="mr-1 text-monospace">时间:</span>
-                                            <span v-text="transfer['accept_time']"></span>
-                                        </div>
-                                        <div>
-                                            <span class="mr-1 text-monospace">到达地:</span>
-                                            <span v-text="transfer['accept_address']"></span>
-                                        </div>
-                                        <div>
-                                            <span class="mr-1 text-monospace">详情:</span>
-                                            <span v-text="transfer['remark']"></span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
+
                     @cannot('订单管理-问题件-客户不可见')
                             <td class="p-0 m-0 child-layer-3" style="min-width:50px;"
                                 v-if="index===0"
@@ -1247,7 +1217,6 @@
                     orderIssue: {id: null, showId: ''},
                 },
                 toggleBtnHeight: null,
-                selectOrderPackage: null,
             },
             created() {
                 let _this = this;
@@ -1529,29 +1498,12 @@
                     this.isShowRejectedBill = false;
                     this.isShowSecondOrderInfo = false;
                 },
-                sortTransferStatus(item){
-                    item.isShowTransferStatus = false;
-                    item.isShowRemark = false;
-                    if (item['transfer_status'] == null) {
-                        item['transfer_status'] = [];
-                        return;
-                    }
-                    if (item['transfer_status'].length === 0) return;
-                    item['transfer_status'].sort((item1,item2)=>{
-                        let date1 = new Date(item1['accept_time']);
-                        let date2 = new Date(item2['accept_time']);
-                        if (date1 - date2 > 0) return -1;
-                        if (date1 - date2 < 0) return 1;
-                        return 0;
-                    });
-                },
                 regroupOrder(order) {
                     if (!order) return;
                     let amounts = 0; // 商品总数
                     let type_numbers = 0; // 商品类型数量
                     let _this = this;
                     $.each(order.packages, function (i, item) {
-                        _this.sortTransferStatus(item);
                         $.each(item.commodities, function (i, commodity) {
                             type_numbers++;
                             amounts += Number(commodity.amount);

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

@@ -526,6 +526,21 @@
                         {name: 'is_end', type: 'checkbox', tip: '是否已拦截', data: [{name: 'ture', value: '已完成'}]},
                     ], [
                         {name: 'order_issue_log', type: 'input', placeholder: '问题件处理日志'},
+                        {
+                            name: ['log_content', 'addtime'],
+                            type: 'input_select',
+                            tip: ['处理结果:前或后加 百分号为单个模糊搜索，否则为多条件精确搜索', '查询范围越短，搜索速度越快'],
+                            placeholder: ['处理结果', ''],
+                            data: log_content_range,
+                            rules: [{
+                                son: {
+                                    addtime: {
+                                        default: '31',
+                                        required_without_all_if: ['created_at_start', 'created_at_end']
+                                    }
+                                }
+                            }]
+                        },
                     ]];
                     this.form = new query({
                         el: '#form_div',