Merge branch 'master' into yang

app/Filters/WorkOrderFilters.php

@@ -60,6 +60,7 @@ class WorkOrderFilters
         'user_owner_group_id',
         'user_work_group_id',
         'rejecting_status',
+        'custom_rejected_status',
     ];
     protected $array_filter;
     protected $params = [];
@@ -490,4 +491,9 @@ class WorkOrderFilters
     {
         $this->getOrderDetailQuery()->where('rejecting_status',$rejectingStatus);
     }
+
+    public function custom_rejected_status($custom_rejected_status)
+    {
+        $this->queryBuilder->where('custom_rejected_status',$custom_rejected_status);
+    }
 }

app/Http/Controllers/OrderIssueProcessLogController.php

@@ -78,7 +78,7 @@ class OrderIssueProcessLogController extends Controller
      * @param Request $request
      * @return array
      */
-    public function batchStoreApi(Request $request)
+    public function batchStoreApi(Request $request): array
     {
         if (!Gate::allows('订单管理-问题件-编辑')) {
             return ['success' => false, 'fail_info' => '没有对应的权限'];

app/Http/Controllers/UserController.php

@@ -28,7 +28,7 @@ class UserController extends Controller
         if(!Gate::allows('用户-查询')){ return redirect(url('/'));  }
         $owners=app("OwnerService")->getIntersectPermitting();
         $userDetailQuery = UserDetail::query()->select('user_id')->where('type','临时工');
-        $query = User::with(['roles','logistics','userWorkgroups','suppliers','userDetail'])->whereNotIn('id',$userDetailQuery);
+        $query = User::with(['roles','logistics','workGroups','suppliers','userDetail'])->whereNotIn('id',$userDetailQuery);
         if($request->has('name')){
             $user=$request->input('name');
             $query->where('name','like',$user.'%');
@@ -63,11 +63,6 @@ class UserController extends Controller
         return view('maintenance.user.index',compact('users','owners'));
     }
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return Response
-     */
     public function create()
     {
         if(!Gate::allows('用户-录入')){ return redirect(url('/'));  }
@@ -98,12 +93,6 @@ class UserController extends Controller
         ]);
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param User $user
-     * @return Response
-     */
     public function edit(User $user)
     {
         if(!Gate::allows('用户-编辑')){ return redirect(url('/'));  }
@@ -131,13 +120,6 @@ class UserController extends Controller
         return view('maintenance.user.edit',compact('user','rolesAll','roles','logistics','logisticUser','userWorkgroups','userWorkgroup','suppliers','supplierUser','workGroup','workGroups','ownerGroup','ownerGroups'));
     }
 
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param User $user
-     * @return Response
-     */
     public function update(Request $request, User $user)
     {
 
@@ -185,23 +167,20 @@ class UserController extends Controller
         foreach ($treeData as $v){
             if (strrpos($v,'g') === 0) array_push($work_id, mb_substr($v,1));
         }
-        if ($work_id)$user->workGroups()->sync($work_id);
+        if ($work_id){
+            $user->workGroups()->sync($work_id);
+        }
         //项目组
         $owners = $request->input('ownerGroup')??'';
-        if ($owners)$user->ownerGroups()->sync($owners);
-
+        if ($owners){
+            $user->ownerGroups()->sync($owners);
+        }
+        app("UserService")->bindOwner($work_id, $owners, $user);
         app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         app("UserService")->clearUserCache($user);
         return redirect('maintenance/user/')->with('successTip',"成功修改用户“{$user['name']}”！");
     }
 
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param User $user
-     * @return array|Response
-     * @throws Exception
-     */
     public function destroy(User $user)
     {
         if(!Gate::allows('用户-删除')){ return redirect(url('/'));  }

app/Http/Controllers/WorkOrderController.php

@@ -279,17 +279,17 @@ class WorkOrderController extends Controller
     {
         $json = [];
         $row = [
-            '工单类型', '当前进度', '客户', '店铺名称', '客户订单号','承运人', '快递单号', '创建时间', '当前处理人', '创建人', '情况说明', '退回单号', '退回商品', '退回商品名称', '退回商品数量', '是否正品', '操作类型', '操作人', '内容'
+            '工单类型', '当前进度', '客户', '店铺名称', '客户订单号', '承运人', '快递单号', '创建时间', '当前处理人', '创建人', '情况说明', '退回单号', '退回商品', '退回商品名称', '退回商品数量', '是否正品', '操作类型', '操作人', '内容'
         ];
         $workOrders->each(function ($item) use (&$json) {
             $logistic_numbers = $item->order->packages->implode('logistic_number', ",\r\n");
-            $logistic_numbers_return = $item->orderIssueRejectedBills->implode('logistic_number_return',",\r\n");
+            $logistic_numbers_return = $item->orderIssueRejectedBills->implode('logistic_number_return', ",\r\n");
             $rejected_item_name = '';
             $rejected_item_sku = '';
             $rejected_item_label = '';
             $rejected_item_amount = '';
             $item->orderIssueRejectedBills->each(function ($item) use (&$rejected_item_name, &$rejected_item_sku, &$rejected_item_label, &$rejected_item_amount) {
-                if($item->rejectedBill)
+                if ($item->rejectedBill)
                     $item->rejectedBill->items->each(function ($item) use (&$rejected_item_name, &$rejected_item_sku, &$rejected_item_label, &$rejected_item_amount) {
                         $rejected_item_name = $rejected_item_name . $item->name_goods . ",\r\n";
                         $rejected_item_sku = $rejected_item_sku . $item->barcode_goods . ",\r\n";
@@ -304,11 +304,11 @@ class WorkOrderController extends Controller
             $work_order_details = $item->details->filter(function ($detail) use ($item) {
                 return $detail->order_issue_type_id == $item->order_issue_type_id;
             });
-            if(count($work_order_details) > 0){
-                $work_order_details->first()->processLogs->each(function ($log) use (&$work_order_process_logs_type,&$work_order_process_logs_user,&$work_order_process_logs) {
-                    $work_order_process_logs_type .= $log->type. ",\r\n";
-                    $work_order_process_logs_user .= ($log->user->name ?? ''). ",\r\n";
-                    $work_order_process_logs .= $log->content. ",\r\n";
+            if (count($work_order_details) > 0) {
+                $work_order_details->first()->processLogs->each(function ($log) use (&$work_order_process_logs_type, &$work_order_process_logs_user, &$work_order_process_logs) {
+                    $work_order_process_logs_type .= $log->type . ",\r\n";
+                    $work_order_process_logs_user .= ($log->user->name ?? '') . ",\r\n";
+                    $work_order_process_logs .= $log->content . ",\r\n";
                 });
             }
 
@@ -339,11 +339,33 @@ class WorkOrderController extends Controller
 
     public function customRejectedStatusApi(Request $request): array
     {
-        $result = $this->service->customRejectedStatus($request->input('ids'),$request->input('rejectedStatus'));
-        if($result>0){
+        $result = $this->service->customRejectedStatus($request->input('ids'), $request->input('rejectedStatus'));
+        if ($result > 0) {
             return ['success' => true,];
         }
-        return ['success' => false,'message' => '操作异常请稍后重试'];
+        return ['success' => false, 'message' => '操作异常请稍后重试'];
 
     }
+
+    public function batchOthersApi(Request $request): array
+    {
+        if (Gate::denies('订单管理-工单处理-宝时编辑')) {
+            return ['success' => false, 'message' => '没有对应权限'];
+        }
+        if (!$request->has(['ids'])) {
+            return ['success' => false, 'message' => '参数异常'];
+        } else if (!$request->hasAny(['logistic_express_remission', 'bao_shi_express_remission', 'userWorkGroupIds'])) {
+            return ['success' => false, 'message' => '参数异常'];
+        }
+        $query = WorkOrder::query()->whereIn('id', $request->input('ids', []));
+        $query->update(array_filter($request->only(['logistic_express_remission', 'bao_shi_express_remission']), function ($item) {
+            return $item;
+        }));
+        if ($request->has(['userWorkGroupIds'])) {
+            $query->get()->each(function ($item) use ($request) {
+                $item->userWorkGroups()->attach($request->input('userWorkGroupIds', []));
+            });
+        }
+        return ['success' => true];
+    }
 }

app/Http/Controllers/WorkOrderProcessLogController.php

@@ -126,7 +126,20 @@ class WorkOrderProcessLogController extends Controller
         if (Gate::denies('订单管理-工单处理-处理日志删除')) {
             return ['success' => false, 'message' => '没有对应的权限'];
         }
-        WorkOrderProcessLog::query()->where('id',$request->input('id'))->delete();
+        WorkOrderProcessLog::query()->where('id', $request->input('id'))->delete();
+        return ['success' => true];
+    }
+
+
+    public function tagApi(Request $request): array
+    {
+        if (Gate::denies('订单管理-工单处理-宝时编辑')) {
+            return ['success' => false, 'message' => '没有对应的权限'];
+        }
+        if (!$request->has('id')) {
+            return ['success' => false, 'message' => '参数异常'];
+        }
+        WorkOrderProcessLog::query()->where('id', $request->input('id'))->update(['tag' => 1]);
         return ['success' => true];
     }
 

app/Services/ObligationService.php

@@ -7,6 +7,7 @@ use App\Owner;
 use App\Traits\ServiceAppAop;
 use App\Obligation;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
 
 class ObligationService
 {
@@ -152,4 +153,13 @@ class ObligationService
         }
         return Owner::query()->with('departmentObligationOwner')->find($param['id']);
     }
+
+    public function getObligationUnderOwner($ids):array
+    {
+        if (!$ids || count($ids) == 0){
+            return [];
+        }
+        return DB::table("department_obligation_owner")->select("owner_id")->whereIn("obligation_id",$ids)
+            ->groupBy("owner_id")->pluck("owner_id")->toArray();
+    }
 }

app/Services/OrderRejectingStatusService.php

@@ -7,8 +7,11 @@ use App\CommodityBarcode;
 use App\Order;
 use App\OrderDetail;
 use App\OrderIssueRejectedBill;
+use App\OrderIssueType;
 use App\RejectedBill;
 use App\RejectedBillItem;
+use App\WorkOrder;
+use App\WorkOrderDetail;
 
 class OrderRejectingStatusService
 {
@@ -29,21 +32,30 @@ class OrderRejectingStatusService
         $rejecting_status = $this->getOrderRejectingStatus($order);
         $query = OrderDetail::query()->where('order_id', $order->id);
         $order_detail = $query->first();
-        $is_new_rejecting = in_array($rejecting_status,['无','未退回']) ? '无':'有';
+        $is_new_rejecting = in_array($rejecting_status, ['无', '未退回']) ? '无' : '有';
         if (!$order_detail) {
             try {
                 OrderDetail::query()->create(
                     ['order_id' => $order->id, 'is_new_rejecting' => $is_new_rejecting, 'rejecting_status' => $rejecting_status]
                 );
             } catch (\Exception $e) {
-                LogService::log(__CLASS__,__METHOD__,$e->getMessage());
+                LogService::log(__CLASS__, __METHOD__, $e->getMessage());
             }
             return;
         }
         if (in_array($order_detail->is_new_rejecting, ['有', '已处理']) && $rejecting_status != '无') {
             $query->update(['rejecting_status' => $rejecting_status]);
         } else {
-            $query->update(['rejecting_status' => $rejecting_status, 'is_new_rejecting' =>$is_new_rejecting]);
+            $query->update(['rejecting_status' => $rejecting_status, 'is_new_rejecting' => $is_new_rejecting]);
+        }
+
+        if ($rejecting_status == '全部完成') {
+            $orderIssueTypeQuery = OrderIssueType::query()->where('name','拦截');
+            $workOrder = WorkOrder::query()->where('order_id',$order->id)
+                ->whereIn('order_issue_type_id',$orderIssueTypeQuery)->where('status','!=',6)->first();
+            if($workOrder){
+                app(WorkOrderInterceptService::class)->autoReviewIntercept($workOrder);
+            }
         }
     }
 
@@ -56,8 +68,8 @@ class OrderRejectingStatusService
 
     private function getRejectedBillItems(Order $order)
     {
-        $orderIssueRejectedBills = OrderIssueRejectedBill::query()->select('logistic_number_return')->where('order_id', $order->id)->where('logistic_number_return','!=','')->get();
-        $logistic_number_return = $orderIssueRejectedBills->map(function($item){
+        $orderIssueRejectedBills = OrderIssueRejectedBill::query()->select('logistic_number_return')->where('order_id', $order->id)->where('logistic_number_return', '!=', '')->get();
+        $logistic_number_return = $orderIssueRejectedBills->map(function ($item) {
             return $item->logistic_number_return;
         })->toArray();
         $query = RejectedBill::query()->select('id')->whereIn('logistic_number_return', $logistic_number_return);

app/Services/OwnerService.php

@@ -624,4 +624,10 @@ sql;
         }
         return $owners;
     }
+
+    public function getOwnerGroupUnderOwner($ids):array
+    {
+        return Owner::query()->select("id")->whereIn("user_owner_group_id",$ids)
+            ->pluck("id")->toArray();
+    }
 }

app/Services/UserOwnerGroupService.php

@@ -5,6 +5,7 @@ namespace App\Services;
 
 use App\UserOwnerGroup;
 use App\Traits\ServiceAppAop;
+use Illuminate\Support\Facades\DB;
 
 
 class UserOwnerGroupService

app/Services/UserService.php

@@ -208,4 +208,22 @@ class UserService
         $user->load("owners:id");
         return array_column($user->owners->toArray(),"id");
     }
+
+    public function bindOwner($workGroupIds, $ownerGroupIds, User $user){
+        $ownerIds = [];
+        if ($workGroupIds){
+            $ownerIds = app("ObligationService")->getObligationUnderOwner($workGroupIds);
+        }
+        if ($ownerGroupIds){
+            $ownerIds = array_merge($ownerIds, app("OwnerService")->getOwnerGroupUnderOwner($ownerGroupIds));
+        }
+        /*$user->loadMissing("owners:id");
+        if ($user->owners){
+            foreach ($user->owners as $owner){
+                $ownerIds[] = $owner->id;
+            }
+        }*/
+        $ownerIds = array_unique($ownerIds);
+        $user->owners()->sync($ownerIds);
+    }
 }

app/Services/WorkOrderInterceptService.php

@@ -198,7 +198,7 @@ class WorkOrderInterceptService extends WorkOrderService
         /** @var WorkOrderDetail $detail */
         $issueType = $this->issueTypeService->firstOrCreate(['name' => '拦截']);
         if ($workOrder->order_issue_type_id != $issueType->id) return;
-        $detail = $workOrder->details()->where('order_issue_type_id', $issueType->id)->where('status', '宝时终审')->orderByDesc('created_at')->first();
+        $detail = $workOrder->details()->where('order_issue_type_id', $issueType->id)->where('status','!=', 6)->orderByDesc('created_at')->first();
         if (!$detail) return;
         $process_progress = '成功已退回，不赔偿';
         $detail->update([

app/Services/WorkOrderProcessLogService.php

@@ -24,11 +24,13 @@ class WorkOrderProcessLogService
     public function createProcessLog(WorkOrderDetail $detail, $params, User $user = null): Model
     {
         $user = $user ?? Auth::user();
+
         $process_log = $detail->processLogs()->create([
             'work_order_detail_id' => $detail->id,
             'work_order_id' => $detail->work_order_id,
             'content' => $params['content'],
             'user_id' => Auth::id(),
+            'tag' => $params['tag'] ?? 0,
         ]);
 
         /** @var WorkOrder $work_order */

app/Services/WorkOrderService.php

@@ -398,6 +398,7 @@ class WorkOrderService
                 'created_at' => $process_log->created_at,
                 'updated_at' => $process_log->updated_at,
                 'type' => $process_log->type,
+                'tag' => $process_log->tag,
             ];
         }))->toArray());
         $this->orderIssueService->endOrderIssues([$order_issue->id]);

app/WorkOrder.php

@@ -285,7 +285,11 @@ class WorkOrder extends Model
         return ['owner', 'logistic', 'issueType', 'creator', 'lastHandler','orderDetail','orderIssueRejectedBills.rejectedBill.items',
             'userWorkGroups','details' => function ($query) {
             return $query->with(['commodities.commodity', 'logs' => function ($query) {
-                return $query->with('creator')->orderByDesc('created_at');
+                if(Gate::denies('订单管理-工单处理-宝时编辑')){
+                    return $query->with('creator')->orderByDesc('created_at');
+                } else {
+                    return $query->with('creator')->where('tag','!=','1')->orderByDesc('created_at');
+                }
             }, 'images.uploadFile', 'issueType', 'processLogs' => function ($query) {
                 return $query->with('user')->orderByDesc('created_at');
             }]);

app/WorkOrderProcessLog.php

@@ -20,6 +20,7 @@ class WorkOrderProcessLog extends Model
         'content',
         'status',
         'type', // 创建 处理 完结
+        'tag'
     ];
 
 

database/migrations/2022_02_18_170500_work_order_precess_logs_add_hidden_tag.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class WorkOrderPrecessLogsAddHiddenTag extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('work_order_process_logs', function (Blueprint $table) {
+            $table->tinyInteger('tag');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('work_order_process_logs', function (Blueprint $table) {
+            $table->dropColumn('tag');
+        });
+    }
+}

resources/views/maintenance/user/index.blade.php

@@ -22,7 +22,11 @@
                                     <li v-for="role in user.roles" style="list-style: none">@{{ role.name }}</li>
                                 </ul>
                             </td>
-                            <td><span v-if="user.workgroup&&user.workgroup.length>0">@{{ user.workgroup[0].name }}</span></td>
+                            <td><span v-if="user.work_groups && user.work_groups.length>0">
+                                    <p v-for="group in user.work_groups">
+                                        @{{ group.name }}
+                                    </p>
+                                </span></td>
                             <td>
                                 <ul v-if="user.logistics.length>0" class="list-group">
                                     <li v-for="logistic in user.logistics" style="list-style: none">@{{ logistic.name }}</li>

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

@@ -0,0 +1,40 @@
+<div class="modal fade" id="batchOthersModel" tabindex="-1" role="dialog" aria-labelledby="othersLabel"
+     aria-hidden="true">
+    <div class="modal-dialog  modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h5 class="modal-title" id="othersLabel">承运商快递减免</h5>
+                <select class="form-control form-control-sm"
+                        v-model="batchOthers.logistic_express_remission">
+                    <option disabled value="">请选择</option>
+                    <option v-for="item in expressRemission" :value="item">@{{ item }}</option>
+                </select>
+            </div>
+            <div class="modal-body">
+                <h5 class="modal-title" id="othersLabel">宝时快递减免</h5>
+                <select class="form-control form-control-sm"
+                        v-model="batchOthers.bao_shi_express_remission">
+                    <option disabled value="">请选择</option>
+                    <option v-for="item in expressRemission" :value="item">@{{ item }}</option>
+                </select>
+            </div>
+
+            <div class="modal-body">
+                <h5 class="modal-title" id="logsLabel">事故责任方</h5>
+                <span v-for="item in userWorkgroup">
+                     <input type="checkbox" name="vehicle"
+                                    :value="item.name"
+                                    :id="'userWorkGroupIds' + item.name"
+                                    v-model="batchOthers.userWorkGroupIds"
+                     ></input>
+                    <label :for="'userWorkGroupIds' + item.name">@{{ item.value }}</label>
+                </span>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-primary" data-dismiss="modal" @click="batchOthersExpressRemission()">确认
+                </button>
+            </div>
+        </div>
+    </div>
+</div>

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

@@ -2,30 +2,37 @@
     @if( \Illuminate\Support\Facades\Gate::check('订单管理-工单处理-宝时编辑') ||
             \Illuminate\Support\Facades\Gate::check('订单管理-工单处理-商家编辑') ||
              \Illuminate\Support\Facades\Gate::check('订单管理-工单处理-承运商编辑'))
-    <div class="add-btn"
-         style="position: absolute;display: none;margin-top: -35px;z-index: 51"
-         :id="'AddProcessLogBtn'+item.pending_detail.id">
-        <button type="button" class="btn btn-primary"
-                @click="showAddDiv('addWorkOrderProcessLogForm'+item.pending_detail.id)">新
-        </button>
-    </div>
-
-    <div class="addLogDiv row m-0 p-0 form-group" style="display: none;"
-         :id="'addWorkOrderProcessLogForm'+item.pending_detail.id">
-        <input type="hidden" name="id" :value="item.pending_detail.id">
-        <div style="width: 45px"></div>
-        <div class="form-inline m-2">
-            <input type="text" name="content" :id="'addWorkOrderProcessLogFormInput_'+item.pending_detail.id"
-                   class="form-control m-0 p-0"
-                   style="width: 275px"
-                   required>
-            <button type="button"
-                    class="btn btn-primary ml-2 m-0 p-0"
-                    style="width: 50px"
-                    @click="formStoreProcessLog(item.pending_detail.id,item.id)">添加
+        <div class="add-btn"
+             style="position: absolute;display: none;margin-top: -35px;z-index: 51"
+             :id="'AddProcessLogBtn'+item.pending_detail.id">
+            <button type="button" class="btn btn-primary"
+                    @click="showAddDiv('addWorkOrderProcessLogForm'+item.pending_detail.id)">新
             </button>
         </div>
-    </div>
+
+        <div class="addLogDiv row m-0 p-0 form-group" style="display: none;"
+             :id="'addWorkOrderProcessLogForm'+item.pending_detail.id">
+            <input type="hidden" name="id" :value="item.pending_detail.id">
+            <div style="width: 45px"></div>
+            <div class="form-inline m-2">
+                <input type="text" name="content" :id="'addWorkOrderProcessLogFormInput_'+item.pending_detail.id"
+                       class="form-control m-0 p-0"
+                       style="width: 275px"
+                       required>
+                @can('订单管理-工单处理-宝时编辑')
+                    <input type="checkbox" class="form-control"
+                           value="true"
+                           :name="item.pending_detail.id + '_log_check'"
+                           :id="item.pending_detail.id + '_log_check'">
+                    <label :for="item.pending_detail.id + '_log_check'">标</label>
+                @endcan
+                <button type="button"
+                        class="btn btn-primary ml-2 m-0 p-0"
+                        style="width: 50px"
+                        @click="formStoreProcessLog(item.pending_detail.id,item.id)">添加
+                </button>
+            </div>
+        </div>
     @endif
     <template class="p-0 m-0" v-if="item.process_logs.length > 0">
         <table class="table table-sm p-0 m-0 " :id="'logs'+item.pending_detail.id">
@@ -45,13 +52,19 @@
                     <span v-text="log.created_at"></span>
                 </td>
                 @if( \Illuminate\Support\Facades\Gate::check('订单管理-工单处理-宝时编辑') || \Illuminate\Support\Facades\Gate::check('订单管理-工单处理-商家编辑') )
-                <td style="max-width: 35px;min-width: 35px;" class="m-0 p-0 border-0">
-                    <button type="button"
-                            class="btn btn-sm btn-outline-danger m-0 del-btn invisible"
-                            @click="destroyProcessLog(item,log,logIndex)">
-                        删
-                    </button>
-                </td>
+                    <td style="max-width: 70px;min-width: 70px;" class="m-0 p-0 border-0">
+                        <button type="button"
+                                class="btn btn-sm btn-outline-danger m-0 del-btn invisible"
+                                @click="destroyProcessLog(item,log,logIndex)">
+                            删
+                        </button>
+                        <button type="button"
+                                v-if="log.tag !== '1' "
+                                class="btn btn-sm btn-primary m-0 del-btn invisible"
+                                @click="workOrderProcessLogTagApi(log)">
+                            标
+                        </button>
+                    </td>
                 @endif
             </tr>
         </table>
@@ -63,7 +76,8 @@
 
             <button type="button" class="btn btn-sm btn-outline-primary align-middle mt-1 center-block"
                     v-show="showWorkOrderProcessLog === item.id"
-                    @click="showWorkOrderProcessLog = null">点击收起</button>
+                    @click="showWorkOrderProcessLog = null">点击收起
+            </button>
         </div>
 
     </template>

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

@@ -73,10 +73,18 @@
                             批量修改退回状态
                         </button>
                     @endcan
+                    @can('订单管理-工单处理-宝时编辑')
+                        <button type="button" class="ml-1 btn btn-outline-primary btn-sm"
+                                v-show="checkData.length > 0"
+                                @click="showBatchOthersExpressRemission">
+                            批量处理赔偿金额与事故责任方
+                        </button>
+                    @endcan
 
                 </div>
                 <div>
-                    <table class="table table-sm table-striped table-hover table-bordered td-min-width-80 " id="table" :class="tableClass">
+                    <table class="table table-sm table-striped table-hover table-bordered td-min-width-80 " id="table"
+                           :class="tableClass">
                         <thead>
                         <tr>
                             <th style="min-width: 100px">
@@ -95,7 +103,6 @@
                             <th style="min-width: 120px">承运人</th>
                             <th style="min-width: 120px">快递单号</th>
                             <th style="min-width: 120px">当前处理人</th>
-                            <th style="min-width: 120px">创建人</th>
                             <th style="min-width: 150px">情况说明</th>
                             <th style="min-width: 50px;max-width: 50px" v-text="hideRejectedBills ? '隐藏' :'展开' ">展开</th>
 
@@ -119,6 +126,8 @@
                                 <th style="min-width: 75px">删除</th>
                             @endcan
                             <th style="min-width: 300px">资料</th>
+                            <th style="min-width: 120px">创建人</th>
+
                         </tr>
                         </thead>
                         <tbody>
@@ -283,12 +292,11 @@
                                 <td v-text="item.order_client_code"></td>
                                 <td v-text="item.logisitc_name"></td>
                                 <td>
-                                    <div v-for="logistic_number in item.logistic_numbers">
-                                        <span v-text="logistic_number"></span>
-                                    </div>
+                                    <span class="m-0 p-0 d-inline-block"
+                                          v-for="logistic_number in item.logistic_numbers"
+                                          v-text="logistic_number"></span>
                                 </td>
                                 <td v-text="item.status"></td>
-                                <td v-text="item.creator ? item.creator.name : ''"></td>
                                 <td v-text="item.result_explain ? item.result_explain: item.remark"></td>
                                 <td class="p-0 m-0 w-50" style="width:30px;" v-if="i===0"
                                     :rowspan="workOrders.length">
@@ -461,6 +469,7 @@
                                 <td class="container" style="min-width: 500px">
                                     @include('order.workOrder._work_order_details')
                                 </td>
+                                <td v-text="item.creator ? item.creator.name : ''"></td>
                             </tr>
                         </template>
                         </tbody>
@@ -483,6 +492,7 @@
         @include('order.workOrder._order_commodity_info')
         @include('order.workOrder._rejected_item_equals_order_commodity')
         @include('order.workOrder._custom_rejected_status')
+        @include('order.workOrder._batch_order_dispose')
     </div>
 @endsection()
 
@@ -512,14 +522,16 @@
             width: 100%;
         }
 
-        .logistic-table{
+        .logistic-table {
             min-width: 775px;
             max-width: 900px
         }
-        .owner-table{
+
+        .owner-table {
             min-width: 775px;
             max-width: 900px;
         }
+
         .baoShi-table {
             min-width: 900px;
         }
@@ -763,14 +775,20 @@
                 hideRejectedBills: false,
                 tableHeader: null,
                 toggleBtnHeight: 0,
+                batchOthers: {
+                    logistic_express_remission: '',
+                    bao_shi_express_remission: '',
+                    userWorkGroupIds: [],
+                },
+                expressRemission: ['原单减免', '补发减免', '全部减免'],
             },
             computed: {
                 tableClass() {
-                    if(this.isBaoShi){
+                    if (this.isBaoShi) {
                         return 'baoShi-table'
-                    }else if(this.isLogistic){
+                    } else if (this.isLogistic) {
                         return 'logistic-table';
-                    } else if(this.isOwner){
+                    } else if (this.isOwner) {
                         return 'owner-table';
                     }
                 }
@@ -932,6 +950,15 @@
                             {name: '超量退回', value: '超量退回'},
                         ]
                     }
+                ], [
+                    {
+                        name: 'custom_rejected_status', type: 'select', placeholder: '退回标记',
+                        data: [
+                            {name: '无', value: '无'},
+                            {name: '待退回', value: '待退回'},
+                            {name: '退回中', value: '退回中'},
+                        ]
+                    },
                 ]];
                 this.form = new query({
                     el: '#form_div',
@@ -1220,7 +1247,7 @@
                     return new Array(...logistic_numbers);
                 },
                 groupProcessLogs(workOrder) {
-                    return workOrder.details.map(e => e.process_logs ? e.process_logs : []).reduce((a, b) => a = [...a, ...b], []).sort((pre, cur) => cur.id - pre.id);
+                    return workOrder.details.map(e => e.process_logs ? e.process_logs : []).reduce((a, b) => [...a, ...b], []).sort((pre, cur) => cur.id - pre.id);
                 },
                 createOrderIssue(item, tag) { // 生成问题件
                     let url = '{{route('workOrder.buildOrderIssueApi')}}';
@@ -1269,7 +1296,7 @@
                     }
                     return this.workOrders.filter((item) => {
                         if (!item.order || !item.order.packages) return false;
-                        return selected.includes(item.id + '');
+                        return selected.includes(item.id);
                     });
                 },
                 exportText() {
@@ -3440,9 +3467,11 @@
                 },
                 formStoreProcessLog(work_order_detail_id, worK_order_id) {
                     let url = "{{route('workOrder.processLog.storeApi')}}";
+                    let tagDoc = document.getElementById(work_order_detail_id + '_log_check');
                     let data = {
                         id: worK_order_id,
                         content: document.getElementById('addWorkOrderProcessLogFormInput_' + work_order_detail_id).value,
+                        tag: tagDoc ? tagDoc.value : 0
                     };
                     this.waitingTempTip('处理中');
                     window.axios.post(url, data).then(res => {
@@ -3451,6 +3480,8 @@
                             this.pushProcessLog(res.data.data);
                             this.successTempTip('处理完成');
                             this.showAddDiv('addWorkOrderProcessLogForm' + work_order_detail_id);
+                            document.getElementById('addWorkOrderProcessLogFormInput_' + work_order_detail_id).value = '';
+                            if(tagDoc)tagDoc = false;
                             this.$forceUpdate();
                             return;
                         }
@@ -3524,6 +3555,7 @@
                     this.workOrders.forEach((e, index) => {
                         let has = e.details.filter(detail => `${detail.id}` === `${work_order_detail_id}`).length > 0;
                         if (has) {
+                            process_log.tag = process_log.tag + '';
                             this.workOrders[index]['process_logs'].unshift(process_log);
                             if (this.isBaoShi) {
                                 this.workOrders[index]['bao_shi_tag'] = '1'
@@ -3786,6 +3818,70 @@
                 checkAll(e) {
                     this.checkData = e.target.checked ? this.workOrders.map(e => e.id) : []
                 },
+
+                workOrderProcessLogTagApi(item) {
+                    let url = "{{route('workOrder.processLog.tagApi')}}"
+                    let data = {
+                        id: item.id
+                    }
+                    window.tempTip.waitingTip('处理中')
+                    axios.post(url, data).then(res => {
+                        window.tempTip.cancelWaitingTip()
+                        if (res.data.success) {
+                            item.tag = '1';
+                            this.successTempTip('标记成功');
+                        } else {
+                            this.errorTempTip(res.data.message ? res.data.message : '处理出现异常');
+                        }
+                    }).catch(err => {
+                        window.tempTip.cancelWaitingTip()
+                        this.errorTempTip(err)
+                    })
+                },
+                showBatchOthersExpressRemission() {
+                    if (this.checkData.length === 0) {
+                        this.errorTempTip('请勾选需要处理工单')
+                        return
+                    }
+                    $("#batchOthersModel").modal('show');
+                },
+                batchOthersExpressRemission() {
+                    let {logistic_express_remission, bao_shi_express_remission, userWorkGroupIds} = this.batchOthers;
+                    let url = "{{route('workOrder.batchOthersApi')}}";
+                    let data = {
+                        ids: this.checkData,
+                        logistic_express_remission: logistic_express_remission,
+                        bao_shi_express_remission: bao_shi_express_remission,
+                        userWorkGroupIds: userWorkGroupIds,
+                    }
+
+                    let userWorkGroupArray = this.userOwnerGroup.filter(e => {
+                        return userWorkGroupIds.includes(e.id);
+                    })
+                    window.tempTip.waitingTip('处理中')
+                    axios.post(url, data).then(res => {
+                        window.tempTip.cancelWaitingTip();
+                        if (res.data.success) {
+                            this.successTempTip('处理完成')
+                            this.workOrders.forEach(e => {
+                                if (this.checkData.includes(e.id)) {
+                                    if (logistic_express_remission) e.logistic_express_remission = logistic_express_remission;
+                                    if (bao_shi_express_remission) e.bao_shi_express_remission = bao_shi_express_remission
+                                    if (userWorkGroupIds) e.user_work_groups = e.user_work_groups.concat(userWorkGroupArray)
+                                }
+                            })
+                            this.batchOthers.logistic_express_remission = ''
+                            this.batchOthers.bao_shi_express_remission = ''
+                            this.batchOthers.userWorkGroupIds = []
+                        } else {
+                            this.errorTempTip(res.data.message ? res.data.message : '处理出现异常');
+                        }
+                    }).catch(err => {
+                        window.tempTip.cancelWaitingTip()
+                        this.errorTempTip(err)
+                    })
+
+                }
             },
         });
     </script>

routes/apiLocal.php

@@ -305,6 +305,7 @@ Route::prefix('workOrder')->group(function(){
     Route::post('batchEnd','WorkOrderController@ownerBatchEndWorkOrderApi')->name('workOrder.owner.batchEndApi');               // 承运商处理标记
     Route::post('logisticTag','WorkOrderController@logisticHandlerTagApi')->name('workOrder.logistic.handlerTagApi');
     Route::post('customRejectedStatusApi','WorkOrderController@customRejectedStatusApi')->name('workOrder.customRejectedStatusApi');
+    Route::post('batchOthers','WorkOrderController@batchOthersApi')->name('workOrder.batchOthersApi');
 
     // 承运商处理标记
     Route::prefix('intercept')->group(function(){           // 拦截
@@ -362,6 +363,7 @@ Route::prefix('workOrder')->group(function(){
         Route::post('/store/baoShi','WorkOrderProcessLogController@baoShiStoreApi')->name('workOrder.processLog.baoShiStoreApi');
         Route::post('/batchStore','WorkOrderProcessLogController@batchStoreApi')->name('workOrder.processLog.batchStore');
         Route::post('/destroy','WorkOrderProcessLogController@destroyApi')->name('workOrder.processLog.destroyApi');
+        Route::post('/tag','WorkOrderProcessLogController@tagApi')->name('workOrder.processLog.tagApi');
     });
 
     Route::post('updateIssueType','WorkOrderController@updateIssueTypeApi')->name('workOrder.updateIssueTypeApi');                // 修改问题类型