Merge branch 'master' into zengjun

# Conflicts:
#	resources/js/utilities/tempTip.js

app/Http/Controllers/StoreCheckingReceiveController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Imports\StoreCheckingReceiveImport;
+use App\Imports\StoreCheckingReceiveSheets;
 use App\Services\CommodityService;
 use App\Services\LogService;
 use App\Services\OracleDocAsnDetailService;
@@ -33,11 +33,10 @@ class StoreCheckingReceiveController extends Controller
         $fileSuffix=$request->file('file')->getClientOriginalExtension();
         if ($fileSuffix != 'xlsx' && $fileSuffix != 'xls' && $fileSuffix != 'csv')
             return ['success'=>false,'data'=>'不支持该文件类型'];
-        $isCovering = $request->input('isCovering');
         ini_set('max_execution_time',2500);
         ini_set('memory_limit','1526M');
         $fileSuffix = ucwords($fileSuffix);
-        Excel::import(new StoreCheckingReceiveImport($isCovering),$request->file('file')->path(),null,$fileSuffix);
+        Excel::import(new StoreCheckingReceiveSheets(),$request->file('file')->path(),null,$fileSuffix);
         if (Cache::has('storeCheckingReceive')){
             return Cache::pull('storeCheckingReceive');
         }

app/Http/Controllers/api/thirdPart/haiq/StorageController.php

@@ -10,6 +10,31 @@ use Illuminate\Support\Facades\Request;
 
 class StorageController
 {
+    protected $request;
+
+    public function __construct()
+    {
+        $stockInfo = [
+            "skuCode" => "TEST-BSSKU",//商品编码 sku
+            "qty" => 9,//数量
+        ];
+        $bin = [
+            "taskCode" => "TEST-BS2010100001",//任务编号
+            "binCode" => "TEST-BIN01",//料箱编码
+            "fromLocCode" => "TEST-J04-058-3",//源库位编码
+            "toLocCode" => "TEST-J24-128-7",//目标库位编码 出库填多个，表示这些库位都可以支持
+            "sequence" => -1,//出库顺序 -1表示没有顺序，只有移库出库时需要指定顺序，其他可为-1
+            "stockInfo" => [$stockInfo],//商品信息
+        ];
+        $this->request = [[
+            "groupCode" => 1,//组号/波次号 决定了出库的顺序,越大优先级越高
+            "taskMode" => 1,//任务模式 1(拣货出库) 2(入库指定料箱出库) 3(盘点出库) 4(移库出库) 5(入库不指定料箱出库)
+            "priority" => 99,//优先级 1-100 1最低
+            "sequenceFlag" => -1,//出库顺序 -1表示没有顺序，只有移库出库时需要指定顺序，其他可为-1
+            "bins" => [$bin],//可执行货箱任务
+        ]];
+    }
+
     public function out(Request $request){
         $bin = [
             "taskCode" => "TEST-BS2010100001",//任务编号
@@ -27,7 +52,7 @@ class StorageController
             "bins" => [$bin],//可执行货箱任务
         ]];
 
-        $response = Http::post(config('api.haiq.storage.out'),$req);
+        $response = Http::post(config('api.haiq.storage.out'),$this->request);
         return $response;
         if ($response["code"] != 200){
             LogService::log(__METHOD__,"haiq-料箱出库失败","REQUEST：".json_encode($req)." | RESPONSE：".$response);
@@ -52,7 +77,7 @@ class StorageController
             "stockInfo" => [$stockInfo],//商品信息
         ]];
 
