阶段性提交3 by 'zengjun'

app/Http/Controllers/OrderIssueController.php

@@ -6,8 +6,6 @@ use App\Exports\Export;
 use App\Imports\OrderIssueExport;
 use App\Imports\OrderIssueImport;
 use App\Logistic;
-use App\OracleDOCOrderDetail;
-use App\OracleDOCOrderHeader;
 use App\Order;
 use App\OrderIssue;
 use App\OrderIssueProcessLog;
@@ -23,6 +21,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
 use Maatwebsite\Excel\Facades\Excel;
 
 class OrderIssueController extends Controller
@@ -30,9 +29,10 @@ class OrderIssueController extends Controller
 
     public function __construct()
     {
-        app()->bind("orderIssueService", OrderIssueService::class);
-        app()->bind("orderService", OrderService::class);
-        app()->bind("rejectedService", RejectedService::class);
+        app()->singleton("orderIssueService", OrderIssueService::class);
+        app()->singleton("orderService", OrderService::class);
+        app()->singleton("rejectedService", RejectedService::class);
+        app()->singleton('rejectedService',RejectedService::class);
     }
 
     public function index(Request $request)
@@ -67,7 +67,7 @@ class OrderIssueController extends Controller
         $orderIssueService = app('orderIssueService');
         $orderIssueService->validatorCreate($request)->validate();
         $orderIssue = null;
-        if ($request->filled('second_logistic_number')) {
+        if ($request->filled('logistic_number_return')) {
             $orderIssue = $orderIssueService->createByLogisticNumber($request);
         } else {
             $orderIssue = $orderIssueService->create($request);
@@ -170,7 +170,8 @@ class OrderIssueController extends Controller
 // 二次商品信息 order -> package -> commodity
             's_commodity_code' => '条码', 's_commodity_name' => '商品名', 's_amount' => '数量', /*'s_is_checked' => '是否正品', 's_remark' => '备注',*/
             'final_status' => '最终状态', 'logistic_indemnity_money' => '承运商赔偿金额', 'logistic_express_remission' => '承运商快递减免',
-            'baoshi_indemnity_money' => '宝石赔偿金额', 'baoshi_express_remission' => '宝石快递减免', 'user_workgroup' => '事故责任方']];
+            'baoshi_indemnity_money' => '宝时赔偿金额', 'baoshi_express_remission' => '宝时快递减免', 'user_workgroup' => '事故责任方']];
+
         $list = [];
         $mergeCell = [];
         $i = 0;
@@ -280,18 +281,18 @@ class OrderIssueController extends Controller
             /*"AD", "AF", "AG",*/
             "AH", "AI", "AJ",
             "AK", "AL" , "AM"];
+        if(Gate::has('客户不可见')){
+            unset($row[0]['baoshi_indemnity_money']);
+            unset($columnName['AK']);
+
+        }
         foreach ($list as $key=>&$value){
             foreach ($row[0] as $rowKey=>$rowValue){
                 if(!isset($value[$rowKey])){
-//                    array_push($value,[$rowKey,'']);
                     $value[$rowKey] = '';
                 }
             }
-//            if($key == 2){
-//                dd($value);
-//            }
         }
-//        dd($list);
         return Excel::download(new Export($row, $list, $mergeCell, $columnName), date('YmdHis', time()) . '-订单问题件.xlsx');
     }
 
@@ -338,6 +339,17 @@ class OrderIssueController extends Controller
         if (!Gate::allows('订单管理-问题件-编辑')) {
             return ['success' => false, 'fail_info' => '没有对应权限'];
         }
+        $validator =  $this->apiUpdateValidator($request);
+        if ($validator->fails()){
+            $arr = [];
+            foreach ($validator->getMessageBag()->toArray() as $k=>$error){
+                array_push($arr, $error[0]);
+            }
+            return [
+                'success' => false,
+                'errors' => $arr
+            ];
+        }
         $orderIssue = OrderIssue::where('id', $request->input('id'))->first();
         if (!$orderIssue) {
             return ['success' => false, 'fail_info' => '数据库没有相应记录,请到查询页面刷新重试'];
@@ -426,4 +438,27 @@ class OrderIssueController extends Controller
             }
         }
     }
+
+    public function apiUpdateValidator(Request $request){
+        return Validator::make($request->input(), [
+            'order_issue_type_id' => ['required'],
+            'handle_status' => ['nullable'],
+            'result_explain' => ['nullable'],
+            'logistic_indemnity_money' => ['nullable','numeric'],
+            'logistic_express_remission' => ['nullable'],
+            'baoshi_indemnity_money' => ['nullable','numeric'],
+            'baoshi_express_remission' => ['nullable'],
+        ],[
+            'required' => [':attribute 为必填项',':attribute'] ,
+            'numeric' => [':attribute  为可确认的数值',':attribute']
+        ],[
+            'order_issue_type_id'=>'问题类别',
+            'handle_status' => '处理状态',
+            'result_explain' => '处理结果说明',
+            'logistic_indemnity_money' => '承运商赔偿金额',
+            'logistic_express_remission' => '承运商快递减免',
+            'baoshi_indemnity_money' => '宝时赔偿金额',
+            'baoshi_express_remission' => '宝时快递减免',
+        ]);
+    }
 }

app/Http/Controllers/RejectedBillController.php

@@ -11,6 +11,7 @@ use App\QualityLabel;
 use App\Rejected;
 use App\RejectedBill;
 use App\RejectedBillItem;
