Sfoglia il codice sorgente

为创建破损工单添校验

ajun 4 anni fa
parent
commit
6d672addf5

+ 13 - 8
app/Http/Requests/WorkOrder/WorkOrderRequest.php

@@ -50,11 +50,11 @@ class WorkOrderRequest extends FormRequest
     public function damagedApiRule(): array
     {
         return [
-            'name' => 'required',
-            'order_no' => 'required',
-            'packageImages' => 'required',
-            'commodityImages' => 'required',
-            'dealImages' => 'required',
+            'name' => 'required|string',
+            'order_no' => 'required|string',
+            'packageImages' => 'required|array',
+            'commodityImages' => 'required|array',
+            'dealImages' => 'required|array',
             ];
     }
 
@@ -62,10 +62,15 @@ class WorkOrderRequest extends FormRequest
     {
         return [
             'name.required' => '未指定工单类型',
+            'name.string' => '工单类型格式不争取',
             'order_no.required' => '未指定订单',
-            'packageImages' => '未上传外包装图片',
-            'commodityImages' => '未上传内物图片',
-            'dealImages' => '未上传交易图片',
+            'order_no.string' => '订单数据格式不正确',
+            'packageImages.required' => '未上传外包装图片',
+            'packageImages.array' => '外包装图片按数组格式上传',
+            'commodityImages.required' => '未上传内物图片',
+            'commodityImages.array' => '内物图片按数组格式上传',
+            'dealImages.required' => '未上传交易图片',
+            'dealImages.array' => '交易图片按数组格式上传',
         ];
     }
 }

+ 6 - 6
resources/views/order/workOrder/index.blade.php

@@ -65,13 +65,15 @@
                                             审核
                                         </button>
                                     @endcan
-
+                                    @can('订单管理-工单处理-货主编辑')
                                     <button class="btn btn-sm btn-outline-secondary" @click="showFillModel(item,i)" v-if="item['issue_type']['name'] ==='快递丢件'">信息填充</button>
-
+                                    @endcan
+                                    @can('订单管理-工单处理-承运商编辑')
                                     <button class="btn btn-sm btn-outline-secondary" @click="showEditLog(item,i,2)" v-if="['快递丢件','破损'].includes(item['issue_type']['name'])">快递处理</button>
-
+                                    @endcan
+                                    @can('订单管理-工单处理-宝时处理')
                                     <button class="btn btn-sm btn-outline-secondary" @click="showEditLog(item,i,1)" v-if="['快递丢件','破损'].includes(item['issue_type']['name'])">宝时处理</button>
-
+                                    @endcan
                                 </td>
                                 <td class="text-center">@{{ item.status }}</td>
                                 <td class="text-center">@{{ item.owner ? item.owner.name : '' }}</td>
@@ -786,7 +788,6 @@
                     window.tempTip.waitingTip('操作中请稍后');
                     window.axios.post(url,data).then(res=>{
                         window.tempTip.cancelWaitingTip();
-                        window.tempTip.setIndex(1999);
                         window.tempTip.setDuration(2000);
                         if (res.data.success){
                             window.tempTip.showSuccess('创建成功');
@@ -795,7 +796,6 @@
                             window.tempTip.show(res.data.message ? res.data.message : '创建异常,刷新页面重试');
                         }
                     }).catch(err=>{
-                        window.tempTip.setIndex(1999);
                         window.tempTip.setDuration(2000);
                         window.tempTip.show(err);
                     });