赔偿，减免 责任方

app/Http/Controllers/WorkOrderController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Filters\WorkOrderFilters;
 use App\Logistic;
 use App\OrderIssue;
+use App\OwnerGroup;
 use App\Services\OrderIssueTypeService;
 use App\Services\OrderService;
 use App\Services\OwnerService;
@@ -12,6 +13,8 @@ use App\Services\WorkOrderCommoditiesService;
 use App\Services\WorkOrderDetailService;
 use App\Services\WorkOrderLogService;
 use App\Services\WorkOrderService;
+use App\UserOwnerGroup;
+use App\UserWorkgroup;
 use App\WorkOrder;
 use App\WorkOrderDetail;
 use Illuminate\Http\Request;
@@ -74,9 +77,11 @@ class WorkOrderController extends Controller
 
         $owners = $this->ownerService->getAuthorizedOwners();
 
+        $userWorkgroup = UserWorkgroup::all();
+        $userOwnerGroups = UserOwnerGroup::all();
 
         $this->service->tags($workOrders);
-        return view('order.workOrder.index', compact('workOrders', 'logistics', 'orderIssueTypes', 'owners'));
+        return view('order.workOrder.index', compact('workOrders', 'logistics', 'orderIssueTypes', 'owners','userWorkgroup','userOwnerGroups'));
     }
 
     /**

app/WorkOrder.php

@@ -48,6 +48,7 @@ class WorkOrder extends Model
         "is_new_rejecting",         // 回库标记
         'created_at',
         'rejecting_status',         // 退回状态
+
     ];
     /**
      * @var int 默认

app/WorkOrderDetail.php

@@ -3,10 +3,11 @@
 namespace App;
 
 use App\Traits\ModelTimeFormat;
-use Illuminate\Database\Eloquent\Model;
-
 use App\Traits\ModelLogChanging;
+
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Facades\Auth;
 
@@ -21,7 +22,7 @@ class WorkOrderDetail extends Model
         'price',                    // 商品价值
         'sku_amount',               // 破损sku数
         'type',                     // 快递异常填写：在途异常，签收未收到
-        'last_handler_id',             // 上一个处理人
+        'last_handler_id',          // 上一个处理人
         'reissue_logistic_number',  // 补发单号
         'return_logistic_number',   // 退回单号 (错漏发:商家填写) (破损：创建时填写)
         'process_progress',         // 处理进度
@@ -33,8 +34,12 @@ class WorkOrderDetail extends Model
         'return_address',           // 退回单 寄件人地址
         'return_phone',             // 退回单 寄件人联系号码
         'return_name',              // 退回单 寄件人姓名
-
         'logistic_handle_tag',      // 承运商在处理标记
+        'logistic_indemnity_money',     // 承运商赔偿金额
+        'logistic_express_remission',   // 承运商减免
+        'bao_shi_indemnity_money',      // 宝时赔偿金额
+        'bao_shi_express_remission',    // 宝时减免
+        'user_owner_group_id',
     ];
 
     static public $enums = [
@@ -198,6 +203,16 @@ class WorkOrderDetail extends Model
         return $this->hasMany(WorkOrderProcessLog::class,'work_order_detail_id','id');
     }
 
+    public function userOwnerGroup(): BelongsTo
+    {
+        return $this->belongsTo(UserOwnerGroup::class);
+    }
+
+    public function userWorkgroups(): BelongsToMany
+    {
+        return $this->belongsToMany(UserWorkgroup::class);
+    }
+
     // 未完成历史标记
     public function undoneTag()
     {

database/migrations/2022_01_19_172151_work_order_details_add_indemnity_money.php

@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class WorkOrderDetailsAddIndemnityMoney extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('work_order_details', function (Blueprint $table) {
+            $table->decimal('logistic_indemnity_money')->index()->nullable()->comment('承运商赔偿金额');
+            $table->enum('logistic_express_remission', ['原单减免', '补发减免', '全部减免'])->index()->nullable()->comment('承运商快递减免');
+            $table->decimal('bao_shi_indemnity_money')->index()->nullable()->comment('宝时赔偿金额');
+            $table->enum('bao_shi_express_remission', ['原单减免', '补发减免', '全部减免'])->index()->nullable()->comment('宝时快递减免');
+            $table->integer('user_workgroup_id')->index()->nullable()->comment('仓库责任方');
+            $table->integer('user_owner_group_id')->index()->nullable()->comment('项目责任方');
+        });
+        Schema::create('work_order_user_work_group', function (Blueprint $table) {
+            $table->bigInteger('work_order_detail_id')->comment('工单详情');
+            $table->bigInteger('user_workgroup_id')->comment('工单详情');
+            $table->unique(['work_order_detail_id','user_work_group_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('work_order_details', function (Blueprint $table) {
+            $table->dropColumn('logistic_indemnity_money');
+            $table->dropColumn('logistic_express_remission');
+            $table->dropColumn('bao_shi_indemnity_money');
+            $table->dropColumn('bao_shi_express_remission');
+            $table->dropColumn('user_workgroup_id');
+            $table->dropColumn('user_owner_group_id');
+        });
+        Schema::dropIfExists('work_order_user_work_group');
+    }
+}

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

@@ -918,7 +918,6 @@
                                         </td>
                                     </tr>
                                 </table>
-
                             </td>
                             <td>
                                 @can('订单管理-问题件-编辑')

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

@@ -3,7 +3,7 @@
         商品详情
     </div>
     <el-table
-        :key="order_info_commodityes_key"
+        :key="order_info_commodities_key"
         :data="orderInfo.commodities"
         row-key="order_commodities_id"
         border

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

@@ -471,6 +471,20 @@
                     },
                     @endforeach
                 ],
+                userWorkgroup: [
+                        @foreach($userWorkgroup as $item)
+                    {
+                        name: '{{$item->id}}', value: '{{$item->name}}'
+                    },
+                    @endforeach
+                ],
+                userOwnerGroups: [
+                        @foreach($userOwnerGroups as $item)
+                    {
+                        name: '{{$item->id}}', value: '{{$item->name}}'
+                    },
+                    @endforeach
+                ],
                 logisticEditWorkOrder: {
                     id: null,
                     issue_type_name: null,
@@ -572,7 +586,8 @@
                 orderInfo: {
                     commodities: [],
                 },
-                order_info_commodityes_key: 1,
+                order_info_commodities_key: 1,
+
             },
             computed: {},
             mounted() {