+use App\Services\OrderPackageCommoditiesService;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -25,6 +26,12 @@ use Ramsey\Uuid\Uuid;
 
 class RejectedBillController extends Controller
 {
+    function __construct()
+    {
+
+//        app()->bind('orderPackageCommoditiesService',OrderPackageCommoditiesService::class);
+    }
+
     /**
      * Display a listing of the resource.
      *
@@ -103,6 +110,7 @@ class RejectedBillController extends Controller
         $rejectedBill->fill($request->all());
         $rejectedBill->save();
         $rejectedBill->syncOrderIssue();
+
         $this->log(__METHOD__,__FUNCTION__.'_'.$rejectedBill['id'],json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true'];
     }

app/Imports/OrderIssueImport.php

@@ -34,6 +34,7 @@ class OrderIssueImport implements ToCollection, WithHeadingRow,WithMultipleSheet
         $orderIssues = [];
         if ($endIS) {
             foreach ($collection as $row) {
+
                 if (!$row['原始运单号']) {
                     array_push($exception, ['第' . $sum . '行数据运单号为空!']);
                     $sum++;
@@ -49,6 +50,10 @@ class OrderIssueImport implements ToCollection, WithHeadingRow,WithMultipleSheet
                     $sum++;
                     continue;
                 }
+                if(OracleDOCOrderHeader::where('orderNo',$row['原始运单号'])->count() == 0){
+                    array_push($exception, ['订单' . $row['原始运单号'] . '运单号不存在']);
+                    continue;
+                }
                 $order = Order::with('issue')->where('code', $row['原始运单号'])->first();
 
                 $orderHeader =OracleDOCOrderHeader::where('orderNo',$row['原始运单号'])->first();

app/Order.php

@@ -12,7 +12,7 @@ class Order extends Model
 
     protected $fillable = [
         'created_at','code','shop_id','owner_id',
-        'logistic_number','logistic_id','consignee_name','consignee_phone','province',
+        'logistic_id','consignee_name','consignee_phone','province',
         'city','district','address','wms_status'];
 
     protected $appends = [

app/RejectedBill.php

@@ -4,10 +4,11 @@ namespace App;
 
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\LogisticNumberFeatureController;
+use App\Services\OrderPackageCommoditiesService;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Overtrue\LaravelPinyin\Facades\Pinyin;
 
@@ -139,7 +140,93 @@ class RejectedBill extends Model
     public function syncOrderIssue(){
         $orderIssue = $this->orderIssue()->first();
         if(isset($orderIssue)){
+           $this-> judgeRejectingStatus($orderIssue);
            OrderIssue::where('id',$orderIssue['id'])->update(['is_new_rejecting'=>'有']);
         }
     }
+
+    private function judgeRejectingStatus(OrderIssue $orderIssue)
+    {
+        $orderPackageCommoditiesService = new OrderPackageCommoditiesService();
+        $rejectedItems = [];
+        $orderItems = [];
+        if ($orderIssue->rejected_bill_id) {
+            $rejectedBill = RejectedBill::find($orderIssue->rejected_bill_id)->first();
+            $rejectedBillItems = RejectedBillItem::where('id_rejected_bill', $rejectedBill->id)->get();
+            if ($rejectedBillItems) {
+                foreach ($rejectedBillItems as $item) {
+                    if(!isset($rejectedItems[$item->barcode_goods])){
+                        $rejectedItems[$item->barcode_goods]  =0;
+                    }
+                    $rejectedItems[$item->barcode_goods] = $item->amount + $rejectedItems[$item->barcode_goods] ?? 0;
+                }
+            }
+        } else {
+            $orderIssue->update(['rejecting' => '无']);
+            $orderIssue->save();
+            return;
+        }
+        if ($orderIssue->order_id) {
+            $orderPackageCommodities = $orderPackageCommoditiesService->getOrderPackageCommoditiesByOrderId($orderIssue->order_id);
+            if ($orderPackageCommodities) {
+                foreach ($orderPackageCommodities as $key => $item) {
+                    if (!isset($orderItems[$item->commodity->sku])) {
+                        Arr::add($orderItems,$item->commodity->sku,0);
+                    }
+                    $orderItems[$item->commodity->sku] = $orderItems[$item->commodity->sku] ?? 0 + $item->amount;
+                }
+            } else {
+                $orderIssue->update(['rejecting_status' => '未退回']);
+                $orderIssue->save();
+                return;
+            }
+        }
+
+        $rejectedExcess = 0;    // 退回差异
+        $rejectedReview = 0;    // 退回复核  $rejectedItems == $orderItems
+        foreach ($rejectedItems as $key => $items) {
+            if (!isset($orderItems[$key])) {
+                $rejectedExcess++;
+            } else {
+                if ($rejectedItems[$key] == $orderItems[$key]) {
+                    $rejectedReview++;
+                }
+            }
+        }
+        if ($rejectedExcess > 0) {
+            $orderIssue->update(['rejecting_status' => '差异退回']);
+            $orderIssue->save();
+            return;
+        }
+        $isExcess = 0; // 超量 $orderItems < $rejectedItems
+        $isDiff = 0;   // 部分 $orderItems > $rejectedItems
+        $isAccord = 0; // 相同 $orderItems == $rejectedItems
+        $isLack = 0;   // 缺少 $orderItems != $rejectedItems
+        foreach ($orderItems as $key => $item) {
+            if (isset($rejectedItems[$key])) {
+                if ($orderItems[$key] > $rejectedItems[$key]) {
+                    $isExcess++;
+                } else if ($orderItems[$key] < $rejectedItems[$key]) {
+                    $isDiff++;
+                } else if ($orderItems[$key] == $rejectedItems[$key]) {
+                    $isAccord++;
+                }
+            } else {
+                $isLack++;
+            }
+        }
+        if ($isAccord == $rejectedReview) {
+            $orderIssue->update(['rejecting_status' => '全部退回']);
+            $orderIssue->save();
+            return;
+        } else if ($isDiff > 0 and $isLack >= 0) {
+            $orderIssue->update(['rejecting_status' => '部分退回']);
+            $orderIssue->save();
+            return;
+        } else if ($isExcess > 0 and $isDiff == 0) {
+            $orderIssue->update(['rejecting_status' => '超量退回']);
+            $orderIssue->save();
+            return;
+        }
+    }
 }

app/Services/OrderIssueService.php

@@ -16,6 +16,7 @@ use App\RejectedBill;
 use App\RejectedBillItem;
 use App\Sign;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
@@ -36,10 +37,20 @@ class OrderIssueService
         }
         $user = Auth::user();
         $owner_ids = $user ? $user->getPermittingOwnerIdsAttribute() : [];
-        $orders = Order::select('id')->whereIn('owner_id', $owner_ids)->get();
         $order_ids = [];
+        if (isset($condition['owner_id'])) {
+            $owner_ids = explode(',', $condition['owner_id']);
+        }
+
+        $orderIssues = OrderIssue::whereHas('order', function ($query) use ($owner_ids) {
+            $query->whereHas('owner', function ($query) use ($owner_ids) {
+                return $query->whereIn('id', $owner_ids);
+            });
+        })->get();
+
+        $orders = Order::select('id')->whereIn('owner_id', $owner_ids)->get();
         foreach ($orders as $order) {
-            array_push($order_ids,$order['id']);
+            array_push($order_ids, $order['id']);
         }
         $query = OrderIssue::with(['top', 'userWorkGroup', 'issueType', 'logs' => function ($query) {
             return $query->with(['user'])->orderByDesc('created_at');
@@ -57,15 +68,17 @@ class OrderIssueService
                     return $query->with('commodity');
                 }]);
             }]);
-        }])->whereIn('order_id', $order_ids);
-
-
+        }])->whereHas('order', function ($query) use ($owner_ids) {
+            $query->whereHas('owner', function ($query) use ($owner_ids) {
+                return $query->whereIn('id', $owner_ids);
+            });
+        });
+        // ->whereIn('order_id', $order_ids)
         $query->selectRaw('order_issues.* ,order_issue_on_tops.id top_id ,order_issue_on_tops.remark,order_issue_on_tops.updated_at top_update')
             ->leftJoin('order_issue_on_tops', 'order_issue_on_tops.order_issue_id', '=', 'order_issues.id')
             ->whereNull('order_issue_on_tops.deleted_at')
             ->orderBy('order_issue_on_tops.updated_at', 'desc')
             ->orderBy('order_issues.id', 'desc');
-
         return $query;
     }
 
@@ -103,6 +116,7 @@ class OrderIssueService
             }
             $query->whereIn('order_issues.id', $orderIssuesId);
         }
+//        dd($query->toSql());
         return $query;
     }
 
@@ -130,31 +144,40 @@ class OrderIssueService
     public function createOrFind($orderNo)
     {
         $orderService = app('orderService');
+        $rejectedService = app('rejectedService');
         $order = $orderService->createOrderByWMSOrderNo($orderNo);
         $arr = [
             'order_id' => $order->id,
         ];
         $orderIssue = OrderIssue::create($arr);
+        if ($order->code) {
+            $rejectedBill = $rejectedService->getRejectedByWMSOrderNo($order->code);
+            if ($rejectedBill) {
+                $orderIssue->rejected_bill_id = $rejectedBill['id'];
+                $orderIssue->save();
+            }
+        }
         $this->judgeRejectingStatus($orderIssue);
         $orderIssue->order = $order;
         return $orderIssue;
     }
 
-/*    public function createOrderIssue(Request $request)
-    {
-        $orderService = app('orderService');
-        $this->validatorCreate($request)->validate();
-        $oracleOrderNo = $request->input('order_id');
-        $logistic_number = $request->input('logistic_number');
-        $order = $orderService->creted($oracleOrderNo);
-        $this->create($request);
-    }*/
+    /*    public function createOrderIssue(Request $request)
+        {
+            $orderService = app('orderService');
+            $this->validatorCreate($request)->validate();
+            $oracleOrderNo = $request->input('order_id');
+            $logistic_number = $request->input('logistic_number');
+            $order = $orderService->creted($oracleOrderNo);
+            $this->create($request);
+        }*/
 
     public function validatorCreate(Request $request)
     {
         return Validator::make($request->input(), [
             'rejected_bill_id' => ['nullable'],
             'order_id' => ['nullable'],
+            'owner_id'=>['required'],
             'second_order_id' => ['nullable'],
             'logistic_id' => ['nullable'],
             'order_issue_type_id' => ['required'],
@@ -167,7 +190,7 @@ class OrderIssueService
             'unique' => ':attribute 已存在',
             'numeric' => ':attribute 为数组',
         ], [
-
+            'owner_id'=>'货主',
             'rejected_bill_id' => '退回单号',
             'order_id' => '订单ID',
             'second_order_id' => '退回订单id',
@@ -183,27 +206,31 @@ class OrderIssueService
     public function create(Request $request)
     {
         $orderIssue = OrderIssue::create($request->all());
-        if ($request->filled('rejected_bill_id')) {
-
-        } else {
+        if (!$request->has('order_id')) {
+            $order = Order::create($request->all());
+            $orderIssue->order_id = $order['id'];
+            $orderIssue->save();
+        }
+        if (!$request->filled('rejected_bill_id')) {
             $orderIssue->update(['rejecting_status' => '无']);
+        } else {
+            $this->judgeRejectingStatus($orderIssue);
         }
-        $this->judgeRejectingStatus($orderIssue);
         return $orderIssue;
     }
 
     public function judgeRejectingStatus(OrderIssue $orderIssue)
     {
+        $orderPackageCommoditiesService = new OrderPackageCommoditiesService();
         $rejectedItems = [];
         $orderItems = [];
-        $orderPackageCommoditiesService = app('orderPackageCommoditiesService');
         if ($orderIssue->rejected_bill_id) {
             $rejectedBill = RejectedBill::find($orderIssue->rejected_bill_id)->first();
             $rejectedBillItems = RejectedBillItem::where('id_rejected_bill', $rejectedBill->id)->get();
             if ($rejectedBillItems) {
                 foreach ($rejectedBillItems as $item) {
-                    if(!isset($rejectedItems[$item->barcode_goods])){
-                        $rejectedItems[$item->barcode_goods]  =0;
+                    if (!isset($rejectedItems[$item->barcode_goods])) {
+                        $rejectedItems[$item->barcode_goods] = 0;
                     }
                     $rejectedItems[$item->barcode_goods] = $item->amount + $rejectedItems[$item->barcode_goods] ?? 0;
                 }
@@ -217,13 +244,13 @@ class OrderIssueService
             $orderPackageCommodities = $orderPackageCommoditiesService->getOrderPackageCommoditiesByOrderId($orderIssue->order_id);
             if ($orderPackageCommodities) {
                 foreach ($orderPackageCommodities as $key => $item) {
-                    if (!isset($orderItems[$item->sku])) {
-                        $orderItems[$item->sku] = 0;
+                    if (!isset($orderItems[$item->commodity->sku])) {
+                        Arr::add($orderItems, $item->commodity->sku, 0);
                     }
-                    $orderItems[$item->sku] = $orderItems[$item->sku] ?? 0 + $item->amount;
+                    $orderItems[$item->commodity->sku] = $orderItems[$item->commodity->sku] ?? 0 + $item->amount;
                 }
             } else {
-                $orderIssue->update(['rejecting' => '未退回']);
+                $orderIssue->update(['rejecting_status' => '未退回']);
                 $orderIssue->save();
                 return;
             }
@@ -241,7 +268,7 @@ class OrderIssueService
             }
         }
         if ($rejectedExcess > 0) {
-            $orderIssue->update(['rejecting' => '差异退回']);
+            $orderIssue->update(['rejecting_status' => '差异退回']);
             $orderIssue->save();
             return;
         }
@@ -263,15 +290,15 @@ class OrderIssueService
             }
         }
         if ($isAccord == $rejectedReview) {
-            $orderIssue->update(['rejecting' => '全部退回']);
+            $orderIssue->update(['rejecting_status' => '全部退回']);
             $orderIssue->save();
             return;
         } else if ($isDiff > 0 and $isLack >= 0) {
-            $orderIssue->update(['rejecting' => '部分退回']);
+            $orderIssue->update(['rejecting_status' => '部分退回']);
             $orderIssue->save();
             return;
         } else if ($isExcess > 0 and $isDiff == 0) {
-            $orderIssue->update(['rejecting' => '超量退回']);
+            $orderIssue->update(['rejecting_status' => '超量退回']);
             $orderIssue->save();
             return;
         }
@@ -280,11 +307,12 @@ class OrderIssueService
     public function createByLogisticNumber(Request $request)
     {
         $orderService = app('orderService');
-        if (!$request->has('logistic_number')) {
-            return null;
-        }
-        $order = $orderService->create($request->fill());
-        return OrderPackage::create(['order_id' => $order->id, 'logistic_number' => $request->input('logistic_number')]);
+        $order = Order::create($request->all());
+        $orderIssue = OrderIssue::create($request->all());
+        $orderIssue->order_id = $order['id'];
+        OrderPackage::create(['order_id' => $order->id, 'logistic_number' => $request->input('logistic_number_return')]);
+        $orderIssue->update();
+        return $orderIssue;
     }
 
     public function verifyOrderIssue(Request $request)
@@ -344,21 +372,21 @@ class OrderIssueService
             return $meg['success'] = true;
         }*/
 
-    public function getOrderHead(Request $request)
-    {
-        $data = ['orderHeader' => null, 'orderDetails' => null, 'rejectedBill' => null];
-        $logisticNumberReturn = $request->input('logisticNumberReturn');
-        $ASNOrderHeaders = OracleDOCASNHeader::where('ASNReference3', $logisticNumberReturn)->get();
-        if (count($ASNOrderHeaders) == 0) {
-            return $data;
-        }
-        $orderHeader = OracleDOCOrderHeader::where('SOReference1', $ASNOrderHeaders->asnreference3)->get();
-        $data['orderHeader'] = $orderHeader;
-        $orderDetails = OracleDOCASNDetail::with(['sku'])->where('OrderNo', $orderHeader)->get();
-        $data['orderDetails'] = $orderDetails;
-
-        return $data;
-    }
+//    public function getOrderHead(Request $request)
+//    {
+//        $data = ['orderHeader' => null, 'orderDetails' => null, 'rejectedBill' => null];
+//        $logisticNumberReturn = $request->input('logisticNumberReturn');
+//        $ASNOrderHeaders = OracleDOCASNHeader::where('ASNReference3', $logisticNumberReturn)->get();
+//        if (count($ASNOrderHeaders) == 0) {
+//            return $data;
+//        }
+//        $orderHeader = OracleDOCOrderHeader::where('SOReference1', $ASNOrderHeaders->asnreference3)->get();
+//        $data['orderHeader'] = $orderHeader;
+//        $orderDetails = OracleDOCASNDetail::with(['sku'])->where('OrderNo', $orderHeader)->get();
+//        $data['orderDetails'] = $orderDetails;
+//
+//        return $data;
+//    }
 
     public function getReturnLogisticInfo(Request $request)
     {
@@ -390,16 +418,17 @@ class OrderIssueService
         } else if ($request->getMethod() == 'POST') {
 // 选中
             $orderIssueIds = $request->input('data');
-            $ids=  explode(',',$orderIssueIds);
+            $ids = explode(',', $orderIssueIds);
             $result = $this->getConditionQuery($request, ['order_issue_ids' => $ids])->get();
         }
         return $result;
     }
 
-    public function paddingData(array $row,array $rowData){
-        foreach ($rowData as $key=>$value){
-            foreach ($row as $rowKey){
-                if(!isset($value[$rowKey])){
+    public function paddingData(array $row, array $rowData)
+    {
+        foreach ($rowData as $key => $value) {
+            foreach ($row as $rowKey) {
+                if (!isset($value[$rowKey])) {
                     $value[$rowKey] = '';
                 }
             }

public/js/app.js

@@ -61978,17 +61978,6 @@ __webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\js\app.js */"./resou
 module.exports = __webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
-/***/ }),
-
-/***/ 1:
-/*!********************!*\
-  !*** ws (ignored) ***!
-  \********************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-/* (ignored) */
-
 /***/ }),
 
 /***/ 1:

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

@@ -8,13 +8,12 @@
             <div class="card col-md-8 offset-md-2">
                 <div class="card-header">订单问题件录入</div>
                 <div class="card-body">
-                    <form action="{{url('order/issue/store')}}" method="post" {{--@submit.prevent="onSubmit()"--}}>
+                    <form action="{{url('order/issue/store')}}" method="post">
                         @csrf
                         @method('POST')
                         <input type="hidden" name="rejected_bill_id" :value='rejectedBill.id'>
                         <input type="hidden" name="order_id" :value='order.id'>
                         <input type="hidden" name="second_order_id" :value='second_order_id'>
-                        {{--退回单号--}}
                         <div class="form-group row">
                             <label for="logistic_number_return" class="col-2 col-form-label text-right ">退回单号</label>
                             <div class="col-8 ">
@@ -26,10 +25,8 @@
                                 @error('logistic_number_return')
                                 <span class="invalid-feedback" role="alert"><strong>{{ $message }}</strong></span>
                                 @enderror
-                                {{--                                <span class="valid-feedback" style="display: none" id="logistic_number_return_feedback"></span>--}}
                             </div>
                         </div>
-                        {{--原始WMS订单号--}}
                         <div class="form-group row">
                             <label for="wms_order_no" class="col-2 col-form-label text-right ">原始WMS订单号</label>
                             <div class="col-8">
@@ -41,15 +38,13 @@
                                 @error('wms_order_no')
                                 <span class="invalid-feedback" role="alert"><strong>{{ $message }}</strong></span>
                                 @enderror
-                                {{--                                <span class="valid-feedback" style="display: none" id="wms_order_no_feedback"></span>--}}
                             </div>
                         </div>
-                        {{--退回快递单号--}}
                         <div class="form-group row">
                             <label for="logistic_number" class="col-2 col-form-label text-right ">退回快递单号</label>
                             <div class="col-8">
                                 <input type="text" name="second_logistic_number" id="second_logistic_number"
-                                       class="form-control col-lg-5 @error('logistic_number') is-invalid @enderror"
+                                       class="form-control col-lg-5 @error('second_logistic_number') is-invalid @enderror"
                                        value="@if(old('second_logistic_number')){{old('second_logistic_number')}}@endif"
                                        @blur="">
                                 @error('second_logistic_number')
@@ -57,14 +52,13 @@
                                 @enderror
                             </div>
                         </div>
-                        {{--问题类别--}}
                         <div class="form-group row">
                             <label for="order_issue_type_id"
                                    class="col-2 col-form-label text-right text-primary"><span
                                     class="text-danger">*</span>问题类别</label>
                             <div class="col-8">
                                 <select name="order_issue_type_id" id="order_issue_type_id"
-                                        class="form-control @error('order_issue_type_id') is-invalid @enderror">
+                                        class="form-control @error('order_issue_type_id') is-invalid @enderror" v-model="order_issue_type_id">
                                     <option value></option>
                                     <option v-for="type in types " :value="type.id">@{{ type.name }}</option>
                                 </select>
@@ -73,7 +67,6 @@
                                 @enderror
                             </div>
                         </div>
-                        {{--原始快递单号--}}
                         <div class="form-group row">
                             <label class="col-2 col-form-label text-right ">原始快递单号</label>
                             <div class="col-8">
@@ -82,8 +75,6 @@
                                        v-model="order.logstic_number">
                             </div>
                         </div>
-
-                        {{--原始商品详情--}}
                         <div class="form-group row">
                             <label for="" class="col-2 col-form-label text-right">原始商品详情</label>
                             <div class="col-8" id="">
@@ -109,7 +100,6 @@
                                 </table>
                             </div>
                         </div>
-                        {{--退回商品明细--}}
                         <div class="form-group row">
                             <label for="" class="col-2 col-form-label text-right ">退回单商品详情</label>
                             <div class="col-8" id="">
@@ -137,19 +127,20 @@
                                 </table>
                             </div>
                         </div>
-                        {{--货主--}}
                         <div class="form-group row">
                             <label for="wms_order_no" class="col-2 col-form-label text-right ">货主</label>
                             <div class="col-8 row">
                                 <div class="form-group col-lg-5">
-                                    <select class="form-control " name="owner_id" v-model="order.owner_id">
+                                    <select class="form-control @error('owner_id') is-invalid @enderror" name="owner_id" v-model="order.owner_id" >
                                         <option value></option>
                                         <option v-for="owner in owners" :value="owner.id">@{{ owner.name }}</option>
                                     </select>
+                                    @error('owner_id')
+                                    <span class="invalid-feedback" role="alert"><strong>{{ $message }}</strong></span>
+                                    @enderror
                                 </div>
                             </div>
                         </div>
-                        {{--原始承运商--}}
                         <div class="form-group row">
                             <label for="wms_order_no" class="col-2 col-form-label text-right ">原始承运商</label>
                             <div class="col-8 row">
@@ -163,7 +154,6 @@
                                 </div>
                             </div>
                         </div>
-                        {{--收货人名称--}}
                         <div class="form-group row">
                             <label for="wms_order_no" class="col-2 col-form-label text-right ">收货人名称</label>
                             <div class="col-8">
@@ -171,7 +161,6 @@
                                        v-model="order.consignee_name">
                             </div>
                         </div>
-                        {{--收货人号码--}}
                         <div class="form-group row">
                             <label for="wms_order_no" class="col-2 col-form-label text-right ">收货人号码</label>
                             <div class="col-8">
@@ -179,7 +168,6 @@
                                        v-model="order.consignee_phone">
                             </div>
                         </div>
-                        {{--收货人地址 省 市 区 --}}
                         <div class="form-group row">
                             <label class="col-2 col-form-label text-right ">收货人地址</label>
                             <div class="col-8 row">
@@ -194,7 +182,6 @@
                                            v-model="order.district"></div>
                             </div>
                         </div>
-                        {{--详细地址--}}
                         <div class="form-group row">
                             <label class="col-2 col-form-label text-right ">详细地址</label>
                             <div class="col-8 ">
@@ -202,7 +189,6 @@
                             </div>
                         </div>
 
-                        {{--二次订单编号--}}
                         <div class="form-group row">
                             <label for="second_order_no" class="col-2 col-form-label text-right">二次订单编号</label>
                             <div class="col-8">
@@ -213,7 +199,6 @@
                                 <div class="valid-feedback" style="display: none" id="secondOrderNo_feedback"></div>
                             </div>
                         </div>
-                        {{--二次订单承运商--}}
                         <div class="form-group row">
                             <label for="second_order_no" class="col-2 col-form-label text-right">二次承运商</label>
                             <div class="col-8">
@@ -224,7 +209,6 @@
                                 </select>
                             </div>
                         </div>
-                        {{--二次商品明细--}}
                         <div class="form-group row">
                             <label for="" class="col-2 col-form-label text-right">二次订单商品明细</label>
                             <div class="col-8" id="">
@@ -250,7 +234,6 @@
                                 </table>
                             </div>
                         </div>
-                        {{--最终状态--}}
                         <div class="form-group row">
                             <label for="order_issue_type_id" class="col-2 col-form-label text-right ">最终状态</label>
                             <div class="col-8">
@@ -261,7 +244,6 @@
                                 </select>
                             </div>
                         </div>
-                        {{--处理结果说明--}}
                         <div class="form-group row">
                             <label for="" class="col-2 col-form-label text-right ">处理结果说明</label>
                             <div class="col-8">
@@ -333,7 +315,6 @@
                                 </select>
                             </div>
                         </div>
-
                         <div class="form-group row">
                             <div class="col-8 offset-2">
                                 <button type="submit" class="btn btn-success form-control" :disabled="!isSubmit">提交
@@ -350,7 +331,7 @@
 @section('lastScript')
     <script type="text/javascript">
         let crete_vue = new Vue({
-            el: '#issue_create_div',
+                el: '#issue_create_div',
             data: {
                 logistic_number_return: @if(old('logistic_number_return'))"{{old('logistic_number_return')}}"
                 @else''@endif,
@@ -362,6 +343,8 @@
                 @else''@endif,
                 second_logistic_number: @if(old('second_logistic_number'))"{{old('second_logistic_number')}}"
                 @else''@endif,
+                order_issue_type_id: @if(old('order_issue_type_id'))"{{old('order_issue_type_id')}}"
+                @else''@endif,
                 owners:{!! $owners !!},
                 logistics:{!! $logistic !!},
                 types:{!! $types !!},
@@ -380,7 +363,7 @@
                     consignee_name: '',
                     consignee_phone: '',
                     carrierid: '',
-                    owner: '',
+                    owner_id: @if(old('owner_id')){{old('owner_id')}}@else '' @endif,
                     ownerName: '',
                     order_id: '',
                 },
@@ -405,6 +388,7 @@
                     this.verifySecondOrder();
                 }
                 if (this.logistic_number_return) {
+                    this.logistic_number_return= this.logistic_number_return;
                     this.checkLogisticNumberReturn();
                 }
             },

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

@@ -43,7 +43,7 @@
                 <div class="form-group row">
                     <label class="col-2 col-form-label text-right">问题类别</label>
                     <div class="col-8">
-                        <select name="order_issue_type_id" class="form-control"
+                        <select name="order_issue_type_id" class="form-control" id="order_issue_type_id"
                                 v-model="orderIssues.order_issue_type_id">
                             <option value></option>
                             <option v-for="type in orderIssueType" :value="type.id">@{{ type.name }}</option>
@@ -92,7 +92,7 @@
                 <div class="form-group row">
                     <label class="col-2 col-form-label text-right">最终状态</label>
                     <div class="col-8">
-                        <select name="final_status" class="form-control" v-model="orderIssues.final_status">
+                        <select name="final_status" class="form-control" v-model="orderIssues.final_status" id="final_status">
                             <option></option>
                             <option v-for="value in final_status" :value="value">@{{ value }}</option>
                         </select>
@@ -102,7 +102,7 @@
                 <div class="form-group row">
                     <label class="col-2 col-form-label text-right">承运商赔偿金额</label>
                     <div class="col-8">
-                        <input type="number" name="logistic_indemnity_money" class="form-control"
+                        <input type="number" name="logistic_indemnity_money" class="form-control" id="logistic_indemnity_money"
                                v-model="orderIssues.logistic_indemnity_money">
                     </div>
                 </div>
@@ -122,7 +122,7 @@
                 <div class="form-group row">
                     <label class="col-2 col-form-label text-right">宝时赔偿金额</label>
                     <div class="col-8">
-                        <input type="text" name="baoshi_indemnity_money" class="form-control"
+                        <input type="number" name="baoshi_indemnity_money" class="form-control" id="baoshi_indemnity_money"
                                v-model="orderIssues.baoshi_indemnity_money">
                     </div>
                 </div>
@@ -130,7 +130,7 @@
                 <div class="form-group row">
                     <label class="col-2 col-form-label text-right">宝时快递减免</label>
                     <div class="col-8">
-                        <select name="baoshi_express_remission" class="form-control"
+                        <select name="baoshi_express_remission" class="form-control" id="baoshi_express_remission"
                                 v-model="orderIssues.baoshi_express_remission">
                             <option value></option>
                             <option v-for="remission in baoShiExpressRemission" :value="remission">@{{ remission }}
@@ -208,6 +208,7 @@
             mounted: function () {
                 $("#editOrderIssue").removeClass('d-none');
                 console.log(this.secondOrder);
+
             },
             watch:{
                 secondOrder:{
@@ -223,12 +224,27 @@
             methods: {
                 orderIssueUpdate() {
                     let data = this.orderIssues;
+                    let arr = {
+                        '问题类别':'order_issue_type_id',
+                        '处理状态':'handle_status',
+                        '处理结果说明':'result_explain',
+                        '承运商赔偿金额':'logistic_indemnity_money',
+                        '承运商快递减免':'logistic_express_remission',
+                        '宝时赔偿金额':'baoshi_indemnity_money',
+                        '宝时快递减免':'baoshi_express_remission',
+                    }
                     axios.post('{{url("apiLocal/order/issue/update")}}', data).then(function (res) {
                         if (res.data.success) {
                             $('#alertModal').modal('show');
                         } else {
                             tempTip.setDuration(3000);
-                            tempTip.show(res.data.fail_info);
+                            tempTip.show(res.data.errors[0][0]);
+                            res.data.errors.forEach(function(item){
+                                let target = $('#'+arr[item[1]]);
+                                target.addClass('is-invalid').change(function(){
+                                    target.removeClass('is-invalid');
+                                });
+                            })
                             $('#alertModal').modal('hide');
                         }
                     }).catch(function (err) {
@@ -269,7 +285,12 @@
                     window.close();
                 }
             }
+        });
+        $('.is-invalid').change(function(){
+            console.log(123);
+            $(this).removeClass('is-invalid');
         })
+
     </script>
 
 @endsection

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

@@ -30,7 +30,7 @@
                         <th class="bg-white font-weight-bolder " colspan="6"></th>
                         <th class="td-yellow text-center font-weight-bolder original-class table-head-warning " colspan="16" >原始运单号</th>
 {{--                        <th class=" text-center font-weight-bolder" colspan="3">原始商品明细</th><th class=" text-center font-weight-bolder" colspan="5">返回商品明细</th>--}}
-                        <th class="bg-white text-center font-weight-bolder" colspan="23">情况说明</th>
+                        <th class="bg-white text-center font-weight-bolder"  @cannot('客户不可见')colspan="22"@else colspan="23" @endcannot>情况说明</th>
                         <th></th>
                     </tr>
 
@@ -73,7 +73,9 @@
                         <th class="bg-white text-center align-middle" rowspan="2">二次运单号</th>
                         <th class="bg-white text-center" colspan="3">二次商品明细</th>
                         <th class="bg-white text-center align-middle" rowspan="2">最终转态</th>
+                        @cannot('客户不可见')
                         <th class="bg-white text-center align-middle" rowspan="2">承运商赔偿金额</th>
+                        @endcannot
                         <th class="bg-white text-center align-middle" rowspan="2">承运商快递减免</th>
                         <th class="bg-white text-center align-middle" rowspan="2">宝石赔偿金额</th>
                         <th class="bg-white text-center align-middle" rowspan="2">宝石快递减免</th>
@@ -90,23 +92,25 @@
                         v-for="(orderIssue,index) in orderIssues"
                         @click="selectedColor(orderIssue.id)"
                         v-if="orderIssues"
-                        :style="{minheight: orderIssue.remark?'55px':'75px'}"
-                        v-on:mouseover="hidetop($event)" v-on:mouseleave="showtop($event)">
-                        <td>
-                            <input class="checkItem" type="checkbox" :value="orderIssue.id" v-model="checkData">
+                        :class="orderIssue.remark ? 'tr_top':''"
+                        @click="selectedColor(waybill.id)"
+                        v-on:mouseover="hidetop($event)" v-on:mouseleave="showtop($event)"
+                        :style="[{'font-weight': orderIssue.id==selectedStyle?'bold':''}]">
+                        <td >
+                            <div class="m-0 p-0 " :style="[{'min-height':orderIssue.remark ?'72px':'45px'}]"><input class="checkItem" type="checkbox" :value="orderIssue.id" v-model="checkData"></div>
                         </td>
                         <td class="">@{{index+1}}</td>
                         <td class="">@{{ orderIssue.id }}</td>
-                        <td class="">
+                        <td class=" text-center">
                             @can('订单管理-问题件-编辑')
                                 <button type="button" class="btn btn-sm btn-outline-secondary" @click="disposeOrderIssue($event)" :data-value="orderIssue.id" v-if="orderIssue.is_new_rejecting == '有'">有</button>
-                                <p v-else>@{{ orderIssue.is_new_rejecting }}</p>
+                                <span v-else>@{{ orderIssue.is_new_rejecting }}</span>
                             @else
-                                <p v-if="orderIssue.is_new_rejecting">@{{ orderIssue.is_new_rejecting }}</p>
+                                <span v-if="orderIssue.is_new_rejecting">@{{ orderIssue.is_new_rejecting }}</span>
                             @endcan
                         </td>
                          @can("订单管理-问题件-置顶")
-                        <td class=" text-muted"  >
+                        <td class=" text-muted text-center"  >
                             <button type="button" class="btn btn-sm btn-outline-danger "
                                     @click="cancelOnTop($event)" :data-value="orderIssue.top.id" style="opacity: 0.75" v-if="orderIssue.top">取消
                             </button>
@@ -116,22 +120,22 @@
                         </td>
                         @endcan
                         </td>
-                        <td class="">@{{ orderIssue.handle_status }}</td>
-                        <td class="toptd td-yellow">
-                            <div v-if="orderIssue.remark" class="bg-light-yellow  text-danger top"  data-toggle="tooltip" style="opacity: 0.1;position: absolute;z-index: 1">置顶备注：@{{  orderIssue.remark }}</div>
+                        <td class=" text-center">@{{ orderIssue.handle_status }}</td>
+                        <td class="toptd td-yellow text-center" >
+                            <div v-if="orderIssue.remark" class="bg-light-yellow  text-danger top text-left"  data-toggle="tooltip" style="opacity: 0.1;position: absolute;z-index: 1">置顶备注：@{{  orderIssue.remark }}</div>
                             @{{ orderIssue.created_at }}</td>
-                        <td class="td-yellow" >
+                        <td class="td-yellow text-center" >
                             @{{ orderIssue.order.created_at }}</td>
-                        <td class="td-yellow">
-                            <p v-if='orderIssue.order.owner'>@{{ orderIssue.order.owner.name }}</p>
+                        <td class="td-yellow text-center">
+                            <span v-if='orderIssue.order.owner'>@{{ orderIssue.order.owner.name }}</span>
                         </td>
-                        <td class="td-yellow"><template v-if="orderIssue.order.shop">@{{ orderIssue.order.shop.name }}</template> </td>
-                        <td class="td-yellow">@{{ orderIssue.order.code }} </td>
-                        <td class="td-yellow">
-                            <p v-if='orderIssue.order.logistic'>@{{ orderIssue.order.logistic.name }}</p>
+                        <td class="td-yellow text-center"><template v-if="orderIssue.order.shop">@{{ orderIssue.order.shop.name }}</template> </td>
+                        <td class="td-yellow text-center">@{{ orderIssue.order.code }} </td>
+                        <td class="td-yellow text-center">
+                            <span v-if='orderIssue.order.logistic'>@{{ orderIssue.order.logistic.name }}</span>
                         </td>
 
-                        <td class=" hide-content p-0 td-yellow" :id="orderIssue.id+'logisticNumbers'" valign="middle" align="center">
+                        <td class=" hide-content p-0 td-yellow text-center" :id="orderIssue.id+'logisticNumbers'" valign="middle" align="center">
                             <div class="collapse hide" :id="'logisticNumbers'+orderIssue.id">
                                 <p v-for="logisticNumber in orderIssue.order.logisticNumbers" class="m-0 p-0 text-center text-muted ">@{{ logisticNumber }}</p>
                             </div>
@@ -146,12 +150,12 @@
                                 分箱@{{ orderIssue.order.logisticNumbers.length }}件,点击展开
                             </button>
                         </td>
-                        <td class="td-yellow">@{{ orderIssue.order.consignee_name }}</td>
-                        <td class="td-yellow">@{{ orderIssue.order.consignee_phone }}</td>
-                        <td class="td-yellow">@{{ orderIssue.order.province }}</td>
-                        <td class="td-yellow">@{{ orderIssue.order.city }}</td>
-                        <td class="td-yellow">@{{ orderIssue.order.district }}</td>
-                        <td class="td-yellow" style="width: 400px"><p class="text-wrap m-0 p-0 text-center" style="width: 400px">@{{ orderIssue.order.address }}</p></td>
+                        <td class="td-yellow text-center">@{{ orderIssue.order.consignee_name }}</td>
+                        <td class="td-yellow text-center">@{{ orderIssue.order.consignee_phone }}</td>
+                        <td class="td-yellow text-center">@{{ orderIssue.order.province }}</td>
+                        <td class="td-yellow text-center">@{{ orderIssue.order.city }}</td>
+                        <td class="td-yellow text-center">@{{ orderIssue.order.district }}</td>
+                        <td class="td-yellow" style="width: 400px"><span class="text-wrap m-0 p-0 text-center" style="width: 400px">@{{ orderIssue.order.address }}</span></td>
                         <td class="td-yellow p-0" :id="orderIssue.id+'items'"  valign="middle" align="center" colspan="3">
                             <div v-if="orderIssue.order">
                                 <table v-if="orderIssue.order.packages" class="table table-sm  m-0"  :class="orderIssue.order.packages.length > 1?'collapse':''"  :id="'order'+orderIssue.id" >
@@ -196,8 +200,8 @@
                                     商品@{{ orderIssue.logs.length }}件,点击展开</button>
                             </div>
                         </td>
-                        <td class="bg-white">@{{ orderIssue.rejecting_status }}</td>
-                        <td class="bg-white m-0 p-0 log-td" valign="middle" align="center" v-on:mouseover="showAddBtn($event)" v-on:mouseleave="hideAddBtn($event)"  colspan="3">
+                        <td class="bg-white text-center">@{{ orderIssue.rejecting_status }}</td>
+                        <td class="bg-white m-0 p-0 log-td text-center" valign="middle" align="center" v-on:mouseover="showAddBtn($event)" v-on:mouseleave="hideAddBtn($event)"  colspan="3">
 
                             <div class="addLogDiv row m-0 p-0" :id="'AddLog_'+orderIssue.id" style="display: none">
                                 <input type="hidden" name="id" :value="orderIssue.id" >
@@ -211,7 +215,7 @@
                                 <button type="button" class="btn  btn-outline-primary " @click="showAddDiv('AddLog_'+orderIssue.id)">新</button>
                             </div>
 
-                            <template v-if="orderIssue.logs" class="p-0 m-0">
+                            <template v-if="orderIssue.logs" class="p-0 m-0 ">
                                 <table class="table table-sm p-0 m-0 " :id="'logs'+orderIssue.id" :class="orderIssue.logs.length > 1?'collapse':''">
                                     <tr v-for="log in orderIssue.logs" v-on:mouseover="showDelBtn($event)" v-on:mouseleave="hideDelBtn($event)" class="del-tr" style="position:static">
                                         <td>@{{ log.type }}</td>
@@ -236,16 +240,16 @@
                             </template>
                         </td>
                         <td class="bg-white">
-                            <p v-if="orderIssue.issue_type">@{{ orderIssue.issue_type.name}}</p>
+                            <span v-if="orderIssue.issue_type">@{{ orderIssue.issue_type.name}}</span>
                         </td>
                         <td class="bg-white p-0 m-0">
                             @{{ orderIssue.result_explain}}
                         </td>
-                        <td class="bg-white"><p v-if="orderIssue.second_order"> @{{ orderIssue.second_order.code }}</p></td>
-                        <td class="bg-white"><p v-if="orderIssue.second_order"> @{{ orderIssue.second_order.logistic_id }}</p></td>
-                        <td class="bg-white" valign="middle" align="center">
+                        <td class="bg-white"><span v-if="orderIssue.second_order" class="p-0"> @{{ orderIssue.second_order.code }}</span></td>
+                        <td class="bg-white"><span v-if="orderIssue.second_order" class="p-0"> @{{ orderIssue.second_order.logistic_id }}</span></td>
+                        <td class="bg-white p-0" valign="middle" align="center">
                             <template v-if="orderIssue.second_order">
-                                <div class="collapse hide" :id="'secondOrderNumbers'+orderIssue.id">
+                                <div class="collapse hide m-0" :id="'secondOrderNumbers'+orderIssue.id">
                                     <p v-for="logisticNumber in orderIssue.second_order.logisticNumbers" class="m-0 p-0 text-center text-muted ">@{{ logisticNumber }}</p>
                                 </div>
                                 <button v-if="orderIssue.second_order.logisticNumbers.length > 1" type="button"
@@ -289,9 +293,11 @@
                         <td class="bg-white">@{{ orderIssue.final_status }}</td>
                         <td class="bg-white">@{{ orderIssue.logistic_indemnity_money }}</td>
                         <td class="bg-white">@{{ orderIssue.logistic_express_remission }}</td>
+                        @cannot('客户不可见')
                         <td class="bg-white">@{{ orderIssue.baoshi_indemnity_money }}</td>
+                        @endcannot
                         <td class="bg-white">@{{ orderIssue.baoshi_express_remission }}</td>
-                        <td class="bg-white"><p v-if="orderIssue.user_work_group">@{{ orderIssue.user_work_group.name }}</p></td>
+                        <td class="bg-white"><span v-if="orderIssue.user_work_group">@{{ orderIssue.user_work_group.name }}</span></td>
                         <td>
                             <button type="button" class="btn btn-sm btn-outline-primary" @click="editOrderIssue($event)" :data-value="orderIssue.id">改</button>
                             <button type="button" class="btn btn-sm btn-outline-danger" @click="deleteOrderIssue($event)" :data-value="orderIssue.id">删</button>
@@ -354,6 +360,7 @@
 @endsection
 @section('lastScript')
     <style type="text/css">
+
         @keyframes anima
         {
             from {
@@ -372,6 +379,9 @@
                 opacity:0.1;
             }
         }
+        .tr_top{
+            min-height: 75px;
+        }
         .bg-light-yellow{
             background: #fffff8;
         }
@@ -395,6 +405,7 @@
             -webkit-animation-direction: alternate;
             -webkit-animation-play-state: running;
         }
+
     </style>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
@@ -562,6 +573,7 @@
                                 })
                                 tempTip.setDuration(2500);
                                 tempTip.showSuccess('置顶成功');
+                                window.location.href=window.location.href;
                             } else {
                                 tempTip.setDuration(2500);
                                 tempTip.show( res.data.fail_info);
@@ -785,13 +797,6 @@
                     let button = $("#logisticNumbersBtn"+id);
                     let isShow =  button.attr('aria-expanded');
                     if(isShow==='false'){button.text('点击收起');}else{button.text("分箱"+length+"件,点击展开");}
-                    /*if(!collapse.hasClass('show')){
-                        collapse.removeClass('show').addClass('hide');
-                        button.text('点击收起');
-                    }else{
-                        collapse.removeClass('hide').addClass('show');
-                        button.text("分箱"+length+"件,点击展开");
-                    }*/
                 },
                 toggleLogs(id,length){
                     let button = $("#logsBtn"+id);
@@ -833,7 +838,8 @@
                     }else{
                         button.text("商品"+length+"件,点击展开");
                     }
-                }
+                },
+
             }
         })
         // modal 隐藏时修改 input 为空