导出格式化选择，时间格式化选择。

需要： npm
go build

app/Http/Controllers/CommodityController.php

@@ -156,7 +156,7 @@ class CommodityController extends Controller
         $barcode=$request->input('barcode');
         $name = '';
         if($barcode){
-            $commodity=Commodity::whereHas('barcodes', function (Builder $query)use($barcode){
+            $commodity=Commodity::query()->whereHas('barcodes', function (Builder $query)use($barcode){
                 $query->where('code',$barcode);
             })->first();
             if($commodity&&$commodity['name']) $name=$commodity['name'];
@@ -169,7 +169,12 @@ class CommodityController extends Controller
         $owner_code = $request->owner_code ?? false;
         $owner_id = $request->owner_id ?? false;
         if (!$owner_code || !$owner_id)return ['success'=>false, 'data'=>"未指定货主"];
+        $this->syncOwnerCommodities($owner_id,$owner_code);
+        return ['success'=>true];
+    }
+
 
+    public function syncOwnerCommodities($owner_id,$owner_code){
         $map = [];
         $skus = [];
         $wmsCommodities = app('oracleBasSkuService')->getOwnerCommodities(['code' => $owner_code]);
@@ -224,7 +229,5 @@ class CommodityController extends Controller
         }
 
         if (count($createCommodities) > 0)app('commodityService')->insert($createCommodities);
-
-        return ['success'=>true];
     }
 }

app/Http/Controllers/OrderController.php

@@ -37,13 +37,17 @@ class OrderController extends Controller
 
     //导出
     public function export(Request $request){
+        $is_merge = $request->is_merge ?? false;
         /** @var OrderService $orderService */
         $orderService = app('orderService');
+        $req = ['type'=>'order'];
+        if ($is_merge && $is_merge == 'true')$req["createFormat"] = "merge";
         if ($request->data){
-            $post = Http::post(config('go.export.url'),['type'=>'order','sql'=>$orderService->getSql(['data'=>$request->data])]);
+            $req["sql"] = $orderService->getSql(['data'=>$request->data]);
         }else{
-            $post = Http::post(config('go.export.url'),['type'=>'order','sql'=>$orderService->getSql($request->input())]);
+            $req["sql"] = $orderService->getSql($request->input());
         }
+        $post = Http::post(config('go.export.url'),$req);
         if ($post->status() == 500){
             throw new Exception($post->header("Msg"));
         }

app/Http/Controllers/StoreCheckingReceiveController.php

@@ -39,6 +39,63 @@ class StoreCheckingReceiveController extends Controller
         /** @var StoreCheckingReceiveService $service */
         $service = app('storeCheckingReceiveService');
         $storeCheckingReceive = $service->find($id);
+
+        if ($storeCheckingReceive->owner ?? false){
+            $commodityController = new CommodityController();
+            $commodityController->syncOwnerCommodities($storeCheckingReceive->owner->id, $storeCheckingReceive->owner->code);
+        }
+
         return view('store.checkingReceive.show',compact('storeCheckingReceive'));
     }
+
+    public function insertItem(Request $request){
+        $mission_id = $request->mission_id ?? false;
+        $goods = $request->goods ?? false;
+        if (!$mission_id || !$goods)return ['success'=>false, 'data'=>'参数传递错误！'];
+        $storeCheckingReceive = app('storeCheckingReceiveService')->find($mission_id);
+        if (!$storeCheckingReceive)return ['success'=>false, 'data'=>'盘收任务不存在'];
+
+        $item_id = null;
+        $item_amount = null;
+        foreach ($storeCheckingReceive->storeCheckingReceiveItems as $item){
+            if (!$item->commodity)continue;
+            if (count($item->commodity->barcodes) < 1)continue;
+            foreach ($item->commodity->barcodes as $barcode){
+                if ($barcode->code == $goods['barcode']){
+                    if ($goods['bin_number'] == $item->bin_number &&
+                        $goods['batch_number'] == $item->batch_code &&
+                        $goods['produce_date'] == $item->produce_date &&
+                        $goods['valid_date'] == $item->valid_date){
+                        $item_id = $item->id;
+                        $item_amount = $item->amount;
+                        break;
+                    }
+                }
+            }
+        }
+
+        if ($item_id){
+            $item = app('storeCheckingReceiveItemService')->update(['id'=>$item_id],['amount'=>($item_amount+$goods['amount'])]);
+            $item->load(['commodity'=>function($query){
+                $query->with('barcodes');
+            }]);
+            return ['success'=>true, 'type'=>"update", 'data'=>$item];
+        }
+        $commodity_barcode = app('commodityBarcodeService')->first([
+            'code' => $goods['barcode'],
+        ]);
+        if (!$commodity_barcode) return ['success'=>false, 'data'=>'该条码未找到对应商品'];
+        $item = app('storeCheckingReceiveItemService')->create([
+            'store_checking_receive_id' => $mission_id,
+            'bin_number' => $goods['bin_number'],
+            'commodity_id' => $commodity_barcode->commodity_id,
+            'produced_at' => $goods['produced_at'],
+            'invalid_at' => $goods['invalid_at'],
+            'batch_code' => $goods['batch_number'],
+        ]);
+        $item->load(['commodity'=>function($query){
+            $query->with('barcodes');
+        }]);
+        return ['success'=>true, 'type'=>'create', 'data'=>$item];
+    }
 }

