Merge branch 'zzd'

app/Http/Controllers/OrderController.php

@@ -104,7 +104,7 @@ class OrderController extends Controller
         if ($checkData || $export)return $this->export($orders,$commodities);
         $customers=OracleBasCustomer::select('customerid','descr_c')->where('customer_type','OW')->where('active_flag','Y')->get();
         $request=$request->input();
-        return view('order/index/delivering',compact('orders','customers','request','commodities'));
+        return view('order/index/delivering',compact('orders','customers','request','commodities','page'));
     }
     public function batchComments(Request $request){
         if(!Gate::allows('订单管理-批量注释')){ return redirect(url('/'));  }

app/Http/Controllers/TestController.php

@@ -24,6 +24,7 @@ use App\UserWorkgroup;
 use App\Waybill;
 use App\OraccleBasCustomer;
 use App\WMSReflectReceive;
+use App\WMSWaybillOrder;
 use Carbon\Carbon;
 use Endroid\QrCode\QrCode;
 use Endroid\QrCode\Response\QrCodeResponse;
@@ -185,7 +186,29 @@ class TestController extends Controller
         });
     }
     public function test1(){
-        Owner::update([["id"=>18,"code"=>"test1"],["id"=>17,"code"=>"test2"]]);
+        $waybills=Waybill::select('id','wms_bill_number')->get();
+        foreach ($waybills as $waybill){
+            $orders=WMSWaybillOrder::where('OrderNo',$waybill->wms_bill_number)->get();
+            if (count($orders)>0){
+                $warehouseWeight=0;
+                $sign=false;
+                foreach ($orders as $order){
+                    $warehouseWeight+=$order->Cubic;
+                    if ($order->Cubic==0)$sign=true;
+                }
+                if ($sign)unset($warehouseWeight);
+            }
+            $waybill=Waybill::find($waybill->id);
+            if (isset($warehouseWeight)){
+                if ($waybill){
+                    $waybill->warehouse_weight=$warehouseWeight;
+                }
+            }else{
+                $waybill->warehouse_weight=null;
+                $waybill->warehouse_weight_unit_id=null;
+            }
+            $waybill->update();
+        }
     }
     public function test3()
     {

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

@@ -14,7 +14,7 @@
             </tr>
             <tr>
                 <td >
-                    <select name="paginate" v-model="filterData.paginate" class="tooltipTarget form-control-sm" style="vertical-align: middle" @change="submit">
+                    <select name="paginate" v-model="filterData.paginate" class="tooltipTarget form-control form-control-sm" style="vertical-align: middle;max-width: 100px" @change="submit">
                         <option value="50">50行</option>
                         <option value="100">100行</option>
                         <option value="200">200行</option>
@@ -22,49 +22,51 @@
                         <option value="1000">1000行</option>
                     </select></td>
                 <td >
-                    <input type="date" name="date_start" class=" form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
+                    <div class="form-inline">
+                    <input type="date" name="date_start" style="max-width: 150px" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
                            v-model="filterData.date_start" :class="filterData.created_at_start?'bg-warning':''">
-                    <select v-model="filterData.range" name="range" @change="submit" title="查询内容的日期范围" class="form-control-sm tooltipTarget m-2">
+                    <select v-model="filterData.range" name="range" @change="submit" title="查询内容的日期范围" class="form-control form-control-sm tooltipTarget m-2">
                         <option value="1">近一天</option>
                         <option value="3">近三天</option>
                         <option value="7">近七天</option>
                         <option value="30">近三十天</option>
-                    </select>
+                    </select></div>
                 </td>
                 <td>
-                    <input name="TOLocation" v-model="filterData.TOLocation" class="form-control-sm tooltipTarget" placeholder="库位" :class="filterData.TOLocation?'bg-warning':''">
+                    <input name="TOLocation" style="max-width: 200px" v-model="filterData.TOLocation" class="form-control form-control-sm tooltipTarget" placeholder="库位" :class="filterData.TOLocation?'bg-warning':''">
                 </td>
                 <td >
-                    <input name="LotAtt05" v-model="filterData.LotAtt05" class="form-control-sm tooltipTarget" placeholder="属性仓" :class="filterData.LotAtt05?'bg-warning':''">
+                    <input name="LotAtt05" style="max-width: 200px" v-model="filterData.LotAtt05" class="form-control form-control-sm tooltipTarget" placeholder="属性仓" :class="filterData.LotAtt05?'bg-warning':''">
                 </td>
                 <td >
-                    <input type="date" class=" form-control-sm tooltipTarget" name="LotAtt02_start" title="选择显示失效日期的起始时间"
+                    <input style="max-width: 150px" type="date" class="form-control form-control-sm tooltipTarget" name="LotAtt02_start" title="选择显示失效日期的起始时间"
                            v-model="filterData.LotAtt02_start" :class="filterData.LotAtt02_start?'bg-warning':''" >
                 </td>
                 <td colspan="5"></td>
             </tr>
             <tr>
                 <td >
-                    <input type="text" class="form-control-sm tooltipTarget" placeholder="客户"
+                    <div class="form-inline">
+                    <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="客户"
                            style="width:70px" @input="owner_seek"
                            title="输入关键词快速定位下拉列表，回车确定">
-                    <select name="descr_c" v-model="filterData.descr_c" @change="submit" style="max-width: 100px" class="form-control-sm tooltipTarget"  title="选择要显示的客户" :class="filterData.descr_c?'bg-warning':''">
+                    <select name="descr_c" v-model="filterData.descr_c" @change="submit" style="max-width: 100px" class="form-control form-control-sm tooltipTarget"  title="选择要显示的客户" :class="filterData.descr_c?'bg-warning':''">
                         <option >    </option>
                         <option v-for="owner in owners" :value="owner.descr_c" >@{{owner.descr_c}}</option>
-                    </select>
+                    </select></div>
                 </td>
                 <td >
-                    <input type="date" class=" form-control-sm tooltipTarget" name="date_end" title="选择显示指定日期的结束时间"
+                    <input style="max-width: 150px" type="date" class="form-control form-control-sm tooltipTarget" name="date_end" title="选择显示指定日期的结束时间"
                            v-model="filterData.date_end" :class="filterData.created_at_end?'bg-warning':''" >
                 </td>
                 <td>
-                    <input name="SKU" v-model="filterData.SKU" class="form-control-sm tooltipTarget" placeholder="产品编码" :class="filterData.SKU?'bg-warning':''">
+                    <input style="max-width: 200px" name="SKU" v-model="filterData.SKU" class="form-control form-control-sm tooltipTarget" placeholder="产品编码" :class="filterData.SKU?'bg-warning':''">
                 </td>
                 <td >
-                    <input name="ALTERNATE_SKU1" v-model="filterData.ALTERNATE_SKU1" class="form-control-sm tooltipTarget" placeholder="产品条码" :class="filterData.ALTERNATE_SKU1?'bg-warning':''">
+                    <input style="max-width: 200px" name="ALTERNATE_SKU1" v-model="filterData.ALTERNATE_SKU1" class="form-control form-control-sm tooltipTarget" placeholder="产品条码" :class="filterData.ALTERNATE_SKU1?'bg-warning':''">
                 </td>
                 <td >
-                    <input type="date" class=" form-control-sm tooltipTarget" name="LotAtt02_end" title="选择显示失效日期的结束时间"
+                    <input style="max-width: 150px" type="date" class="form-control form-control-sm tooltipTarget" name="LotAtt02_end" title="选择显示失效日期的结束时间"
                            v-model="filterData.LotAtt02_end" :class="filterData.LotAtt02_end?'bg-warning':''" >
                 </td>
                 <td colspan="5">
@@ -229,12 +231,12 @@
                     this.href();
                 },
                 pageSkip(e){
-                  this.page=e.target.value;
-                  if (Number(this.page)<=0 || Number(this.page)>this.maxPage){
+                  if (Number(e.target.value)<=0 || Number(e.target.value)>this.maxPage){
                       tempTip.setDuration(2000);
                       tempTip.show('页数不存在！ ');
                       return
                   }
+                  this.page=e.target.value;
                   this.href();
                 },
                 href(){

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

@@ -21,30 +21,32 @@
                             <option value="1000">每页显示1000行</option>
                         </select></td>
                     <td style="width: 400px">
-                        <input  type="date" name="ordertime_start" class=" form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
+                        <input style="max-width: 200px"  type="date" name="ordertime_start" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
                                v-model="filterData.ordertime_start" :class="filterData.ordertime_start?'bg-warning':''">
                     </td>
                     <td style="width: 400px">
-                        <input  type="date" class=" form-control-sm tooltipTarget" name="ordertime_end" title="选择显示指定日期的结束时间"
+                        <input style="max-width: 200px"  type="date" class=" form-control form-control-sm tooltipTarget" name="ordertime_end" title="选择显示指定日期的结束时间"
                                v-model="filterData.ordertime_end" :class="filterData.ordertime_end?'bg-warning':''" >
                     </td>
                     <td colspan="7"></td>
                 </tr>
                 <tr>
                     <td >
-                        <input type="text" class="form-control-sm tooltipTarget" placeholder="客户"
+                        <div class="form-inline">
+                        <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="客户"
                                style="width:70px" @input="owner_seek"
                                title="输入关键词快速定位下拉列表，回车确定">
-                        <select name="customerid" v-model="filterData.customerid" @change="submit" style="max-width: 120px" class="form-control-sm tooltipTarget"  title="选择要显示的客户" :class="filterData.customerid?'bg-warning':''">
+                        <select name="customerid" v-model="filterData.customerid" @change="submit" style="max-width: 120px" class="form-control form-control-sm tooltipTarget"  title="选择要显示的客户" :class="filterData.customerid?'bg-warning':''">
                             <option >    </option>
                             <option v-for="owner in owners" :value="owner.customerid" >@{{owner.descr_c}}</option>
                         </select>
+                        </div>
                     </td>
                     <td>
-                        <input name="orderno" v-model="filterData.orderno" class="form-control-sm tooltipTarget" placeholder="发运单号" :class="filterData.orderno?'bg-warning':''">
+                        <input style="max-width: 200px" name="orderno" v-model="filterData.orderno" class="form-control form-control-sm tooltipTarget" placeholder="发运单号" :class="filterData.orderno?'bg-warning':''">
                     </td>
                     <td >
-                        <input name="soreference5" title="可输出多快递单号" v-model="filterData.soreference5" class="form-control-sm tooltipTarget" placeholder="快递单号" :class="filterData.soreference5?'bg-warning':''">
+                        <input style="max-width: 200px" name="soreference5" title="可输出多快递单号" v-model="filterData.soreference5" class="form-control form-control-sm tooltipTarget" placeholder="快递单号" :class="filterData.soreference5?'bg-warning':''">
                     </td>
                     <td colspan="7"><input hidden type="submit"></td>
                 </tr>
@@ -157,7 +159,10 @@
                 <td>@{{ order.c_address1 }}</td>
             </tr>
         </table>
-
+        <button type="button" @click="pageUp()" :readonly="page>1?false:true" class="btn btn-sm " :class="page>1?'btn-outline-info':''">上一页</button>
+        <button type="button" @click="pageDown()" :readonly="page<maxPage?false:true" class="btn btn-sm m-3" :class="page<maxPage?'btn-outline-info':''">下一页</button>
+        <input  @keyup.enter="pageSkip($event)" class="form-control-sm ml-3 tooltipTarget" :placeholder="'当前页数：'+page+'/'+maxPage" title="去往指定页">
+        <span class="text-muted m-1">共 @{{ sum }} 条</span>
     </div>
 @endsection
 
@@ -169,6 +174,9 @@
                 filterData:{
                     paginate:50,ordertime_start:'',ordertime_end:'',customerid:'',orderno:'',soreference5:'',
                 },
+                page:Number('{{$page}}'),
+                maxPage:1,
+                sum:0,
                 checkData:[],
                 owners:[
                     @foreach($customers as $customer)
@@ -184,11 +192,15 @@
                 $(".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'){
+                        if(this.filterData[key] && key!='paginate' && key!='page'){
                             return true
                         }
                     }
@@ -223,6 +235,35 @@
                         });
                     }
                 },
