临时提交

app/Http/Requests/Demand/DemandRequest.php

@@ -11,27 +11,31 @@ class DemandRequest extends FormRequest
 {
     use RequestApiFormValidation;
 
-    private $storeApiRules = [
+    protected $storeApiRules = [
         'description' => 'required',
         'type' => 'required',
     ];
 
-    private $storeApiMessage = [
+    protected $storeApiMessage = [
         'description.required' => '需求描述为必填项',
         'type.required' => '需求类型为必填项',
     ];
 
-    private $updateApiRules = [];
+    protected $updateApiRules = [];
 
-    private $updateApiMessage = [];
+    protected $updateApiMessage = [];
 
-    private $uploadFileApiRules = [];
+    protected $uploadFileApiRules = [
+        'file' => 'required'
+    ];
 
-    private $uploadFileApiMessage = [];
+    protected $uploadFileApiMessage = [
+        'file.required' => '请选择上传文件'
+    ];
 
-    private $destroyApiRules = ['id' => 'required'];
+    protected $destroyApiRules = ['id' => 'required'];
 
-    private $destroyApiMessage = ['id.required' => 'id不能为空'];
+    protected $destroyApiMessage = ['id.required' => 'id不能为空'];
 
     public function authorize(): bool
     {
@@ -40,8 +44,8 @@ class DemandRequest extends FormRequest
 
     public function rules(): array
     {
-        $currentRoute = Route::getCurrentRoute();
-        $routeName = $currentRoute->getName();
+        $routeName = Route::currentRouteName();
+        dd($routeName);
         switch ($routeName) {
             case 'demand.storeApi':
                 return $this->storeApiRules;
@@ -58,8 +62,8 @@ class DemandRequest extends FormRequest
 
     public function messages(): array
     {
-        $currentRoute = Route::getCurrentRoute();
-        $routeName = $currentRoute->getName();
+        $routeName = Route::currentRouteName();
+        dd($routeName);
         switch ($routeName) {
             case 'demand.storeApi':
                 return $this->storeApiMessage;

app/Http/Requests/Demand/Process/DemandProcessRequest.php

@@ -28,8 +28,7 @@ class DemandProcessRequest extends FormRequest
 
     public function rules(): array
     {
-        $currentRoute = Route::getCurrentRoute();
-        $routeName = $currentRoute->getName();
+        $routeName = Route::currentRouteName();
         switch ($routeName) {
             case 'demand.process.storeApi':
                 return $this->storeApiRules;
@@ -40,8 +39,7 @@ class DemandProcessRequest extends FormRequest
 
     public function messages(): array
     {
-        $currentRoute = Route::getCurrentRoute();
-        $routeName = $currentRoute->getName();
+        $routeName = Route::getCurrentRoute();
         switch ($routeName) {
             case 'demand.process.storeApi':
                 return $this->storeApiMessage;

resources/views/maintenance/demand/_create.blade.php

@@ -15,7 +15,7 @@
 
 
     <div class="modal" tabindex="-1" id="add-demand">
-        <div class="modal-dialog modal-lg">
+        <div class="modal-dialog modal-lg modal-dialog-centered">
             <div class="modal-content">
                 <div class="modal-header">
                     <h4>问题详情添加</h4>
@@ -42,7 +42,7 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="add-demand-type" class="col-sm-2 col-form-label text-right">问题类型</label>
+                        <label for="add-demand-type" class="col-sm-2 col-form-label text-right text-primary">问题类型&nbsp;*</label>
                         <div class="col-sm-10 form-inline">
                             <select name="add-demand-auth" id="add-demand-type" class="form-control col-sm-10"
                                     v-model="addDemand.type"
@@ -57,7 +57,7 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="add-demand-description" class="col-sm-2 col-form-label text-right">问题描述</label>
+                        <label for="add-demand-description" class="col-sm-2 col-form-label text-right text-primary">问题描述&nbsp;*</label>
                         <div class="col-sm-10 form-inline">
                             <textarea  id="add-demand-description" class="form-control col-sm-10"
                                        v-model="addDemand.description"

resources/views/maintenance/demand/_createjs.blade.php

@@ -64,6 +64,8 @@
                         $('#add-demand').modal('hide')
                         return;
                     }
+                    console.log(res.data.data);
+                    if(res.data.data)this.addDemand = res.data.data;
                     window.tempTip.show('问题提交失败');
                 }).catch(err => {
                     window.tempTip.show(err);

resources/views/maintenance/demand/_uploadFile.blade.php

@@ -15,7 +15,7 @@
                     </div>
                 </div>
                 <div>
-                    <input type="file" class=" form-control-file" id="upLoadFile-input" ref="file">
+                    <input type="file" class=" form-control-file" id="upLoadFile-input" ref="file" @focus="uploadError = null">
                 </div>
                 <div>
                     <span class="text-secondary mt-1">文件大小不能超过10MB</span>

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

@@ -155,10 +155,16 @@
                     formData.append('id', this.selectDemand);
                     let file = fileInput.files[0];
                     formData.append('file', file);
-
                     tempTip.setDuration(9999)
                     tempTip.setIndex(1051)
-                    tempTip.waitingTip('上传中......')
+                    tempTip.waitingTip('上传中......');
+
+                    // if(fileInput.files.length === 0){
+                    //     tempTip.cancelWaitingTip();
+                    //     this.uploadError = ['请选择上传文件'];
+                    //     return;
+                    // }
+
                     let that = this;
                     window.axios.post(url, formData, {
                         'Content-Type': 'multipart/form-data'
@@ -179,6 +185,7 @@
                         }
                         window.tempTip.show('文件上传失败');
                     }).catch(err => {
+                        tempTip.cancelWaitingTip()
                         window.tempTip.show('文件上传异常：' + err);
                     });
                 },