修改工单图片的上传和显示及工单详情的显示

app/Http/Requests/WorkOrder/WorkOrderRequest.php

@@ -50,7 +50,7 @@ class WorkOrderRequest extends FormRequest
     public function damagedApiRule(): array
     {
         return [
-            'name' => 'required|string',
+            'type' => 'required|string',
             'order_no' => 'required|string',
             'packageImages' => 'required|array',
             'commodityImages' => 'required|array',
@@ -61,8 +61,8 @@ class WorkOrderRequest extends FormRequest
     public function damagedApiMessage(): array
     {
         return [
-            'name.required' => '未指定工单类型',
-            'name.string' => '工单类型格式不争取',
+            'type.required' => '未指定工单类型',
+            'type.string' => '工单类型格式不正确',
             'order_no.required' => '未指定订单',
             'order_no.string' => '订单数据格式不正确',
             'packageImages.required' => '未上传外包装图片',

app/Services/WorkOrderImageService.php

@@ -34,7 +34,7 @@ class WorkOrderImageService
         /** @var UploadedFile  $image */
         $count = $workOrder->packageImages()->count();
         /** @var WorkOrderImage $workOrderImage */
-        $workOrderImage = $workOrder->packageImages()->create(['type' => 0, 'amount' => ++$count]);
+        $workOrderImage = $workOrder->packageImages()->create(['type' => 1, 'number' => ++$count]);
         $workOrderImage->saveFile($image);
     }
 
@@ -61,7 +61,7 @@ class WorkOrderImageService
         /** @var UploadedFile  $image */
         $count = $workOrder->commodityImages()->count();
         /** @var WorkOrderImage $workOrderImage */
-        $workOrderImage = $workOrder->commodityImages()->create(['type' => 1, 'amount' => ++$count]);
+        $workOrderImage = $workOrder->commodityImages()->create(['type' => 2, 'number' => ++$count]);
         $workOrderImage->saveFile($image);
     }
 
@@ -84,7 +84,7 @@ class WorkOrderImageService
         /** @var UploadedFile  $image */
         $count = $workOrder->commodityImages()->count();
         /** @var WorkOrderImage $workOrderImage */
-        $workOrderImage = $workOrder->dealImages()->create(['type' => 3, 'amount' => ++$count]);
+        $workOrderImage = $workOrder->dealImages()->create(['type' => 3, 'number' => ++$count]);
         $workOrderImage->saveFile($image);
     }
 
@@ -107,7 +107,7 @@ class WorkOrderImageService
         /** @var UploadedFile  $image */
         $count = $workOrder->refundImages()->count();
         /** @var WorkOrderImage $workOrderImage */
-        $workOrderImage = $workOrder->refundImages()->create(['type' => 4, 'amount' => ++$count]);
+        $workOrderImage = $workOrder->refundImages()->create(['type' => 4, 'number' => ++$count]);
         $workOrderImage->saveFile($image);
     }
 }

app/Services/WorkOrderService.php

