修改路由和 页面

resources/views/demand/menu.blade.php

@@ -0,0 +1,10 @@
+<div class="container-fluid nav2" id="nav2">
+    <div class="card">
+        <ul class="nav nav-pills">
+            <li class="nav-item">
+                <a target="finance/instantBill" class="nav-link" href="{{url('demand/')}}" :class="{active:isActive('demand',1)}">问题</a>
+            </li>
+        </ul>
+    </div>
+</div>
+

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

@@ -4,14 +4,15 @@
 
 @section('content')
     <nav id="nav2">
-        @component('maintenance.menu')@endcomponent
+        @component('demand.menu')@endcomponent
+        @component('demand.search.menu')@endcomponent
     </nav>
 
     <div class="container-fluid d-none" id="list">
         <div id="form_div"></div>
 
-        @include('maintenance.demand._table')
-        @include('maintenance.demand._uploadFile')
+        @include('demand.search._table')
+        @include('demand.search._uploadFile')
 
     </div>
 @endsection
@@ -31,7 +32,7 @@
                     {name: 0, value: '需求'}, {name: 1, value: '问题'}
                 ],
                 selectTr: null,
-                uploadError: null,
+                uploadError: [],
                 selectDemand: null,
                 selectIndex: null,
                 imgs: [],
@@ -159,11 +160,11 @@
                     tempTip.setIndex(1051)
                     tempTip.waitingTip('上传中......');
 
-                    // if(fileInput.files.length === 0){
-                    //     tempTip.cancelWaitingTip();
-                    //     this.uploadError = ['请选择上传文件'];
-                    //     return;
-                    // }
+                    if(fileInput.files.length === 0){
+                        tempTip.cancelWaitingTip();
+                        this.uploadError = ['请选择上传文件'];
+                        return;
+                    }
 
                     let that = this;
                     window.axios.post(url, formData, {
@@ -183,6 +184,7 @@
                             this.$forceUpdate();
                             return;
                         }
+                        if(res.data.errors)this.uploadError = res.data.errors;
                         window.tempTip.show('文件上传失败');
                     }).catch(err => {
                         tempTip.cancelWaitingTip()
@@ -230,6 +232,7 @@
                 showUploadDiv(demand, index) {
                     this.selectDemand = demand['id'];
                     this.selectIndex = index;
+                    this.uploadError = [];
                     $('#uploadFile').modal('show');
                 },
                 lazy() {

resources/views/demand/search/menu.blade.php

@@ -0,0 +1,10 @@
+<div class="container-fluid nav3">
+    <div class="card">
+        <ul class="nav nav-pills">
+            <li class="nav-item">
+                <a target="finance/instantBill" class="nav-link" href="{{url('demand/')}}" :class="{active:isActive('demand',1)}">查询</a>
+            </li>
+        </ul>
+    </div>
+</div>
+

resources/views/layouts/menu.blade.php

@@ -62,6 +62,11 @@
                                         :class="{active:isActive('procurement',1)}">
                         <span class="fa fa-cart-plus" style="color: #1b4b72"></span>
                         采购管理</a></li>@endcan
+
+            <li class="nav-item"><a href="{{url("demand/")}}" class="nav-link"
+                                    :class="{active:isActive('demand',1),'d-none':!isActive('demand',1)}">
+                    <span class="fa fa-cart-plus" style="color: #1b4b72"></span>
+                    需求管理</a></li>
         @can('基础设置')
             <li class="nav-item"><a href="{{url("maintenance")}}" class="nav-link" target="maintenance"
                                     :class="{active:isActive('maintenance',1)}">

routes/web.php

@@ -257,9 +257,7 @@ Route::group(['prefix'=>'maintenance'],function(){
     Route::post('mail/active', 'SendEmailsController@active')->name('mail.active');
 
 
-    Route::group(['prefix'=>'demand'],function (){
-        Route::get('/','DemandController@index');
-    });
+
 });
 Route::get('maintenance', function () {return view('maintenance.index');});
 
@@ -826,3 +824,7 @@ Route::group(['prefix'=>'procurement'],function () {
     Route::get('relating',function (){return view('procurement.menuProcurement');});
 });
 
+/** 需求管理 */
+Route::group(['prefix'=>'demand'],function (){
+    Route::get('/','DemandController@index');
+});