Merge branch 'zzd'

# Conflicts:
#	app/Http/Controllers/InventoryController.php
#	resources/views/inventory/statement/changeInventory.blade.php
#	resources/views/order/index/delivering.blade.php
#	resources/views/personnel/laborReport/index.blade.php
#	resources/views/process/index.blade.php
#	resources/views/rejected/search/analyze.blade.php
#	resources/views/rejected/search/general.blade.php
#	resources/views/waybill/index.blade.php
#	resources/views/weight/package/index.blade.php
#	webpack.mix.js

app/Http/Controllers/InventoryController.php

@@ -19,9 +19,7 @@ class InventoryController extends Controller
     {
         app()->singleton('inventoryService',InventoryService::class);
     }
-
-    public function conditionQuery(Request $request,$page=null,$paginate=null){
-        if(!Gate::allows("库存管理-库存")){ return redirect(url('/'));  }
+    private function conditionQuery(Request $request,$page=null,$paginate=null){
         $date_start=$request->input('date_start');
         $range = $request->input('range');
         if ($range)$date_start=date('Y-m-d',strtotime('-'.$range." day"));
@@ -96,6 +94,7 @@ class InventoryController extends Controller
     }
     //动库报表
     public function changeInventory(Request $request){
+        if(!Gate::allows("库存管理-动库报表")){ return redirect(url('/'));  }
         $page=$request->input('page')??1;
         $paginate=$request->input('paginate')??50;
         $oracleActTransactingLogs=$this->conditionQuery($request,$page,$paginate);
@@ -114,6 +113,7 @@ class InventoryController extends Controller
         return view('inventory.statement.allInventory',compact('oracleActTransactingLogs','page','owners'));
     }
     public function exportData(Request $request){
+        if(!Gate::allows("库存管理-动库报表")){ return redirect(url('/'));  }
         if (!$request->checkAllSign){
             $oracleActTransactingLogs=json_decode($request->input('data'),true);
             return $this->export($oracleActTransactingLogs);

app/Http/Controllers/StoreController.php

@@ -10,6 +10,7 @@ use App\StoreItems;
 use App\Warehouse;
 use App\WMSReflectReceive;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
 
 class StoreController extends Controller
@@ -21,6 +22,7 @@ class StoreController extends Controller
      */
     public function index()
     {
+        if(!Gate::allows('入库管理-快速入库-查询')){ return redirect(url('/'));  }
         $stores=Store::orderBy('id','DESC')->paginate(50);
         return view('store.index',['stores'=>$stores]);
     }
@@ -32,6 +34,7 @@ class StoreController extends Controller
      */
     public function create()
     {
+        if(!Gate::allows('入库管理-快速入库-录入')){ return redirect(url('/'));  }
         return view('store.fast.create');
     }
 
@@ -43,6 +46,7 @@ class StoreController extends Controller
      */
     public function store(Request $request)
     {
+        if(!Gate::allows('入库管理-快速入库-录入')){ return redirect(url('/'));  }
         $this->validator($request);
         $WMSReflectReceive=WMSReflectReceive::with('skus')->where('ASNNO',$request->input('asn_code'))->first();
         if (!$WMSReflectReceive)return redirect('store/fast/create')->with('successError','ASN编号不存在！');
@@ -187,7 +191,6 @@ class StoreController extends Controller
 
     public function validator(Request $request){
         $validator=Validator::make($request->input(),[
-//            'asn_code'=>['required','unique:stores,asn_code'],
             'asn_code'=>['required'],
             'quality'=>['required'],
             'depository_code'=>['nullable','string'],

resources/js/queryForm/header.js

@@ -6,14 +6,13 @@
 
 window.sort=require('../utilities/sort');
 window.Header = function getHeader(object) {
-    this.object = object;
-    this._header = object.el || '#header';
-    this._column = object.column;
-    this._data = object.data;
-    this._restorationColumn = object.restorationColumn;
-    this._fixedTop = object.fixedTop || 0;
-    this._offset = object.offset || 0;
-    this._is_restorationColumn_desc = object.is_restorationColumn_desc || 0;
+    this._header = object.el || '#header';  //基点元素
+    this._column = object.column;   //列名
+    this._data = object.data;   //被排序数据
+    this._restorationColumn = object.restorationColumn; //恢复原数据基准字段
+    this._fixedTop = object.fixedTop || 0;  //同级浮动元素高度，使当前元素追加该元素高度浮动
+    this._offset = object.offset || 0;  //偏移量
+    this._is_restorationColumn_asc = object.is_restorationColumn_asc || false;    //恢复原数据基准字段的排序类型 true:asc false:desc
 
     let _this = this;
     let _parentNode = $(_this._header);
@@ -22,6 +21,7 @@ window.Header = function getHeader(object) {
     // form fixed
     let _headerParent = $(_this._header+"Parent");
     let _parentNodeTemp = _parentNode.clone();
+    //滚动监听
     function fixed() {
         let _parentNode_top = _parentNode.offset().top;
         $(window).scroll(function(){
@@ -49,6 +49,7 @@ window.Header = function getHeader(object) {
      *          neglect : null || bool          --是否忽略排序
      *         }
      * */
+    //点击事件触发的排序规则
     function rule(column,column_sort,column_sort_temp) {
         return function () {
             if (!sortType[column.name]){
@@ -89,13 +90,13 @@ window.Header = function getHeader(object) {
                         for(let i = gap; i < len; i++) {
                             let j = i;
                             let current = arr[i];
-                            if (_this._is_restorationColumn_desc){
-                                while(j - gap >= 0 && current[_this._restorationColumn] < arr[j - gap][_this._restorationColumn]) {
+                            if (_this._is_restorationColumn_asc){
+                                while(j - gap >= 0 && Number(current[_this._restorationColumn]) < Number(arr[j - gap][_this._restorationColumn])) {
                                     arr[j] = arr[j - gap];
                                     j = j - gap;
                                 }
                             }else{
-                                while(j - gap >= 0 && current[_this._restorationColumn] > arr[j - gap][_this._restorationColumn]) {
+                                while(j - gap >= 0 && Number(current[_this._restorationColumn]) > Number(arr[j - gap][_this._restorationColumn])) {
                                     arr[j] = arr[j - gap];
                                     j = j - gap;
                                 }
@@ -124,17 +125,22 @@ window.Header = function getHeader(object) {
             }
         }
     };
+    //追加表头字段
     function append() {
         _this._column.forEach(function (column) {
             if (column.customization){
-                _parentNode.append(column.dom);
+                let _th = $("<th id='dom_"+column.name+"'><span style='display: inline-block'></span></th>");
+                $(_th.children()[0]).append(column.dom);
+                _parentNode.append(_th);
             }else{
                 let _td = "<th id='dom_"+column.name+"' style='";
                 if(!column.neglect){
                     _td += "cursor: pointer;"
                 }
                 if (column.style) _td += column.style;
-                _td += "'>";
+                _td += "' ";
+                if (column.class) _td += "class='"+column.class+"'";
+                _td += ">";
                 _td += "<span style='display: inline-block'>";
                 if(!column.neglect){
                     _td += "<span id='sort_"+column.name+"' class='fa fa-sort'></span>";
@@ -142,25 +148,22 @@ window.Header = function getHeader(object) {
                 _td += column.value+"</span>";
                 _td += "</th>";
                 _parentNode.append(_td);
-                let column_dom = $('#dom_'+column.name);
-                if (!column.neglect){
-                    let column_sort = $('#sort_'+column.name);
-                    let column_sort_temp = $('#sort_'+column.name+"_temp");
-                    column_dom.on('click',rule(column,column_sort,column_sort_temp));
-                }
             }
         });
     }
+    //追加浮动表头：克隆表头元素，改变元素属性
     function cloneDom(){
+        let height = _parentNode.height();
+        _parentNodeTemp.css('position',"fixed");
+        _parentNodeTemp.css('top',_this._fixedTop+"px");
+        _parentNodeTemp.css('z-index',"1030");
+        _parentNodeTemp.css('width',_headerParent.width()+"px");
+        _parentNodeTemp.css('background',"rgb(255, 255, 255)");
+        _parentNodeTemp.addClass('text-center');
+        _parentNodeTemp.height(height);
+        _parentNodeTemp.attr('id',_parentNode.attr('id')+"Temp");
+        $(_this._header+"Roll").append(_parentNodeTemp);
         _this._column.forEach(function (column) {
-            let height = _parentNode.height();
-            _parentNodeTemp.css('position',"fixed");
-            _parentNodeTemp.css('top',_this._fixedTop+"px");
-            _parentNodeTemp.css('z-index',"1030");
-            _parentNodeTemp.css('width',_headerParent.width()+"px");
-            _parentNodeTemp.height(height);
-            _parentNodeTemp.attr('id',_this._header+"Temp");
-            $(_this._header+"Roll").append(_parentNodeTemp);
             let column_dom = $('#dom_'+column.name);
             let column_dom_temp = column_dom.clone();
             let columnNameDom = column_dom_temp.children()[0];
@@ -173,11 +176,12 @@ window.Header = function getHeader(object) {
             if (!column.neglect){
                 let column_sort = $('#sort_'+column.name);
                 let column_sort_temp = $('#sort_'+column.name+"_temp");
+                column_dom.on('click',rule(column,column_sort,column_sort_temp));
                 column_dom_temp.on('click',rule(column,column_sort,column_sort_temp));
             }
         });
     }
-
+    //初始化
     this.init = function() {
         append();
         fixed();

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

@@ -16,28 +16,12 @@
             <a class="dropdown-item" @click="processExport(true)" href="javascript:">导出所有页</a>
         </div>
     </span>
-    <table class="table table-sm table-striped table-bordered table-hover text-nowrap card-body mt-2">
-        <tr>
-            <th>
-                <label for="all">
-                    <input id="all" type="checkbox" @click="checkAll($event)">全选
-                </label>
-            </th>
-            <th>序号</th>
-            <th>货主</th>
-            <th>库位</th>
-            <th>产品编码</th>
-            <th>产品条码</th>
-            <th>商品名称</th>
-            <th>属性仓</th>
-            <th>质量状态</th>
-            <th>失效日期</th>
-            <th>批号</th>
-            <th>移出数量</th>
-            <th>移入数量</th>
-            <th>在库数量</th>
-            <th>占用数量</th>
-        </tr>
+    <label for="all" id="cloneCheckAll" class="d-none">
+        <input id="all" type="checkbox" @click="checkAll($event)">全选
+    </label>
+    <table class="table table-sm table-bordered text-nowrap d-none" id="headerRoll"></table>
+    <table class="table table-sm table-striped table-bordered table-hover text-nowrap card-body mt-2" id="headerParent">
+        <tr id="header"></tr>
         <tr v-for="(oracleActTransactingLog,i) in oracleActTransactingLogs">
             <td>
                 <input class="checkItem" type="checkbox" :value="oracleActTransactingLog" v-model="checkData">
@@ -73,8 +57,8 @@
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
-        $.cookie('xxx', 2223);
         new Vue({
             el:"#list",
             data:{
@@ -137,6 +121,33 @@
                         return true;
                     });
                 }
+                let column = [
+                    {name:'cloneCheckAll',customization:true,dom:$('#cloneCheckAll').removeClass('d-none'), neglect: true},
+                    {name:'index',value: '序号', neglect: true},
+                    {name:'货主',value: '货主', class:'text-primary'},
+                    {name:'库位',value: '库位', class:'text-muted'},
+                    {name:'产品编码',value: '产品编码', class:'text-muted'},
+                    {name:'产品条码',value: '产品条码', class:'text-muted'},
+                    {name:'商品名称',value: '商品名称'},
+                    {name:'属性仓',value: '属性仓', class:'text-muted'},
+                    {name:'质量状态',value: '质量状态', class:'text-muted'},
+                    {name:'失效日期',value: '失效日期', class:'text-muted'},
+                    {name:'批号',value: '批号', class:'text-muted'},
+                    {name:'移出数量',value: '移出数量', neglect: true},
+                    {name:'移入数量',value: '移入数量', neglect: true},
+                    {name:'在库数量',value: '在库数量', neglect: true},
+                    {name:'占用数量',value: '占用数量', neglect: true},
+                ];
+                let header = new Header({
+                    el: "#header",
+                    column: column,
+                    data: this.oracleActTransactingLogs,
+                    restorationColumn: 'rn',
+                    is_restorationColumn_asc:true,
+                    fixedTop:($('#form_div').height())+2,
+                    offset:0.5
+                });
+                header.init();
             },
             watch:{
                 checkData:{

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

@@ -8,18 +8,13 @@
     </span>
     <div class="container-fluid">
         <div class="card">
-            <div class="card-body">
+            <div class="card-body" id="list">
                 @if(Session::has('successTip'))
                     <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
                 @endif
-                <table class="table table-striped table-sm" id="list">
-                    <tr>
-                        <th>ID</th>
-                        <th>角色名</th>
-                        <th>允许权限</th>
-                        <th>禁止权限</th>
-                        <th>创建时间</th>
-                        <th>操作</th>
+                <table class="table table-bordered table-sm d-none" id="headerRoll"></table>
+                <table class="table table-striped table-sm" id="headerParent">
+                    <tr id="header">
                     </tr>
                     <tr v-for="role in roles">
                         <td class="text-muted">@{{role.id}}</td>
@@ -54,6 +49,7 @@
 @endsection
 
 @section('lastScript')
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -66,6 +62,22 @@
                     @endforeach
                 ],
             },
+            mounted:function(){
+                let column = [
+                    {name:'id',value: 'ID'},
+                    {name:'name',value: '用户名'},
+                    {name:'alias_name',value: '允许权限', neglect: true},
+                    {name:'alias_name_false',value: '禁止权限', neglect: true},
+                    {name:'created_at',value: '创建时间'},
+                    {name:'operation',value: '操作', neglect: true},
+                ];
+                let header = new Header({
+                    column: column,
+                    data: this.roles,
+                    restorationColumn: 'id',
+                });
+                header.init();
+            },
             methods:{
                 edit:function(id){
                     location.href = "{{url('maintenance/role')}}/"+id+"/edit";

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

@@ -12,49 +12,44 @@
                 @if(Session::has('successTip'))
                     <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
                 @endif
-                <table class="table table-striped table-sm" id="list">
-                    <tr>
-                        <th>ID</th>
-                        <th>用户名</th>
-                        <th>角色</th>
-                        <th>工作组</th>
-                        <th>配置承运商</th>
-                        <th>邮件地址</th>
-                        <th>创建时间</th>
-                        <th>操作</th>
-                    </tr>
-                    <tr v-for="user in users">
-                        <td class="text-muted">@{{user.id}}</td>
-                        <td>@{{user.name}}</td>
-                        <td>
-                            <span class="text-danger" v-if="user.isSuperAdmin">超级管理员</span>
-                            <ul v-if="user.roles.length>0" class="list-group">
-                                <li v-for="role in user.roles" style="list-style: none">@{{ role.name }}</li>
-                            </ul>
-                        </td>
-                        <td><span v-if="user.workgroup&&user.workgroup.length>0">@{{ user.workgroup[0].name }}</span></td>
-                        <td>
-                            <ul v-if="user.carriers.length>0" class="list-group">
-                                <li v-for="carrier in user.carriers" style="list-style: none">@{{ carrier.name }}</li>
-                            </ul>
-                        </td>
-                        <td>@{{user.email}}</td>
-                        <td class="text-muted">@{{user.created_at}}</td>
-                        <td>
-                            @can('用户-编辑')
-                            <button class="btn btn-sm btn-outline-primary" @click="edit(user.id)">改</button> @endcan
-                            @can('用户-删除')
-                            <button class="btn btn-sm btn-outline-dark" @click="destroy(user)">删</button> @endcan
-                        </td>
-                    </tr>
-                </table>
-                {{$users->links()}}
+                <div id="list">
+                    <table class="table table-bordered table-sm d-none" id="headerRoll">
+                    <table class="table table-striped table-sm" id="headerParent">
+                        <tr id="header"></tr>
+                        <tr v-for="user in users">
+                            <td class="text-muted">@{{user.id}}</td>
+                            <td>@{{user.name}}</td>
+                            <td>
+                                <span class="text-danger" v-if="user.isSuperAdmin">超级管理员</span>
+                                <ul v-if="user.roles.length>0" class="list-group">
+                                    <li v-for="role in user.roles" style="list-style: none">@{{ role.name }}</li>
+                                </ul>
+                            </td>
+                            <td><span v-if="user.workgroup&&user.workgroup.length>0">@{{ user.workgroup[0].name }}</span></td>
+                            <td>
+                                <ul v-if="user.carriers.length>0" class="list-group">
+                                    <li v-for="carrier in user.carriers" style="list-style: none">@{{ carrier.name }}</li>
+                                </ul>
+                            </td>
+                            <td>@{{user.email}}</td>
+                            <td class="text-muted">@{{user.created_at}}</td>
+                            <td>
+                                @can('用户-编辑')
+                                <button class="btn btn-sm btn-outline-primary" @click="edit(user.id)">改</button> @endcan
+                                @can('用户-删除')
+                                <button class="btn btn-sm btn-outline-dark" @click="destroy(user)">删</button> @endcan
+                            </td>
+                        </tr>
+                    </table>
+                    {{$users->links()}}
+                </div>
             </div>
         </div>
     </div>
 @endsection
 
 @section('lastScript')
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -67,12 +62,31 @@
                     @endforeach
                 ],
             },
+            mounted:function(){
+                let column = [
+                    {name:'id',value: 'ID'},
+                    {name:'name',value: '用户名'},
+                    {name:'role_name',value: '角色', neglect: true},
+                    {name:'workgroup_name',value: '工作组', neglect: true},
+                    {name:'carrier_name',value: '配置承运商', neglect: true},
+                    {name:'email',value: '邮件地址'},
+                    {name:'created_at',value: '创建时间'},
+                    {name:'operation',value: '操作', neglect: true},
+                ];
+                let header = new Header({
+                    column: column,
+                    data: this.users,
+                    restorationColumn: 'id',
+                    is_restorationColumn_asc:true,
+                });
+                header.init();
+            },
             methods:{
                 edit:function(id){
                     location.href = "{{url('maintenance/user')}}/"+id+"/edit";
                 },
                 destroy:function(user){
-                    if(!confirm('确定要删除用户“' + user.name + '”吗？')){return};
+                    if(!confirm('确定要删除用户“' + user.name + '”吗？'))return;
                     let data=this;
                     let url = "{{url('maintenance/user')}}/"+user.id;
                     axios.delete(url,{id:user.id})

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

@@ -42,46 +42,14 @@
                         </div><!-- /.modal-content -->
                     </div><!-- /.modal -->
                 </div>
-                <table class="table table-sm table-striped table-bordered table-hover card-body mt-2 ml-3">
-                    <tr class="text-nowrap">
+                <table class="table table-sm table-striped table-bordered table-hover card-body mt-2 ml-3 d-none" id="headerRoll"></table>
+                <table class="table table-sm table-striped table-bordered table-hover card-body mt-2 ml-3" id="headerParent">
+                    <tr class="text-nowrap" id="header">
                         <th>
                             <label for="all">
                                 <input id="all" type="checkbox" @click="checkAll($event)">全选
                             </label>
                         </th>
-                        <th>序号</th>
-                        <th>编号</th>
-                        <th>订单状态</th>
-                        <th>接口下发时间</th>
-                        <th>店铺名称</th>
-                        <th>客户</th>
-                        <th>客户订单号</th>
-                        <th>承运人</th>
-                        <th>快递单号</th>
-                        <th>收货人名称</th>
-                        <th>收货人电话</th>
-                        <th>省</th>
-                        <th>市</th>
-                        <th>区</th>
-                        <th style="min-width:320px;">收货人地址</th>
-                        <th>波次编号</th>
-                        <th>仓库</th>
-                        <th>快递获取标记</th>
-                        <th>快递获取时间</th>
-                        <th style="min-width: 150px">产品代码</th>
-                        <th style="min-width: 150px">产品条码</th>
-                        <th style="min-width: 180px">产品名称</th>
-                        <th>订单数量</th>
-                        <th style="min-width: 150px">明细状态</th>
-                        <th>复核时间</th>
-                        <th style="min-width:260px;">备注</th>
-                        <th>接口取消标记</th>
-                        <th>拣货单打印标记</th>
-                        <th>接口回传标记</th>
-                        <th>接口回传异常备注</th>
-                        <th>订单冻结</th>
-                        <th>取消分配</th>
-
                     </tr>
                     <tr v-for="(order,i) in orders" @click="selectedColor(order.orderno)" :style="{'font-weight': order.orderno==selectedStyle?'bold':''}">
                         <td>
@@ -174,6 +142,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -233,6 +202,49 @@
                     condition:data,
                 });
                 this.form.init();
+                let column = [
+                    {name:'index',value: '序号', neglect: true},
+                    {name:'orderno',value: '编号'},
+                    {name:'ordercodename',value: '订单状态'},
+                    {name:'addtime',value: '接口下发时间'},
+                    {name:'issuepartyname',value: '店铺名称'},
+                    {name:'customer_descr_c',value: '客户'},
+                    {name:'soreference1',value: '客户订单号'},
+                    {name:'carriername',value: '承运人'},
+                    {name:'soreference5',value: '快递单号'},
+                    {name:'c_contact',value: '收货人名称'},
+                    {name:'c_tel2',value: '收货人电话'},
+                    {name:'c_province',value: '省'},
+                    {name:'c_city',value: '市'},
+                    {name:'c_district',value: '区'},
+                    {name:'c_address1',value: '收货人地址', style:"min-width:320px;"},
+                    {name:'waveno',value: '波次编号'},
+                    {name:'warehouseid',value: '仓库'},
+                    {name:'edisendflag2',value: '快递获取标记'},
+                    {name:'edisendtime2',value: '快递获取时间'},
+                    {name:'sku',value: '产品代码', neglect: true, style:"min-width: 150px"},
+                    {name:'alternate_sku1',value: '产品条码', neglect: true, style:"min-width: 150px"},
+                    {name:'descr_c',value: '产品名称', neglect: true, style:"min-width: 180px"},
+                    {name:'qtyordered',value: '订单数量', neglect: true},
+                    {name:'orderdetailcodename',value: '明细状态', neglect: true, style:"min-width: 150px"},
+                    {name:'checktime',value: '复核时间', neglect: true},
+                    {name:'notes',value: '备注', style:"min-width: 260px"},
+                    {name:'erpcancelflag',value: '接口取消标记'},
+                    {name:'picking_print_flag',value: '拣货单打印标记'},
+                    {name:'edisendflag',value: '接口回传标记'},
+                    {name:'ediremarks2',value: '接口回传异常备注'},
+                    {name:'update',value: '订单冻结', neglect: true},
+                    {name:'remove',value: '取消分配', neglect: true},
+                ];
+                let header = new Header({
+                    el: "#header",
+                    column: column,
+                    data: this.orders,
+                    restorationColumn: 'addtime',
+                    fixedTop:($('#form_div').height())+2,
+                    offset:0.5,
+                });
+                header.init();
             },
             watch:{
                 checkData:{

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

@@ -18,33 +18,12 @@
                     <a class="dropdown-item" @click="laborReportExport(true)" href="javascript:">导出所有页</a>
                 </div>
             </span>
-        <table class="table table-sm table-hover table-striped d-none d-xl-block p-0 text-nowrap table-bordered" >
-            <tr>
-                <th class="text-center">
-                    <label for="all">
-                        <input id="all" type="checkbox" @click="checkAll($event)">全选
-                    </label>
-                </th>
-                <th class="text-center">序号</th>
-                {{--                            <th>ID</th>--}}
-                <th class="text-center">操作</th>
-                <th class="text-center"  style="background-color: rgb(241, 234, 190)">进厂编号</th>
-                <th class="text-center" style="background-color: rgb(241, 234, 190)">小组</th>
-                <th class="text-center" style="background-color: rgb(241, 234, 190)">临时工</th>
-                <th class="text-center" style="background-color: rgb(241, 234, 190)">电话</th>
-                <th class="text-center" style="background-color: rgb(241, 234, 190)">身份证号</th>
-                <th class="text-center" style="background-color: rgb(241, 234, 190)">劳务所</th>
-                <th class="text-center">进场时间</th>
-                <th class="text-center">进组时间</th>
-                <th class="text-center">退组时间</th>
-                <th class="text-center">退场时间</th>
-                <th class="text-center">审核时间</th>
-                <th class="text-center">审核人</th>
-                <th class="text-center">晚饭打卡(分)</th>
-                <th class="text-center">在线时长</th>
-                <th class="text-center">本次工作时长</th>
-                <th class="text-center">备注</th>
-            </tr>
+        <label for="all" class="d-none" id="cloneCheckAll">
+            <input id="all" type="checkbox" @click="checkAll($event)">全选
+        </label>
+        <table class="table table-sm table-bordered d-none text-nowrap " id="headerRoll">
+        <table class="table table-sm table-hover table-striped d-none d-xl-block p-0 text-nowrap table-bordered" id="headerParent">
+            <tr class="text-center" id="header"></tr>
             <tr v-for="(laborReport,i) in laborReports"  @click="selectedColor(laborReport.id)" :style="{'font-weight': laborReport.id==selectedStyle?'bold':''}">
                 <td>
                     <input class="checkItem" type="checkbox" :value="laborReport.id" v-model="checkData">
@@ -233,6 +212,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
         let today=(new Date());
         function isTomorrow(){
@@ -390,6 +370,37 @@
                     condition:data,
                 });
                 this.form.init();
+                let column = [
+                    {name:'cloneCheckAll',customization:true,dom:$('#cloneCheckAll').removeClass('d-none'), neglect: true},
+                    {name:'index',value: '序号', neglect: true},
+                    {name:'operation',value: '操作', neglect: true},
+                    {name:'enter_number',value: '进厂编号', style:'background-color: rgb(241, 234, 190)'},
+                    {name:'userWorkGroupName',value: '小组', style:'background-color: rgb(241, 234, 190)'},
+                    {name:'name',value: '临时工', style:'background-color: rgb(241, 234, 190)'},
+                    {name:'mobile_phone',value: '电话', style:'background-color: rgb(241, 234, 190)'},
+                    {name:'identity_number',value: '身份证号', style:'background-color: rgb(241, 234, 190)'},
+                    {name:'labor_company',value: '劳务所', style:'background-color: rgb(241, 234, 190)'},
+                    {name:'enter_at',value: '进场时间'},
+                    {name:'checkInAt',value: '进组时间'},
+                    {name:'checkOutAt',value: '退组时间'},
+                    {name:'exit_at',value: '退场时间'},
+                    {name:'verifyAt',value: '审核时间'},
+                    {name:'verifyPerson',value: '审核人'},
+                    {name:'relax_time',value: '晚饭打卡(分)', neglect: true},
+                    {name:'thisRecordOnlineTime',value: '在线时长', neglect: true},
+                    {name:'thisRecordWorkingTime',value: '本次工作时长', neglect: true},
+                    {name:'remark',value: '备注'},
+                ];
+                let header = new Header({
+                    el: "#header",
+                    column: column,
+                    data: this.oracleActTransactingLogs,
+                    restorationColumn: 'rn',
+                    is_restorationColumn_asc:true,
+                    fixedTop:($('#form_div').height())+2,
+                    offset:0.5
+                });
+                header.init();
             },
             watch:{
                 checkData:{

resources/views/process/index.blade.php

@@ -160,7 +160,7 @@
         </div>
         <table class="table table-sm text-nowrap table-bordered d-none" id="headerRoll"></table>
         <table class="table table-sm text-nowrap table-bordered" id="headerParent">
-            <tr class="row-even p-0" id="header" style="background: rgb(255, 255, 255);">
+            <tr class="row-even p-0" id="header">
                 <th>
                     <label for="all">
                         <input id="all" type="checkbox" @click="checkAll($event)">全选
@@ -461,7 +461,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
         new Vue({
             el:"#process",
@@ -572,7 +572,7 @@
                     data: this.processes,
                     restorationColumn: 'serial_number',
                     fixedTop:($('#form_div').height())+2,
-                    is_restorationColumn_desc :true,
+                    is_restorationColumn_asc :true,
                 });
                 header.init();
             },

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

@@ -22,20 +22,11 @@
                    href="javascript:">导出所有页</a>
             </div>
         </span>
-        <table class="table table-striped table-sm table-bordered table-hover" style="background: #fff;">
-            <tr>
-                <th>
-                    <input type="checkbox" class="form-control-sm tooltipTarget" title="全选"
-                           id="checkSelectingAll" @click="checkBoxAllToggle" v-model="checkBoxAll" value="1">
-                </th>
-                <th>序号</th>
-                <th>货主</th>
-                <th class="text-muted">退件数</th>
-                <th class="text-success font-weight-bold">审核数</th>
-                <th>未审核数</th>
-                <th class="text-success font-weight-bold">入库数</th>
-                <th>未入库数</th>
-            </tr>
+        <input type="checkbox" class="form-control-sm tooltipTarget d-none" title="全选"
+               id="checkSelectingAll" @click="checkBoxAllToggle" v-model="checkBoxAll" value="1">
+        <table class="table table-striped table-sm table-bordered table-hover d-none" id="headerRoll"></table>
+        <table class="table table-striped table-sm table-bordered table-hover" style="background: #fff;" id="headerParent">
+            <tr id="header"></tr>
             <tr v-for="(rejectedBill,index) in rejectedBills " :data-id="rejectedBill.id">
                 <td>
                     <input type="checkbox" v-model="rejectedBills_checkBoxes" :value="rejectedBill.id_owner">
@@ -69,6 +60,7 @@
 @section('lastScript')
     <script src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -101,6 +93,24 @@
                     isPaginations:false,
                 });
                 this.form.init();
+                let header = new Header({
+                    el: "#header",
+                    column: [
+                        {name:'checkSelectingAll',customization:true,dom:$('#checkSelectingAll').removeClass('d-none'), neglect: true},
+                        {name:'index',value: '序号', neglect: true},
+                        {name:'owner_name',value: '货主', neglect: true},
+                        {name:'bounce_amount',value: '退件数', neglect: true, class:'text-muted'},
+                        {name:'check_amount',value: '审核数', neglect: true, class:'text-success font-weight-bold'},
+                        {name:'bounce_amount_check_amount',value: '未审核数', neglect: true},
+                        {name:'in_storage_count',value: '入库数', neglect: true, class:'text-success font-weight-bold'},
+                        {name:'not_in_storage_count',value: '未入库数', neglect: true},
+                    ],
+                    data: this.rejectedBills,
+                    restorationColumn: 'id',
+                    fixedTop:($('#form_div').height())+2,
+                    offset:0.5,
+                });
+                header.init();
             },
             methods:{
                 checkBoxAllToggle:function(e){

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

@@ -58,7 +58,7 @@
                 </span>
                 <table class="table table-striped table-sm table-bordered table-hover text-nowrap d-none" id="headerRoll" ></table>
                 <table class="table table-striped table-sm table-bordered table-hover text-nowrap" style="background: #fff;" id="headerParent">
-                    <tr id="header" style="background: rgb(255, 255, 255)">
+                    <tr id="header">
                         <th>
                             <input type="checkbox" class="form-control-sm tooltipTarget" title="全选"
                                    id="checkSelectingAll" @click="checkBoxAllToggle" v-model="checkBoxAll" value="1">
@@ -180,7 +180,7 @@
     </script>
     <script src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/store/index.blade.php

@@ -7,48 +7,37 @@
     </span>
     <div class="d-none" id="fast">
         <div class="container-fluid">
-            <div class="">
-                <table class="table table-striped table-sm text-nowrap table-hover">
-                    <tr>
-                        <th>
-                            <label for="all">
-                                <input id="all" type="checkbox" @click="checkAll($event)">全选
-                            </label>
-                        </th>
-                        <th>序号</th>
-                        <th>ID</th>
-                        <th>ASN编号</th>
-                        <th>仓库</th>
-                        <th>货主</th>
-                        <th>入库类型</th>
-                        <th>状态</th>
-                        <th>备注</th>
-                        <th>生成时间</th>
-                    </tr>
-                    <tr v-for="(store,i) in stores">
-                        <td>
-                            <input class="checkItem" type="checkbox" :value="store.id" v-model="checkData">
-                        </td>
-                        <td>@{{ i+1  }}</td>
-                        <td>@{{store.id}}</td>
-                        <td class="text-muted">@{{store.asn_code}}</td>
-                        <td>@{{store.warehouse_name}}</td>
-                        <td class="text-muted">@{{store.owner_name}}</td>
-                        <td class="text-muted">@{{store.stored_method}}</td>
-                        <td class="text-muted">@{{store.status}}</td>
-                        <td>@{{store.remark}}</td>
-                        <td class="text-muted">@{{store.created_at}}</td>
-                    </tr>
-                </table>
-                <div class="text-info h5 btn btn">{{$stores->count()}}/{{$stores->total()}}</div>
-                {{$stores->links()}}
-            </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" id="headerParent">
+                <tr id="header">
+                    <th>
+                        <label for="all">
+                            <input id="all" type="checkbox" @click="checkAll($event)">全选
+                        </label>
+                    </th>
+                </tr>
+                <tr v-for="(store,i) in stores">
+                    <td>
+                        <input class="checkItem" type="checkbox" :value="store.id" v-model="checkData">
+                    </td>
+                    <td>@{{ i+1  }}</td>
+                    <td class="text-muted">@{{store.asn_code}}</td>
+                    <td>@{{store.warehouse_name}}</td>
+                    <td class="text-muted">@{{store.owner_name}}</td>
+                    <td class="text-muted">@{{store.stored_method}}</td>
+                    <td class="text-muted">@{{store.status}}</td>
+                    <td>@{{store.remark}}</td>
+                    <td class="text-muted">@{{store.created_at}}</td>
+                </tr>
+            </table>
+            <div class="text-info h5 btn btn">{{$stores->count()}}/{{$stores->total()}}</div>
+            {{$stores->links()}}
         </div>
     </div>
-    </div>
 @endsection
 
 @section('lastScript')
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
         new Vue({
             el:'#fast',
@@ -61,9 +50,24 @@
                 checkData:[]
             },
             mounted:function(){
-                /*this.initInputs();
-                $(".tooltipTarget").tooltip({'trigger':'hover'});*/
                 $('#fast').removeClass('d-none');
+                let column = [
+                    {name:'index',value: '序号', neglect: true},
+                    {name:'asn_code',value: 'ASN编号'},
+                    {name:'warehouse_name',value: '仓库'},
+                    {name:'owner_name',value: '货主'},
+                    {name:'stored_method',value: '入库类型'},
+                    {name:'status',value: '状态'},
+                    {name:'remark',value: '备注'},
+                    {name:'created_at',value: '生成时间'},
+                ];
+                let header = new Header({
+                    el: "#header",
+                    column: column,
+                    data: this.stores,
+                    restorationColumn: 'id',
+                });
+                header.init();
             },
             watch:{
                 checkData:{

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

@@ -8,134 +8,40 @@
     </span>
     <div class="d-none" id="item">
         <div class="container-fluid">
-            <div class="">
-                <div>
- {{--                   <form  method="GET" action="{{url('store/')}}" id="optionSubmit">
-                        <table class="table  table-sm table-bordered text-nowrap ">
-                            <tr v-if="isBeingFilterConditions">
-                                <td colspan="10"><div class="col" style="padding:0">
-                                        <a  href="{{url('store')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
-                                    </div></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <span class="text-muted">每页显示记录：</span>
-                                </td>
-                                <td  colspan="9">
-                                    <select name="paginate" v-model="filterData.paginate" class="tooltipTarget form-control-sm" style="vertical-align: middle" @change="setPaginate">
-                                        <option value="50">50行</option>
-                                        <option value="100">100行</option>
-                                        <option value="200">200行</option>
-                                        <option value="500">500行</option>
-                                        <option value="1000">1000行</option>
-                                    </select></td>
-                            </tr>
-                            <tr>
-                                <td rowspan="2">
-                                    <span class="text-muted">根据条件过滤：</span>
-                                </td>
-                                <td >
-                                    <label class="form-inline" style="width: 350px">时间：
-                                        <input style="width: 150px" name="created_at_start" type="date" v-model="filterData.created_at_start" class="form-control-sm">
-                                        <input style="width: 150px" type="date" name="created_at_end" v-model="filterData.created_at_end" class="form-control-sm">
-                                    </label>
-                                </td>
-                                --}}{{--<td > <label class="form-inline" style="width:200px;margin-left: 2%">货主：
-                                        <input class="form-control-sm" style="width: 80px" placeholder="搜索定位" @input="owner_seek">&nbsp;&nbsp;&nbsp;
-                                        <select name="owner_id" v-model="filterData.owner_id" class="form-control-sm"  @change="setOwner">
-                                            <option >    </option>
-                                            @foreach($owners as $owner)
-                                                <option value="{{$owner->id}}">{{$owner->name}}</option>
-                                            @endforeach
-                                        </select></label><input hidden type="submit" value="kk"></td>--}}{{--
-                                <td>
-                                    <label for="">客户：</label>
-                                    <input type="text" class="form-control-sm tooltipTarget" placeholder="查找"
-                                           style="width:70px" @input="owner_seek"
-                                           title="输入关键词快速定位下拉列表，回车确定">
-                                    <select name="owner_id" v-model="filterData.owner_id" @change="setOwner" class="form-control-sm tooltipTarget">
-                                        <option >    </option>
-                                        @foreach($owners as $owner)
-                                            <option value="{{$owner->id}}">{{$owner->name}}</option>
-                                        @endforeach
-                                    </select>
-                                    <input hidden type="submit" value="kk">
-                                </td>
-                                <td > <label class="form-inline" style="width:250px;margin-left: 2%">快递单号：
-                                        <input type="text" name="logistic_number" class="form-control-sm  " v-model="filterData.logistic_number" style="vertical-align: middle"></label></td>
-                                <td > <label  class="form-inline" style="width:250px;margin-left: 2%">发货单号：
-                                        <input type="text" name="delivery_number" class="form-control-sm  " v-model="filterData.delivery_number" style="vertical-align: middle"></label></td>
-                                <td colspan="5"></td>
-                            </tr>
-                            <tr>
-                                <td > <label class="form-inline" >波次号：
-                                        <input type="text" name="batch_number" class="form-control-sm  " v-model="filterData.batch_number" style="vertical-align: middle"></label></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <span class="text-muted">操作选定记录：</span>
-                                </td>
-                                <td colspan="9">
-                                    <select @change="storeExport($event)" :class="[checkData.length>0?'btn-dark':'btn-outline-dark']"  class=" tooltipTarget form-control-sm" style=" vertical-align: middle"
-                                             title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
-                                        <option >导出Excel</option>
-                                        <option value="1">导出勾选内容</option>
-                                        <option value="2">导出所有页</option>
-                                    </select>
-                                    <input hidden type="submit" value="kk">
-                                </td>
-                            </tr>
-                        </table>
-                    </form>--}}
-                </div>
-            <div class="">
-                <table class="table table-striped table-sm text-nowrap table-hover">
-                    <tr>
-                        <th>
-                            <label for="all">
-                                <input id="all" type="checkbox" @click="checkAll($event)">全选
-                            </label>
-                        </th>
-                        <th>序号</th>
-                        <th>ID</th>
-                        <th>ASN编号</th>
-                        <th>ASN行号</th>
-                        <th>产品名</th>
-                        <th>单位</th>
-                        <th>条码</th>
-                        <th>属性仓</th>
-                        <th>总计</th>
-                        <th>质量</th>
-                        <th>状态</th>
-                        <th>创建时间</th>
-                    </tr>
-                    <tr v-for="(storeItem,i) in storeItems">
-                        <td>
-                            <input class="checkItem" type="checkbox" :value="storeItem.id" v-model="checkData">
-                        </td>
-                        <td>@{{ i+1  }}</td>
-                        <td class="text-muted">@{{storeItem.id}}</td>
-                        <td>@{{storeItem.store_asn_code}}</td>
-                        <td>@{{storeItem.asn_line_code}}</td>
-                        <td class="text-muted">@{{storeItem.name}}</td>
-                        <td class="text-muted">@{{storeItem.sku}}</td>
-                        <td class="text-muted">@{{storeItem.barcode}}</td>
-                        <td>@{{storeItem.depository_name}}</td>
-                        <td class="text-muted">@{{storeItem.amount}}</td>
-                        <td class="text-muted">@{{storeItem.quality}}</td>
-                        <td class="text-muted">@{{storeItem.status}}</td>
-                        <td class="text-muted">@{{storeItem.created_at}}</td>
-                    </tr>
-                </table>
-                <div class="text-info h5 btn btn">{{$storeItems->count()}}/{{$storeItems->total()}}</div>
-                {{$storeItems->links()}}
-            </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" id="headerParent">
+                <tr id="header">
+                    <th>
+                        <label for="all">
+                            <input id="all" type="checkbox" @click="checkAll($event)">全选
+                        </label>
+                    </th>
+                </tr>
+                <tr v-for="(storeItem,i) in storeItems">
+                    <td>
+                        <input class="checkItem" type="checkbox" :value="storeItem.id" v-model="checkData">
+                    </td>
+                    <td>@{{ i+1  }}</td>
+                    <td>@{{storeItem.store_asn_code}}</td>
+                    <td>@{{storeItem.asn_line_code}}</td>
+                    <td class="text-muted">@{{storeItem.name}}</td>
+                    <td class="text-muted">@{{storeItem.sku}}</td>
+                    <td class="text-muted">@{{storeItem.barcode}}</td>
+                    <td>@{{storeItem.depository_name}}</td>
+                    <td class="text-muted">@{{storeItem.amount}}</td>
+                    <td class="text-muted">@{{storeItem.quality}}</td>
+                    <td class="text-muted">@{{storeItem.status}}</td>
+                    <td class="text-muted">@{{storeItem.created_at}}</td>
+                </tr>
+            </table>
+            <div class="text-info h5 btn btn">{{$storeItems->count()}}/{{$storeItems->total()}}</div>
+            {{$storeItems->links()}}
         </div>
     </div>
-    </div>
 @endsection
 
 @section('lastScript')
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
         new Vue({
             el:'#item',
@@ -148,9 +54,27 @@
                 checkData:[]
             },
             mounted:function(){
-                /*this.initInputs();
-                $(".tooltipTarget").tooltip({'trigger':'hover'});*/
                 $('#item').removeClass('d-none');
+                let column = [
+                    {name:'index',value: '序号', neglect: true},
+                    {name:'store_asn_code',value: 'ASN编号'},
+                    {name:'asn_line_code',value: 'ASN行号'},
+                    {name:'name',value: '产品名', class:'text-muted'},
+                    {name:'sku',value: 'SKU', class:'text-muted'},
+                    {name:'barcode',value: '条码', class:'text-muted'},
+                    {name:'depository_name',value: '属性仓'},
+                    {name:'amount',value: '总计', class:'text-muted'},
+                    {name:'quality',value: '质量', class:'text-muted'},
+                    {name:'status',value: '状态', class:'text-muted'},
+                    {name:'created_at',value: '创建时间', class:'text-muted'},
+                ];
+                let header = new Header({
+                    el: "#header",
+                    column: column,
+                    data: this.storeItems,
+                    restorationColumn: 'id',
+                });
+                header.init();
             },
             watch:{
                 checkData:{

resources/views/waybill/delivering.blade.php

@@ -44,29 +44,14 @@
             </div>
         </form>
         <div class="card">
-            <table class="card-body table table-sm table-hover table-striped table-bordered d-none d-sm-block p-0 text-nowrap" style="width: 100%">
-                <tr style="width: 100%">
+            <table class="table table-sm table-hover table-striped table-bordered d-none" id="headerRoll"></table>
+            <table class="card-body table table-sm table-hover table-striped table-bordered d-none d-sm-block p-0 text-nowrap" style="width: 100%" id="headerParent">
+                <tr style="width: 100%" id="header">
                     <th class="td-operation">
                         <label for="all">
                             <input id="all" type="checkbox" @click="checkAll($event)">全选
                         </label>
                     </th>
-                    <th>序号</th>
-                    <th class="color1">日期</th>
-                    <th class="color1">承运商</th>
-                    <th class="color1">宝时运单号</th>
-                    <th class="color1">提货仓</th>
-                    <th class="color1">货主</th>
-                    <th class="color1">预估重量/KG</th>
-                    <th class="color1">预估体积/M³</th>
-                    <th class="color2">状态</th>
-                    <th class="color2">专线运单号</th>
-                    <th class="color2">查件电话</th>
-                    <th class="color2">件数</th>
-{{--                    <th class="color2">件数单位</th>--}}
-                    <th class="color2">重量</th>
-                    <th class="color2">体积</th>
-                    <th>操作</th>
                 </tr>
                 <tr v-for="(waybill,i) in waybills">
                     <td>
@@ -202,6 +187,7 @@
     .color1{background-color: #FFA07A}
     .color2{background-color: cornflowerblue}
 </style>
+<script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
 <script>
     new Vue({
         el:"#list",
@@ -239,6 +225,32 @@
           $(".tooltipTarget").tooltip({'trigger':'hover'});
             _this.initInputs();
           $("#list").removeClass('d-none');
+          let column = [
+              {name:'index',value: '序号', neglect: true},
+              {name:'created_at',value: '日期', class:"color1"},
+              {name:'carrier_name',value: '承运商', class:"color1"},
+              {name:'waybill_number',value: '宝时运单号', class:"color1"},
+              {name:'origination',value: '提货仓', class:"color1"},
+              {name:'owner_name',value: '货主', class:"color1"},
+              {name:'warehouse_weight_other',value: '预估重量', neglect: true, class:"color1"},
+              {name:'warehouse_weight',value: '预估体积', neglect: true, class:"color1"},
+              {name:'status',value: '状态', class:"color2"},
+              {name:'carrier_bill',value: '专线运单号', class:"color2"},
+              {name:'inquire_tel',value: '查件电话', class:"color2"},
+              {name:'amount',value: '件数', neglect: true, class:"color2"},
+              {name:'carrier_weight_other',value: '重量', neglect: true, class:"color2"},
+              {name:'carrier_weight',value: '体积', neglect: true, class:"color2"},
+              {name:'operation',value: '操作', neglect: true},
+          ];
+            let header = new Header({
+                el: "#header",
+                column: column,
+                data: this.waybills,
+                restorationColumn: 'id',
+                fixedTop:($('#form_div').height())+2,
+                offset:0.5,
+            });
+            header.init();
         },
         computed:{
             isBeingFilterConditions:function(){

resources/views/waybill/index.blade.php

@@ -42,60 +42,23 @@
                     <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
                 @endif
             </div>
-            <table class="table table-striped table-sm table-bordered table-hover text-nowrap waybill-table" style="background: #fff;">
+            <table class="table table-striped table-sm table-bordered table-hover text-nowrap d-none" id="headerRoll">
+            <table class="table table-striped table-sm table-bordered table-hover text-nowrap waybill-table" style="background: #fff;" id="headerParent">
                 <tr>
-                    <th class="table-header-layer-1" :colspan="elementCount('th.td-operation')"></th>
-                    <th class="table-header-layer-1" :colspan="elementCount('th.td-warm')"><span class="fa fa-file-text-o"></span> 运单信息</th>
-                    <th class="table-header-layer-1" :colspan="elementCount('th.td-cool')"><span class="fa fa-truck"></span> 运输信息</th>
-                    <th class="table-header-layer-1" :colspan="elementCount('th.td-helpful')"><span class="fa fa-rmb"></span> 费用信息
+                    <th class="table-header-layer-1" colspan="4"></th>
+                    <th class="table-header-layer-1" colspan="11"><span class="fa fa-file-text-o"></span> 运单信息</th>
+                    <th class="table-header-layer-1" colspan="12"><span class="fa fa-truck"></span> 运输信息</th>
+                    <th class="table-header-layer-1" colspan="5"><span class="fa fa-rmb"></span> 费用信息
                     @can('运输管理-删除')
-                        <th class="table-header-layer-1" :colspan="elementCount('th.td-delete')"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
+                        <th class="table-header-layer-1" colspan="1"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
                     @endcan
                 </tr>
-                <tr>
+                <tr id="header">
                     <th class="td-operation">
                         <label for="all">
                             <input id="all" type="checkbox" @click="checkAll($event)">
                         </label>
                     </th>
-                    @can('运输管理-编辑','运输管理-运单审核','运输管理-调度','运输管理-编辑')
-                        <th class="td-operation">操作</th>
-                    @endcan
-                    <th class="td-operation">置顶</th>
-                    <th class="td-operation">状态</th>
-                    <th class="td-warm">ID</th>
-                    <th class="td-warm">创建时间</th>
-                    <th class="td-warm">运单类型</th>
-                    <th class="td-warm">货主</th>
-                    <th class="td-warm">上游单号</th>
-                    <th class="td-warm">WMS订单号</th>
-                    <th class="td-warm">运单号</th>
-                    <th class="td-warm">运输收费</th>
-                    <th class="td-warm">其他收费</th>
-                    <th class="td-warm">其他收费备注</th>
-                    @can('运输管理-图片上传')<th class="td-warm">照片</th>@endcan
-                    <th class="td-cool">收件人</th>
-                    <th class="td-cool">收件人电话</th>
-                    <th class="td-cool">始发地</th>
-                    <th class="td-cool">目的地</th>
-                    <th class="td-cool">承运商</th>
-                    <th class="td-cool">单号/车型</th>
-                    <th class="td-cool">仓库计抛</th>
-                    <th class="td-cool">承运商计抛</th>
-                    <th class="td-cool">仓库计重</th>
-                    <th class="td-cool">承运商计重</th>
-                    <th class="td-cool">计件</th>
-                    <th class="td-cool">里程</th>
-                    @can('运输管理-运费')
-                        <th class="td-helpful">运费</th>
-                    @endcan
-                    <th class="td-helpful">提货费</th>
-                    <th class="td-helpful">其他支出</th>
-                    <th class="td-helpful">发货时间</th>
-                    <th class="td-helpful">调度备注</th>
-                    @can('运输管理-删除')
-                        <th class="td-delete">操作</th>
-                    @endcan
                     {{--                    <th>WMS单号</th>--}}
                     {{--                    <th>收件人</th>--}}
                     {{--                    <th>收件人电话</th>--}}
@@ -110,7 +73,7 @@
                     {{--                    <th>调度审核人</th>--}}
                 </tr>
 
-                <tr v-for="waybill in waybills" :style="[{color:waybill.status=='待重审'?'red':''||waybill.status=='已完结'?'green':''},{'font-weight': waybill.id==selectedStyle?'bold':''}]"
+                <tr v-for="(waybill,i) in waybills" :style="[{color:waybill.status=='待重审'?'red':''||waybill.status=='已完结'?'green':''},{'font-weight': waybill.id==selectedStyle?'bold':''}]"
                     :id="'waybill'+waybill.id" @click="selectedColor(waybill.id)" position="static" v-on:mouseover="hidetop($event)" v-on:mouseleave="showtop($event)">
                     <td>
                         <input class="checkItem" type="checkbox" :value="waybill.id" v-model="checkData">
@@ -154,7 +117,7 @@
                     <td class="td-warm text-muted toptd" >
                         <div v-if="waybill.remark" class="bg-light-yellow  text-danger top"  data-toggle="tooltip" style="opacity: 0.1;position: absolute;z-index: 1"
                         >置顶备注：@{{  waybill.remark }}</div>
-                        @{{waybill.id}}</td>
+                        @{{ i+1 }}</td>
                     <td class="td-warm text-muted">@{{waybill.created_at}}</td>
                     <td class="td-warm">@{{waybill.type}} <span class="badge badge-sm bg-warning" v-if="waybill.collect_fee">到付</span></td>
                     <td class="td-warm">@{{waybill.owner}}</td>
@@ -235,7 +198,7 @@
                         <td class="td-helpful">@{{waybill.other_fee}}</td>
                     @endcan
                     <td class="td-helpful">@{{waybill.deliver_at}}</td>
-                    <td class="td-helpful"><span v-html="waybill.dispatch_remark"></td>
+                    <td class="td-helpful"><span v-html="waybill.dispatch_remark"></span></td>
                     @can('运输管理-删除')
                         <td class="td-operation">
                             <button type="button" class="btn btn-outline-danger btn-sm" @click="waybillDestroy(waybill.id,waybill.waybill_number)">删</button>
@@ -387,6 +350,7 @@
     </style>
     <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',
@@ -493,6 +457,50 @@
                     param:param,
                 });
                 this.form.init();
+                let column = [
+                    @can('运输管理-编辑','运输管理-运单审核','运输管理-调度','运输管理-编辑')
+                    {name:'operation',value: '操作', neglect: true, class:"td-operation"},@endcan
+                    {name:'onTop',value: '置顶', neglect: true, class:"td-operation"},
+                    {name:'status',value: '状态', class:"td-operation"},
+                    {name:'index',value: '序号', neglect: true, class:"td-warm"},
+                    {name:'created_at',value: '创建时间', class:"td-warm"},
+                    {name:'type',value: '运单类型', class:"td-warm"},
+                    {name:'owner',value: '货主', class:"td-warm"},
+                    {name:'source_bill',value: '上游单号', class:"td-warm"},
+                    {name:'wms_bill_number',value: 'WMS订单号', class:"td-warm"},
+                    {name:'waybill_number',value: '运单号', class:"td-warm"},
+                    {name:'charge',value: '运输收费', neglect: true, class:"td-warm"},
+                    {name:'other_charge',value: '其他收费', neglect: true, class:"td-warm"},
+                    {name:'other_charge_remark',value: '其他收费备注', class:"td-warm"},
+                    @can('运输管理-图片上传'){name:'img',value: '照片', neglect: true, class:"td-warm"},@endcan
+                    {name:'recipient',value: '收件人', class:"td-cool"},
+                    {name:'recipient_mobile',value: '收件人电话', class:"td-cool"},
+                    {name:'origination',value: '始发地', class:"td-cool"},
+                    {name:'destination',value: '目的地', class:"td-cool"},
+                    {name:'carrier',value: '承运商', class:"td-cool"},
+                    {name:'carrier_bill',value: '单号/车型', neglect: true, class:"td-cool"},
+                    {name:'warehouse_weight',value: '仓库计抛', neglect: true, class:"td-cool"},
+                    {name:'carrier_weight',value: '承运商计抛', neglect: true, class:"td-cool"},
+                    {name:'warehouse_weight_other',value: '仓库计重', neglect: true, class:"td-cool"},
+                    {name:'carrier_weight_other',value: '承运商计重', neglect: true, class:"td-cool"},
+                    {name:'amount',value: '计件', neglect: true, class:"td-cool"},
+                    {name:'mileage',value: '里程', neglect: true, class:"td-cool"},
+                    @can('运输管理-运费'){name:'fee',value: '运费', neglect: true, class:"td-helpful"},@endcan
+                    {name:'pick_up_fee',value: '提货费', neglect: true, class:"td-helpful"},
+                    {name:'other_fee',value: '其他支出', neglect: true, class:"td-helpful"},
+                    {name:'deliver_at',value: '发货时间', class:"td-helpful"},
+                    {name:'dispatch_remark',value: '调度备注', class:"td-helpful"},
+                    @can('运输管理-删除'){name:'remove',value: '操作', neglect: true, class:"td-delete"},@endcan
+                ];
+                let header = new Header({
+                    el: "#header",
+                    column: column,
+                    data: this.waybills,
+                    restorationColumn: 'id',
+                    fixedTop:($('#form_div').height())+2,
+                    offset:0.5,
+                });
+                header.init();
             },
             methods:{
                 btnRefreshWeightZoomIn(waybill){
@@ -688,9 +696,6 @@
                     }
                     this.selectedStyle=id;
                 },
-                elementCount:function(elementName){
-                    return $(elementName).length;
-                },
                 mouseleaveOwner:function () {
                     if(!this.isOut&&!this.isBlur){
                         this.isOwnersBtn=false;

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

@@ -55,58 +55,26 @@
         </span>
     </div>
     @endif
-    <table class="table  table-hover table-bordered text-nowrap " style="width: 1500px;height: auto">
+    <table class="d-none table table-bordered text-nowrap" id="headerRoll"></table>
+    <table class="table  table-hover table-bordered text-nowrap " style="width: 1500px;height: auto" id="headerParent">
         <thead>
-        <tr style="background: #E8E8E8;@if(isset($excepted)) color: red; @endif">
+        <tr style="background: #E8E8E8;@if(isset($excepted)) color: red; @endif" id="header">
             @if(!isset($excepted))
             <th>
                 <input id="all" type="checkbox" @click="checkAll($event)">全选
             </th>
             @endif
-            <th>运单ID</th>
-            <th>运单类型</th>
-            <th>运单号</th>
-            <th>货主</th>
-            <th>WMS单号</th>
-            <th>始发地</th>
-            <th>目的地</th>
-            <th>收件人</th>
-            <th>收件人电话</th>
-            <th>收费(元)</th>
-            <th>下单备注</th>
-            <th>承运商</th>
-            <th>承运商单号</th>
-            <th>始发市</th>
-            <th>目的市</th>
-            <th>仓库计数(抛)</th>
-            <th>仓库计数二</th>
-            <th>承运商计数(抛)</th>
-            <th>承运商计数二</th>
-            <th>车型</th>
-            <th>车辆信息</th>
-            <th>运费(元)</th>
-            <th>提货费(元)</th>
-            <th>其他费用(元)</th>
-            <th>到付金额(元)</th>
-            <th>调度备注</th>
-            <th>创建时间</th>
-            <th>运单审核人</th>
-            <th>调度审核人</th>
-            <th>应收款</th>
-            <th>应付款</th>
-            <th>毛利</th>
-            <th>毛利率</th>
         </tr>
         </thead>
         <tbody>
 
-        <tr v-for="json_content in json_contents" :style="{background:json_content.waybill.type=='直发车'?'#F8F8F8':''}">
+        <tr v-for="(json_content,i) in json_contents" :style="{background:json_content.waybill.type=='直发车'?'#F8F8F8':''}">
             @if(!isset($excepted))
             <td>
                 <input class="checkItem" type="checkbox" :value="json_content.waybill_id" v-model="checkData">
             </td>
             @endif
-            <td>@{{json_content.waybill_id}}</td>
+            <td>@{{ i+1 }}</td>
             <td>@{{json_content.waybill.type}}</td>
             <td>@{{json_content.waybill.waybill_number}}</td>
             <td><p v-if="json_content.waybill.owner">@{{json_content.waybill.owner.name}}</p></td>
@@ -166,6 +134,7 @@
 @stop
 
 @section('lastScript')
+<script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
 <script>
     let editing= new Vue({
         el:'#editingPanel',
@@ -198,6 +167,49 @@
             this.initInputs();
             $(".tooltipTarget").tooltip({'trigger':'hover'});
             $('#editingPanel').removeClass('d-none');
+            let column = [
+                {name:'index',value: '序号', neglect: true},
+                {name:'type',value: '运单类型', neglect: true},
+                {name:'waybill_number',value: '运单号', neglect: true},
+                {name:'owner',value: '货主', neglect: true},
+                {name:'wms_bill_number',value: 'WMS单号', neglect: true},
+                {name:'origination',value: '始发地', neglect: true},
+                {name:'destination',value: '目的地', neglect: true},
+                {name:'recipient',value: '收件人', neglect: true},
+                {name:'recipient_mobile',value: '收件人电话', neglect: true},
+                {name:'charge',value: '收费(元)', neglect: true},
+                {name:'ordering_remark',value: '下单备注', neglect: true},
+                {name:'carrier',value: '承运商', neglect: true},
+                {name:'carrier_bill',value: '承运商单号', neglect: true},
+                {name:'origination_city',value: '始发市', neglect: true},
+                {name:'destination_city',value: '目的市', neglect: true},
+                {name:'warehouse_weight',value: '仓库计数(抛)', neglect: true},
+                {name:'warehouse_weight_other',value: '仓库计数二', neglect: true},
+                {name:'carrier_weight',value: '承运商计数(抛)', neglect: true},
+                {name:'carrier_weight_other',value: '承运商计数二', neglect: true},
+                {name:'car_type',value: '车型', neglect: true},
+                {name:'car_owner_info',value: '车辆信息', neglect: true},
+                {name:'fee',value: '运费(元)', neglect: true},
+                {name:'pick_up_fee',value: '提货费(元)', neglect: true},
+                {name:'other_fee',value: '其他费用(元)', neglect: true},
+                {name:'collect_fee',value: '到付金额(元)', neglect: true},
+                {name:'dispatch_remark',value: '调度备注', neglect: true},
+                {name:'created_at',value: '创建时间', neglect: true},
+                {name:'user_name',value: '运单审核人', neglect: true},
+                {name:'user_name_update',value: '调度审核人', neglect: true},
+                {name:'total_receivable',value: '应收款', neglect: true},
+                {name:'total_expense',value: '应付款', neglect: true},
+                {name:'gross_margin',value: '毛利', neglect: true},
+                {name:'gross_profit_rate',value: '毛利率', neglect: true},
+            ];
+            let header = new Header({
+                column: column,
+                data: this.json_contents,
+                restorationColumn: 'id',
+                offset:0.5,
+            });
+            header.init();
+
         },
         methods:{
             initInputs:function(){

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

@@ -21,37 +21,20 @@
                 </div>
             </span>
             <div class="">
-                <table class="table table-striped table-sm text-nowrap table-hover">
-                    <tr>
+                <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" id="headerParent">
+                    <tr id="header">
                         <th>
                             <label for="all">
                                 <input id="all" type="checkbox" @click="checkAll($event)">全选
                             </label>
                         </th>
-                        <th>序号</th>
-                        <th>ID</th>
-                        <th>货主</th>
-                        <th>快递单号</th>
-                        <th>波次号</th>
-                        <th>订单号</th>
-                        <th>物流公司</th>
-                        <th>设备</th>
-                        <th>重(KG)</th>
-                        <th>长*宽*高(cm)</th>
-                        <th>体积(cm³)</th>
-                        <th>纸箱</th>
-                        <th>状态</th>
-                        <th>波次规则</th>
-                        <th>称重时间</th>
-                        <th>收件人</th>
-                        <th>收件人电话</th>
                     </tr>
                     <tr v-for="(package,i) in packages">
                         <td>
                             <input class="checkItem" type="checkbox" :value="package.id" v-model="checkData">
                         </td>
                         <td>@{{ i+1  }}</td>
-                        <td class="text-muted">@{{package.id}}</td>
                         <td>@{{package.ownerName}}</td>
                         <td>@{{package.logisticNumber}}</td>
                         <td class="text-muted">@{{package.batchNumber}}</td>
@@ -79,6 +62,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};
@@ -125,6 +109,32 @@
                     condition:data,
                 });
                 _this.form.init();
+                let column = [
+                    {name:'index',value: '序号', neglect: true},
+                    {name:'ownerName',value: '货主'},
+                    {name: 'logisticNumber', value: '快递单号'},
+                    {name: 'batchNumber', value: '波次号'},
+                    {name:'order_code',value: '订单号'},
+                    {name: 'logisticName', value: '物流公司'},
+                    {name: 'measuringMachineName', value: '设备'},
+                    {name: 'weight', value: '重(KG)'},
+                    {name:'length_width_height',value: '长*宽*高(cm)', neglect: true},
+                    {name: 'bulk', value: '体积(cm³)'},
+                    {name: 'paperBoxName', value: '纸箱'},
+                    {name: 'status', value: '状态'},
+                    {name:'batchRule',value: '波次规则'},
+                    {name:'weighed_at',value: '称重时间'},
+                    {name:'recipient',value: '收件人'},
+                    {name:'recipientMobile',value: '收件人电话'},
+                ];
+                let header = new Header({
+                    el: "#header",
+                    column: column,
+                    data: this.packages,
+                    restorationColumn: 'id',
+                    fixedTop:($('#form_div').height())+2,
+                });
+                header.init();
             },
             watch:{
                 checkData:{

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

@@ -73,7 +73,7 @@
                                                 <div class="form-inline">
                                                     <div class="form-group">
                                                         <input style="transform:scale(0.8);width: 170px"  type="date" v-model="filterData.date_end" class="form-control" @change="makeFilterDuration">
-                                                        <input id="hour_input" type="text" class="form-control"  placeholder="00:00" @change="makeFilterDuration" autocomplete="off"
+                                                        <input type="text" class="form-control"  placeholder="00:00" @change="makeFilterDuration" autocomplete="off"
                                                                @input="hourFilter($event)" v-model="inputtingAdd_end" style="transform:scale(0.8);width:80px"
                                                                @keypress="hourFilter($event)" >
                                                         <input v-if="filterData.date_end" hidden  name="date_end" :value="filterData.date_end+' '+inputtingAdd_end">

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

@@ -43,41 +43,20 @@
                     </form>
                 </div>
             <div class="card-body">
-                <table class="table table-striped table-sm">
-                    <tr >
+                <table class="d-none table table-bordered text-nowrap" id="headerRoll"></table>
+                <table class="table table-striped table-sm text-nowrap" id="headerParent">
+                    <tr id="header">
                         <th>
                             <label for="all">
                                 <input id="all" type="checkbox" @click="checkAll($event)">全选
                             </label>
                         </th>
-                        <th>ID</th>
-                        <th>快递单号</th>
-                        <th>物流公司</th>
-                        <th>波次号</th>
-                        <th>波次规则</th>
-                        @if($view=="indexIssued")
-                            <th>货主</th>
-                            <th>发货单号</th>
-                            <th>下发时间</th>
-                            <th>收件人</th>
-                            <th>收件人电话</th>
-                        @else
-                            <th>设备</th>
-                            <th>称重时间</th>
-                            <th>重(KG)</th>
-                            <th>长(CM)</th>
-                            <th>宽(CM)</th>
-                            <th>高(CM)</th>
-                            <th>体积(CM³)</th>
-                            <th>纸箱</th>
-                            <th>异常类型</th>
-                        @endif
                     </tr>
-                    <tr v-for="weightExcepted in weightExcepteds" :style="weightExcepted.status=='上传异常'||weightExcepted.status=='下发异常'?'':color">
+                    <tr v-for="(weightExcepted,i) in weightExcepteds" :style="weightExcepted.status=='上传异常'||weightExcepted.status=='下发异常'?'':color">
                         <td>
                             <input class="checkItem" type="checkbox" :value="weightExcepted.id" v-model="checkData">
                         </td>
-                        <td >@{{weightExcepted.id}}</td>
+                        <td>@{{ i+1 }}</td>
                         <td>@{{weightExcepted.logisticNumber}}</td>
                         <td>@{{weightExcepted.carrierName}}</td>
                         <td>@{{weightExcepted.batchNumber}}</td>
@@ -110,12 +89,11 @@
 @endsection
 
 @section('lastScript')
+    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
             data:{
-
-
                 weightExcepteds:[
                     @foreach($weightExcepteds as $weightExcepted)
                         @if($view=="indexIssued")
@@ -136,9 +114,37 @@
                 color:'color: red',
             },
            mounted:function(){
-                this.initInputs();
+               this.initInputs();
                $(".tooltipTarget").tooltip({'trigger':'hover'});
                $('#list').removeClass('d-none');
+               let column = [
+                   {name:'index',value: '序号', neglect: true},
+                   {name:'logisticNumber',value: '快递单号'},
+                   {name:'carrierName',value: '物流公司'},
+                   {name:'batchNumber',value: '波次号'},
+                   {name:'batchRule',value: '波次规则'},
+                   @if($view=="indexIssued"){name:'ownerName',value: '货主'},
+                   {name:'deliveryNumber',value: '发货单号'},
+                   {name:'createdAt',value: '下发时间', class:"text-muted"},
+                   {name:'recipient',value: '收件人'},
+                   {name:'recipientMobile',value: '收件人电话'},
+                   @else{name:'measuringMachineName',value: '设备'},
+                   {name:'weighedAt',value: '称重时间', class:"text-muted"},
+                   {name:'weight',value: '重(KG)', neglect: true},
+                   {name:'length',value: '长(CM)', neglect: true},
+                   {name:'width',value: '宽(CM)', neglect: true},
+                   {name:'height',value: '高(CM)', neglect: true},
+                   {name:'bulk',value: '体积(CM³)', neglect: true},
+                   {name:'paperBoxName',value: '纸箱'},
+                   {name:'status',value: '异常类型'},@endif
+               ];
+               let header = new Header({
+                   el: "#header",
+                   column: column,
+                   data: this.weightExcepteds,
+                   restorationColumn: 'id',
+               });
+               header.init();
             },
             watch:{
                 checkData:{

webpack.mix.js

@@ -21,5 +21,5 @@ 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/queryForm200813b.js');
 mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200813b.js');
-mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200813b.js');
+mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200814.js');