-        $response = Http::post(config('api.haiq.storage.in'),$req);
+        $response = Http::post(config('api.haiq.storage.in'),$this->request);
         return $response;
         if ($response["code"] != 200){
             LogService::log(__METHOD__,"haiq-料箱回库失败","REQUEST：".json_encode($req)." | RESPONSE：".$response);

app/Imports/StoreCheckingReceiveImport.php

@@ -14,14 +14,6 @@ use Maatwebsite\Excel\Imports\HeadingRowFormatter;
 HeadingRowFormatter::default('none');
 class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
 {
-    /** @var bool $isOverride
-     *  是否覆盖
-     */
-    protected $isOverride;
-    public function __construct($isOverride)
-    {
-        $this->isOverride=$isOverride ? true : false;
-    }
 
     /**
      * @param Collection $collection

app/Imports/StoreCheckingReceiveSheets.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Imports;
+
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+
+class StoreCheckingReceiveSheets implements WithMultipleSheets
+{
+    public function sheets(): array
+    {
+        // TODO: Implement sheets() method.
+        return [
+          0 => new StoreCheckingReceiveImport(),
+        ];
+    }
+
+}

app/Services/CommodityService.php

@@ -145,6 +145,7 @@ Class CommodityService
         return $query->get();
     }
 
+    /* 批量更新 */
     public function batchUpdate(array $params){
         return app(BatchUpdateService::class)->batchUpdate('commodities', $params);
     }
@@ -174,7 +175,7 @@ Class CommodityService
         return $commodities->get();
     }
 
-    /* 通过货主代码与条形码寻找FLUX商品补充至WMS */
+    /* 通过货主代码与条形码寻找FLUX商品补充至WMS 单条*/
     public function ownerAndBarcodeFirstOrCreate(Owner $owner,$barcode){
         $wmsCommodity = app('oracleBasSkuService')->first(['customerid'=>$owner->code, 'barcode'=>$barcode]);
         if (!$wmsCommodity) return null;

config/api.php

@@ -32,7 +32,8 @@ return [
     'haiq'=>[
         'storage'=>[
             'out' => "http://59.37.126.227:65448/api/haiqEss/gr/HAIQ_ESS_BIN_OUTBOUND_MSG",
-            'in' => "http://59.37.126.227:65448/api/haiqEss/gr/HAIQ_ESS_BIN_INBOUND_MSG",
+            //'in' => "http://59.37.126.227:65448/api/haiqEss/gr/HAIQ_ESS_BIN_INBOUND_MSG",
+            'in' => "http://59.37.126.227:65448/api/haiqEss/gr/relocate",
         ],
     ],
 

database/migrations/2020_07_29_160826_create_order_issues_table.php

@@ -22,7 +22,7 @@ class CreateOrderIssuesTable extends Migration
             $table->string('send_back_number')->nullable()->index()->comment('退回单号');
             $table->enum('is_new_rejecting',['无','有','已处理'])->default('无')->index()->comment('有新退件');
             $table->integer('rejected_bill_id')->index()->nullable()->comment('退回单');
-            $table->enum('rejecting_status', ['无', '未退回', '全部退回', '部分退回', '差异退回', '超量退回', '全部退回'])->default('无')->index()->comment('退回状态');
+            $table->enum('rejecting_status', ['无', '未退回', '全部退回', '部分退回', '差异退回', '超量退回', '全部退回',])->default('无')->index()->comment('退回状态');
             $table->string('order_issue_type_id')->nullable()->comment('问题类别');
             $table->string('result_explain')->nullable()->comment('处理结果说明');
             $table->integer('second_order_id')->nullable()->comment('二次订单号');

resources/js/queryForm/queryForm.js

@@ -142,7 +142,7 @@ const query = function getQueryForm(data) {
                 if ([null, '', undefined].includes(condition.type) && ![null, undefined].includes(condition.name)) {
                     condition.type = 'input';
                 }
-                if (['dateTime_dateTime', 'input_input'].includes(condition.type)) {
+                if (['dateTime_dateTime','dateTimeLocal', 'input_input'].includes(condition.type)) {
                     td = $("<td  style='width: 330px'</td>")
                 } else if (['select_multiple_select', 'time', 'dateTime_select'].includes(condition.type)) {
                     td = $("<td  style='width: 280px'</td>");
@@ -171,7 +171,7 @@ const query = function getQueryForm(data) {
             conditions.forEach(function (condition, index, array) {
                 if (['input', 'select', 'dateTime', 'input_select'].includes(condition.type)) {
                     _width += 260;
-                } else if (['dateTime_dateTime', 'input_input'].includes(condition.type)) {
+                } else if (['dateTime_dateTime','dateTimeLocal', 'input_input'].includes(condition.type)) {
                     _width += 330;
                 } else if (['select_multiple_select','search_select'].includes(condition.type)) {
                     _width += 280;
@@ -339,6 +339,7 @@ const query = function getQueryForm(data) {
             || (type === "search_select" && getSearchSelect(condition))
             || (type === "input_select" && getInputSelect(condition))
             || (type === "dateTime" && getdateTime(condition))
+            || (type === "dateTimeLocal" && getDateTimeLocal(condition))
             || (type === "time" && getTime(condition))
             || (type === "input_input" && getInputInput(condition))
             || (type === "dateTime_dateTime" && getdateTimedateTime(condition))
@@ -433,6 +434,18 @@ const query = function getQueryForm(data) {
         return dateTime;
     }
 
+    // dateTimeLocal
+    //dateTimeLocal
+    function getDateTimeLocal(condition) {
+        let dateTimeLocal = $("<input name = '"+ condition.name +"' type='datetime-local' step='01' class='form-control form-control-sm' style='vertical-align: middle; max-width: 280px;' placeholder='" + condition.placeholder + "' autocomplete='off' data-toggle='tooltip' data-placement='top' >");
+        dateTimeLocal.attr('title', condition.tip === undefined ? '' : condition.tip);
+        dateTimeLocal.bind('input propertychange', function () {
+            let dom = {name: condition.name, type: 'dateTimeLocal', value: this.value, mold: 'dateTimeLocal'};
+            modifyData(dom);
+        });
+        return dateTimeLocal;
+    }
+
     // time
     function getTime(condition) {
         let div = $("<div class='form-inline'></div>");
@@ -1051,7 +1064,7 @@ const query = function getQueryForm(data) {
     }
 
     function redenerSearchFormOnData(key, value, mold) {
-        if (mold === 'input' ||mold === 'dateTime') {
+        if (mold === 'input' ||mold === 'dateTime' || mold === 'dateTimeLocal') {
             rendererSearchFormOnInput(key, value, mold);
         } else if (mold === 'select') {
             rendererSearchFormOnSelect(key, value, mold);
@@ -1068,7 +1081,7 @@ const query = function getQueryForm(data) {
     function switchData() {
         _this.condition.forEach(function (conditions) {
             conditions.forEach(function (condition) {
-                if (['input', 'select', 'dateTime', 'search_select', 'time', 'select_multiple_select','checkbox'].includes(condition.type)) {
+                if (['input', 'select', 'dateTime','dateTimeLocal', 'search_select', 'time', 'select_multiple_select','checkbox'].includes(condition.type)) {
                     if (!condition.select) {
                         condition.select = '';
                     }
@@ -1166,7 +1179,7 @@ const query = function getQueryForm(data) {
             // }
             _data[key].select = value;
 
-            if (['input', 'dateTime'].includes(mold)) {
+            if (['input', 'dateTime', 'dateTimeLocal'].includes(mold)) {
                 rendererSearchFormOnInput(key, value, mold);
             } else if (['select'].includes(mold)) {
                 rendererSearchFormOnSelect(key, value, mold);

resources/js/utilities/tempTip.js

@@ -13,32 +13,24 @@ const tempTip={
         this.inputType=type;
     },
     showSuccess:function(text){
-        let parWidth = window.screen.availWidth;
-        let parHeight = window.screen.availHeight ;
-        let parentDom = $("<div style='top: 0;left: 0;width: "+parWidth+"px;height: "+parHeight+"px;position:fixed'></div>");
-        let tiper=$("<div class='row' style='color:white;opacity:0.9;position: relative;top:40%;transform:translateY(-50%);z-index:"+this.index+";width:100%;'>" +
+        let tiper=$("<div class='row' style='color:white;opacity:0.9;position: fixed;top:40%;transform:translateY(-50%);z-index:"+this.index+";width:100%;'>" +
             "<div class='col-8 offset-2'><div class='card'><div class='card-body h4 bg-success text-center'>" +
             text +
             "</div></div></div></div>");
         tiper.animate({opacity:'0'},this.fadingDuration,'swing',function () {
-            parentDom.remove();
+            tiper.remove();
         });
-        parentDom.append(tiper);
-        $('body').append(parentDom);
+        $('body').append(tiper);
     },
     show:function(text){
-        let parWidth = window.screen.availWidth;
-        let parHeight = window.screen.availHeight ;
-        let parentDom = $("<div style='top: 0;left: 0;width: "+parWidth+"px;height: "+parHeight+"px;position:fixed'></div>");
-        let tiper=$("<div class='row' style='color:white;opacity:0.9;top:40%;position: relative;transform:translateY(-50%);width:100%;z-index:"+this.index+";'>" +
+        let tiper=$("<div class='row' style='color:white;opacity:0.9;top:40%;position: fixed;transform:translateY(-50%);width:100%;z-index:"+this.index+";'>" +
             "<div class='col-8 offset-2'><div class='card'><div class='card-body h2 bg-danger text-center'>" +
             text +
             "</div></div></div></div>");
         tiper.animate({opacity:'0'},this.fadingDuration,'swing',function () {
-            parentDom.remove();
+            tiper.remove();
         });
-        parentDom.append(tiper);
-        $('body').append(parentDom);
+        $('body').append(tiper);
     },
     okWindow:function(text,okText){
         let bg=$("<div style='opacity:0.4;position:fixed;top:0;width:100%;height:100%;z-index:"+this.index+";background-color:#000;'></div>" );

resources/views/auth/login.blade.php

@@ -9,7 +9,7 @@
                     <div class="card-body">
                         <div class="row">
                             <div class="col-md-6 text-md-right">
-                                <img src="{{asset('images/login/bg1.jpg')}}" alt="" class="img-fluid">
+                                <img src="{{mix('images/login/bg1.jpg')}}" alt="" class="img-fluid">
                             </div>
                             <div class="col-md-6"><form method="POST" action="{{ route('login') .'?rand='.microtime(true)}}">
                                     @csrf

resources/views/index.blade.php

@@ -6,10 +6,10 @@
             <div class="card-body">
                 @can('退货管理')
                 <div class="card-columns">
-                    <a href="{{asset('rejected/')}}">退货管理</a>
+                    <a href="{{mix('rejected/')}}">退货管理</a>
                 </div> @endcan
                 <div class="card-columns">
-                    <a href="{{asset('login/')}}">登录</a>
+                    <a href="{{mix('login/')}}">登录</a>
                 </div>
             </div>
         </div>

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

@@ -53,9 +53,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let vue=new Vue({
             el:"#list",

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

@@ -81,9 +81,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#container",

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

@@ -133,9 +133,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#container",

resources/views/inventory/stockInventory/blindReceive.blade.php

@@ -57,9 +57,9 @@
         {{--        </span>--}}
         {{--    </div>--}}
 
-        <audio src="{{asset('sound/warning_otherBarcode.mp3')}}" controls="controls" preload id="soundWarning" hidden>
+        <audio src="{{mix('sound/warning_otherBarcode.mp3')}}" controls="controls" preload id="soundWarning" hidden>
         </audio>
-        <audio src="{{asset('sound/ding.mp3')}}" controls="controls" preload id="soundDing" hidden>
+        <audio src="{{mix('sound/ding.mp3')}}" controls="controls" preload id="soundDing" hidden>
         </audio>
         <div class="row mt-2">
             <div class="col-12" id="scanColumn">

resources/views/inventory/stockInventory/inventoryMission.blade.php

@@ -86,9 +86,9 @@
         </div>
 
         <div v-if="blindReceive" class="container">
-            <audio src="{{asset('sound/warning_otherBarcode.mp3')}}" controls="controls" preload id="soundWarning" hidden>
+            <audio src="{{mix('sound/warning_otherBarcode.mp3')}}" controls="controls" preload id="soundWarning" hidden>
             </audio>
-            <audio src="{{asset('sound/ding.mp3')}}" controls="controls" preload id="soundDing" hidden>
+            <audio src="{{mix('sound/ding.mp3')}}" controls="controls" preload id="soundDing" hidden>
             </audio>
             <div class="row mt-2">
                 <div class="col-12" id="scanColumn">
@@ -567,8 +567,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let hideHeaderTitle = function () {
             let $listOnPad = $('#listOnPad');

resources/views/inventory/stockInventory/mission.blade.php

@@ -94,9 +94,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let vue = new Vue({
             el: "#list",

resources/views/layouts/app.blade.php

@@ -3,21 +3,21 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="icon" href="{{asset('icon/faviconc.ico')}}" type="image/x-icon"/>
+    <link rel="icon" href="{{mix('icon/faviconc.ico')}}" type="image/x-icon"/>
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
     <title>@yield('title') {{ config('app.name', '宝时WAS') }}</title>
     @yield('head')
     <!-- Styles -->
-    <link href="{{ asset('css/app200923.css') }}" rel="stylesheet">
+    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
 </head>
 <body>
 <div id="app">
     <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="padding: 0;" >
         <div class="container-fluid">
             <a class="navbar-brand" href="{{ url('/') }}" title="宝时 Warehouse Assistance System" style="vertical-align: text-bottom">
-                <img src="{{asset('icon/logo100b.png')}}" alt="宝时 Warehouse Assistance System" height="30" >
+                <img src="{{mix('icon/logo100b.png')}}" alt="宝时 Warehouse Assistance System" height="30" >
             </a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
                 <span class="navbar-toggler-icon"></span>
@@ -32,7 +32,7 @@
 <!-- Scripts -->
 @yield('script')
 {{-- 必须在app.js前边--}}
-<script src="{{ asset('js/app201009.js') }}"></script>
+<script src="{{ asset('js/app.js') }}"></script>
 <script>
     let isActive=function (name,atSlashLevel) {
         let uriWithNoParam=location.href.split('?')[0];

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

@@ -50,8 +50,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/maintenance/tutorial/create.blade.php

@@ -1,8 +1,8 @@
 @extends('layouts.app')
 @section('title')创建教程@endsection
 @section('head')
-    <link rel="stylesheet" type="text/css" href="{{asset('css/trix.css')}}">
-    <script type="text/javascript" src="{{asset('js/trix.js')}}"></script>
+    <link rel="stylesheet" type="text/css" href="{{mix('css/trix.css')}}">
+    <script type="text/javascript" src="{{mix('js/trix.js')}}"></script>
     <script>
 
         addEventListener("trix-file-accept", function(event) {

resources/views/maintenance/tutorial/edit.blade.php

@@ -1,8 +1,8 @@
 @extends('layouts.app')
 @section('title')修改教程@endsection
 @section('head')
-    <link rel="stylesheet" type="text/css" href="{{asset('css/trix.css')}}">
-    <script type="text/javascript" src="{{asset('js/trix.js')}}"></script>
+    <link rel="stylesheet" type="text/css" href="{{mix('css/trix.css')}}">
+    <script type="text/javascript" src="{{mix('js/trix.js')}}"></script>
     <script>
 
         addEventListener("trix-file-accept", function(event) {

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

@@ -53,8 +53,8 @@
     <script>
 
     </script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200825.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

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

@@ -116,7 +116,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

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

@@ -220,9 +220,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let vue=new Vue({
             el:"#list",

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

@@ -614,8 +614,8 @@
             -webkit-animation-play-state: running;
         }
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script>
         let listVue = new Vue({
             el: '#issue_div ',

resources/views/order/issue/performance.blade.php

@@ -65,8 +65,8 @@
 
 @endsection
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script>
         let performance_vue = new Vue({
             el:'#performance_div',

resources/views/order/issue/workload.blade.php

@@ -74,9 +74,9 @@
 
 @endsection
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let workLoadVue = new Vue({
             el: "#workLoad_div",

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

@@ -223,9 +223,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <style>
         .btn-border{
             border:1px solid rgba(108, 117, 125,0.3);

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

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

resources/views/personnel/checking-in/QRcode.blade.php

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="icon" href="{{asset('icon/faviconc.ico')}}" type="image/x-icon"/>
+    <link rel="icon" href="{{mix('icon/faviconc.ico')}}" type="image/x-icon"/>
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <title>显示二维码 BsWAS</title>

resources/views/personnel/checking-in/importAndExportQRCode.blade.php

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="icon" href="{{asset('icon/faviconc.ico')}}" type="image/x-icon"/>
+    <link rel="icon" href="{{mix('icon/faviconc.ico')}}" type="image/x-icon"/>
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <title>显示二维码 BsWAS</title>

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

@@ -235,9 +235,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let today=(new Date());
         function isTomorrow(){

resources/views/process/index.blade.php

@@ -462,9 +462,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#process",
@@ -651,7 +651,7 @@
                 processExport(checkAllSign) {
                     let url = '{{url('process/export')}}';
                     let token='{{ csrf_token() }}';
-                    //excelExport 定义在 js/queryForm/export200918.js
+                    //excelExport 定义在 js/queryForm/export.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
                 //获取登记工时

resources/views/process/statistic.blade.php

@@ -78,9 +78,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200825.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         new Vue({
             el:"#statistics",
@@ -161,7 +161,7 @@
                 processStatisticExport(checkAllSign){
                     let url = '{{url('process/statistic/export')}}';
                     let token='{{ csrf_token() }}';
-                    //excelExport 定义在 js/queryForm/export200918.js
+                    //excelExport 定义在 js/queryForm/export.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
             },

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

@@ -60,9 +60,9 @@
 @endsection
 
 @section('lastScript')
-    <script src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script src="{{mix('js/queryForm/export.js')}}"></script>
+    <script src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#list",

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

@@ -175,9 +175,9 @@
         let ajaxFinishAllUrl='{{url("rejected/ajaxFinishAll")}}';
         let csrfInput='@csrf';
     </script>
-    <script src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script src="{{mix('js/queryForm/export.js')}}"></script>
+    <script src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#list",

resources/views/store/blindReceive/excel/index.blade.php

@@ -23,7 +23,7 @@
                             <td>{{$excel['name']}}</td>
                             <td>{{$excel['created_at']}}</td>
                             <td>{{$excel['goods_amount']}}</td>
-                            <td><a href="{{asset('storage/'.$excel['file'])}}"><span class="fa fa-download"></span><span class="fa fa-download"></span><span class="fa fa-download"></span></a></td>
+                            <td><a href="{{mix('storage/'.$excel['file'])}}"><span class="fa fa-download"></span><span class="fa fa-download"></span><span class="fa fa-download"></span></a></td>
                         </tr>
                     @endforeach
                 </table>

resources/views/store/blindReceive/index.blade.php

@@ -6,9 +6,9 @@
         @component('store.blindReceive.menu')@endcomponent
     </div>
     <div class="container">
-        <audio src="{{asset('sound/warning_otherBarcode.mp3')}}" controls="controls" preload id="soundWarning" hidden>
+        <audio src="{{mix('sound/warning_otherBarcode.mp3')}}" controls="controls" preload id="soundWarning" hidden>
         </audio>
-        <audio src="{{asset('sound/ding.mp3')}}" controls="controls" preload id="soundDing" hidden>
+        <audio src="{{mix('sound/ding.mp3')}}" controls="controls" preload id="soundDing" hidden>
         </audio>
         <div class="row mt-2">
             <div class="col-12" id="scanColumn">

resources/views/store/blindReceive/layout.blade.php

@@ -10,8 +10,8 @@
     <title>盲收神器</title>
 
     <!-- Styles -->
-    <link rel="shortcut icon" href="{{asset('icon/WcsIcon_blindPack.ico')}}" />
-    <link rel="bookmark" href="{{asset('icon/WcsIcon_blindPack.ico')}}" />
+    <link rel="shortcut icon" href="{{mix('icon/WcsIcon_blindPack.ico')}}" />
+    <link rel="bookmark" href="{{mix('icon/WcsIcon_blindPack.ico')}}" />
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
 </head>
 <body>

resources/views/store/checkingReceive/mission.blade.php

@@ -76,8 +76,8 @@
 @stop
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#container",

resources/views/store/checkingReceive/show.blade.php

@@ -16,9 +16,9 @@
 
         @can('入库管理-盘收一体-盘收-编辑')
         <div class="row m-2 card" v-if="is_show">
-            <audio src="{{asset('sound/warning_otherBarcode.mp3')}}" controls="controls" preload id="soundWarning" hidden>
+            <audio src="{{mix('sound/warning_otherBarcode.mp3')}}" controls="controls" preload id="soundWarning" hidden>
             </audio>
-            <audio src="{{asset('sound/ding.mp3')}}" controls="controls" preload id="soundDing" hidden>
+            <audio src="{{mix('sound/ding.mp3')}}" controls="controls" preload id="soundDing" hidden>
             </audio>
             <div class="card-body col-12">
                 <div class="col-12">
@@ -87,39 +87,70 @@
             @can('入库管理-盘收一体-盘收-编辑')<button type="button" v-if="storeCheckingReceive.status != '已收货'" class="btn btn-sm btn-outline-success" data-toggle="modal" data-target="#asnWindow">匹配ASN单据</button>@endcan
         </div>
         <div class="row text-primary ml-1 mr-2 mt-1 mb-1 w-100" style="background-color: #c3e3b5">
-            <span class="ml-1">任务ID： <b class="text-dark">@{{ storeCheckingReceive.id }}</b></span>
-            <span class="ml-3">货主： <b class="text-dark">@{{ storeCheckingReceive.owner_name }}</b></span>
-            <span class="ml-3">创建时间： <b class="text-dark">@{{ storeCheckingReceive.created_at }}</b></span>
-            <span class="ml-3">ASN号： <b class="text-dark">@{{ storeCheckingReceive.asn }}</b></span>
+            <span class="ml-md-1">任务ID： <b class="text-dark">@{{ storeCheckingReceive.id }}</b></span>
+            <span class="ml-md-3"> &nbsp;货主： <b class="text-dark">@{{ storeCheckingReceive.owner_name }}</b></span>
+            <span class="ml-md-3">创建时间： <b class="text-dark">@{{ storeCheckingReceive.created_at }}</b></span>
+            <span class="ml-md-3">ASN号： <b class="text-dark">@{{ storeCheckingReceive.asn }}</b></span>
         </div>
-        <table class="table table-sm text-nowrap table-bordered d-none" id="headerRoll"></table>
-        <table class="table table-striped table-sm text-nowrap table-hover mt-1" id="headerParent">
-            <tr id="header"></tr>
-            <tr v-for="(storeCheckingReceiveItem,i) in storeCheckingReceiveItems">
-                <td>@{{ i+1 }}</td>
-                <td>@{{ storeCheckingReceiveItem.bin_number }}</td>
-                <td>@{{ storeCheckingReceiveItem.commodity_name }}</td>
-                <td>
+        <!-- pc >544 -->
+        <div class="d-none d-sm-block">
+            <table class="table table-sm text-nowrap table-bordered d-none" id="headerRoll"></table>
+            <table class="table table-striped table-sm text-nowrap table-hover mt-1" id="headerParent">
+                <tr id="header"></tr>
+                <tr v-for="(storeCheckingReceiveItem,i) in storeCheckingReceiveItems">
+                    <td>@{{ i+1 }}</td>
+                    <td>@{{ storeCheckingReceiveItem.bin_number }}</td>
+                    <td>@{{ storeCheckingReceiveItem.commodity_name }}</td>
+                    <td>
                     <span v-for="commodity_barcode in storeCheckingReceiveItem.commodity_barcodes">
                         <small>@{{ commodity_barcode.code }}</small><br>
                     </span>
-                </td>
-                <td>@{{ storeCheckingReceiveItem.imported_amount }}</td>
-                <td>@{{ storeCheckingReceiveItem.counted_amount }}</td>
-                <td>@{{ storeCheckingReceiveItem.asn_amount }}</td>
-                <td>@{{ storeCheckingReceiveItem.imported_diff_amount }}</td>
-                <td>@{{ storeCheckingReceiveItem.asn_diff_amount }}</td>
-                <td>@{{ storeCheckingReceiveItem.produced_at }}</td>
-                <td>@{{ storeCheckingReceiveItem.invalid_at }}</td>
-                <td>@{{ storeCheckingReceiveItem.batch_code }}</td>
-                <td>@{{ storeCheckingReceiveItem.unique_code }}</td>
-            </tr>
-        </table>
+                    </td>
+                    <td>@{{ storeCheckingReceiveItem.imported_amount }}</td>
+                    <td>@{{ storeCheckingReceiveItem.counted_amount }}</td>
+                    <td>@{{ storeCheckingReceiveItem.asn_amount }}</td>
+                    <td>@{{ storeCheckingReceiveItem.imported_diff_amount }}</td>
+                    <td>@{{ storeCheckingReceiveItem.asn_diff_amount }}</td>
+                    <td>@{{ storeCheckingReceiveItem.produced_at }}</td>
+                    <td>@{{ storeCheckingReceiveItem.invalid_at }}</td>
+                    <td>@{{ storeCheckingReceiveItem.batch_code }}</td>
+                    <td>@{{ storeCheckingReceiveItem.unique_code }}</td>
+                </tr>
+            </table>
+        </div>
+        <!-- phone <544 -->
+        <div class="d-xl-none">
+            <div v-for="(storeCheckingReceiveItem) in storeCheckingReceiveItems" class="mt-1 border border-1 rounded">
+                <div class="row">
+                    <div class="col-12 row">
+                        <label class="text-primary col-4 mr-0">商品条码：</label>
+                        <div class="col-8 ml-0">
+                            <span v-for="commodity_barcode in storeCheckingReceiveItem.commodity_barcodes">
+                                <small>@{{ commodity_barcode.code }}</small><br>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-12">
+                        <label class="text-muted">商品名称：</label>@{{ storeCheckingReceiveItem.commodity_name }}
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-6">
+                        <label class="text-muted">格口号：</label>@{{ storeCheckingReceiveItem.bin_number }}
+                    </div>
+                    <div class="col-6">
+                        <label class="text-muted">实盘数：</label>@{{ storeCheckingReceiveItem.counted_amount }}
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 @stop
 
 @section('lastScript')
-<script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
 <script>
     new Vue({
         el:"#container",
@@ -334,6 +365,7 @@
                 this.inputting.batch_number='';
                 this.status.commitButtonVisible=false;
                 this.status.binDisable=false;
+                this.status.barcodeDisable = true;
             },
             autoFillBin: function () {
                 let isNotRepeatingBarcode=this.storeCheckingReceiveItems.every(item=>{
@@ -414,7 +446,10 @@
                     }, () => {
                         this.focusDocument();
                     });
-                }else this.commitGoods();
+                }else{
+                    this.commitGoods();
+                    this.focusDocument();
+                }
             },
             getItem: function () {
                 let repeatedGoods=null;
@@ -539,4 +574,4 @@
         },
     });
 </script>
-@stop
+@stop

resources/views/store/fast/index.blade.php

@@ -35,7 +35,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let vue = new Vue({
             el:'#fast',

resources/views/store/fast/storeItem.blade.php

@@ -38,7 +38,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let vue = new Vue({
             el:'#item',

resources/views/waybill/delivering.blade.php

@@ -187,8 +187,8 @@
     .color1{background-color: #FFA07A}
     .color2{background-color: cornflowerblue}
 </style>
-<script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-<script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+<script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
 <script>
     new Vue({
         el:"#list",

resources/views/waybill/index.blade.php

@@ -251,9 +251,9 @@
             -webkit-animation-play-state: running;
         }
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
         let vue = new Vue({
             el:'#list',

resources/views/waybill/waybillFinancialSnapshot/index.blade.php

@@ -124,8 +124,8 @@
 @stop
 
 @section('lastScript')
-<script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
-<script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
+<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
+<script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
 <script>
     let vue = new Vue({
         el:'#editingPanel',

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

@@ -57,9 +57,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

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

@@ -142,7 +142,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script>
         new Vue({
             el:"#statistics",
@@ -457,7 +457,7 @@
                 statisticExport:function (checkAllSign) {
                     let url = '{{url('package/statistics/export')}}';
                     let token='{{ csrf_token() }}';
-                    //excelExport 定义在 js/queryForm/export200918.js
+                    //excelExport 定义在 js/queryForm/export.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
                 hourFilter:function(e){

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

@@ -86,8 +86,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#list",

webpack.mix.js

@@ -11,17 +11,21 @@ const mix = require('laravel-mix');
  |
  */
 
-mix.js('resources/js/app.js', 'public/js/app201009.js')
-    .sass('resources/sass/app.scss', 'public/css/app200923.css');
+mix.js('resources/js/app.js', 'public/js/app.js')
+    .sass('resources/sass/app.scss', 'public/css/app.css');
 mix.copy('resources/sass/fonts/','public/fonts');
 mix.copy('resources/icon','public/icon');
 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/queryForm201010.js');
-mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200918.js');
-mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200826b.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm.js');
+mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export.js');
+mix.js('resources/js/queryForm/header.js','public/js/queryForm/header.js');
 
 mix.copy('resources/sound/','public/sound');
 
+
+if (mix.inProduction()) {
+    mix.version();
+}