+                pageUp(){
+                    if (this.page<=1)return;
+                    this.page=this.page-1;
+                    this.href();
+                },
+                pageDown(){
+                    if (this.page>=this.maxPage)return;
+                    this.page=this.page+1;
+                    this.href();
+                },
+                pageSkip(e){
+                    if (Number(e.target.value)<=0 || Number(e.target.value)>this.maxPage){
+                        tempTip.setDuration(2000);
+                        tempTip.show('页数不存在！ ');
+                        return
+                    }
+                    this.page=e.target.value;
+                    this.href();
+                },
+                href(){
+                    let url="{{url('order/index/delivering?page=')}}"+this.page;
+                    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;
+                    window.location.href=url;
+                },
                 //提交表单
                 submit:function(){
                     let form = $("#form");

resources/views/process/index.blade.php

@@ -16,11 +16,8 @@
                                </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="submit">
+                               <select name="paginate" v-model="filterData.paginate" class="tooltipTarget form-control form-control-sm" style="vertical-align: middle;max-width: 100px" @change="submit">
                                    <option value="50">50行</option>
                                    <option value="100">100行</option>
                                    <option value="200">200行</option>
@@ -29,36 +26,34 @@
                                </select></td>
                        </tr>
                        <tr>
-                           <td rowspan="2" >
-                               <span class="text-muted">根据条件过滤：</span>
-                           </td>
                            <td >
-                               <input id="date_start" name="date_start" v-model="filterData.date_start"  :class="filterData.date_start?'bg-warning':''" type="date" class="form-control-sm tooltipTarget" title="选择显示指定日期的起始时间">
+                               <input id="date_start" name="date_start" style="max-width: 200px" v-model="filterData.date_start"  :class="filterData.date_start?'bg-warning':''" type="date" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的起始时间">
                            </td>
                            <td >
-                               <input type="text" class="form-control-sm tooltipTarget" placeholder="客户"
+                               <div class="form-inline">
+                               <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="客户"
                                       style="width:70px" @input="owner_seek"
                                       title="输入关键词快速定位下拉列表，回车确定">
-                               <select name="owner_id" v-model="filterData.owner_id" @change="submit" class="form-control-sm tooltipTarget"  title="选择要显示的客户" :class="filterData.owner_id?'bg-warning':''">
+                               <select name="owner_id" v-model="filterData.owner_id" @change="submit" class="form-control form-control-sm tooltipTarget"  title="选择要显示的客户" :class="filterData.owner_id?'bg-warning':''">
                                    <option >    </option>
                                    <option v-for="owner in owners" :value="owner.id">@{{owner.name}}</option>
-                               </select>
+                               </select></div>
                            </td>
                            <td>
-                               <input id="wms_code" name="wms_code" title="单据号：支持15内模糊搜索与15天外精确搜索" v-model="filterData.wms_code" class="form-control-sm tooltipTarget" placeholder="单据号" :class="filterData.wms_code?'bg-warning':''">
+                               <input id="wms_code" name="wms_code" style="max-width: 200px" title="单据号：支持15内模糊搜索与15天外精确搜索" v-model="filterData.wms_code" class="form-control form-control-sm tooltipTarget" placeholder="单据号" :class="filterData.wms_code?'bg-warning':''">
                            </td>
                            <td colspan="6"></td>
                        </tr>
                        <tr>
                            <td >
-                               <input id="date_end" name="date_end" v-model="filterData.date_end" type="date" class="form-control-sm tooltipTarget" title="选择显示指定日期的结束时间" :class="filterData.date_end?'bg-warning':''">
+                               <input id="date_end" name="date_end" style="max-width: 200px" v-model="filterData.date_end" type="date" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的结束时间" :class="filterData.date_end?'bg-warning':''">
                            </td>
                            <td>
-                               <input name="commodity_barcode" title="商品条码：支持15内模糊搜索与15天外精确搜索" v-model="filterData.commodity_barcode" class="form-control-sm tooltipTarget" placeholder="商品条码" :class="filterData.commodity_barcode?'bg-warning':''">
+                               <input name="commodity_barcode" style="max-width: 200px" title="商品条码：支持15内模糊搜索与15天外精确搜索" v-model="filterData.commodity_barcode" class="form-control form-control-sm tooltipTarget" placeholder="商品条码" :class="filterData.commodity_barcode?'bg-warning':''">
                            </td>
                            <td >
 
-                               <select id="status" name="status" v-model="filterData.status" @change="submit" class="form-control-sm tooltipTarget" :class="filterData.status?'bg-warning':''" >
+                               <select id="status" name="status" v-model="filterData.status" @change="submit" style="max-width: 100px" class="form-control form-control-sm tooltipTarget" :class="filterData.status?'bg-warning':''" >
                                    <option value="" selected>状态</option>
                                    <option value="待接单">待接单</option>
                                    <option value="待加工">待加工</option>
@@ -73,9 +68,6 @@
                            </td>
                        </tr>
                        <tr>
-                           <td>
-                               <span class="text-muted">操作选定记录：</span>
-                           </td>
                            <td colspan="9">
                                <span class="dropdown">
                                         <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"

resources/views/process/statistic.blade.php

@@ -17,10 +17,7 @@
                         </tr>
                         <tr>
                             <td >
-                                <span class="text-muted">每页显示记录：</span>
-                            </td>
-                            <td >
-                                <select name="paginate" v-model="filterData.paginate" class="tooltipTarget form-control-sm" style="vertical-align: middle" @change="submit()">
+                                <select name="paginate" v-model="filterData.paginate" class="tooltipTarget form-control form-control-sm" style="vertical-align: middle;max-width: 100px" @change="submit()">
                                     <option value="50">50行</option>
                                     <option value="100">100行</option>
                                     <option value="200">200行</option>
@@ -29,44 +26,40 @@
                                 </select></td>
                         </tr>
                         <tr>
-                            <td rowspan="2" style="width: 100px">
-                                <span class="text-muted">根据条件过滤：</span>
-                            </td>
                             <td style="width: 400px">
-                                <label for="started_at" style="width: 35px">时间：</label>
-                                <input id="started_at" name="started_at" v-model="filterData.started_at" type="date" class="form-control-sm ">
+                                <input id="started_at" name="started_at" style="max-width: 200px" v-model="filterData.started_at" type="date" class="form-control form-control-sm ">
                             </td>
-                            <td style="width: 400px">
-                                <label>&nbsp;客&nbsp;&nbsp;户&nbsp;：</label>
-                                <input type="text" class="form-control-sm tooltipTarget" placeholder="查找"
+                            <td style="width: 300px">
+                                <div class="form-inline">
+                                <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="客户"
                                        style="width:70px" @input="owner_seek"
                                        title="输入关键词快速定位下拉列表，回车确定">
-                                <select name="owner_id" v-model="filterData.owner_id" @change="submit" class="form-control-sm tooltipTarget">
+                                <select name="owner_id" v-model="filterData.owner_id" @change="submit" class="form-control form-control-sm tooltipTarget">
                                     <option >    </option>
                                     <option v-for="owner in owners" :value="owner.id">@{{owner.name}}</option>
-                                </select>
+                                </select></div>
                             </td>
                             <td >
+                                <div class="form-inline">
                                 <label>加工类型：</label>
-                                <select name="processMethod_id" v-model="filterData.processMethod_id" style="width: 80px" @change="submit" class="form-control-sm tooltipTarget">
+                                <select name="processMethod_id" v-model="filterData.processMethod_id" style="width: 80px" @change="submit" class="form-control form-control-sm tooltipTarget">
                                     <option >    </option>
                                     <option v-for="processMethod in processMethods" :value="processMethod.id">@{{processMethod.name}}</option>
-                                </select>
+                                </select></div>
                             </td>
                             <td colspan="6"></td>
                         </tr>
                         <tr>
                             <td >
-                                <label for="ended_at" style="width: 35px"></label>
-                                <input id="ended_at" name="ended_at" v-model="filterData.ended_at" type="date" class="form-control-sm ">
+                                <input id="ended_at" style="max-width: 200px" name="ended_at" v-model="filterData.ended_at" type="date" class="form-control form-control-sm ">
                             </td>
                             <td >
-                                <label for="code">任务号：</label>
-                                <input id="code" name="code" v-model="filterData.code" class="form-control-sm">
+                                <input id="code" style="max-width: 200px" placeholder="任务号" name="code" v-model="filterData.code" class="form-control form-control-sm">
                             </td>
                             <td >
+                                <div class="form-inline">
                                 <label for="status">&nbsp;状&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;态&nbsp;：</label>
-                                <select id="status" name="status" style="width: 80px" v-model="filterData.status" @change="submit" class="form-control-sm tooltipTarget">
+                                <select id="status" name="status" style="max-width: 100px" v-model="filterData.status" @change="submit" class="form-control form-control-sm tooltipTarget">
                                     <option >    </option>
                                     <option value="待接单">待接单</option>
                                     <option value="待加工">待加工</option>
@@ -74,16 +67,11 @@
                                     <option value="加工中">加工中</option>
                                     <option value="待验收">待验收</option>
                                     <option value="已完成">已完成</option>
-                                </select>
+                                </select></div>
                             </td>
                             <td colspan="6"><input hidden type="submit"></td>
                         </tr>
                         <tr>
-                            <td>
-                                <div>
-                                    <span class="text-muted">操作选定记录：</span>
-                                </div>
-                            </td>
                             <td colspan="3">
                                 <span class="dropdown">
                                     <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget"

resources/views/rejected/index.blade.php

@@ -23,7 +23,7 @@
                         <table class="table table-sm table-bordered m-0">
                             <tr>
                                 <td colspan="9">
-                                    <select name="" id="setPaginate" class="tooltipTarget form-control-sm" style="vertical-align: middle"
+                                    <select id="setPaginate" class="tooltipTarget form-control-sm" style="vertical-align: middle"
                                             @change="setPaginate" v-model="filterParams.paginate">
                                         <option value="50">每页显示50条</option>
                                         <option value="100">每页显示100条</option>
@@ -35,38 +35,40 @@
                             </tr>
                             <tr>
                                 <td colspan="2">
-                                    <input type="date" name="created_at_start" class="form-control-sm tooltipTarget" style="width:140px"
+                                    <input type="date" name="created_at_start" class="form-control form-control-sm tooltipTarget" style="width:140px"
                                            :class="filterParams.created_at_start?'bg-warning':''" v-model="filterParams.created_at_start"
                                            @keypress="created_at_startEntering" @change="created_at_startChange" title="选择显示指定日期的起始时间">
                                 </td>
                                 <td>
-                                    <input type="text" class="form-control-sm tooltipTarget" placeholder="客户"
+                                    <div class="form-inline">
+                                    <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="客户"
                                            style="width:70px" @input="locateOwner" @keypress="owner_idEntering"
                                            title="客户：输入关键词快速定位下拉列表，回车确定">
-                                    <select name="owner_id" id="owner_id" class="form-control-sm tooltipTarget"
+                                    <select name="owner_id" id="owner_id" class="form-control form-control-sm tooltipTarget"
                                             :class="filterParams.owner_id?'bg-warning':''" v-model="filterParams.owner_id"
                                             title="选择要显示的客户" @change="owner_idChange">
                                         <option value="" selected>全部客户</option>
                                         <option v-for="owner in owners" :value="owner.id">@{{ owner.name }}</option>
                                     </select>
+                                    </div>
                                 </td>
                                 <td>
-                                    <input type="text" class="form-control-sm tooltipTarget" placeholder="订单号" name="order_number"
+                                    <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="订单号" name="order_number"
                                            :class="filterParams.order_number?'bg-warning':''" v-model="filterParams.order_number"
                                            @input="order_numberEntering" @keypress="submitFilterOnEnter" title="订单号：15天以内的支持模糊搜索，回车提交">
                                 </td>
                                 <td>
-                                    <input type="text" class="form-control-sm tooltipTarget" placeholder="退回单号" name="logistic_number_return"
+                                    <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="退回单号" name="logistic_number_return"
                                            :class="filterParams.logistic_number_return?'bg-warning':''"
                                            @input="logistic_number_returnEntering" @keypress="submitFilterOnEnter" title="退回单号：支持查找多个以逗号或空格分隔的单号，15天以内的支持模糊搜索，回车提交">
                                 </td>
                                 <td>
-                                    <input type="text" class="form-control-sm tooltipTarget" placeholder="原单单号" name="logistic_number"
+                                    <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="原单单号" name="logistic_number"
                                            :class="filterParams.logistic_number?'bg-warning':''"
                                            @input="logistic_numberEntering" @keypress="submitFilterOnEnter" title="原单单号：15天以内的支持模糊搜索，回车提交">
                                 </td>
                                 <td>
-                                    <select name="is_checked" class="form-control-sm tooltipTarget" @change="is_checkedChange" title="审核"
+                                    <select name="is_checked" class="form-control form-control-sm tooltipTarget" @change="is_checkedChange" title="审核"
                                             :class="filterParams.is_checked?'bg-warning':''">
                                         <option value="">是否审核</option>
                                         <option value="1">已审核</option>
@@ -77,17 +79,17 @@
                             </tr>
                             <tr>
                                 <td colspan="2">
-                                    <input type="date" name="created_at_end" class="form-control-sm tooltipTarget" style="width:140px"
+                                    <input type="date" name="created_at_end" class="form-control form-control-sm tooltipTarget" style="width:140px"
                                            :class="filterParams.created_at_end?'bg-warning':''"
                                            @keypress="created_at_endEntering" @change="created_at_endChange" title="选择显示指定日期的结束时间">
                                 </td>
                                 <td>
-                                    <input type="text" class="form-control-sm tooltipTarget" placeholder="商品条码" name="barcode_goods"
+                                    <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="商品条码" name="barcode_goods"
                                            :class="filterParams.barcode_goods?'bg-warning':''" title="商品条码：可模糊匹配右边未填完的部分，按回车提交"
                                            @input="barcode_goodsEntering" @keypress="submitFilterOnEnter">
                                 </td>
                                 <td>
-                                    <select name="id_quality_label" id="id_quality_label" class="form-control-sm tooltipTarget"
+                                    <select name="id_quality_label" id="id_quality_label" class="form-control form-control-sm tooltipTarget"
                                             :class="filterParams.id_quality_label?'bg-warning':''"
                                             title="是否正品：正品仅显示全部是正品的退单，但残次显示的是包含有残次的退单" @change="id_quality_labelChange">
                                         <option value="" selected>是否正品</option>
@@ -95,17 +97,17 @@
                                     </select>
                                 </td>
                                 <td>
-                                    <input type="text" class="form-control-sm tooltipTarget" name="mobile_sender" placeholder="寄件人手机"
+                                    <input type="text" class="form-control form-control-sm tooltipTarget" name="mobile_sender" placeholder="寄件人手机"
                                            :class="filterParams.mobile_sender?'bg-warning':''"
                                            @input="mobile_senderEntering" @keypress="submitFilterOnEnter" title="寄件人手机：输入完成敲回车提交">
                                 </td>
                                 <td>
-                                    <input type="text" class="form-control-sm tooltipTarget" name="checked_numbers" placeholder="审核批次号"
+                                    <input type="text" class="form-control form-control-sm tooltipTarget" name="checked_numbers" placeholder="审核批次号"
                                            :class="filterParams.checked_numbers?'bg-warning':''"
                                            @input="checked_numbersEntering" @keypress="submitFilterOnEnter" title="审核批次号：支持右位留空的模糊搜索">
                                 </td>
                                 <td>
-                                    <select name="is_loaded" id="is_loaded" class="form-control-sm"
+                                    <select name="is_loaded" id="is_loaded" class="form-control form-control-sm"
                                             :class="filterParams.is_loaded?'bg-warning':''"
                                             title="是否入库" @change="is_loadedChange">
                                         <option value="" selected>是否入库</option>

resources/views/waybill/delivering.blade.php

@@ -12,19 +12,19 @@
                     </div>
                 </div>
                 <div class="row mt-2 ml-2">
-                    <div class="col-md-6" style="max-width: 400px">
-                        <input type="date" name="created_at_start" class=" form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
+                    <div class="col-md-6 form-inline" style="max-width: 400px">
+                        <input type="date" name="created_at_start" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
                                v-model="filterData.created_at_start" :class="filterData.created_at_start?'bg-warning':''">
-                        <input type="date" class=" form-control-sm tooltipTarget" name="created_at_end" title="选择显示指定日期的结束时间"
+                        <input type="date" class="form-control form-control-sm tooltipTarget" name="created_at_end" title="选择显示指定日期的结束时间"
                                v-model="filterData.created_at_end" :class="filterData.created_at_end?'bg-warning':''" >
                     </div>
                     <div class=" col-md-2 mr-0 " style="max-width: 160px">
                         <input type="text" title="运单号：支持15内模糊搜索与15天外精确搜索" name="waybill_number" placeholder="运单号"
-                               class=" form-control-sm tooltipTarget" v-model="filterData.waybill_number" style="vertical-align: middle;width: 153px" :class="filterData.waybill_number?'bg-warning':''">
+                               class="form-control form-control-sm tooltipTarget" v-model="filterData.waybill_number" style="vertical-align: middle;width: 153px" :class="filterData.waybill_number?'bg-warning':''">
                     </div>
-                    <div class=" col-md-2 " style="max-width: 160px">
+                    <div class=" col-md-2 ml-2 p-0" style="max-width: 160px">
                         <input type="text" title="承运商单号：支持15内模糊搜索与15天外精确搜索"  name="carrier_bill" placeholder="承运商单号"
-                               class="form-control-sm tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle;width: 153px" :class="filterData.carrier_bill?'bg-warning':''">
+                               class="form-control form-control-sm tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle;width: 153px" :class="filterData.carrier_bill?'bg-warning':''">
                     </div>
                     <input type="submit" hidden>
                 </div>

resources/views/waybill/index.blade.php

@@ -48,44 +48,44 @@
                     </tr>
                     <tr >
                         <td >
-                            <select name="owner_id" v-model="filterData.owner_id" class="form-control-sm  "  @change="setOwner" style="vertical-align: middle" :class="filterData.owner_id?'bg-warning':''">
-                                <option value="" selected>货主</option>
+                            <select name="owner_id" title="货主" v-model="filterData.owner_id"  class="form-control form-control-sm tooltipTarget "  @change="setOwner" style="vertical-align: middle;max-width: 100px" :class="filterData.owner_id?'bg-warning':''">
+                                <option> </option>
                                 @foreach($owners as $owner)
                                     <option value="{{$owner->id}}">{{$owner->name}}</option>
                                 @endforeach
                             </select></td>
                         <td >
-                            <select name="carrier_id" v-model="filterData.carrier_id" class="form-control-sm  " @change="setCarrier" style="vertical-align: middle" :class="filterData.carrier_id?'bg-warning':''">
-                                <option value="" selected>承运商</option>
+                            <select name="carrier_id" title="承运商"  v-model="filterData.carrier_id" class="form-control form-control-sm  tooltipTarget" @change="setCarrier" style="vertical-align: middle;max-width: 100px" :class="filterData.carrier_id?'bg-warning':''">
+                                <option > </option>
                                 @foreach($carriers as $carrier)
                                     <option value="{{$carrier->id}}">{{$carrier->name}}</option>
                                 @endforeach
                             </select></td>
                         <td >
                             <input type="text" title="运单号：支持15内模糊搜索与15天外精确搜索" name="waybill_number" placeholder="运单号"
-                                   class="form-control-sm  tooltipTarget" v-model="filterData.waybill_number" style="vertical-align: middle" :class="filterData.waybill_number?'bg-warning':''"></td>
+                                   class="form-control form-control-sm  tooltipTarget" v-model="filterData.waybill_number" style="vertical-align: middle;max-width: 200px" :class="filterData.waybill_number?'bg-warning':''"></td>
                         <td  >
                             <input type="text" title="承运商单号：支持15内模糊搜索与15天外精确搜索"  name="carrier_bill" placeholder="承运商单号"
-                                   class="form-control-sm  tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle" :class="filterData.carrier_bill?'bg-warning':''"></td>
+                                   class="form-control form-control-sm  tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle;max-width: 200px" :class="filterData.carrier_bill?'bg-warning':''"></td>
                         <td></td>
                     </tr>
                     <tr>
-                        <td  >
+                        <td  style="width: 300px">
                             <input type="text" title="WMS单号：支持15内模糊搜索与15天外精确搜索" name="wms_bill_number" placeholder="WMS单号"
-                                   class="form-control-sm  tooltipTarget" v-model="filterData.wms_bill_number" style="vertical-align: middle" :class="filterData.wms_bill_number?'bg-warning':''"></td>
-                        <td  style="width: 500px"><div>
+                                   class="form-control form-control-sm  tooltipTarget" v-model="filterData.wms_bill_number" style="vertical-align: middle;max-width: 200px" :class="filterData.wms_bill_number?'bg-warning':''"></td>
+                        <td  style="width: 350px"><div class="form-inline">
                                 <input type="text" title="始发地：支持15内模糊搜索与15天外精确搜索" name="origination" placeholder="始发地"
-                                       class="form-control-sm  tooltipTarget" v-model="filterData.origination" style="vertical-align: middle" :class="filterData.origination?'bg-warning':''">
+                                       class="form-control form-control-sm  tooltipTarget" v-model="filterData.origination" style="vertical-align: middle" :class="filterData.origination?'bg-warning':''">
                                 <input type="text" title="目的地：支持15内模糊搜索与15天外精确搜索" style="vertical-align: middle" placeholder="目的地"
-                                       name="destination" class="form-control-sm  tooltipTarget" v-model="filterData.destination" :class="filterData.destination?'bg-warning':''"></div></td>
-                        <td  style="width: 500px"><div>
-                                <input type="date" name="created_at_start" class="form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
+                                       name="destination" class="form-control form-control-sm  tooltipTarget" v-model="filterData.destination" :class="filterData.destination?'bg-warning':''"></div></td>
+                        <td  style="width: 350px"><div class="form-inline">
+                                <input type="date" name="created_at_start" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
                                        v-model="filterData.created_at_start" :class="filterData.created_at_start?'bg-warning':''">
-                                <input type="date" class="form-control-sm tooltipTarget" name="created_at_end" title="选择显示指定日期的结束时间"
+                                <input type="date" class="form-control form-control-sm tooltipTarget" name="created_at_end" title="选择显示指定日期的结束时间"
                                        v-model="filterData.created_at_end" :class="filterData.created_at_end?'bg-warning':''"></div></td>
                         <td>
-                            <select name="status" v-model="filterData.status" @change="setState" class="form-control-sm" style="vertical-align: middle" :class="filterData.status?'bg-warning':''">
-                                <option value="" selected>运单状态</option>
+                            <select name="status" title="运单状态" v-model="filterData.status" @change="setState" class="form-control form-control-sm tooltipTarget" style="vertical-align: middle;max-width: 100px" :class="filterData.status?'bg-warning':''">
+                                <option > </option>
                                 <option value="未审核">未审核</option>
                                 <option value="已审核">待调度</option>
                                 <option value="待终审">待终审</option>
@@ -215,10 +215,10 @@
                     <td class="td-transit"><span v-if="waybill.type=='专线'">@{{waybill.carrier_bill}}</span>
                         <span v-if="waybill.type=='直发车'">
                             <span v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></span></span></td>
-                    <td class="td-transit">@{{waybill.warehouse_weight}}  @{{waybill.warehouse_weight_unit}}</td>
-                    <td class="td-transit">@{{waybill.carrier_weight}}  @{{waybill.carrier_weight_unit}}</td>
-                    <td class="td-transit">@{{waybill.warehouse_weight_other}}  @{{waybill.warehouse_weight_unit_other}}</td>
-                    <td class="td-transit">@{{waybill.carrier_weight_other}}  @{{waybill.carrier_weight_unit_other}}</td>
+                    <td class="td-transit"><span v-if="waybill.warehouse_weight">@{{waybill.warehouse_weight}}  @{{waybill.warehouse_weight_unit}}</span></td>
+                    <td class="td-transit"><span v-if="waybill.carrier_weight">@{{waybill.carrier_weight}}  @{{waybill.carrier_weight_unit}}</span></td>
+                    <td class="td-transit"><span v-if="waybill.warehouse_weight_other">@{{waybill.warehouse_weight_other}}  @{{waybill.warehouse_weight_unit_other}}</span></td>
+                    <td class="td-transit"><span v-if="waybill.carrier_weight_other">@{{waybill.carrier_weight_other}}  @{{waybill.carrier_weight_unit_other}}</span></td>
                     <td class="td-transit">@{{waybill.amount}} </td>
                     <td class="td-transit">@{{waybill.mileage|km}} </td>
                     @can('运输管理-可见费用项')

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

@@ -33,9 +33,9 @@
     @else
     @if($type=='ZF'){{url('waybill/waybillFinancialExcepted/ZF')}}@elseif($type=='ZX'){{url('waybill/waybillFinancialExcepted/ZX')}}@else{{url('waybill/waybillFinancialExcepted')}}@endif
     @endif ">
-    <div class="card-header">
-        <label style="margin-left: 1%"> 开始日期：</label><input type="date" name="created_at_start" class="rounded"  v-model="filterData.created_at_start">
-        <label style="margin-left: 1%"> 截至日期：</label><input type="date" class="rounded" name="created_at_end" v-model="filterData.created_at_end">
+    <div class="card-header form-inline">
+        <label style="margin-left: 1%"> 开始日期：</label><input style="max-width: 200px" type="date" name="created_at_start" class="form-control form-control-sm"  v-model="filterData.created_at_start">
+        <label style="margin-left: 1%"> 截至日期：</label><input style="max-width: 200px" type="date" class="form-control form-control-sm" name="created_at_end" v-model="filterData.created_at_end">
         <input hidden type="submit">
     </div>
     </form>

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

@@ -19,9 +19,6 @@
                                     </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>
@@ -32,44 +29,40 @@
                                     </select></td>
                             </tr>
                             <tr>
-                                <td rowspan="2">
-                                    <span class="text-muted">根据条件过滤：</span>
-                                </td>
                                 <td >
-                                    <input style="width: 150px" name="created_at_start" type="date" v-model="filterData.created_at_start" :class="filterData.created_at_start?'bg-warning':''" class="form-control-sm tooltipTarget" title="选择显示指定日期的起始时间">
+                                    <input style="width: 150px" name="created_at_start" type="date" v-model="filterData.created_at_start" :class="filterData.created_at_start?'bg-warning':''" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的起始时间">
 
                                 </td>
                                 <td>
-                                    <input type="text" class="form-control-sm tooltipTarget" placeholder="客户"
+                                    <div class="form-inline">
+                                    <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="客户"
                                            style="width:70px" @input="owner_seek"
                                            title="输入关键词快速定位下拉列表，回车确定">
                                     <select name="owner_id" id="owner_id" :class="filterData.owner_id?'bg-warning':''" v-model="filterData.owner_id" @change="setOwner"
-                                            class="form-control-sm tooltipTarget"  title="选择要显示的客户">
+                                            class="form-control form-control-sm tooltipTarget"  title="选择要显示的客户">
                                         @foreach($owners as $owner)
                                             <option value="{{$owner->id}}">{{$owner->name}}</option>
                                         @endforeach
                                     </select>
-                                    <input hidden type="submit" >
+                                    </div>
                                 </td>
 
                                 <td>
-                                    <input :class="filterData.logistic_number?'bg-warning':''" type="text" title="快递单号：支持15内模糊搜索与15天外精确搜索" name="logistic_number" class="form-control-sm  tooltipTarget" v-model="filterData.logistic_number" style="vertical-align: middle" ></td>
+                                    <input :class="filterData.logistic_number?'bg-warning':''" type="text" placeholder="快递单号" title="快递单号：支持15内模糊搜索与15天外精确搜索" name="logistic_number" class="form-control form-control-sm  tooltipTarget" v-model="filterData.logistic_number" style="vertical-align: middle;max-width: 200px" ></td>
                                 {{--<td >
                                     <input :class="filterData.delivery_number?'bg-warning':''" type="text" title="支持15内模糊搜索与15天外精确搜索" name="delivery_number" class="form-control-sm  tooltipTarget" v-model="filterData.delivery_number" style="vertical-align: middle" placeholder="发货单号"></td>--}}
                                 <td colspan="6"></td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input style="width: 150px" type="date" name="created_at_end" v-model="filterData.created_at_end" :class="filterData.created_at_end?'bg-warning':''" class="form-control-sm tooltipTarget" title="选择显示指定日期的结束时间">
+                                    <input style="width: 150px" type="date" name="created_at_end" v-model="filterData.created_at_end" :class="filterData.created_at_end?'bg-warning':''" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的结束时间">
                                 </td>
                                 <td >
-                                    <input type="text" title="波次号：支持15内模糊搜索与15天外精确搜索" name="batch_number" class="form-control-sm  tooltipTarget" v-model="filterData.batch_number"  :class="filterData.batch_number?'bg-warning':''" style="vertical-align: middle" ></td>
+                                    <input type="text" title="波次号：支持15内模糊搜索与15天外精确搜索" placeholder="波次号" name="batch_number" class="form-control form-control-sm  tooltipTarget" v-model="filterData.batch_number"  :class="filterData.batch_number?'bg-warning':''" style="vertical-align: middle;max-width: 200px" ></td>
                             </tr>
                             <tr>
-                                <td>
-                                    <span class="text-muted">操作选定记录：</span>
-                                </td>
                                 <td colspan="9">
+                                    <input hidden type="submit" >
                                     <span class="dropdown">
                                         <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="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">

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

@@ -17,20 +17,13 @@
                                     </div></td>
                             </tr>
                             <tr >
-                                <td rowspan="2" class="" style=" width: 150px">
-                                    <div class="d-flex" style="height: 100px;">
-                                        <span class="text-muted align-items-center d-flex">根据条件过滤：</span>
-                                    </div>
-                                </td>
                                 <td>
                                     <div class="form-inline pl-3" style="height: 100px">
                                         <div class="align-items-center">
-                                            <div class="text-right">货主：</div>
-                                            <p>
-                                                <input type="text" style="width: 100px;opacity: 0.6" class="form-control-sm tooltipTarget" placeholder="定位货主"
+                                            <div class="text-right form-inline">货主：
+                                                <input type="text" style="width: 100px;opacity: 0.6" class="form-control form-control-sm tooltipTarget" placeholder="定位货主"
                                                        @input="owner_seek"
-                                                       title="输入关键词快速定位下拉列表">
-                                            </p>
+                                                       title="输入关键词快速定位下拉列表"></div>
                                         </div>
 
 
@@ -45,13 +38,11 @@
                                 </td>
                                 <td >
                                     <div class="form-inline pl-3" style="height: 100px">
-                                        <div class="align-items-center">
-                                            <div class="text-right">物流公司：</div>
-                                            <p>
-                                                <input type="text" style="width: 100px;opacity: 0.6" class="form-control-sm tooltipTarget" placeholder="定位物流公司"
+                                        <div class="align-items-center ">
+                                            <div class="text-right form-inline" >物流公司：
+                                                <input type="text" style="width: 100px;opacity: 0.6" class="form-control form-control-sm tooltipTarget" placeholder="定位物流公司"
                                                        @input="logistic_seek"
-                                                       title="输入关键词快速定位下拉列表">
-                                            </p>
+                                                       title="输入关键词快速定位下拉列表"></div>
                                         </div>
                                         <div style="max-height: 90px;overflow-y: scroll;border: solid 1px #ddd;border-radius:5px;text-align: center;transform:scale(0.9)"  v-if="logisticsAll.length>0">
                                             <ul class="list-group tooltipTarget" onselectstart="return false;">
@@ -107,11 +98,6 @@
                             </tr>
                             <tr></tr>
                             <tr>
-                                <td>
-                                    <div>
-                                        <span class="text-muted">操作选定记录：</span>
-                                    </div>
-                                </td>
                                 <td colspan="3">
                                     <span class="dropdown">
                                         <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" {{--:class="[rejectedBills_checkBoxes.length>0?'btn-dark text-light':'']"--}}

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

@@ -14,15 +14,17 @@
                     <form  method="GET" action="{{url('package/weightExcepted/'.$view)}}" id="optionSubmit">
                         <table class="table  table-sm table-bordered table-hover text-nowrap ">
                             <tr>
-                                <td  style="width:200px;"> <label style="margin-left: 2%" class="form-inline">页显示条数：
-                                    <select name="paginate" v-model="filterData.paginate" class="form-control" @change="setPaginate">
+                                <td  style="width:200px;"> <div class="form-inline"><label style="margin-left: 2%" >页显示条数：</label>
+                                    <select name="paginate" v-model="filterData.paginate" class="form-control-sm" @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></label></td>
-                                <td colspan="5">
+                                    </select></div></td>
+                            </tr>
+                            <tr>
+                                <td >
                                     <label style="margin-left: 5px"> 操作选定记录：</label>
                                     <span class="dropdown">
                                         <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark':'btn-outline-dark']"