app/Services/CommodityBarcodeService.php

@@ -14,4 +14,12 @@ Class CommodityBarcodeService
         return CommodityBarcode::query()->insert($params);
     }
 
+
+    public function first(array $params){
+        $query = CommodityBarcode::query();
+        foreach ($params as $column => $value){
+            $query->where($column,$value);
+        }
+        return $query->first();
+    }
 }

app/Services/OrderService.php

@@ -85,11 +85,11 @@ class OrderService
         }
         if ($orderdate_start){
             if (strlen($orderdate_start)<11)$orderdate_start .= ' 00:00';
-            $sql.=" and addtime>='".$orderdate_start.":00'";
+            $sql.=" and addtime>=to_date('".$orderdate_start.":00','yyyy-mm-dd hh24:mi:ss')";
         }
         if ($orderdate_end){
             if (strlen($orderdate_end)<11)$orderdate_end .= ' 23:59 ';
-            $sql.=" and addtime<='".$orderdate_end.":59' ";
+            $sql.=" and addtime<=to_date('".$orderdate_end.":59','yyyy-mm-dd hh24:mi:ss')";
         }
         if ($customerid){
             $arr = explode(',',$customerid);
@@ -130,7 +130,7 @@ class OrderService
         if ($waveno)$sql.=" and WaveNo like '".$waveno."%'";
         if ($issuepartyname)$sql.=" and issuepartyname like '".$issuepartyname."%'";
         if ($notes){
-            if ($addtime&&$addtime!=0)$sql.=" and addtime >= '".date('Y-m-d H:i:s',strtotime("-".$addtime." day"))."'";
+            if ($addtime&&$addtime!=0)$sql.=" and addtime >= to_date('".date('Y-m-d H:i:s',strtotime("-".$addtime." day"))."','yyyy-mm-dd hh24:mi:ss')";
             $sql.=" and notes like '%".$notes."%'";
         }
         if ($soreference5){

app/Services/StoreCheckingReceiveItemService.php

@@ -10,4 +10,15 @@ Class StoreCheckingReceiveItemService
         return StoreCheckingReceiveItem::query()->insert($params);
     }
 
+    public function update(array $params, array $values){
+        $query = StoreCheckingReceiveItem::query();
+        foreach ($params as $column => $value){
+            $query->where($column,$value);
+        }
+        return $query->update($values);
+    }
+
+    public function create(array $params){
+        return StoreCheckingReceiveItem::query()->create($params);
+    }
 }

app/Services/StoreCheckingReceiveService.php

