分支

app/Http/Controllers/OrderController.php

@@ -31,14 +31,10 @@ class OrderController extends Controller
         $waveno=$request->input('waveno');
         $edisendflag2=$request->edisendflag2;
         if ($orderdate_start){
-            $sql.=" and ordertime>='".$orderdate_start;
-            if ($ordertime_start)$sql.=" ".$ordertime_start.":00'";
-            else $sql.=" 00:00:00'";
+            $sql.=" and ordertime>='".$orderdate_start.":00'";
         }
         if ($orderdate_end){
-            $sql.=" and ordertime<='".$orderdate_end;
-            if ($ordertime_end)$sql.=" ".$ordertime_end.":59' ";
-            else $sql.=" 23:59:59' ";
+            $sql.=" and ordertime<='".$orderdate_end.":59' ";
         }
         if ($customerid)$sql.=" and customerid='".$customerid."'";
         if ($orderno)$sql.=" and orderno like '".$orderno."%'";
@@ -103,7 +99,7 @@ class OrderController extends Controller
        BAS_SKU.Alternate_SKU1,BAS_SKU.Descr_C,(select count(*) from DOC_ORDER_HEADER WHERE 1=1";
         $sql=$this->preciseQuery($request,$sql);
         ;$sql.=" ) as counted from (";
-        if (!$request->input('export')&&!$request->input('export'))$sql.=" select * from (";
+        if (!$request->input('export'))$sql.=" select * from (";
         $sql.=" select ROWNUM as rn,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
                           ,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,
                          DOC_ORDER_HEADER.WaveNo,DOC_ORDER_HEADER.SOReference1
@@ -125,8 +121,8 @@ class OrderController extends Controller
                 $sql.=")";
             }
         }
-        if (!$request->input('export')&&!$request->input('export'))$sql.=" and ROWNUM<='".$page*$paginate."')";
-        if (!$request->input('export')&&!$request->input('export'))$sql.=" header where header.rn>'".($page-1)*$paginate."' ";
+        if (!$request->input('export'))$sql.=" and ROWNUM<='".$page*$paginate."')";
+        if (!$request->input('export'))$sql.=" header where header.rn>'".($page-1)*$paginate."' ";
         $sql.=")DOC_ORDER_HEADER left join DOC_ORDER_DETAILS on DOC_ORDER_DETAILS.ORDERNO=DOC_ORDER_HEADER.ORDERNO
                       left join BAS_CODES on BAS_CODES.CODE=DOC_ORDER_HEADER.sostatus and BAS_CODES.codeid='SO_STS'
                       left join BAS_Customer on BAS_Customer.customerid=DOC_ORDER_HEADER.customerid

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

@@ -6,18 +6,6 @@
         <div style="min-width: 4070px;">
             <div id="list" class="d-none">
                 <div id="form_div"></div>
-                <span class="dropdown">
-                    <button type="button" class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget"
-                            :class="[checkData.length>0?'btn-dark text-light':'']"
-                            data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
-                        导出Excel
-                    </button>
-                    <div class="dropdown-menu">
-                        <a class="dropdown-item" @click="orderExport(1)" href="javascript:">导出勾选内容</a>
-                        <a class="dropdown-item" @click="orderExport(2)" href="javascript:">导出所有页</a>
-                    </div>
-                </span>
-                @can('订单管理-批量备注')<button @click="modal()" type="button" class="btn btn-sm ml-2 btn-outline-primary">批量备注追加</button>@endcan
                 <div class="modal fade " style="top: 20%" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
                     <div class="modal-dialog">
                         <div class="modal-content">
