Revert "修改问题件录入"

This reverts commit 80159b51

app/Http/Controllers/OrderIssueController.php

@@ -70,18 +70,13 @@ class OrderIssueController extends Controller
         /** @var OrderIssueService $orderIssueService */
         $orderIssueService = app('OrderIssueService');
         $orderIssueService->validatorCreate($request)->validate();
-        /** @var OrderIssue $orderIssue */
         $orderIssue = null;
         if ($request->filled('logistic_number_return')) {
             $orderIssue = $orderIssueService->createByLogisticNumber($request->all());
         } else {
             $orderIssue = $orderIssueService->create($request->all());
         }
-        if($request->has('logistic_number_return'))
-            $orderIssue->joinRejectedBill($request['logistic_number_return']);
         OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '创建订单问题件', 'type' => '创建']);
-        if($request->has('content'))
-            OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => $request['content'], 'type' => '处理']);
         return redirect('order/issue/index');
     }
 
@@ -90,7 +85,7 @@ class OrderIssueController extends Controller
         if (!Gate::allows('订单管理-问题件-编辑')) {
             return redirect(url('/'));
         }
-        $orderIssue = OrderIssue::query()->with(['order','orderIssueRejectedBills','secondOrder.packages.commodities.commodity'])->where('id', $id)->first();
+        $orderIssue = OrderIssue::query()->with(['order','secondOrder.packages.commodities.commodity'])->where('id', $id)->first();
         $order = $orderIssue->order;
         $secondOrder = $orderIssue->secondOrder;
         $rejectedBill = RejectedBill::query()->where('id', $orderIssue->rejected_bill_id)->first();

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

@@ -9,7 +9,7 @@
                 <div class="card-header">订单问题件录入</div>
                 <div class="card-body">
                     <form action="{{url('order/issue/store')}}" method="post">
-                        @csrf`
+                        @csrf
                         @method('POST')
                         <input type="hidden" name="rejected_bill_id" :value='rejectedBill.id'>
                         <input type="hidden" name="order_id" :value='order.id'>
@@ -201,12 +201,6 @@
                                 </table>
                             </div>
                         </div>
-                        <div class="form-group row">
-                            <label for="" class="col-2 col-form-label text-right ">情况说明</label>
-                            <div class="col-8">
-                                <textarea name="result_explain" class="form-control"></textarea>
-                            </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">
@@ -219,9 +213,10 @@
                         <div class="form-group row">
                             <label for="" class="col-2 col-form-label text-right ">处理结果</label>
                             <div class="col-8">
-                                <textarea name="content" class="form-control"></textarea>
+                                <textarea name="result_explain" class="form-control"></textarea>
                             </div>
                         </div>
+
                         <div class="form-group row">
                             <label for="logistic_indemnity_money"
                                    class="col-2 col-form-label text-right ">承运商赔偿金额</label>