@@ -36,7 +36,7 @@ Class StoreCheckingReceiveService
     }
 
     public function find($id){
-        return StoreCheckingReceive::query()->with(['storeCheckingReceiveItems'=>function($query){
+        return StoreCheckingReceive::query()->with(['owner','storeCheckingReceiveItems'=>function($query){
             $query->with(['commodity'=>function($builder){
                 $builder->with('barcodes');
             }]);

resources/js/queryForm/export.js

@@ -1,5 +1,5 @@
 
-function excelExport(checkAllSign,checkData,url,sum,token) {
+function excelExport(checkAllSign,checkData,url,sum,token,reservation = null) {
     if (checkAllSign) {
         if (sum > 10000){
             if (!confirm('导出条数超过一万条，耗时可能过长，您确定继续吗？'))return;
@@ -7,6 +7,11 @@ function excelExport(checkAllSign,checkData,url,sum,token) {
         let thisUrl=document.URL;
         let parameter=thisUrl.split('?',2);
         url += "?checkAllSign=true";
+        if (reservation) {
+            for (let key in reservation){
+                url += "&"+key+"="+reservation[key];
+            }
+        }
         if (parameter[1])url+="&"+parameter[1];
         location.href=url;
     }else {
@@ -14,10 +19,16 @@ function excelExport(checkAllSign,checkData,url,sum,token) {
             tempTip.setDuration(3000);
             tempTip.showSuccess('没有勾选任何记录');
         } else {
-            let form=$('<form hidden method="post" target="_blank" action="'+url+'">' +
+            let html = '<form hidden method="post" target="_blank" action="'+url+'">' +
                 '<input name="_token" value="'+token+'">' +
-                "<input name='data' value='"+checkData+"' >" +
-                '</form>');
+                "<input name='data' value='"+checkData+"' >" ;
+            if (reservation){
+                for (let key in reservation){
+                    html += '<input name="'+key+'" value="'+reservation[key]+'">';
+                }
+            }
+            html += '</form>';
+            let form=$(html);
             $('body').append(form);
             form.submit();
         }

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

@@ -53,7 +53,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

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

@@ -79,7 +79,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

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

@@ -133,7 +133,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

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

@@ -402,7 +402,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     {{--    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>--}}
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

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

@@ -86,7 +86,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

resources/views/layouts/menu.blade.php

@@ -7,7 +7,7 @@
                     <span class="fa fa-recycle" style="color: #721b6e"></span>
                     退货管理</a></li> @endcan
         @can('入库管理')
-            <li class="nav-item"><a href="{{url("store/checkReceive/mission")}}" class="nav-link"
+            <li class="nav-item"><a href="{{url("store/checkingReceive/mission")}}" class="nav-link"
                                     :class="{active:isActive('store',1)}">
                     <span class="fa fa-sign-in" style="color: #721b25"></span>
                     入库管理</a></li>

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

@@ -18,6 +18,10 @@
                             <a class="dropdown-item" @click="orderExport(true)" href="javascript:">导出所有页</a>
                         </div>
                     </span>
+                    <div class="custom-control custom-checkbox ml-1">
+                        <input type="checkbox" class="custom-control-input" id="customCheck" v-model="is_merge">
+                        <label class="custom-control-label" for="customCheck">导出是否格式化</label>
+                    </div>
                     @can('订单管理-批量备注')<button @click="modal()" type="button" class="btn btn-sm ml-2 btn-outline-primary">批量备注追加</button>@endcan
                     @can('订单管理-编辑')
                         <span class="btn btn-sm tooltipTarget ml-2" @click="freezeAll" style="cursor: pointer" title="订单的冻结条件要只局限在“创建订单”,“分配完成”,“拣货完成”,“播种完成”"
@@ -181,7 +185,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
@@ -213,6 +217,7 @@
                 typeId:'',
                 result_explain:'',
                 orderIssueType:{!! $orderIssueType !!},
+                is_merge : false,
             },
             mounted:function () {
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
@@ -389,7 +394,7 @@
                 orderExport(checkAllSign){
                     let url = '{{url('order/index/export')}}';
                     let token='{{ csrf_token() }}';
-                    excelExport(checkAllSign,this.checkData,url,this.sum,token);
+                    excelExport(checkAllSign,this.checkData,url,this.sum,token,{is_merge : this.is_merge});
                 },
                 modal(){
                     $("#myModal").modal('show');

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

@@ -533,7 +533,7 @@
         }
     </style>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script>
         let listVue = new Vue({
             el: '#issue_div ',

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

@@ -66,7 +66,7 @@
 @endsection
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script>
         let performance_vue = new Vue({
             el:'#performance_div',

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

@@ -75,7 +75,7 @@
 @endsection
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.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>
         let workLoadVue = new Vue({

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

@@ -114,7 +114,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
 

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

@@ -227,7 +227,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

resources/views/process/index.blade.php

@@ -461,7 +461,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
@@ -646,7 +646,7 @@
                 processExport(checkAllSign) {
                     let url = '{{url('process/export')}}';
                     let token='{{ csrf_token() }}';
-                    //excelExport 定义在 js/queryForm/export200818a.js
+                    //excelExport 定义在 js/queryForm/export200918.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
                 //获取登记工时

resources/views/process/statistic.blade.php

@@ -72,7 +72,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <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>
@@ -155,7 +155,7 @@
                 processStatisticExport(checkAllSign){
                     let url = '{{url('process/statistic/export')}}';
                     let token='{{ csrf_token() }}';
-                    //excelExport 定义在 js/queryForm/export200818a.js
+                    //excelExport 定义在 js/queryForm/export200918.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
             },

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

@@ -60,7 +60,7 @@
 @endsection
 
 @section('lastScript')
-    <script src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

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

@@ -175,7 +175,7 @@
         let ajaxFinishAllUrl='{{url("rejected/ajaxFinishAll")}}';
         let csrfInput='@csrf';
     </script>
-    <script src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

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

@@ -4,7 +4,7 @@
             <ul class="nav nav-pills">
                 @can('入库管理-盘收一体-任务')
                     <li class="nav-item">
-                        <a class="nav-link" href="{{url('store/checkReceive/mission')}}" :class="{active:isActive('',4)}">任务</a>
+                        <a class="nav-link" href="{{url('store/checkingReceive/mission')}}" :class="{active:isActive('',4)}">任务</a>
                     </li> @endcan
                 {{$slot}}
             </ul>

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

@@ -56,7 +56,7 @@
             <td>@{{ storeCheckingReceive.is_asn_diff }}</td>
             <td>@{{ storeCheckingReceive.created_at }}</td>
             <td>
-                @can('入库管理-盘收一体-盘收')<a target="_blank" :href="'{{url('store/checkReceive/mission')}}/'+storeCheckingReceive.id">
+                @can('入库管理-盘收一体-盘收')<a target="_blank" :href="'{{url('store/checkingReceive/mission')}}/'+storeCheckingReceive.id">
                     <button class="btn btn-sm btn-outline-success">盘收</button>
                 </a>@endcan
             </td>
@@ -161,7 +161,7 @@
                     }
                     let formData = new FormData();
                     formData.append("file",this.excel.file);
-                    axios.post('{{url('store/checkReceive/mission/import')}}',formData,{
+                    axios.post('{{url('store/checkingReceive/mission/import')}}',formData,{
                         'Content-Type':'multipart/form-data'
                     })
                     .then(res=>{

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

@@ -38,65 +38,41 @@
                             <div class="btn btn-sm btn-outline-danger" v-if="!status.barcodeDisable" @click="status.barcodeDisable=true">扫描输入</div>
                         </div>
                         <input type="text" id="barcode" class="form-control"
-                               :placeholder="status.barcodeDisable ? '扫入条码' : '输入条码'" :disabled="status.barcodeDisable" v-model="inputting.barcode" :class="inputMode=='regular' ? '' : 'mt-4'" {{-- @focusin="focusOutDocument" @focusout="focusDocument" --}}>
+                               :placeholder="status.barcodeDisable ? '扫入条码' : '输入条码'" :disabled="status.barcodeDisable" v-model="inputting.barcode" :class="inputMode=='regular' ? '' : 'mt-4'"
+                               @focusin="focusOutDocument" @focusout="focusDocument">
 
                         <div v-if="inputMode=='regular'">
                         <div class="card-title">生产日期：</div>
                         <input type="date" class="form-control mb-2"
-                               v-model="inputting.produce_date"
-                               {{-- @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter"--}}>
+                               v-model="inputting.produce_date" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
 
                         <div class="card-title">失效日期：</div>
                         <input type="date" class="form-control mb-2"
-                               v-model="inputting.valid_date"
-                               {{-- @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter"--}}>
+                               v-model="inputting.valid_date" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
+
                         </div>
                     </div>
                     <div class="col-6">
                         <div class="card-title" id="amountLabel">手动输入数量：</div>
                         <div class="input-group mt-n2 mb-2">
                             <input type="number" id="amount" style='height: 40px;font-size: 1.6em;color:blue;font-weight: bolder;padding: 3px;text-align: center' class="form-control" placeholder=""
-                                   :disabled="status.amountDisable" v-model="inputting.amount"{{--  @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter"--}}>
+                                   :disabled="status.amountDisable" v-model="inputting.amount" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
                         </div>
 
                         <div class="card-title">格口号：</div>
                         <input type="number" id="bin_number" class="form-control mt-n2 mb-2" style='height: 80px;font-size: 5em;color:red;font-weight: bolder;padding: 3px;text-align: center'
-                               v-model="inputting.bin_number"{{-- :disabled="status.binDisable" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter"--}}>
+                               v-model="inputting.bin_number" :disabled="status.binDisable"  @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
 
                         <div v-if="inputMode=='regular'">
                             <div class="card-title">批次号：</div>
                             <input type="text" class="form-control mb-2"
-                                   v-model="inputting.batch_number"{{-- @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter"--}}>
+                                   v-model="inputting.batch_number" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
                         </div>
                     </div>
                     <div class="col-12" v-if="status.commitButtonVisible && inputMode=='regular'" >
                         <button class="btn btn-success btn form-control" @click="commitGoods">确定</button>
                     </div>
                 </div>
-                <p class="card-text text-muted mt-3 mb-n3 text-center">已完成：</p>
-                <hr>
-                <table class="table table-sm  table-striped" {{--v-if="goodses.length>0"--}}>
-                    <tr>
-                        <th>隔口号</th>
-                        <th>数量</th>
-                        <th>条码</th>
-                        <th>生产日期</th>
-                        <th>失效日期</th>
-                        <th>批次号</th>
-                        <th>操作</th>
-                    </tr>
-                    {{--<tr v-for="goods in goodses">
-                        <td>@{{ goods.bin_number }}</td>
-                        <td>@{{ goods.amount }}</td>
-                        <td>@{{ goods.barcode }}</td>
-                        <td>@{{ goods.produce_date }}</td>
-                        <td>@{{ goods.valid_date }}</td>
-                        <td>@{{ goods.batch_number }}</td>
-                        <td><button class="btn btn-outline-danger btn-sm" @click="removeGoods($event,goods.barcode)">删</button></td>
-                    </tr>--}}
-                </table>
-                <hr>
-                <span class="btn btn-outline-success btn form-control" style="cursor: pointer">确定生成该批盘收</span>
             </div>
         </div>
         <div class="ml-2 mt-2">
@@ -115,7 +91,6 @@
             <tr id="header"></tr>
             <tr v-for="(storeCheckingReceiveItem,i) in storeCheckingReceiveItems">
                 <td>@{{ i+1 }}</td>
-                <td>@{{ storeCheckingReceiveItem.id }}</td>
                 <td>@{{ storeCheckingReceiveItem.bin_number }}</td>
                 <td>@{{ storeCheckingReceiveItem.commodity_name }}</td>
                 <td>
@@ -163,6 +138,7 @@
                 commitButtonVisible:false,
                 scanEndInputted:false,
                 amountDisable : false,
+                binDisable : false,
             },
             focusing : 'document',
             inputting:{
@@ -173,14 +149,13 @@
                 produce_date : '',
                 valid_date : '',
             },
-            goodses : [],
+            lastScannedBarcode : '',
         },
         mounted(){
             $('#container').removeClass('d-none');
             $(".tooltipTarget").tooltip({'trigger':'hover'});
             let column = [
                 {name:'index',value: '序号', neglect: true},
-                {name:'id',value: 'ID', neglect: true},
                 {name:'bin_number',value: '格口号'},
                 {name:'commodity_name',value: '商品名'},
                 {name:'commodity_barcode',value: '商品条码'},
@@ -206,7 +181,7 @@
         methods:{
             switchMenu(menuName){
                 this.inputMode = menuName;
-                this.inputting.barcode='';
+                this.cleanInputs();
                 if (menuName === 'regular') {
                     this.status.amountDisable = false;
                     $('#amountLabel').text('输入数量：');
@@ -233,11 +208,10 @@
                             return;
                         }
                         _this.status.scanEndInputted = true;
-                        _this.showCommitButton();
-                        _this.autoFillBin();
                         switch(_this.inputMode){
+                            case 'regular' : _this.commitGoodsOnRegularMode();break;
                             case 'increasing': _this.commitGoodsOnIncreasingMode();break;
-                            case 'multiIncreasing': _this.commitGoodsOnMultiIncreasingMode();break;
+                            case 'multiIncreasing': _this.commitGoodsOnIncreasingMode(false);break;
                         }
                     }
                 });
@@ -255,14 +229,30 @@
                 if(!this.inputting.barcode){window.tempTip.show('请扫入条码');return;}
                 else if(!this.inputting.amount){window.tempTip.show('请输入数量');return;}
                 else if(!this.inputting.bin_number){window.tempTip.show('请输入隔口号');return;}
-                this.recordOrPlusGoods();
-                window.tempTip.setDuration(1500);
-                window.tempTip.showSuccess('成功提交：' + data.inputting.barcode);
-                this.cleanInputs();
-                this.audioDing();
+                axios.post('{{url('store/checkingReceive/insertItem')}}',{mission_id : this.storeCheckingReceive.id,goods : this.inputting})
+                    .then(res=>{
+                        if (res.data.success) {
+                            this.lastScannedBarcode = this.inputting.barcode;
+                            if (this.inputMode === 'regular')this.cleanInputs();
+                            if (res.data.type === 'create'){
+                                console.log(res.data.data);
+                                this.storeCheckingReceiveItems.unshift(res.data.data);
+                                window.tempTip.setDuration(2000);
+                                window.tempTip.showSuccess('成功提交：' + this.inputting.barcode);
+                            }else{
+
+                            }
+                            this.audioDing();
+                            return;
+                        }
+                        window.tempTip.setDuration(3000);
+                        window.tempTip.show(res.data.data);
+                    }).catch(err=>{
+                    window.tempTip.setDuration(3000);
+                    window.tempTip.show("网络错误："+err);
+                });
             },
             cleanInputs: function () {
-                this.changeToScanInputBarcode();
                 this.inputting.barcode='';
                 this.inputting.amount='';
                 this.inputting.bin_number='';
@@ -273,115 +263,81 @@
                 this.status.binDisable=false;
             },
             autoFillBin: function () {
-                let data = this;
-                let isNotRepeatingBarcode=this.goodses.every(function(goods){
-                    if(goods.barcode===data.inputting.barcode){
-                        data.inputting.bin_number=goods.bin_number;
-                        data.status.binDisable=true;
-                        return false;
-                    }
-                    return true;
+                let isNotRepeatingBarcode=this.storeCheckingReceiveItems.every(item=>{
+                    if (item.commodity_barcodes.length > 0){
+                        return  item.commodity_barcodes.every(barcode=> {
+                            if (barcode.code === this.inputting.barcode){
+                                this.inputting.bin_number=item.bin_number;
+                                this.status.binDisable=true;
+                                return false;
+                            }
+                            return true;
+                        });
+                    }else return true;
                 });
-                if(isNotRepeatingBarcode){
-                    data.status.binDisable=false;
-                }
+                if(isNotRepeatingBarcode) this.status.binDisable=false;
             },
-            commitGoodsOnIncreasingMode: function () {
-                let data = this;
-
-                function doIt() {
-                    let repeatedBarcode = data.repeatedIncreasingBarcodeFromSaved();
-
-                    function increase() {
-                        data.inputting.bin_number = repeatedBarcode.bin_number;
-                        repeatedBarcode.amount++;
-                        data.inputting.amount = repeatedBarcode.amount;
-                        window.tempTip.setDuration(500);
-                        window.tempTip.showSuccess(repeatedBarcode.amount);
-                        data.focusDocument();
-                        data.audioDing();
-                    }
-
-                    if (!repeatedBarcode) {
-                        data.focusOutDocument();
-                        data.alertVibrate();
-                        window.tempTip.setInputType('number');
-                        window.tempTip.inputVal('该商品第一件递增请输入隔口号：', function (bin_number) {
-                            if (bin_number === '') {
-                                window.tempTip.setDuration(1500);
-                                window.tempTip.show('未输入隔口号，请重新扫描');
-                                data.alertVibrate();
-                                data.focusDocument();
-                                return
-                            }
-                            data.inputting.bin_number = bin_number;
-                            data.inputting.amount = 1;
-                            data.goodses.unshift(JSON.parse(JSON.stringify(data.inputting)));
-                            data.status.binDisable = true;
-                            window.tempTip.setDuration(500);
-                            window.tempTip.showSuccess('保存成功');
-                            data.focusDocument();
-                            data.audioDing();
-                        })
-                    } else {
-                        increase();
-                    }
-                }
-
-                if (data.lastScannedBarcode !== data.inputting.barcode && data.lastScannedBarcode) {
-                    data.audioWarning_otherBarcode();
-                    data.focusOutDocument();
-                    window.tempTip.confirm('扫到其它条码，是否切换至新条码并记录？', doIt, function () {
-                        data.inputting.barcode = data.lastScannedBarcode;
-                        data.focusDocument();
-                    })
-                } else {
-                    doIt()
-                }
+            commitGoodsOnRegularMode(){
+                this.showCommitButton();
             },
-            commitGoodsOnMultiIncreasingMode: function () {
-                let data = this;
-                let repeatedBarcode=this.repeatedIncreasingBarcodeFromSaved();
-                function increase(){
-                    data.inputting.bin_number=repeatedBarcode.bin_number;
-                    repeatedBarcode.amount++;
-                    data.inputting.amount=repeatedBarcode.amount;
-                    window.tempTip.setDuration(500);
-                    window.tempTip.showSuccess(repeatedBarcode.amount);
-                    data.focusDocument();
-                    data.audioDing();
-                }
-                if(!repeatedBarcode){
-                    data.focusOutDocument();
-                    data.alertVibrate();
+            commitGoodsOnIncreasingMode: function (signIncreasing = true) {
+                let item = this.getItem();
+                let _this = this;
+                if (!item){
+                    _this.focusOutDocument();
                     window.tempTip.setInputType('number');
-                    window.tempTip.inputVal('该商品第一件递增请输入隔口号：',function(bin_number){
-                        if(bin_number===''){
+                    window.tempTip.inputVal('该商品第一件递增请输入隔口号：', function (bin_number) {
+                        if (bin_number === '') {
                             window.tempTip.setDuration(1500);
                             window.tempTip.show('未输入隔口号，请重新扫描');
-                            data.alertVibrate();
-                            data.focusDocument();return}
-                        data.inputting.bin_number=bin_number;
-                        data.inputting.amount=1;
-                        data.goodses.unshift(JSON.parse(JSON.stringify(data.inputting)));
-                        data.status.binDisable=true;
-                        window.tempTip.setDuration(500);
-                        window.tempTip.showSuccess('保存成功');
-                        data.focusDocument();
-                        data.audioDing();
-                    })
-                }else{
-                    increase();
+                            _this.alertVibrate();
+                            _this.focusDocument();
+                            return;
+                        }
+                        _this.inputting.bin_number = bin_number;
+                        _this.inputting.amount = 1;
+                        _this.commitGoods();
+                        _this.focusDocument();
+                    });
+                    return;
                 }
+                _this.status.binDisable=true;
+                _this.inputting.amount = item.amount;
+                _this.inputting.bin_number = item.bin_number;
+                if (signIncreasing && _this.lastScannedBarcode && _this.lastScannedBarcode !== _this.inputting.barcode) {
+                    this.audioWarning_otherBarcode();
+                    this.focusOutDocument();
+                    window.tempTip.confirm('扫到其它条码，是否切换至新条码并记录？', function (){
+                        _this.commitGoods();
+                        _this.focusDocument();
+                    },function () {
+                        _this.focusDocument();
+                    });
+                }else this.commitGoods();
+            },
+            getItem: function () {
+                let repeatedGoods=null;
+                this.storeCheckingReceiveItems.every(item=>{
+                    if (item.commodity_barcodes.length > 0){
+                        return  item.commodity_barcodes.every(barcode=> {
+                            if (barcode.code === this.inputting.barcode){
+                                repeatedGoods = item;
+                                return false;
+                            }
+                            return true;
+                        });
+                    }else return true;
+                });
+                return repeatedGoods;
             },
             oninputEnter:function(e){
                 if (e.key === 'Enter') {
                     this.focusDocument();
+                    this.showCommitButton();
                 }
             },
             focusDocument: function () {
                 this.focusing = 'document';
-                this.showCommitButton();
             },
             focusOutDocument: function () {
                 this.focusing = '';
@@ -410,23 +366,21 @@
                 }
                 startVibrate(500);
             },
-            recordOrPlusGoods: function () {
-                if(this.inputMode==='regular'){
-                    this.addGoods();
-                    return;
-                }
-                let isNotRepeating=this.goodses.every(goods => {
-                    if(goods.barcode===this.inputting.barcode){
-                        goods.amount=parseInt(goods.amount)+parseInt(this.inputting.amount);
-                        return false;
+            alertVibrate: function () {
+                function startVibrate(duration) {
+                    if (navigator.vibrate) {
+                        navigator.vibrate(duration);
+                    } else if (navigator.webkitVibrate) {
+                        navigator.webkitVibrate(duration);
                     }
-                    return true;
-                });
-                if(isNotRepeating)this.addGoods();
+                }
+                let vibrateInterval = setInterval(function() {
+                    startVibrate(150);
+                }, 50);
+                setTimeout(function() {
+                    clearInterval(vibrateInterval)
+                }, 2000);
             },
-            addGoods(){
-                this.goodses.unshift(JSON.parse(JSON.stringify(this.inputting)));
-            }
         },
     });
 </script>

resources/views/store/menu.blade.php

@@ -4,7 +4,7 @@
         <ul class="nav nav-pills">
             @can('入库管理-盘收一体')
                 <li class="nav-item">
-                    <a class="nav-link"  href="{{url('store/checkReceive/mission')}}" :class="{active:isActive('checkReceive',2)}">盘收一体</a>
+                    <a class="nav-link"  href="{{url('store/checkingReceive/mission')}}" :class="{active:isActive('checkingReceive',2)}">盘收一体</a>
                 </li> @endcan
             @can('入库管理-快速入库')
                 <li class="nav-item">

resources/views/waybill/delivering.blade.php

@@ -187,7 +187,7 @@
     .color1{background-color: #FFA07A}
     .color2{background-color: cornflowerblue}
 </style>
-<script type="text/javascript" src="{{asset('js/queryForm/export200818a.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>
     new Vue({

resources/views/waybill/index.blade.php

@@ -251,7 +251,7 @@
             -webkit-animation-play-state: running;
         }
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

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

@@ -125,7 +125,7 @@
 
 @section('lastScript')
 <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
-<script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+<script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
 <script>
     let vue = new Vue({
         el:'#editingPanel',

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

@@ -57,7 +57,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

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

@@ -142,7 +142,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.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/export200818a.js
+                    //excelExport 定义在 js/queryForm/export200918.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
                 hourFilter:function(e){

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

@@ -87,7 +87,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#list",

routes/web.php

@@ -224,11 +224,12 @@ Route::group(['prefix'=>'store'],function(){
     });
 
     /** 盘收 */
-    Route::group(['prefix'=>'checkReceive'],function(){
+    Route::group(['prefix'=>'checkingReceive'],function(){
         Route::group(['prefix'=>'mission'],function(){
             Route::post('import','StoreCheckingReceiveController@import');
             Route::get('{id}','StoreCheckingReceiveController@show');
         });
+        Route::post('insertItem','StoreCheckingReceiveController@insertItem');
         Route::get('mission','StoreCheckingReceiveController@mission');
     });
 });

serves/excelExportGo/api/controller/controller.go

@@ -18,7 +18,8 @@ func Export(w http.ResponseWriter,req *http.Request)  {
 		utilities.WriteLog("/api/controller/controller.go:18   参数解析失败!","ERROR")
 		return
 	}
-	file := excel.CreateFile(selectModule(params))
+
+	file := excel.CreateFile(selectCreateFormat(params))
 	if errorMsg.GetMsg() != "" {
 		w.Header().Set("Msg",errorMsg.GetMsg())
 		w.WriteHeader(500)
@@ -34,6 +35,16 @@ type base struct {
 	LIST [][]interface{} `json:"list"`
 }
 
+func selectCreateFormat(params map[string]string) (row []interface{}, list [][]interface{}, mergeRow map[string]string, mergeColumn []string){
+	switch params["createFormat"] {
+	case "merge":
+		row, list, mergeRow, mergeColumn = selectModule(params)
+	default:
+		row, list, _, _ = selectModule(params)
+	}
+	return
+}
+
 func selectModule(params map[string]string) (row []interface{}, list [][]interface{}, mergeRow map[string]string, mergeColumn []string) {
 	var data []map[string]string
 	switch params["type"] {

serves/excelExportGo/api/controller/inventoryController.go

@@ -45,7 +45,7 @@ func InventoryDailyLogFormat(data []map[string]string) ([]interface{}, [][]inter
 		line := make([]interface{},len(row))
 		for key,value := range column {
 			if key == "created_at" {
-				line[value] = utilities.DateFormat(v[key])
+				line[value] = utilities.DateFormat(v[key],"2006-01-02T15:04:05Z")
 				continue
 			}
 			line[value] = v[key]
@@ -84,11 +84,11 @@ func InventoryAccountMissionFormat(data []map[string]string) ([]interface{}, [][
 		line := make([]interface{},len(row))
 		for key,value := range column {
 			if key == "produced_at"{
-				line[value] = utilities.DateFormat(v[key])
+				line[value] = utilities.DateFormat(v[key],"2006-01-02T15:04:05Z")
 				continue
 			}
 			if key == "valid_at"{
-				line[value] = utilities.DateFormat(v[key])
+				line[value] = utilities.DateFormat(v[key],"2006-01-02T15:04:05Z")
 				continue
 			}
 			line[value] = v[key]
@@ -119,7 +119,7 @@ func InventoryCompareFormat(data []map[string]string) ([]interface{}, [][]interf
 		line := make([]interface{},len(row))
 		for key,value := range column {
 			if key == "created_at" {
-				line[value] = utilities.DateFormat(v[key])
+				line[value] = utilities.DateFormat(v[key],"2006-01-02T15:04:05Z")
 				continue
 			}
 			line[value] = v[key]

serves/excelExportGo/api/controller/orderController.go

@@ -66,7 +66,7 @@ func OrderFormat(data []map[string]string) ([]interface{}, [][]interface{}, map[
 		line := make([]interface{},len(row))
 		for key,value := range column {
 			if key == "ADDTIME" || key == "EDISENDTIME2" || key == "CHECKTIME"{
-				line[value] = utilities.DateFormat(v[key])
+				line[value] = utilities.DateFormat(v[key], "2006-01-02T15:04:05+08:00")
 				continue
 			}
 			line[value] = v[key]
@@ -317,7 +317,7 @@ func OrderIssueFormat(dataMap map[string]map[string]interface{}) ([]interface{},
 			line := make([]interface{},len(row))
 			for key,value := range column {
 				if key == "order_created_at" || key == "order_issues_created_at" {
-					line[value] = utilities.DateFormat(v[key].(string))
+					line[value] = utilities.DateFormat(v[key].(string),"2006-01-02T15:04:05Z")
 					continue
 				}
 				if key == "order_package_logistic_number" || key == "commodity_sku" || key == "commodity_name" || key == "commodity_amount"{

serves/excelExportGo/api/controller/packageController.go

@@ -88,7 +88,7 @@ func PackageIssuedExceptionFormat(data []map[string]string) ([]interface{}, [][]
 		line := make([]interface{},len(row))
 		for key,value := range column {
 			if key == "created_at"{
-				line[value] = utilities.DateFormat(v[key])
+				line[value] = utilities.DateFormat(v[key],"2006-01-02T15:04:05Z")
 				continue
 			}
 			line[value] = v[key]

serves/excelExportGo/api/controller/processController.go

@@ -59,7 +59,7 @@ func ProcessFormat(data []map[string]string) ([]interface{}, [][]interface{}, ma
 				val = v["sign_commodity_barcode_mark"]
 			}
 			if key == "created_at"{
-				val = utilities.DateFormat(v[key])
+				val = utilities.DateFormat(v[key],"2006-01-02T15:04:05Z")
 			}
 			line[value] = val
 		}

serves/excelExportGo/api/controller/rejectedController.go

@@ -64,7 +64,7 @@ func RejectedFormat(data []map[string]string) ([]interface{}, [][]interface{}, m
 		line := make([]interface{},len(row))
 		for key,value := range column {
 			if key == "created_at"{
-				line[value] = utilities.DateFormat(v[key])
+				line[value] = utilities.DateFormat(v[key],"2006-01-02T15:04:05Z")
 				continue
 			}
 			val := v[key]

serves/excelExportGo/api/controller/waybillController.go

@@ -46,7 +46,7 @@ func WaybillFormat(data []map[string]string) ([]interface{}, [][]interface{}) {
 		line := make([]interface{},len(row))
 		for key,value := range column {
 			if key == "created_at" {
-				line[value] = utilities.DateFormat(v[key])
+				line[value] = utilities.DateFormat(v[key],"2006-01-02T15:04:05Z")
 				continue
 			}
 			line[value] = v[key]
@@ -94,7 +94,7 @@ func WaybillDeliveringFormat(data []map[string]string) ([]interface{}, [][]inter
 				continue
 			}
 			if key == "created_at" {
-				line[value] = utilities.DateFormat(v[key])
+				line[value] = utilities.DateFormat(v[key],"2006-01-02T15:04:05Z")
 				continue
 			}
 			line[value] = v[key]
@@ -155,11 +155,11 @@ func WaybillFinancialFormat(data []map[string]string) ([]interface{}, [][]interf
 		line := make([]interface{},len(row))
 		for key,value := range column {
 			if key == "snapshotCreated_at" {
-				line[value] = utilities.DateFormat(v["created_at"])
+				line[value] = utilities.DateFormat(v["created_at"],"2006-01-02T15:04:05Z")
 				continue
 			}
 			if key == "created_at"{
-				line[value] = utilities.DateFormat(m[key])
+				line[value] = utilities.DateFormat(m[key],"2006-01-02T15:04:05Z")
 				continue
 			}
 			line[value] = m[key]

serves/excelExportGo/excel/export.go

@@ -34,6 +34,7 @@ func CreateFile(row []interface{},list [][]interface{}, mergeRow map[string]stri
 			}
 		}
 	}
+
 	if err := streamWriter.Flush(); err != nil {
 		utilities.WriteLog("/excel/export.go:38  文件流关闭失败!","ERROR")
 	}

serves/excelExportGo/utilities/format.go

@@ -4,11 +4,11 @@ import (
 	"time"
 )
 
-func DateFormat(date string)string{
+func DateFormat(date string, parseType string)string{
 	if date == ""{
 		return ""
 	}
 	var LOC, _ = time.LoadLocation("Asia/Shanghai")
-	dateUTC,_ := time.ParseInLocation("2006-01-02T15:04:05Z",date,LOC)
+	dateUTC,_ := time.ParseInLocation(parseType,date,LOC)
 	return  dateUTC.Local().Format("2006-01-02 15:04:05")
 }

webpack.mix.js

@@ -20,7 +20,7 @@ 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/queryForm200914.js');
-mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200818a.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/sound/','public/sound');