@@ -152,51 +140,64 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200721')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200721.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
             data:{
-                filterData:{
-                    paginate:50,ordertime_start:'',orderdate_start:'',orderdate_end:'',ordertime_end:'',customerid:'',orderno:'',soreference5:'',codename_c:'',
-                    carriername:'',issuepartyname:'',soreference1:'',notes:'',addtime:'1',alternate_sku1:'',waveno:'',edisendflag2:'',
-                },
                 page:Number('{{$page}}'),
                 maxPage:1,
                 sum:0,
                 checkData:[],
                 owners:[
                     @foreach($customers as $customer)
-                    {!! $customer !!},
+                    { name:'{{$customer->descr_c}}',value:'{{$customer->customerid}}' },
                     @endforeach
                 ],
                 orders:{!! $orders !!},
                 commodities:{!! $commodities !!},
                 isBtn:{},
                 content:'',
-                codes:{!! $codes !!},
+                codes:[
+                    @foreach($codes as $code)
+                    {name:'{{$code->code}}',value:'{{$code->codename_c}}'},
+                    @endforeach
+                ],
                 selectedStyle:'',
                 picktotraceidMap:[],
             },
             mounted:function () {
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
-                this.initInputs();
                 $("#list").removeClass('d-none');
                 if (this.orders.length>0){
                     this.maxPage=Math.ceil(this.orders[0].counted/50);
                     this.sum=this.orders[0].counted;
                 }
-            },
-            computed:{
-                isBeingFilterConditions:function(){
-                    for(let key in this.filterData){
-                        if(this.filterData[key] && key!='paginate' && key!='page' && key!='addtime'){
-                            return true
-                        }
-                    }
-                    return false;
-                },
-
+                let data=[
+                    [   {name:'codename_c',type:'select',placeholder:'订单状态',data:this.codes},
+                        {name:'orderdate_start',type:'time',tip:['选择显示日期的起始时间','选择显示日期的起始时间']},
+                        {name:'orderno',type:'input',tip:'编号，糊模查找需要在左边打上%符号',placeholder: '编号'},
+                        {name:'carriername',type:'input',tip:'',placeholder:'承运人'},
+                        {name:['notes','addtime'],type:'input_select',tip:['右侧选择查询范围，默认为一天内','查询范围，范围越短搜索越快'],placeholder: ['客户',''],
+                            data:[{name:'31',value:'近一月'},{name:'92',value:'近三月'},{name:'183',value:'近半年'},{name:'366',value:'近一年'},{name:'0',value:'不限'},]},
+                        {name:'issuepartyname',type:'input',tip:'',placeholder: '店铺名称'},
+                        {name:'edisendflag2',type:'select',tip:'快递获取标记',placeholder: '快递获取标记',data:[{name:'Y',value:'是'},{name:'N',value:'否'},{name:'W',value:'错误'},]}
+                    ],
+                    [
+                        {name:'customerid',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                            placeholder:['货主','定位或多选货主'],data:this.owners},
+                        {name:'ordertime_end',type:'time',tip:['选择显示指定日期的结束时间','选择显示指定日期的结束时间']},
+                        {name:'soreference5',type:'input',tip:'可支持多快递单号，糊模查找需要在左边打上%符号',placeholder: '多快递单号'},
+                        {name:'soreference1',type:'input',tip:'客户订单号，糊模查找需要在左边打上%符号',placeholder: '客户订单号'},
+                        {name:'waveno',type:'input',tip:'波次编号，模糊查找需要在左边打上%的符号',placeholder: '波次编号'},
+                        {name:'alternate_sku1',type:'input',tip:'产品条码，模糊查找需要在左边打上%的符号',placeholder: '产品条码'},
+                    ],
+                ];
+                this.form = new query({
+                    el:"#form_div",
+                    condition:data,
+                });
+                this.form.init();
             },
             watch:{
                 checkData:{
@@ -211,31 +212,13 @@
                 }
             },
             methods:{
-                initInputs:function(){
-                    let data=this;
-                    let uriParts =decodeURI(location.href).split("?");
-                    if(uriParts.length>1){
-                        let params = uriParts[1].split('&');
-                        params.forEach(function(paramPair){
-                            let pair=paramPair.split('=');
-                            let key = pair[0], val = pair[1];
-                            $('input[name="'+key+'"]').val(val);
-                            $('select[name="'+key+'"]').val(val);
-                            decodeURI(data.filterData[key]=val);
-                            if (key==='ordertime_start' || key==='ordertime_end')
-                                data.filterData[key]=unescape(val);
-                        });
-                    }
-                },
                 pageUp(){
                     if (this.page<=1)return;
-                    this.page=this.page-1;
-                    this.href();
+                    this.href(this.page-1);
                 },
                 pageDown(){
                     if (this.page>=this.maxPage)return;
-                    this.page=this.page+1;
-                    this.href();
+                    this.href(this.page+1);
                 },
                 pageSkip(e){
                     if (Number(e.target.value)<=0 || Number(e.target.value)>this.maxPage){
@@ -243,36 +226,18 @@
                         tempTip.show('页数不存在！ ');
                         return
                     }
-                    this.page=e.target.value;
-                    this.href();
+                    this.href(e.target.value);
                 },
-                href(){
-                    let url="{{url('order/index/delivering?page=')}}"+this.page;
-                    if (this.filterData.orderdate_start)url+="&orderdate_start="+this.filterData.orderdate_start;
-                    if (this.filterData.orderdate_end)url+="&orderdate_end="+this.filterData.orderdate_end;
-                    if (this.filterData.ordertime_start)url+="&ordertime_start="+this.filterData.ordertime_start;
-                    if (this.filterData.ordertime_end)url+="&ordertime_end="+this.filterData.ordertime_end;
-                    if (this.filterData.customerid)url+="&customerid="+this.filterData.customerid;
-                    if (this.filterData.paginate)url+="&paginate="+this.filterData.paginate;
-                    if (this.filterData.orderno)url+="&orderno="+this.filterData.orderno;
-                    if (this.filterData.soreference5)url+="&soreference5="+this.filterData.soreference5;
-                    if (this.filterData.codename_c)url+="&codename_c="+this.filterData.codename_c;
-                    if (this.filterData.carriername)url+="&carriername="+this.filterData.carriername;
-                    if (this.filterData.soreference1)url+="&soreference1="+this.filterData.soreference1;
-                    if (this.filterData.issuepartyname)url+="&issuepartyname="+this.filterData.issuepartyname;
-                    if (this.filterData.notes)url+="&notes="+this.filterData.notes;
-                    if (this.filterData.addtime)url+="&addtime="+this.filterData.addtime;
-                    if (this.filterData.alternate_sku1)url+="&alternate_sku1="+this.filterData.alternate_sku1;
-                    if (this.filterData.waveno)url+="&waveno="+this.filterData.waveno;
-                    if (this.filterData.edisendflag2) url+="&edisendflag2="+this.filterData.edisendflag2;
-
+                href(page){
+                    let url = document.URL;
+                    if (url.indexOf('page='+this.page) != -1){
+                        url = url.replace("page="+this.page,"page="+page);
+                    }else{
+                        if (url.indexOf('?') == -1) url += "?page="+page;
+                        else url += "&page="+page;
+                    }
                     window.location.href=url;
                 },
-                //提交表单
-                submit:function(){
-                    let form = $("#form");
-                    form.submit();
-                },
                 //全选事件
                 checkAll(e){
                     if (e.target.checked){
@@ -285,18 +250,6 @@
                         this.checkData = [];
                     }
                 },
-                //寻找客户
-                owner_seek:function (e) {
-                    let _this=this;
-                    let $val=e.target.value;
-                    if($val==='')_this.filterData.customerid='';
-                    else
-                        _this.owners.forEach(function (owner) {
-                            if (owner.descr_c.includes($val)){
-                                _this.filterData.customerid=owner.customerid;
-                            }
-                        });
-                },
                 unfold(orderno){
                     this.$set(this.isBtn,orderno,true);
                     setTimeout(function () {
@@ -316,14 +269,11 @@
                     if (this.sum>10000){
                         if (!confirm("需要导出的条数超过了一万条,等待时间较长,是否继续？"))return;
                     }
-                    window.open("{{url('order/index/delivering?ordertime_start=')}}"+this.filterData.ordertime_start
-                        +"&ordertime_end="+this.filterData.ordertime_end+"&orderdate_start="+this.filterData.orderdate_start
-                        +"&orderdate_end="+this.filterData.orderdate_end+"&orderno="+this.filterData.orderno
-                        +"&soreference5="+this.filterData.soreference5+"&export="+true+"&codename_c="+this.filterData.codename_c
-                        +"&issuepartyname="+this.filterData.issuepartyname+"&customerid="+this.filterData.customerid
-                        +"&soreference1="+this.filterData.soreference1+"&notes="+this.filterData.notes
-                        +"&addtime="+this.filterData.addtime+"&alternate_sku1="+this.filterData.alternate_sku1+"&waveno="+this.filterData.waveno
-                        +"&edisendflag2="+this.filterData.edisendflag2);
+                    let url = document.URL;
+                    if (url.indexOf('?') != -1) url += "&";
+                    else url += "?";
+                    url += "export="+true;
+                    window.open(url);
                 },
                 modal(){
                     $("#myModal").modal('show');

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

@@ -111,7 +111,6 @@
                 sum:{!! $packages->total() !!},
             },
             mounted:function(){
-                this.initInputs();
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 $('#list').removeClass('d-none');
                 let _this = this;
@@ -143,19 +142,6 @@
                 }
             },
             methods:{
-                initInputs:function(){
-                    let data=this;
-                    let uriParts =decodeURI(location.href).split("?");
-                    if(uriParts.length>1){
-                        let params = uriParts[1].split('&');
-                        params.forEach(function(paramPair){
-                            let pair=paramPair.split('=');
-                            let key = pair[0], val = pair[1];
-                            $('input[name="'+key+'"]').val(val);
-                            $('select[name="'+key+'"]').val(val);
-                        });
-                    }
-                },
                 checkAll(e){
                     if (e.target.checked){
                         this.packages.forEach((el,i)=>{