js更新

resources/views/inventory/statement/changeInventory.blade.php

@@ -67,8 +67,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/inventory/statement/menu.blade.php

@@ -6,7 +6,7 @@
             <ul class="nav nav-pills">
                 @can('库存管理-动库报表')
                     <li class="nav-item">
-                        <a class="nav-link text-dark" href="{{url('inventory/statement/changeInventory')}}" :class="{active:isActive('changeInventory',3)}">动库报表</a>
+                        <a class="nav-link text-dark" href="{{url('inventory/statement/changeInventory?range=1')}}" :class="{active:isActive('changeInventory',3)}">动库报表</a>
                     </li> @endcan
             </ul>
         </div>

resources/views/layouts/menu.blade.php

@@ -28,7 +28,7 @@
                     <span class="fa fa-balance-scale" style="color: #1b7234"></span>
                     称重管理</a></li> @endcan
         @can('库存管理')
-            <li class="nav-item"><a href="{{url("inventory/statement/changeInventory")}}" class="nav-link"
+            <li class="nav-item"><a href="{{url("inventory/statement/changeInventory?range=1")}}" class="nav-link"
                                     :class="{active:isActive('inventory',1)}">
                     <span class="fa fa-list-alt" style="color: #32721b"></span>
                     库存管理</a></li> @endcan

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

@@ -172,8 +172,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/order/wave/search.blade.php

@@ -82,7 +82,7 @@
 @endsection
 
 @section("lastScript")
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
     <script>
         let vueList = new Vue({
             el: "#wave_div",

resources/views/personnel/laborReport/index.blade.php

@@ -231,8 +231,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
     <script>
         let today=(new Date());
         function isTomorrow(){

resources/views/process/index.blade.php

@@ -475,8 +475,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
     <script>
         new Vue({
             el:"#process",
@@ -627,7 +627,7 @@
                 processExport(checkAllSign) {
                     let url = '{{url('process/export')}}';
                     let token='{{ csrf_token() }}';
-                    //excelExport 定义在 js/queryForm/export.js
+                    //excelExport 定义在 js/queryForm/export200804.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
                 //获取登记工时
@@ -1412,7 +1412,8 @@
                     })
                 },
                 show(id) {
-                    window.location.href = '{{url('process')}}/' + id;
+                    {{--window.location.href = '{{url('process')}}/' + id;--}}
+                    window.open('{{url('process')}}/' + id,'_blank') ;
                 },
                 //修改价格
                 updateUnitPrice(process) {

resources/views/process/show.blade.php

@@ -98,7 +98,7 @@
     </div>
     <div class="col  row">
         <label class="col-2 text-dark" for="tutorials">教程：</label>
-        <span class="col-8  text-danger font-weight-bold" v-if="process.tutorials.length<1">暂无</span>
+        <span class="col-8  font-weight-bold" v-if="process.tutorials.length<1">暂无</span>
         <div v-else id="tutorials" class="col-8  text-muted" style="white-space: normal">
             <b @click="tutorialShow(tutorial.id)" style="cursor: pointer;text-decoration:underline" class="text-primary" v-for="tutorial in process.tutorials">@{{ tutorial.name }}<br></b>
         </div>
@@ -123,4 +123,4 @@
             },
         });
     </script>
-@stop
+@stop

resources/views/rejected/recycle.blade.php

@@ -257,7 +257,7 @@
                         order_number:'{{$rejectedBill->order_number}}',sender:'{{$rejectedBill->sender}}',
                         is_hide:false,
                         mobile_sender:'{{$rejectedBill->mobile_sender}}',logistic_number:'{{$rejectedBill->logistic_number}}',
-                        logistic_number_return:'{{$rejectedBill->logistic_number_return}}',logistic:{!!$rejectedBill->logistic ?? ''!!},
+                        logistic_number_return:'{{$rejectedBill->logistic_number_return}}',logistic:{!!$rejectedBill->logistic ?? "''"!!},
                         fee_collected:'{{$rejectedBill->fee_collected}}',goods_amount:'{{$rejectedBill->goods_amount}}',
                         is_loaded:'{{$rejectedBill->is_loaded_null}}',operator_name:'{{$rejectedBill->operator_name}}',detailFolding:true,
                         items:{!! $rejectedBill->items !!},is_finished:'{{$rejectedBill->is_finished}}',

resources/views/rejected/search/analyze.blade.php

@@ -67,7 +67,7 @@
 @endsection
 
 @section('lastScript')
-    <script src="{{asset('js/queryForm/export.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200804.js')}}"></script>
     <script src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         new Vue({

resources/views/rejected/search/general.blade.php

@@ -208,8 +208,8 @@
         let ajaxFinishAllUrl='{{url("rejected/ajaxFinishAll")}}';
         let csrfInput='@csrf';
     </script>
-    <script src="{{asset('js/queryForm/export.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200803b.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200804.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/waybill/index.blade.php

@@ -361,8 +361,8 @@
             -webkit-animation-play-state: running;
         }
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',

resources/views/weight/package/index.blade.php

@@ -77,8 +77,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

webpack.mix.js

@@ -22,5 +22,5 @@ mix.copy('resources/images','public/images');
 mix.copy('resources/icon/faviconc.ico','public/faviconc.ico');
 mix.js('resources/js/trix.js','public/js/trix.js');
 mix.copy('resources/sass/trix.css','public/css/trix.css');
-mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200803b.js');
-mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200804.js');
+mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200804.js');