Merge branch 'zengjun'

app/Filters/OrderIssueFilters.php

@@ -68,7 +68,8 @@ class OrderIssueFilters
         'archive_at_start',
         'archive_at_end',
         'result_explain',
-        'is_intercept'
+        'is_intercept',
+        'orderCode'
     ];
     protected $array_filter;
     protected $params = [];
@@ -461,4 +462,10 @@ class OrderIssueFilters
     {
         $this->queryBuilder->where('order_issues.is_intercept',1);
     }
+
+    public function orderCode($orderCode)
+    {
+        $this->getOrderQuery();
+        $this->searchWay($this->getOrderQuery(),$orderCode,'orders.code');
+    }
 }

app/Filters/WorkOrderFilters.php

@@ -35,7 +35,8 @@ class WorkOrderFilters
         'is_issue_order',
         'order_issue_type',
         'grad',
-        'owner'
+        'owner',
+        'client_code',
     ];
     protected $array_filter;
     protected $params = [];
@@ -200,5 +201,9 @@ class WorkOrderFilters
         $this->searchWay($this->queryBuilder,$owner,'work_orders.owner_id');
     }
 
+    public function client_code($client_code)
+    {
+        $this->searchWay($this->getOrderQuery(),$client_code,'orders.client_code');
+    }
 
 }

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

@@ -67,7 +67,14 @@
                             <input class="checkItem" type="checkbox" :value="order.orderno">
                         </td>
                         <td class="text-nowrap">
-                            <span>@{{ i+1 }}</span><span v-show="order.is_order_issue" class="badge badge-pill badge-danger">问题件</span>
+                            <span>@{{ i+1 }}</span>
+                            @can('订单管理-问题件')
+                                <a :href="'{{url("order/issue/index")}}'+'?orderCode='+order.orderno" target="order/issue/index?addtime=15">
+                                    <span v-show="order.is_order_issue" class="badge badge-pill badge-danger">问题件</span>
+                                </a>
+                            @else
+                                <span v-show="order.is_order_issue" class="badge badge-pill badge-danger">问题件</span>
+                            @endcan
                         </td>
                         <td class="text-dark font-weight-bold text-nowrap"><span>@{{ order.orderno }}</span></td>
                         <td class="text-muted text-nowrap"><span>@{{ order.ordercodename }}</span></td>

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

@@ -1186,8 +1186,8 @@
                                 }
                             }
                         }]
-
-                    }
+                    },
+                    {name:'orderCode',type:'input',tip: 'SO单号', placeholder: 'SO单号'}
                 ], [
                     {name: 'settlement_at_start', type: 'dateTime', tip: '完结起始日期'},
                     {name: 'settlement_at_end', type: 'dateTime', tip: '完结结束日期'},

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

@@ -294,6 +294,7 @@
                 ], [{name: 'review_at_start', type: 'time', tip: ['工单审核开始日期', '时间']},
                     {name: 'review_at_end', type: 'time', tip: ['工单审核结束日期', '时间']},
                     {name: 'order_issue_type', type: 'select', placeholder: '问题件类型', data: this.orderIssueTypes},
+                    {name: 'client_code', type: 'input', placeholder: '客户订单号'},
                     {name: 'is_review', type: 'checkbox', tip: '是否审核', data: [{name: 'true', value: '已审核'}]},
                 ]];
                 this.form = new query({