Merge branch 'zengjun' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Services/OrderIssueService.php

@@ -175,7 +175,8 @@ class OrderIssueService
             }
         }
         if (isset($condition['order_issue_type_id'])) {
-            $query->where('order_issue_type_id', $condition['order_issue_type_id']);
+            $type_ids = explode(',',$condition['order_issue_type_id']);
+            $query->whereIn('order_issue_type_id', $type_ids);
         }
         if (!($condition['is_handle'] ?? false) && !($condition['final_status'] ?? false)) {
             if (!(isset($condition['settlement_at_start']) || isset($condition['settlement_at_end']))) {

package-lock.json

@@ -8768,7 +8768,7 @@
         },
         "socket.io-client": {
             "version": "2.3.0",
-            "resolved": "https://registry.npm.taobao.org/socket.io-client/download/socket.io-client-2.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsocket.io-client%2Fdownload%2Fsocket.io-client-2.3.0.tgz",
+            "resolved": "https://registry.npm.taobao.org/socket.io-client/download/socket.io-client-2.3.0.tgz",
             "integrity": "sha1-FNW6LgC5vNFFrkQ6uWs/hsvMG7Q=",
             "requires": {
                 "backo2": "1.0.2",

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

@@ -775,7 +775,7 @@
                     {name: 'baoshi_indemnity_money', type: 'select', tip: '宝时赔偿金额', placeholder: '宝时赔偿金额',data:[{name: '是',value:'是'},{name: '否',value:'否'}]},
                     @cannot('订单管理-问题件-客户不可见')
                     {name: 'final_status', type: 'select', tip: '问题件的最终状态', placeholder: '最终状态', data: final_status},
-                    {name: 'order_issue_type_id', type: 'select', tip: '问题类别', placeholder: '问题类别', data: this.orderIssueType},
+                    {name: 'order_issue_type_id', type: 'select_multiple_select', tip: ['问题类别',''], placeholder: ['问题类别',''], data: this.orderIssueType},
                     @endcannot
                     {name: ['log_content','addtime'], type: 'input_select', tip: ['处理结果:前或后加 百分号为单个模糊搜索，否则为多条件精确搜索','查询范围越短，搜索速度越快'], placeholder: ['处理结果',''],
                         data:log_content_range,