@@ -182,7 +182,7 @@ class WorkOrderService
     {
         $workOrder->saveWorkOrderDetail($param);        // 收方信息 丢件价值 补发单号
         $workOrder->addDealImage($param['dealImages']); // 交易截图
-        $workOrder->addRefundImage($param['refundImages']); // 退款截图
+        $workOrder->addRefundImage($param['refundImages'] ?? []); // 退款截图
         $workOrder->update(['work_order_status' => 2]); // 标记信息填写
         $workOrder->loadDefaultWith();
         return $workOrder;

app/WorkOrder.php

@@ -168,25 +168,25 @@ class WorkOrder extends Model
     // 外包装图片
     public function packageImages(): HasMany
     {
-        return $this->hasMany(WorkOrderImage::class)->where('type', 0);
+        return $this->hasMany(WorkOrderImage::class)->where('type', 1);
     }
 
     // 内物破损图片
     public function commodityImages(): HasMany
     {
-        return $this->hasMany(WorkOrderImage::class)->where('type', 1);
+        return $this->hasMany(WorkOrderImage::class)->where('type', 2);
     }
 
     // 交易图片
     public function dealImages(): HasMany
     {
-        return $this->hasMany(WorkOrderImage::class)->where('type', 2);
+        return $this->hasMany(WorkOrderImage::class)->where('type', 3);
     }
 
     // 退款图片
     public function refundImages(): HasMany
     {
-        return $this->hasMany(WorkOrderImage::class)->where('type', 3);
+        return $this->hasMany(WorkOrderImage::class)->where('type', 4);
     }
 
     // 工单详情

app/WorkOrderImage.php

@@ -23,10 +23,11 @@ class WorkOrderImage extends Model
 
     static public $enums = [
         'type' => [
-            '外包装图片' => 0,
-            '内物破碎图片' => 1,
-            '交易截图' => 2,
-            '退款成功截图' => 3,
+            '' => 0,
+            '外包装图片' => 1,
+            '内物破碎图片' => 2,
+            '交易截图' => 3,
+            '退款成功截图' => 4,
         ],
     ];
 

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

@@ -7,36 +7,32 @@
                 <div id="form_div" style="min-width: 1220px;"></div>
                 <div class="form-inline mt-1" id="btn">
                     @can('订单管理-订单问题件生成')
-                        <span class="ml-1">
-                       <button type="button" class="btn btn-outline-dark btn-sm form-control-sm  tooltipTarget"
-                               @click="createOrderIssue(null,false)" style="background: #dad7e8;">生成问题件</button>
-                       </span>
+                        <button type="button"
+                                class="ml-1 btn btn-outline-dark btn-sm form-control-sm  tooltipTarget"
+                                @click="createOrderIssue(null,false)" style="background: #dad7e8;">生成问题件
+                        </button>
                     @endcan
                     @can('订单管理-订单问题件生成')
-                        <span class="ml-1">
-                       <button type="button" class="btn btn-outline-primary btn-sm form-control-sm  tooltipTarget"
-                               @click="exportText()">导出文本</button>
-                       </span>
+                        <button type="button"
+                                class="ml-1 btn btn-outline-primary btn-sm form-control-sm  tooltipTarget"
+                                @click="exportText()">导出文本
+                        </button>
                     @endcan
                     @can('订单管理-工单处理-审核')
-                        <span class="ml-1">
-                        <button type="button" class="btn btn-outline-success btn-sm form-control-sm  tooltipTarget"
-                                @click="batchReview">
-                            批量审核
+                        <button type="button"
+                                class="ml-1 btn btn-outline-success btn-sm form-control-sm tooltipTarget"
+                                @click="batchReview">批量审核
                         </button>
-                        </span>
                     @endcan
-                    <span class="ml-1">
-                    <button type="button" class="btn btn-outline-dark btn-sm form-control-sm  tooltipTarget"
-                            @click="copyLogisticNumber()" style="background: #dad7e8;">批量复制单号</button>
-                    </span>
+                    <button type="button"
+                            class="ml-1 btn btn-outline-dark btn-sm form-control-sm tooltipTarget"
+                            @click="copyLogisticNumber()" style="background: #dad7e8;">批量复制单号
+                    </button>
                     @can('订单管理-工单处理-审核')
-                        <span class="ml-1">
-                        <button type="button" class="btn btn-outline-success btn-sm form-control-sm  tooltipTarget"
-                                @click="showEditIssueType">
-                            批量修改问题件类型
+                        <button type="button"
+                                class="ml-1 btn btn-outline-success btn-sm form-control-sm  tooltipTarget"
+                                @click="showEditIssueType">批量修改问题件类型
                         </button>
-                        </span>
                     @endcan
                 </div>
 
@@ -49,35 +45,38 @@
                                     <label><input type="checkbox" :value="item.id"></label>
                                 </td>
                                 <td class="text-center">
-                                    <span>@{{ i+1 }}</span>
+                                    <span v-text="i+1"></span>
                                     <span v-show="item.is_issue_order" class="badge badge-primary">问题件</span>
                                 </td>
                                 <td class="text-left">
                                     @can('订单管理-订单问题件生成')
                                         <button class="btn btn-sm btn-outline-primary"
-                                                @click="createOrderIssue(item,true)" v-show="!item.is_issue_order ">
-                                            生成问题件
+                                                v-show="!item.is_issue_order "
+                                                @click="createOrderIssue(item,true)">生成问题件
                                         </button>
                                     @endcan
                                     @can('订单管理-工单处理-审核')
-                                        <button class="btn btn-sm btn-outline-success" v-show="item.status !== '已处理'"
-                                                @click="review(item,i)">
-                                            审核
+                                        <button class="btn btn-sm btn-outline-success"
+                                                v-show="item.status !== '已处理'"
+                                                @click="review(item,i)">审核
                                         </button>
                                     @endcan
                                     @can('订单管理-工单处理-货主编辑')
-                                        <button class="btn btn-sm btn-outline-secondary" @click="showFillModel(item,i)"
-                                                v-if="item['issue_type']['name'] ==='快递丢件'">信息填充
+                                        <button class="btn btn-sm btn-outline-secondary"
+                                                v-if="item['issue_type']['name'] ==='快递丢件'"
+                                                @click="showFillModel(item,i)">信息填充
                                         </button>
                                     @endcan
                                     @can('订单管理-工单处理-承运商编辑')
-                                        <button class="btn btn-sm btn-outline-secondary" @click="showEditLog(item,i,2)"
-                                                v-if="['快递丢件','破损'].includes(item['issue_type']['name'])">快递处理
+                                        <button class="btn btn-sm btn-outline-secondary"
+                                                v-if="['快递丢件','破损'].includes(item['issue_type']['name'])"
+                                                @click="showEditLog(item,i,2)">快递处理
                                         </button>
                                     @endcan
                                     @can('订单管理-工单处理-宝时编辑')
-                                        <button class="btn btn-sm btn-outline-secondary" @click="showEditLog(item,i,1)"
-                                                v-if="['快递丢件','破损'].includes(item['issue_type']['name'])">宝时处理
+                                        <button class="btn btn-sm btn-outline-secondary"
+                                                v-if="['快递丢件','破损'].includes(item['issue_type']['name'])"
+                                                @click="showEditLog(item,i,1)">宝时处理
                                         </button>
                                     @endcan
                                 </td>
@@ -85,11 +84,11 @@
                                     @can('订单管理-工单处理-宝时编辑')
                                         <select class="form-control form-control-sm"
                                                 :value="item['work_order_status']"
-                                                @change="updateWorkOrderStatus(item,$event)"
-                                                :disabled="item['work_order_status'] === '工单完成'">
+                                                :disabled="item['work_order_status'] === '工单完成'"
+                                                @change="updateWorkOrderStatus(item,$event)">
                                             <option value="">无</option>
-                                            <option :value="status" v-for="status in workOrderStatus">@{{ status }}
-                                            </option>
+                                            <option :value="status" v-for="status in workOrderStatus"
+                                                    v-text="status"></option>
                                         </select>
                                     @else
                                         @{{ item.work_order_status }}
@@ -100,58 +99,53 @@
                                 <td class="text-center">@{{ item.order ? item.order.client_code : ''}}</td>
                                 <td>@{{item.order ? (item.order.logistic ? item.order.logistic.name : '') : '' }}</td>
                                 <td class="text-center">
-                                    <template v-if="item.order">
-                                        <template v-if="item.order.packages && item.order.packages.length === 1">
-                                            <p>@{{ item.order.packages[0].logistic_number }}</p>
-                                        </template>
-                                        <template v-else-if="item.order.packages && item.order.packages.length > 0">
-                                            <template v-if="selectOrder === item.order.id">
-                                                <template v-for="(package,index) in item.order.packages">
-                                                    @{{ package.logistic_number }}
-                                                </template>
-                                            </template>
-                                            <template v-else>
-                                                <p>@{{ item.order.packages[0].logistic_number }}</p>
-                                            </template>
-                                            <button class="btn btn-sm btn-outline-primary" v-show="selectOrder === null"
-                                                    @click="selectOrder = item.order.id">
-                                                展开
+                                    <div v-if="item.order">
+                                        <p v-if="item.order.packages && item.order.packages.length === 1"
+                                           v-text="item.order.packages[0].logistic_number">
+                                        </p>
+                                        <div v-else-if="item.order.packages && item.order.packages.length > 0">
+                                            <div v-if="selectOrder === item.order.id">
+                                                <p v-for="(package,index) in item.order.packages"
+                                                   v-text="package.logistic_number"></p>
+                                            </div>
+                                            <div v-else>
+                                                <p v-text="item.order.packages[0].logistic_number"></p>
+                                            </div>
+                                            <button class="btn btn-sm btn-outline-primary"
+                                                    v-show="selectOrder === null"
+                                                    @click="selectOrder = item.order.id">展开
                                             </button>
                                             <button class="btn btn-sm btn-outline-primary"
                                                     v-show="selectOrder === item.order.id"
-                                                    @click="selectOrder = null">
-                                                收起
+                                                    @click="selectOrder = null">收起
                                             </button>
-                                        </template>
-
-                                    </template>
+                                        </div>
+                                    </div>
                                 </td>
                                 <td>
                                     {{--  承运商处理日志   --}}
                                     <div v-if="item['logistic_log']" class="alert alert-light">
                                         <div>
-                                            承运商处理
-                                            <button @click="selectLogisticLogId = null"
+                                            <span class="text-muted">承运商处理</span>
+                                            <button class="btn btn-sm btn-outline-info float-right"
                                                     v-show="selectLogisticLogId === item['logistic_log']['id']"
-                                                    class="btn btn-sm btn-outline-info float-right">
-                                                隐藏
+                                                    @click="selectLogisticLogId = null">隐藏
                                             </button>
-                                            <button @click="selectLogisticLogId = item['logistic_log']['id']"
+                                            <button class="btn btn-sm btn-outline-info float-right"
                                                     v-show="selectLogisticLogId !== item['logistic_log']['id']"
-                                                    class="btn btn-sm btn-outline-info float-right">
-                                                显示
+                                                    @click="selectLogisticLogId = item['logistic_log']['id']">显示
                                             </button>
                                         </div>
                                         <transition name="fade">
                                             <div v-show="selectLogisticLogId === item['logistic_log']['id']">
                                                 <div>
                                                     <span class="mr-2">是否赔偿：</span>
-                                                    <span v-text="item['logistic_log']['is_indemnity']"
-                                                          class="text-primary"></span>
+                                                    <span class="text-truncate"
+                                                          v-text="item['logistic_log']['is_indemnity']"></span>
                                                 </div>
                                                 <div v-if="item['logistic_log']['is_indemnity'] === '是'">
                                                     <span class="mr-2">赔偿金额：</span>
-                                                    <span class="text-primary"
+                                                    <span class="text-truncate"
                                                           v-text="item['logistic_log']['indemnity']"></span>
                                                 </div>
                                                 <div v-if="item['logistic_log']['is_indemnity'] === '否'">
@@ -161,52 +155,47 @@
                                             </div>
                                         </transition>
                                     </div>
-
-
                                     <div v-if="item['process_log']" class="alert alert-light">
                                         <div>
-                                            宝时处理
-                                            <button @click="selectBaoShiLogId = null"
+                                            <span class="text-muted">宝时处理</span>
+                                            <button class="btn btn-sm btn-outline-info float-right"
                                                     v-if="selectBaoShiLogId === item['process_log']['id']"
-                                                    class="btn btn-sm btn-outline-info float-right">
-                                                隐藏
+                                                    @click="selectBaoShiLogId = null">隐藏
                                             </button>
-                                            <button @click="selectBaoShiLogId = item['process_log']['id']"
+                                            <button class="btn btn-sm btn-outline-info float-right"
                                                     v-if="selectBaoShiLogId !== item['process_log']['id']"
-                                                    class="btn btn-sm btn-outline-info float-right">
-                                                显示
+                                                    @click="selectBaoShiLogId = item['process_log']['id']">显示
                                             </button>
                                         </div>
                                         <transition name="fade">
                                             <div v-show="selectBaoShiLogId === item['process_log']['id']">
                                                 <div>
-                                                    <span>是否赔偿: </span>
+                                                    <span class="text-muted">是否赔偿: </span>
                                                     <span v-text="item['process_log']['is_indemnity']"
-                                                          class="ml-2 text-primary"></span></div>
+                                                          class="ml-2 text-truncate"></span></div>
                                                 <div v-if="item['process_log']['is_indemnity'] === '是'">
-                                                    <span>赔偿方：</span>
-                                                    <span class="text-primary"
+                                                    <span class="text-muted">赔偿方：</span>
+                                                    <span class="text-truncate"
                                                           v-text="item['process_log']['indemnitor']"></span>
                                                 </div>
                                                 <div v-if="item['process_log']['is_indemnity'] === '是'">
-                                                    <span>赔偿金额：</span>
-                                                    <span class="ml-2 text-primary"
+                                                    <span class="text-muted">赔偿金额：</span>
+                                                    <span class="ml-2 text-truncate"
                                                           v-text="item['process_log']['indemnity']"></span>
                                                 </div>
                                                 <div v-if="item['process_log']['is_indemnity'] === '否'">
-                                                    <span>不赔偿理由：</span>
+                                                    <span class="text-muted">不赔偿理由：</span>
                                                     <span class="ml-2" v-text=" item['process_log']['remark']"></span>
                                                 </div>
                                             </div>
                                         </transition>
                                     </div>
-
                                 </td>
                                 <td>
                                     {{-- 工单详情 --}}
-                                    <div v-if="item.details.length > 0" class="alert alert-light">
+                                    <div v-if="item.details.length > 0" class="alert alert-light mb-0">
                                         <div class="header-alert">
-                                            工单详情
+                                            <span class="text-monospace">工单详情</span>
                                             <button type="button" class="btn btn-sm btn-outline-primary float-right"
                                                     v-show="selectDetailId !== item.id"
                                                     @click="selectDetailId = item.id">显示
@@ -216,44 +205,153 @@
                                                     @click="selectDetailId = null">隐藏
                                             </button>
                                         </div>
-                                        <div class="body-alert" v-if="selectDetailId === item.id">
-                                            <div v-for="(detail,i) in item.details">
-                                                {{-- 快递丢件工单详情 --}}
-                                                <div v-if="item['issue_type']['name'] === '快递丢件'">
-                                                    <div v-if="detail['logistic_number']">
-                                                        <span class="mr-3">丢件快递单号:</span>
-                                                        <span v-text="detail['logistic_number']" class="text-primary"></span>
+                                        <transition name="fade">
+                                            <div class="body-alert" v-if="selectDetailId === item.id">
+                                                <div class="card-body row col-12 mb-0 pb-0"
+                                                     v-for="(detail,i) in item.details">
+                                                    {{-- 快递丢件工单详情 --}}
+                                                    <div v-if="item['issue_type']['name'] === '快递丢件'">
+                                                        <div v-if="detail.logistic_number">
+                                                            <span class="mr-3">丢件快递单号:</span>
+                                                            <span class="text-truncate"
+                                                                  v-text="detail.logistic_number"></span>
+                                                        </div>
+                                                        <div>
+                                                            <span class="mr-3">丢件价值:</span>
+                                                            <span class="text-truncate"
+                                                                  v-text="detail.price"></span>
+                                                        </div>
+                                                        {{-- 工单登记商品详情 --}}
+                                                        <div v-for="(item,i) in item.commodities">
+                                                            <span class="mr-2">sku</span>
+                                                            <span v-text="item.sku"></span>
+                                                            <span class="mr-2">商品名</span>
+                                                            <span
+                                                                v-text="item.commodity ? item.commodity.name : ''"></span>
+                                                            <span class="mr-2">数量</span>
+                                                            <span v-text="item.amount"></span>
+                                                        </div>
                                                     </div>
-                                                    <div>
-                                                        <span class="mr-3">丢件价值:</span>
-                                                        <span v-text="detail['price']" class="text-primary"></span>
+
+                                                    {{-- 破损工单详情 --}}
+                                                    <div v-if="item['issue_type']['name'] === '破损'">
+                                                        <div>
+                                                            <div>
+                                                                <span class="mr-3">破损sku数:</span>
+                                                                <span class="text-truncate"
+                                                                      v-text="detail.sku_amount"></span>
+                                                            </div>
+                                                            <div>
+                                                                <span class="mr-3">快递单号:</span>
+                                                                <span class="text-truncate"
+                                                                      v-text="detail.logistic_number"></span>
+                                                            </div>
+                                                            <div>
+                                                                <span class="mr-3">破损商品价值:</span>
+                                                                <span v-text="detail.price"></span>
+                                                            </div>
+                                                        </div>
+
                                                     </div>
-                                                </div>
-                                                {{-- 破损工单详情 --}}
-                                                <div v-if="item['issue_type']['name'] === '破损'">
-                                                    <div>
-                                                        <span class="mr-3">破损sku数:</span>
-                                                        <span class="text-primary" v-text="detail.sku_amount"></span>
+                                                    {{-- 交易截图 --}}
+                                                    <div class="row"
+                                                         v-if="item['deal_images'] && item['deal_images'].length > 0">
+                                                        <div class="col-12">
+                                                            <hr>
+                                                            <span class="text-monospace" v-text="'交易截图'"></span>
+                                                        </div>
+                                                        <div class="card-body col-sm-6"
+                                                             v-for="(dealImage,i) in item['deal_images']">
+                                                            <div class="">
+                                                                <a  target="_blank"
+                                                                    :href="filePrefix+dealImage.upload_file.url + '.'+dealImage.upload_file.type">
+                                                                    <img class="image-w"
+                                                                         :src="filePrefix+dealImage.upload_file.url + '.'+dealImage.upload_file.type"
+                                                                         alt="交易截图">
+                                                                </a>
+                                                            </div>
+                                                        </div>
                                                     </div>
-                                                    <div>
-                                                        <span class="mr-3">破损商品价值</span>
-                                                        <span class="text-primary" v-text="detail.price"></span>
+                                                    {{-- 退款截图 --}}
+                                                    <div class="row"
+                                                         v-if="item['refund_image'] && item['refund_image'].length > 0">
+                                                        <div class="col-12">
+                                                            <hr>
+                                                            <span class="text-monospace" v-text="'退款截图'"></span>
+                                                        </div>
+                                                        <div class="card-body col-sm-6"
+                                                             v-for="(refundImage,i) in item['refund_images']">
+                                                            <a target="_blank"
+                                                                :href="filePrefix+refundImage.upload_file.url + '.'+refundImage.upload_file.type">
+                                                                <img class="image-w"
+                                                                     :src="filePrefix+refundImage.upload_file.url + '.'+refundImage.upload_file.type"
+                                                                     alt="退款截图">
+                                                            </a>
+                                                        </div>
                                                     </div>
-                                                    {{-- 工单登记商品详情 --}}
-                                                    <div v-for="(item,i) in item.commodities">
-                                                        <span class="mr-2">sku</span>
-                                                        <span v-text="item.sku"></span>
-                                                        <span class="mr-2">商品名</span>
-                                                        <span v-text="item.commodity ? item.commodity.name : ''"></span>
-                                                        <span class="mr-2">数量</span>
-                                                        <span v-text="item.amount"></span>
+                                                    {{-- 外包装截图 --}}
+                                                    <div class="row"
+                                                         v-if="item['package_images'] && item['package_images'].length > 0">
+                                                        <div class="col-12">
+                                                            <hr>
+                                                            <span class="text-monospace" v-text="'外包装截图'"></span>
+                                                        </div>
+                                                        <div class="card-body col-sm-6"
+                                                             v-for="(packageImage,i) in item['package_images']">
+                                                            <a target="_blank"
+                                                               :href="filePrefix+packageImage.upload_file.url + '.'+packageImage.upload_file.type">
+                                                                <img class="image-w"
+                                                                     :src="filePrefix+packageImage.upload_file.url + '.'+packageImage.upload_file.type"
+                                                                     alt="外包装截图">
+                                                            </a>
+                                                        </div>
                                                     </div>
-                                                    <div>
-                                                        图片
+                                                    {{-- 内物破损图片 --}}
+                                                    <div class="row"
+                                                         v-if="item['commodity_images'] && item['commodity_images'].length > 0">
+                                                        <div class="col-12">
+                                                            <hr>
+                                                            <span class="text-monospace" v-text="'内物破损图片'"></span>
+                                                        </div>
+                                                        <div class="card-body col-sm-6"
+                                                             v-for="(commodityImage,i) in item['commodity_images']">
+                                                            <a target="_blank"
+                                                               :href="filePrefix+commodityImage.upload_file.url  + '.'+commodityImage.upload_file.type">
+                                                                <img class="image-w"
+                                                                     :src="filePrefix+commodityImage.upload_file.url + '.'+commodityImage.upload_file.type"
+                                                                     alt="内物破损图片">
+                                                            </a>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                                {{-- 破损商品详情 --}}
+                                                <div class="row"
+                                                     v-if="item['issue_type']['name'] === '破损'">
+                                                    <div class="col-12">
+                                                        <hr>
+                                                        <div class="text-monospace">破损商品详情</div>
+                                                    </div>
+                                                    <div class="card-body col-12"
+                                                         v-for="(commodity,i) in item.commodities">
+                                                        <div>
+                                                            <span class="mr-3">SKU:</span>
+                                                            <span class="text-truncate" v-text="commodity.sku"></span>
+                                                        </div>
+                                                        <div>
+                                                            <span class="mr-3">商品名称:</span>
+                                                            <span class="text-truncate"
+                                                                  v-text="commodity.commodity ? commodity.commodity.name : '' "></span>
+                                                        </div>
+                                                        <div>
+                                                            <span class="mr-3">数量:</span>
+                                                            <span class="text-truncate"
+                                                                  v-text="commodity.amount"></span>
+                                                        </div>
                                                     </div>
                                                 </div>
                                             </div>
-                                        </div>
+                                        </transition>
                                     </div>
                                 </td>
                                 <td class="text-center">
@@ -385,19 +483,26 @@
     <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <style>
         .fade-enter-active, .fade-leave-active {
-            transition: opacity .5s;
+            transition: opacity .3s;
         }
 
         .fade-enter, .fade-leave-to {
             opacity: 0;
         }
+
+        .image-div {
+        }
+
+        .image-w {
+            width: 100%;
+        }
     </style>
     <script>
         let list = new Vue({
             el: "#list",
             data: {
                 workOrders: {!! $workOrders->toJson() !!}['data'],
-                selectTr: null,
+
                 form: null,
                 logistics: [
                         @foreach($logistics as $logistic)
@@ -439,6 +544,7 @@
                     indemnitor: null, // 赔偿方
                 },
                 workOrderStatus: ['信息未填写', '信息已填写', '快递已处理', '工单完成'],
+                selectTr: null,
                 selectOrderPackage: null,
                 selectOrder: null,
                 selectLogisticLogId: null,
@@ -446,6 +552,7 @@
                 selectDetailId: null,
                 selectOrderIssue: null,
                 selectIssueType: '',
+                filePrefix: "{{asset("/storage")}}",
             },
             mounted() {
                 let data = [[
@@ -487,7 +594,7 @@
                     el: '#form_div',
                     condition: data,
                 });
-                this.form.init();
+                // this.form.init();
                 let column = [
                     {name: 'no', value: '序号', neglect: true},
                     {name: 'operation', value: '操作', neglect: true},
@@ -529,7 +636,6 @@
                     data: this.workOrders,
                     fixedTop: ($('#form_div').height()) + 2,
                 }).init();
-
                 $("#list").removeClass("d-none");
             },
             created() {
@@ -895,7 +1001,7 @@
                             window.tempTip.show(res.data.message);
                         }
                     }).catch(err => {
-                        window.template.show(err);
+                        window.tempTip.show(err);
                     });
                 },
                 showEditLog(item, index, type) {