Merge branch 'master' of ssh://47.103.131.176:10022/var/git/bswas

 Conflicts:

	app/Http/Controllers/TestController.php

app/Filters/OrderIssueFilters.php

@@ -133,7 +133,7 @@ class OrderIssueFilters
     private function getOrderIssueRejectedBillQuery(): Builder
     {
         if (!$this->orderIssueRejectedBIllQuery)
-            $this->orderIssueRejectedBIllQuery = OrderIssueRejectedBill::query()->selectRaw('order_issue_id');
+            $this->orderIssueRejectedBIllQuery = OrderIssueRejectedBill::query()->selectRaw('order_id');
         return $this->orderIssueRejectedBIllQuery;
     }
 
@@ -230,12 +230,12 @@ class OrderIssueFilters
         if ($this->rejectedBillQuery)
             $this->getOrderIssueRejectedBIllQuery()->whereIn('logistic_number_return', $this->rejectedBillQuery);
 
-        if ($this->orderIssueRejectedBIllQuery)
-            $this->queryBuilder->whereIn('order_issues.id', $this->orderIssueRejectedBIllQuery);
+        if ($this->orderIssueRejectedBIllQuery){
+            $this->queryBuilder->whereIn('order_issues.order_id', $this->orderIssueRejectedBIllQuery);
+        }
 
         if ($this->orderIssueProcessLogQuery)
             $this->queryBuilder->whereIn('order_issues.id', $this->orderIssueProcessLogQuery);
-
     }
 
     private function isSearchLike($str)

app/Http/Controllers/PackageLogisticController.php

@@ -44,7 +44,7 @@ class PackageLogisticController extends Controller
                 'order.batch:id,wms_type',
                 'order.OracleDOCOrderHeader:orderno,notes,WaveNo',
                 'rejectedBill' => function ($query) {
-                    $query->select('id', 'logistic_number', 'logistic_number_return')->where('logistic_number', '原单退回');
+                    $query->select('id', 'logistic_number', 'logistic_number_return');
                 },
                 'orderPackageRemarks' => function ($query) {
                     $query->with('user')->orderByDesc('created_at');

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

@@ -310,7 +310,9 @@
                 },
                 checkSubmitData() {
                     let {issueType} = this;
-                    if (issueType === "拦截" || issueType === "取消拦截" || issueType === "快递丢件") {
+                    if(issueType === "拦截"){
+                        return true;
+                    }else if (issueType === "取消拦截" || issueType === "快递丢件") {
                         if (!this.checkRemark()) {
                             this.errorTempTip("问题描述为必填项")
                             return false;
@@ -638,6 +640,9 @@
                                 item.abnormal_type = null;
                                 item.dealImages = [];
                                 item.packages.forEach(item => item.select = false);
+                                if(item.packages.length === 1){
+                                    item.packages.map(i => i.select = true);
+                                }
                                 return item;
                             });
                         } else {