样式整体调整

app/Http/Controllers/WaybillController.php

@@ -26,6 +26,7 @@ use Carbon\Carbon;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -377,12 +378,11 @@ class WaybillController extends Controller
     public function waybillRetreatAudit(Request $request){
         if(!Gate::allows('运输管理-运单-调度')){ return redirect(url('/'));  }
         $id=$request->input('id');
+        /** @var Model|\stdClass $waybill */
         $waybill=app('waybillService')->find($id);
-        WaybillAuditLog::query()->whereRaw('waybill_id = ? and audit_stage = ?',[$id,"运单阶段"])->delete();
+        $waybillLog = WaybillAuditLog::query()->whereRaw('waybill_id = ? and audit_stage = ?',[$id,"运单阶段"])->delete();
         $waybill->status='待重审';
-        $result=$waybill->save();
-        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($waybill),Auth::user()['id']);
-        return ['success'=>$result,'status'=>$waybill->status];
+        return ['success'=>$waybill->save(),'status'=>$waybill->status,"log"=>$waybillLog];
     }
     public function waybillEndAudit(Request $request){
         if(!Gate::allows('运输管理-运单-调度审核')){ return redirect(url('/'));  }

resources/js/queryForm/header.js

@@ -279,10 +279,10 @@ window.Header = function getHeader(object) {
             }
             let tds = trs[i].children;
             for (let j=0;j<tds.length;j++){
+                let count = tds[j].children.length;
                 let div = document.createElement("div");
                 div.style.overflowX = "hidden";
-                let count = tds[j].childNodes.length;
-                for (let k=0;k<count;k++){div.appendChild(tds[j].childNodes[0]);}
+                for (let k=0;k<count;k++){div.appendChild(tds[j].children[0]);}
                 tds[j].appendChild(div);
                 tds[j].className += " pl-2 pr-2";
             }

resources/sass/text.scss

@@ -233,4 +233,13 @@
     position: -webkit-sticky;
     background-color: white;
     z-index: 50;
+}
+
+//td颜色
+.td-red td{
+   color: red !important;
+}
+
+.td-green td{
+    color: green !important;
 }

resources/views/customer/project/area.blade.php

@@ -27,7 +27,7 @@
                     <td>
                         <label><input type="checkbox" :value="area.id"></label>
                     </td>
-                    <td>@{{ i+1 }}</td>
+                    <td><span>@{{ i+1 }}</span></td>
                     <td>
                         <span v-if="area.status=='编辑中'">
                             <button class="btn btn-sm btn-outline-info" @click="edit(area,i)">编辑</button>
@@ -36,17 +36,17 @@
                         <span v-if="area.status=='已完成'" class="text-success font-weight-bold">@{{ area.status }}</span>
                         <span v-if="area.status=='已审核'" class="text-primary font-weight-bold">@{{ area.status }}</span>
                     </td>
-                    <td style="min-width: 50px">@{{ area.userOwnerGroupName }}</td>
-                    <td style="min-width: 50px">@{{ area.customerName }}</td>
-                    <td>@{{ area.ownerName }}</td>
-                    <td>@{{ area.countingMonth }}</td>
-                    <td>@{{ area.updatedAt }}</td>
-                    <td>@{{ area.ownerStoragePriceModel }}</td>
-                    <td>@{{ area.unitName }}</td>
-                    <td>@{{ area.areaOnTray }}</td>
-                    <td>@{{ area.areaOnHalfTray }}</td>
-                    <td>@{{ area.areaOnFlat }}</td>
-                    <td>@{{ area.accountingArea }}</td>
+                    <td style="min-width: 50px"><span>@{{ area.userOwnerGroupName }}</span></td>
+                    <td style="min-width: 50px"><span>@{{ area.customerName }}</span></td>
+                    <td><span>@{{ area.ownerName }}</span></td>
+                    <td><span>@{{ area.countingMonth }}</span></td>
+                    <td><span>@{{ area.updatedAt }}</span></td>
+                    <td><span>@{{ area.ownerStoragePriceModel }}</span></td>
+                    <td><span>@{{ area.unitName }}</span></td>
+                    <td><span>@{{ area.areaOnTray }}</span></td>
+                    <td><span>@{{ area.areaOnHalfTray }}</span></td>
+                    <td><span>@{{ area.areaOnFlat }}</span></td>
+                    <td><span>@{{ area.accountingArea }}</span></td>
                 </tr>
             </table>
         </div>
@@ -143,7 +143,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{asset('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script>
         let vue = new Vue({

resources/views/customer/project/index.blade.php

@@ -61,16 +61,16 @@
                     <td>
                         <label><input type="checkbox" :value="owner.id"></label>
                     </td>
-                    <td>@{{ i+1 }}</td>
-                    <td>@{{ owner.name }}</td>
-                    <td>@{{ owner.customer_name }}</td>
-                    <td>@{{ owner.user_owner_group_name }}</td>
-                    <td>@{{ owner.user_work_group_name }}</td>
+                    <td><span>@{{ i+1 }}</span></td>
+                    <td><span>@{{ owner.name }}</span></td>
+                    <td><span>@{{ owner.customer_name }}</span></td>
+                    <td><span>@{{ owner.user_owner_group_name }}</span></td>
+                    <td><span>@{{ owner.user_work_group_name }}</span></td>
                     <td><b>@{{owner.relevance ? owner.relevance.length : 0}}</b>/5</td>
-                    <td>@{{ owner.created_at }}</td>
-                    <td>@{{ owner.customer_company_name }}</td>
-                    <td>@{{ ownerSubjection[owner.subjection] }}</td>
-                    <td>@{{ owner.is_activation }}</td>
+                    <td><span>@{{ owner.created_at }}</span></td>
+                    <td><span>@{{ owner.customer_company_name }}</span></td>
+                    <td><span>@{{ ownerSubjection[owner.subjection] }}</span></td>
+                    <td><span>@{{ owner.is_activation }}</span></td>
                     <td>
                         <button class="btn btn-sm btn-info text-white" @click="showModal(owner)">各项计价</button>
                     </td>
@@ -88,7 +88,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
     <script>

resources/views/finance/billConfirmation.blade.php

@@ -23,13 +23,13 @@
                     <td>
                         <label><input type="checkbox" :value="bill.id"></label>
                     </td>
-                    <td>@{{ i+1 }}</td>
-                    <td>@{{ bill.ownerGroupName }}</td>
-                    <td>@{{ bill.customerName }}</td>
-                    <td>@{{ bill.ownerName }}</td>
-                    <td>@{{ bill.countingMonth }}</td>
-                    <td>@{{ bill.updatedAt }}</td>
-                    <td class="font-weight-bold">@{{ bill.initialFee }}</td>
+                    <td><span>@{{ i+1 }}</span></td>
+                    <td><span>@{{ bill.ownerGroupName }}</span></td>
+                    <td><span>@{{ bill.customerName }}</span></td>
+                    <td><span>@{{ bill.ownerName }}</span></td>
+                    <td><span>@{{ bill.countingMonth }}</span></td>
+                    <td><span>@{{ bill.updatedAt }}</span></td>
+                    <td class="font-weight-bold"><span>@{{ bill.initialFee }}</span></td>
                     <td>
                         <label><input :id="'confirmFee-'+bill.id" @click="thisIndex=i" :readonly="thisIndex==i ? false : true" type="number" min="0" class="form-control form-control-sm" :value="bill.confirmFee"></label>
                         <div v-if="thisIndex==i">
@@ -37,7 +37,7 @@
                             <button class="btn btn-sm btn-danger" @click="thisIndex='-1'">取消</button>
                         </div>
                     </td>
-                    <td>@{{ bill.difference }}</td>
+                    <td><span>@{{ bill.difference }}</span></td>
                     <td>
                         <button class="btn btn-sm btn-outline-success" v-if="bill.confirmed == '否'" @click="billConfirm(bill)">确认</button>
                         <label v-else class="text-success">已确认</label>
@@ -49,7 +49,7 @@
 @stop
 
 @section("lastScript")
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script>

resources/views/finance/instantBill.blade.php

@@ -42,36 +42,36 @@
                     <td :rowspan="bill.rowspan">
                         <label><input type="checkbox" :value="bill.id"></label>
                     </td>
-                    <td :rowspan="bill.rowspan">@{{ i+1 }}</td>
-                    <td :rowspan="bill.rowspan">@{{ bill.customerName }}</td>
-                    <td :rowspan="bill.rowspan">@{{ bill.ownerName }}</td>
-                    <td :rowspan="bill.rowspan">@{{ bill.workedAt }}</td>
+                    <td :rowspan="bill.rowspan"><span>@{{ i+1 }}</span></td>
+                    <td :rowspan="bill.rowspan"><span>@{{ bill.customerName }}</span></td>
+                    <td :rowspan="bill.rowspan"><span>@{{ bill.ownerName }}</span></td>
+                    <td :rowspan="bill.rowspan"><span>@{{ bill.workedAt }}</span></td>
                     <td :rowspan="bill.rowspan">
-                        <label v-if="bill.type == '增值服务'">服务<span class="badge badge-primary">@{{ bill.methodName }}</span></label>
+                        <label v-if="bill.type == '增值服务'">服务<span class="badge badge-primary"><span>@{{ bill.methodName }}</span></span></label>
                         <label v-else>@{{ bill.type }}</label>
                     </td>
-                    <td :rowspan="bill.rowspan">@{{ bill.shopName }}</td>
-                    <td :rowspan="bill.rowspan">@{{ bill.operationBill }}</td>
-                    <td :rowspan="bill.rowspan">@{{ bill.consigneeName }}</td>
-                    <td :rowspan="bill.rowspan">@{{ bill.consigneePhone }}</td>
-                    <td>@{{ bill.commodityAmount }}</td>
+                    <td :rowspan="bill.rowspan"><span>@{{ bill.shopName }}</span></td>
+                    <td :rowspan="bill.rowspan"><span>@{{ bill.operationBill }}</span></td>
+                    <td :rowspan="bill.rowspan"><span>@{{ bill.consigneeName }}</span></td>
+                    <td :rowspan="bill.rowspan"><span>@{{ bill.consigneePhone }}</span></td>
+                    <td><span>@{{ bill.commodityAmount }}</span></td>
                     <td>
                         <span v-if="bill.rowspan <= 1">@{{ bill.logisticBill }}</span>
                         <span v-else class="font-weight-bold text-secondary">分箱：</span>
                     </td>
-                    <td>@{{ bill.volume }}</td>
-                    <td>@{{ bill.weight }}</td>
-                    <td :rowspan="bill.rowspan">@{{ bill.logisticName }}</td>
-                    <td :rowspan="bill.rowspan">@{{ bill.workFee }}</td>
-                    <td>@{{ bill.logisticFee }}</td>
-                    <td :rowspan="bill.rowspan">@{{ bill.total }}</td>
+                    <td><span>@{{ bill.volume }}</span></td>
+                    <td><span>@{{ bill.weight }}</span></td>
+                    <td :rowspan="bill.rowspan"><span>@{{ bill.logisticName }}</span></td>
+                    <td :rowspan="bill.rowspan"><span.@{{ bill.workFee }}</td>
+                    <td><span>@{{ bill.logisticFee }}</span></td>
+                    <td :rowspan="bill.rowspan"><span>@{{ bill.total }}</span></td>
                 </tr>
                 <tr v-for="item in bill.items">
-                    <td>@{{ item.amount }}</td>
-                    <td>@{{ item.logistic_bill }}</td>
-                    <td>@{{ item.volume }}</td>
-                    <td>@{{ item.weight }}</td>
-                    <td>@{{ item.logistic_fee }}</td>
+                    <td><span>@{{ item.amount }}</span></td>
+                    <td><span>@{{ item.logistic_bill }}</span></td>
+                    <td><span>@{{ item.volume }}</span></td>
+                    <td><span>@{{ item.weight }}</span></td>
+                    <td><span>@{{ item.logistic_fee }}</span></td>
                 </tr>
                 </tbody>
             </table>
@@ -81,7 +81,7 @@
 @stop
 
 @section("lastScript")
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script>

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

@@ -19,18 +19,18 @@
             <td>
                 <input class="checkItem" type="checkbox" :value="oracleActTransactingLog">
             </td>
-            <td>@{{ i+1 }}</td>
-            <td class="text-primary">@{{ oracleActTransactingLog.货主 }}</td>
-            <td class="text-muted">@{{ oracleActTransactingLog.库位 }}</td>
-            <td class="text-muted">@{{ oracleActTransactingLog.产品编码 }}</td>
-            <td class="text-muted">@{{ oracleActTransactingLog.产品条码 }}</td>
-            <td :title="oracleActTransactingLog.商品名称" class="tooltipTarget" style="max-width: 200px;overflow:hidden">@{{ oracleActTransactingLog.商品名称 }}</td>
-            <td class="text-muted">@{{ oracleActTransactingLog.属性仓 }}</td>
-            <td class="text-muted">@{{ oracleActTransactingLog.质量状态 }}</td>
-            <td class="text-muted">@{{ oracleActTransactingLog.失效日期 }}</td>
-            <td class="text-muted">@{{ oracleActTransactingLog.批号 }}</td>
-            <td v-if="!isTotalStock">@{{ oracleActTransactingLog.移出数量 }}</td>
-            <td v-if="!isTotalStock">@{{ oracleActTransactingLog.移入数量 }}</td>
+            <td><span>@{{ i+1 }}</span></td>
+            <td class="text-primary"><span>@{{ oracleActTransactingLog.货主 }}</span></td>
+            <td class="text-muted"><span>@{{ oracleActTransactingLog.库位 }}</span></td>
+            <td class="text-muted"><span>@{{ oracleActTransactingLog.产品编码 }}</span></td>
+            <td class="text-muted"><span>@{{ oracleActTransactingLog.产品条码 }}</span></td>
+            <td :title="oracleActTransactingLog.商品名称" class="tooltipTarget" style="max-width: 200px;overflow:hidden"><span>@{{ oracleActTransactingLog.商品名称 }}</span></td>
+            <td class="text-muted"><span>@{{ oracleActTransactingLog.属性仓 }}</span></td>
+            <td class="text-muted"><span>@{{ oracleActTransactingLog.质量状态 }}</span></td>
+            <td class="text-muted"><span>@{{ oracleActTransactingLog.失效日期 }}</span></td>
+            <td class="text-muted"><span>@{{ oracleActTransactingLog.批号 }}</span></td>
+            <td v-if="!isTotalStock"><span>@{{ oracleActTransactingLog.移出数量 }}</span></td>
+            <td v-if="!isTotalStock"><span>@{{ oracleActTransactingLog.移入数量 }}</span></td>
             <td><span v-if="oracleActTransactingLog.在库数量">@{{ oracleActTransactingLog.在库数量 }}</span><span v-else>0</span></td>
             <td><span v-if="oracleActTransactingLog.占用数量">@{{ oracleActTransactingLog.占用数量 }}</span><span v-else>0</span></td>
         </tr>
@@ -50,7 +50,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue=new Vue({
             el:"#list",

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

@@ -43,13 +43,13 @@
             <table class="table table-sm text-nowrap table-striped table-bordered m-0 td-min-width-80" id="table">
                 <tr v-for="(inventoryDailyLog,i) in inventoryDailyLogs" @click="selectedColor(i,$event)">
                    <td>
-                       <input type="checkbox" :value="inventoryDailyLog.id">
+                       <label><input type="checkbox" :value="inventoryDailyLog.id"></label>
                    </td>
-                    <td>@{{ i+1 }}</td>
-                    <td>@{{ inventoryDailyLog.owner_name }}</td>
-                    <td>@{{ inventoryDailyLog.created_at }}</td>
-                    <td>@{{ inventoryDailyLog.commodity_name }}</td>
-                    <td>@{{ inventoryDailyLog.commodity_sku }}</td>
+                    <td><span>@{{ i+1 }}</span></td>
+                    <td><span>@{{ inventoryDailyLog.owner_name }}</span></td>
+                    <td><span>@{{ inventoryDailyLog.created_at }}</span></td>
+                    <td><span>@{{ inventoryDailyLog.commodity_name }}</span></td>
+                    <td><span>@{{ inventoryDailyLog.commodity_sku }}</span></td>
                     <td>
                         <span v-if="inventoryDailyLog.commodity_barcodes && inventoryDailyLog.commodity_barcodes.length>0">
                             <span v-if="inventoryDailyLog.commodity_barcodes.length==1">
@@ -60,14 +60,14 @@
                             </span>
                         </span>
                     </td>
-                    <td>@{{ inventoryDailyLog.depository_name }}</td>
-                    <td>@{{ inventoryDailyLog.amount }}</td>
-                    <td>@{{ inventoryDailyLog.commodity_length }}</td>
-                    <td>@{{ inventoryDailyLog.commodity_width }}</td>
-                    <td>@{{ inventoryDailyLog.commodity_height }}</td>
-                    <td>@{{ inventoryDailyLog.commodity_volumn }}</td>
-                    <td>@{{ inventoryDailyLog.volumn_occupied }}</td>
-                    <td>@{{ inventoryDailyLog.gross_weight }}</td>
+                    <td><span>@{{ inventoryDailyLog.depository_name }}</span></td>
+                    <td><span>@{{ inventoryDailyLog.amount }}</span></td>
+                    <td><span>@{{ inventoryDailyLog.commodity_length }}</span></td>
+                    <td><span>@{{ inventoryDailyLog.commodity_width }}</span></td>
+                    <td><span>@{{ inventoryDailyLog.commodity_height }}</span></td>
+                    <td><span>@{{ inventoryDailyLog.commodity_volumn }}</span></td>
+                    <td><span>@{{ inventoryDailyLog.volumn_occupied }}</span></td>
+                    <td><span>@{{ inventoryDailyLog.gross_weight }}</span></td>
                 </tr>
             </table>
             {{$inventoryDailyLogs->appends($param)->links()}}
@@ -78,7 +78,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el:"#container",

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

@@ -40,24 +40,6 @@
                                     </div>
                                 </div>
                             </div>
-
-{{--                            <div class="form-group row">--}}
-{{--                                <label for="sku" class="col-2 col-form-label text-right">选择货主</label>--}}
-{{--                                <div class="col-3">--}}
-{{--                                    <select name="owner_id" id="owner_id" class="form-control @error('owner_id') is-invalid @enderror">--}}
-{{--                                        <option value="">货主</option>--}}
-{{--                                        <option v-for="owner in fakeOwners" :value="owner.name">@{{ owner.value }}</option>--}}
-{{--                                    </select>--}}
-{{--                                    @error('owner_id')--}}
-{{--                                    <span class="invalid-feedback" role="alert">--}}
-{{--                                    <strong>{{ $message }}</strong>--}}
-{{--                                    </span>--}}
-{{--                                    @enderror--}}
-{{--                                </div>--}}
-{{--                                <div class="col-5">--}}
-{{--                                    <input placeholder="定位货主" id="ownerName" autocomplete="off" class="form-control" @change="定位货主($event)">--}}
-{{--                                </div>--}}
-{{--                            </div>--}}
                             <div class="form-group row">
                                 <div class="col-8 offset-2">
                                     <input type="submit" class="btn btn-success form-control" @click="submitFrom" value="执行导入">
@@ -92,19 +74,18 @@
                 <button class="btn btn-outline-info btn-sm form-control-sm  tooltipTarget" title="导入Excel生成库存对比" @click="importExcel">导入</button>
             </span>
         </div>
-    </span>
         <div class="card-body pt-1">
             <table class="table table-sm text-nowrap table-striped table-bordered m-0 td-min-width-80" id="table">
                 <tr v-for="(inventoryCompare,i) in inventoryCompares">
                    <td>
                        <input type="checkbox" :value="inventoryCompare.id">
                    </td>
-                    <td>@{{ i+1 }}</td>
-                    <td>@{{ inventoryCompare.owner_name }}</td>
-                    <td>@{{ inventoryCompare.mission_code }}</td>
-                    <td>@{{ inventoryCompare.created_at }}</td>
-                    <td>@{{ inventoryCompare.commodity_name }}</td>
-                    <td>@{{ inventoryCompare.commodity_sku }}</td>
+                    <td><span>@{{ i+1 }}</span></td>
+                    <td><span>@{{ inventoryCompare.owner_name }}</span></td>
+                    <td><span>@{{ inventoryCompare.mission_code }}</span></td>
+                    <td><span>@{{ inventoryCompare.created_at }}</span></td>
+                    <td><span>@{{ inventoryCompare.commodity_name }}</span></td>
+                    <td><span>@{{ inventoryCompare.commodity_sku }}</span></td>
                     <td>
                         <span v-if="inventoryCompare.commodity_barcodes && inventoryCompare.commodity_barcodes.length>0">
                             <span v-if="inventoryCompare.commodity_barcodes.length==1">
@@ -115,11 +96,11 @@
                             </span>
                         </span>
                     </td>
-                    <td>@{{ inventoryCompare.custom_location }}</td>
-                    <td>@{{ inventoryCompare.quality }}</td>
-                    <td>@{{ inventoryCompare.amount_in_sys }}</td>
-                    <td>@{{ inventoryCompare.amount_in_compare }}</td>
-                    <td>@{{ inventoryCompare.differ }}</td>
+                    <td><span>@{{ inventoryCompare.custom_location }}</span></td>
+                    <td><span>@{{ inventoryCompare.quality }}</span></td>
+                    <td><span>@{{ inventoryCompare.amount_in_sys }}</span></td>
+                    <td><span>@{{ inventoryCompare.amount_in_compare }}</span></td>
+                    <td><span>@{{ inventoryCompare.differ }}</span></td>
                 </tr>
             </table>
             <div class="text-info h5 btn btn">{{$inventoryCompares->count()}}/@{{ sum }}</div>
@@ -131,7 +112,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el:"#container",

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

@@ -311,8 +311,6 @@
                 </table>
             </div>
         </form>
-
-
         <div class="card-body pt-1">
             <table class="table table-sm table-striped d-none d-xl-block p-0 text-nowrap table-bordered td-min-width-80"
                    id="table" ref="boxPc">
@@ -330,8 +328,8 @@
                         <input type="checkbox" :value="inventoryMission">
                         <span :id="'lockLine'+(i+1)"></span>
                     </td>
-                    <td>@{{ i+1 }}</td>
-                    <td>@{{ inventoryMission.location }}</td>
+                    <td><span>@{{ i+1 }}</span></td>
+                    <td><span>@{{ inventoryMission.location }}</span></td>
                     <td v-if="inventoryMission.commodity"><span
                             v-if="inventoryMission.checked==='是'||inventoryMission.checked==='确认差异'||inventoryMission.checked==='跳过'||inventory.status==='复盘中'||listMode">@{{ inventoryMission.commodity.name }}</span>
                     </td>
@@ -583,7 +581,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let hideHeaderTitle = function () {
             let $listOnPad = $('#listOnPad');

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

@@ -57,26 +57,26 @@
                             <span v-else>未审核</span>
                         @endcan
                     </td>
-                    <td >@{{ i+1 }}</td>
-                    <td >@{{ inventory.status }}</td>
-                    <td >@{{ inventory.id }}</td>
-                    <td >@{{ inventory.created_at }}</td>
-                    <td >@{{ inventory.owner_name }}</td>
+                    <td ><span>@{{ i+1 }}</span></td>
+                    <td ><span>@{{ inventory.status }}</span></td>
+                    <td ><span>@{{ inventory.id }}</span></td>
+                    <td ><span>@{{ inventory.created_at }}</span></td>
+                    <td ><span>@{{ inventory.owner_name }}</span></td>
                     <td style="width: 200px;word-wrap: break-word">
                         <small>@{{ inventory.type }}</small>
                         <span v-if="inventory.remark" class="text-wrap"><small>@{{ inventory.remark }}</small></span>
                     </td>
-                    <td >@{{ inventory.start_at }}</td>
-                    <td class="text-muted">@{{ inventory.end_at }}</td>
-                    <td >@{{ inventory.total }}</td>
-                    <td >@{{ inventory.processed }}</td>
-                    <td >@{{ inventory.surplus }}</td>
-                    <td >@{{ inventory.ignored?inventory.ignored:0 }}</td>
-                    <td>@{{ inventory.difference }}</td>
-                    <td>@{{ inventory.returned }}</td>
-                    <td v-if="inventory.processed">@{{ inventory.processed }}/@{{ inventory.total }}</td>
-                    <td>@{{ inventory.auditor }}</td>
-                    <td class="text-muted">@{{ inventory.creator }}</td>
+                    <td ><span>@{{ inventory.start_at }}</span></td>
+                    <td class="text-muted"><span>@{{ inventory.end_at }}</span></td>
+                    <td ><span>@{{ inventory.total }}</span></td>
+                    <td ><span>@{{ inventory.processed }}</span></td>
+                    <td ><span>@{{ inventory.surplus }}</span></td>
+                    <td ><span>@{{ inventory.ignored?inventory.ignored:0 }}</span></td>
+                    <td><span>@{{ inventory.difference }}</span></td>
+                    <td><span>@{{ inventory.returned }}</span></td>
+                    <td v-if="inventory.processed"><span>@{{ inventory.processed }}/@{{ inventory.total }}</span></td>
+                    <td><span>@{{ inventory.auditor }}</span></td>
+                    <td class="text-muted"><span>@{{ inventory.creator }}</span></td>
                     <td>
                         <span v-if="inventory.status!='已完成'&&inventory.status!='已审核'" class="btn  btn-sm btn-outline-danger" @click="deleteStockInventoryMission(inventory.id)">删</span>
                     </td>
@@ -92,7 +92,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el: "#list",

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

@@ -15,8 +15,8 @@
                 @endif
                 <table class="table table-striped table-sm td-min-width-80" id="table">
                     <tr v-for="(role,i) in roles"  @click="selectTr===i+1?selectTr=0:selectTr=i+1" :class="selectTr===i+1?'focusing' : ''">
-                        <td class="text-muted">@{{role.id}}</td>
-                        <td>@{{role.name}}</td>
+                        <td class="text-muted"><span>@{{role.id}}</span></td>
+                        <td><span>@{{role.name}}</span></td>
                         <td>
                             <div style="max-height: 130px;overflow-y: scroll;border: solid 1px #ddd;" v-if="role.authorities.length>0">
                                 <ul class="list-group">
@@ -31,7 +31,7 @@
                                 </ul>
                             </div>
                         </td>
-                        <td class="text-muted">@{{role.created_at}}</td>
+                        <td class="text-muted"><span>@{{role.created_at}}</span></td>
                         <td>
                             @can('角色-编辑')
                             <button class="btn btn-sm btn-outline-primary" @click="edit(role.id)">改</button> @endcan
@@ -48,7 +48,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         new Vue({
             el:"#list",

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

@@ -16,8 +16,8 @@
                 <div id="list">
                     <table class="table table-striped table-sm td-min-width-80" id="table">
                         <tr v-for="(user,i) in users"  @click="selectTr===i+1?selectTr=0:selectTr=i+1" :class="selectTr===i+1?'focusing' : ''">
-                            <td class="text-muted">@{{user.id}}</td>
-                            <td>@{{user.name}}</td>
+                            <td class="text-muted"><span>@{{user.id}}</span></td>
+                            <td><span>@{{user.name}}</span></td>
                             <td>
                                 <span class="text-danger" v-if="user.isSuperAdmin">超级管理员</span>
                                 <ul v-if="user.roles.length>0" class="list-group">
@@ -35,8 +35,8 @@
                                     <li v-for="supplier in user.suppliers" style="list-style: none">@{{ supplier.name }}</li>
                                 </ul>
                             </td>
-                            <td>@{{user.email}}</td>
-                            <td class="text-muted">@{{user.created_at}}</td>
+                            <td><span>@{{user.email}}</span></td>
+                            <td class="text-muted"><span>@{{user.created_at}}</span></td>
                             <td>
                                 @can('用户-编辑')
                                 <button class="btn btn-sm btn-outline-primary" @click="edit(user.id)">改</button> @endcan
@@ -57,7 +57,7 @@
 
     </script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         new Vue({
             el:"#list",

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

@@ -8,7 +8,7 @@
             <div id="list" class="d-none">
                 <div id="form_div"></div>
                 <div class="ml-3 form-inline" id="btn">
-                    <span class="dropdown">
+                    <div class="dropdown">
                         <button type="button" class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget"
                                 data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                             导出Excel
@@ -17,7 +17,7 @@
                             <a class="dropdown-item" @click="orderExport(false)" href="javascript:">导出勾选内容</a>
                             <a class="dropdown-item" @click="orderExport(true)" href="javascript:">导出所有页</a>
                         </div>
-                    </span>
+                    </div>
                     <div class="custom-control custom-checkbox ml-1">
                         <input type="checkbox" class="custom-control-input" id="customCheck" name="is_merge" v-model="is_merge">
                         <label class="custom-control-label" for="customCheck">导出是否格式化</label>
@@ -58,17 +58,15 @@
                             <input class="checkItem" type="checkbox" :value="order.orderno">
                         </td>
                         <td class="text-nowrap">
-                            @{{ i+1 }}<span v-if="orderIssueNos.includes(order.orderno)" class="badge badge-pill badge-danger">问题件</span>
-                        </td>
-                        <td class="text-dark font-weight-bold text-nowrap">
-                            @{{ order.orderno }}
+                            <span>@{{ i+1 }}</span><span v-if="orderIssueNos.includes(order.orderno)" class="badge badge-pill badge-danger">问题件</span>
                         </td>
-                        <td class="text-muted text-nowrap">@{{ order.ordercodename }}</td>
-                        <td class="text-nowrap">@{{ order.addtime }}</td>
-                        <td class="text-nowrap">@{{ order.issuepartyname }}</td>
-                        <td class="text-nowrap">@{{ order.customer_descr_c }}</td>
-                        <td class="text-nowrap">@{{ order.soreference1 }}</td>
-                        <td class="text-muted text-nowrap">@{{ order.carriername }}</td>
+                        <td class="text-dark font-weight-bold text-nowrap"><span>@{{ order.orderno }}</span></td>
+                        <td class="text-muted text-nowrap"><span>@{{ order.ordercodename }}</span></td>
+                        <td class="text-nowrap"><span>@{{ order.addtime }}</span></td>
+                        <td class="text-nowrap"><span>@{{ order.issuepartyname }}</span></td>
+                        <td class="text-nowrap"><span>@{{ order.customer_descr_c }}</span></td>
+                        <td class="text-nowrap"><span>@{{ order.soreference1 }}</span></td>
+                        <td class="text-muted text-nowrap"><span>@{{ order.carriername }}</span></td>
                         <td class="text-nowrap">
                             <div v-if="picktotraceidMap[order.orderno] && picktotraceidMap[order.orderno].length>1" class="text-center">
                                 <span v-for="picktotraceid in picktotraceidMap[order.orderno]" v-if="order.is_unfold">
@@ -87,14 +85,14 @@
                         <td class="text-muted text-wrap text-letter">
                             <div class="text-overflow-warp-200 w-100">@{{ order.c_tel2?order.c_tel2:order.c_tel1 }}</div>
                         </td>
-                        <td class="text-nowrap"> @{{ order.c_province }}</td>
-                        <td class="text-nowrap"> @{{ order.c_city }}</td>
+                        <td class="text-nowrap"><span> @{{ order.c_province }}</span></td>
+                        <td class="text-nowrap"><span> @{{ order.c_city }}</span></td>
                         <td class="text-nowrap"><div class="text-overflow-warp-200">@{{ order.c_district }}</div></td>
-                        <td class="text-muted text-wrap text-letter"><div class="text-overflow-warp-200" style="max-width: 100%">@{{ order.c_address1 }}</div></td>
-                        <td class="text-nowrap">@{{ order.waveno }}</td>
-                        <td class="text-nowrap"> @{{ order.warehouseid }}</td>
+                        <td class="text-muted text-wrap text-letter"><div class="text-overflow-warp-200"><span>@{{ order.c_address1 }}</span></div></td>
+                        <td class="text-nowrap"><span>@{{ order.waveno }}</span></td>
+                        <td class="text-nowrap"><span> @{{ order.warehouseid }}</span></td>
                         <td class="text-nowrap"><span v-if="order.edisendflag2=='Y'">是</span><span v-if="order.edisendflag2=='N'">否</span><span v-if="order.edisendflag2=='W'">错误</span></td>
-                        <td class="text-nowrap">@{{ order.edisendtime2 }}</td>
+                        <td class="text-nowrap"><span>@{{ order.edisendtime2 }}</span></td>
                         <td class="text-center" style="min-width: 900px">
                             <div :class="commodities[order.orderno]&&commodities[order.orderno].length==1 ? '' : 'up'" :id="'order-'+i">
                                 <div v-for="oracleDOCOrderDetail in commodities[order.orderno]" class="row">
@@ -114,11 +112,11 @@
                                 <b class="col-12" @click="unfold(i)" v-else>点击收起明细</b>
                             </div>
                         </td>
-                        <td>@{{ order.notes }}</td>
-                        <td>@{{ order.erpcancelflag }}</td>
-                        <td>@{{ order.picking_print_flag }}</td>
-                        <td>@{{ order.edisendflag }}</td>
-                        <td>@{{ order.ediremarks2}}</td>
+                        <td><span>@{{ order.notes }}</span></td>
+                        <td><span>@{{ order.erpcancelflag }}</span></td>
+                        <td><span>@{{ order.picking_print_flag }}</span></td>
+                        <td><span>@{{ order.edisendflag }}</span></td>
+                        <td><span>@{{ order.ediremarks2}}</span></td>
                         <td>
                             @can('订单管理-编辑')
                                 <button v-if="order.releasestatus!=='H'" @click="freeze(order.orderno,order.waveno)" class="btn btn-sm btn-outline-dark text-nowrap"
@@ -126,19 +124,17 @@
                                 <button v-else @click="thaw(order.orderno,false,order)" class="btn btn-sm btn-outline-danger text-nowrap"
                                         :disabled="!(order.ordercodename==='创建订单'||order.ordercodename==='分配完成'||order.ordercodename==='拣货完成'||order.ordercodename==='播种完成')">解冻</button>
                             @else
-                                @{{ order.releasestatus }}
+                                <span>@{{ order.releasestatus }}</span>
                             @endcan
                         </td>
                         <td>
                             @can('订单管理-编辑')
                                 <button v-if="order.sostatus=='40'||'30'"  @click="deAllocation(order.orderno,order.waveno)" class="btn btn-sm btn-outline-dark text-nowrap"
-                                        {{--                                        :disabled="!(order.codename_c==='分配完成'||order.codename_c==='部分分配')">取消分配</button>--}}
                                         :disabled="!(order.sostatus==='40'|| order.sostatus==='30')">取消分配</button>
                             @else
-                                @{{ order.sostatus }}
+                                <span>@{{ order.sostatus }}</span>
                             @endcan
                         </td>
-
                     </tr>
                 </table>
                 <button type="button" @click="pageUp()" :readonly="page>1?false:true" class="btn btn-sm " :class="page>1?'btn-outline-info':''">上一页</button>
@@ -231,7 +227,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue=new Vue({
             el:"#list",

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

@@ -10,17 +10,17 @@
             <button class="btn  btn-outline-info mb-1" data-toggle="modal" data-target="#importModal">导入</button>
             <table class="table table-striped table-hover td-min-width-80" id="table">
                 <tr v-for="(model,i) in models"  @click="selectTr===i+1?selectTr=0:selectTr=i+1" :class="selectTr===i+1?'focusing' : ''">
-                    <td>@{{ i+1 }}</td>
-                    <td>@{{ model.orderNumber }}</td>
-                    <td>@{{ model.barcode }}</td>
-                    <td>@{{ model.amount }}</td>
-                    <td>@{{ model.producedAt }}</td>
-                    <td>@{{ model.validAt }}</td>
-                    <td>@{{ model.batchNumber }}</td>
-                    <td>@{{ model.location }}</td>
-                    <td>@{{ model.region }}</td>
-                    <td>@{{ model.createdAt }}</td>
-                    <td>@{{ model.userName }}</td>
+                    <td><span>@{{ i+1 }}</span></td>
+                    <td><span>@{{ model.orderNumber }}</span></td>
+                    <td><span>@{{ model.barcode }}</span></td>
+                    <td><span>@{{ model.amount }}</span></td>
+                    <td><span>@{{ model.producedAt }}</span></td>
+                    <td><span>@{{ model.validAt }}</span></td>
+                    <td><span>@{{ model.batchNumber }}</span></td>
+                    <td><span>@{{ model.location }}</span></td>
+                    <td><span>@{{ model.region }}</span></td>
+                    <td><span>@{{ model.createdAt }}</span></td>
+                    <td><span>@{{ model.userName }}</span></td>
                 </tr>
             </table>
         </div>
@@ -30,7 +30,7 @@
 @endsection
 
 @section('lastScript')
-<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
 <script>
     new Vue({
         el:"#container",

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

@@ -21,14 +21,14 @@
             <table class="table table-sm table-striped table-bordered table-hover card-body mt-2 td-min-width-80" id="table">
                 <tr v-for="(workLoad,index) in workLoads" class="text-center">
                     <td><input type="checkbox" :value="workLoad.id"></td>
-                    <td>@{{ index+1 }}</td>
-                    <td>@{{ workLoad.id }}</td>
-                    <td>@{{ workLoad.created_at }}</td>
+                    <td><span>@{{ index+1 }}</span></td>
+                    <td><span>@{{ workLoad.id }}</span></td>
+                    <td><span>@{{ workLoad.created_at }}</span></td>
                     <td>
                         <template v-if="workLoad.endLog">@{{ workLoad.endLog.created_at }}</template>
                     </td>
-                    <td>@{{ workLoad.createUser }}</td>
-                    <td >@{{ workLoad.endUser }}</td>
+                    <td><span>@{{ workLoad.createUser }}</span></td>
+                    <td><span>@{{ workLoad.endUser }}</span></td>
                     <td>
                         <template v-if="workLoad.order.owner">@{{ workLoad.order.owner.name }}</template>
                     </td>
@@ -41,7 +41,7 @@
                             <b style="cursor:pointer;text-decoration: underline;color: #4aa0e6;" @click="unfold(workLoad.id)" v-if="!isBtn[workLoad.id] && workLoad.order.packages.length >2">点击展开</b>
                         </div>
                     </td>
-                    <td>@{{ workLoad.processingTime }}</td>
+                    <td><span>@{{ workLoad.processingTime }}</span></td>
                 </tr>
             </table>
             <button  class="btn btn-sm" :class="page.curPage === 1 ?'':'btn-outline-primary'"
@@ -60,7 +60,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let workLoadVue = new Vue({
             el: "#workLoad_div",

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

@@ -27,22 +27,22 @@
                         <td>
                             <input class="checkItem" type="checkbox" :value="package.id">
                         </td>
-                        <td>@{{ i+1  }}</td>
-                        <td>@{{package.ownerName}}</td>
-                        <td>@{{package.logisticNumber}}</td>
-                        <td class="text-muted">@{{package.batchNumber}}</td>
-                        <td>@{{package.orderCode}}</td>
-                        <td class="text-muted">@{{package.logisticName}}</td>
-                        <td class="text-muted">@{{package.measuringMachineName}}</td>
-                        <td>@{{package.weight}}</td>
-                        <td>@{{package.length|upDigit}}<a v-if="package.length" class="text-primary">*</a>@{{package.width|upDigit}}<a class="text-primary" v-if="package.width">*</a>@{{package.height|upDigit}}</td>
-                        <td>@{{package.bulk|upCubic}}</td>
-                        <td>@{{package.paperBoxName}}</td>
-                        <td :class="[package.uploaded_to_wms==='是'?'text-success':'']">@{{package.status}}</td>
-                        <td class="text-muted">@{{package.batchRule}}</td>
-                        <td class="text-muted">@{{package.weighed_at}}</td>
-                        <td class="text-muted">@{{package.recipient}}</td>
-                        <td class="text-muted">@{{package.recipientMobile}}</td>
+                        <td><span>@{{ i+1  }}</span></td>
+                        <td><span>@{{package.ownerName}}</span></td>
+                        <td><span>@{{package.logisticNumber}}</span></td>
+                        <td class="text-muted"><span>@{{package.batchNumber}}</span></td>
+                        <td><span>@{{package.orderCode}}</span></td>
+                        <td class="text-muted"><span>@{{package.logisticName}}</span></td>
+                        <td class="text-muted"><span>@{{package.measuringMachineName}}</span></td>
+                        <td><span>@{{package.weight}}</span></td>
+                        <td><span>@{{package.length|upDigit}}</span><a v-if="package.length" class="text-primary">*</a>@{{package.width|upDigit}}<a class="text-primary" v-if="package.width">*</a>@{{package.height|upDigit}}</td>
+                        <td><span>@{{package.bulk|upCubic}}</span></td>
+                        <td><span>@{{package.paperBoxName}}</span></td>
+                        <td :class="[package.uploaded_to_wms==='是'?'text-success':'']"><span>@{{package.status}}</span></td>
+                        <td class="text-muted"><span>@{{package.batchRule}}</span></td>
+                        <td class="text-muted"><span>@{{package.weighed_at}}</span></td>
+                        <td class="text-muted"><span>@{{package.recipient}}</span></td>
+                        <td class="text-muted"><span>@{{package.recipientMobile}}</span></td>
                     </tr>
                 </table>
                 <div class="text-info h5 btn btn">{{$packages->count()}}/{{$packages->total()}}</div>
@@ -55,7 +55,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

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

@@ -49,27 +49,27 @@
                         <td>
                             <input class="checkItem" type="checkbox" :value="weightExcepted.id">
                         </td>
-                        <td>@{{ i+1 }}</td>
-                        <td>@{{weightExcepted.logisticNumber}}</td>
-                        <td>@{{weightExcepted.carrierName}}</td>
-                        <td>@{{weightExcepted.batchNumber}}</td>
-                        <td>@{{weightExcepted.batchRule}}</td>
+                        <td><span>@{{ i+1 }}</span></td>
+                        <td><span>@{{weightExcepted.logisticNumber}}</span></td>
+                        <td><span>@{{weightExcepted.carrierName}}</span></td>
+                        <td><span>@{{weightExcepted.batchNumber}}</span></td>
+                        <td><span>@{{weightExcepted.batchRule}}</span></td>
                         @if($view=="indexIssued")
-                            <td>@{{weightExcepted.ownerName}}</td>
-                            <td>@{{weightExcepted.deliveryNumber}}</td>
-                            <td class="text-muted">@{{weightExcepted.createdAt}}</td>
-                            <td>@{{weightExcepted.recipient}}</td>
-                            <td>@{{weightExcepted.recipientMobile}}</td>
+                            <td><span>@{{weightExcepted.ownerName}}</span></td>
+                            <td><span>@{{weightExcepted.deliveryNumber}}</span></td>
+                            <td class="text-muted"><span>@{{weightExcepted.createdAt}}</span></td>
+                            <td><span>@{{weightExcepted.recipient}}</span></td>
+                            <td><span>@{{weightExcepted.recipientMobile}}</span></td>
                         @else
-                            <td>@{{weightExcepted.measuringMachineName}}</td>
-                            <td class="text-muted">@{{weightExcepted.weighedAt}}</td>
-                            <td>@{{weightExcepted.weight}}</td>
-                            <td>@{{weightExcepted.length}}</td>
-                            <td>@{{weightExcepted.width}}</td>
-                            <td>@{{weightExcepted.height}}</td>
-                            <td>@{{weightExcepted.bulk}}</td>
-                            <td>@{{weightExcepted.paperBoxName}}</td>
-                            <td>@{{weightExcepted.status}}</td>
+                            <td><span>@{{weightExcepted.measuringMachineName}}</span></td>
+                            <td class="text-muted"><span>@{{weightExcepted.weighedAt}}</span></td>
+                            <td><span>@{{weightExcepted.weight}}</span></td>
+                            <td><span>@{{weightExcepted.length}}</span></td>
+                            <td><span>@{{weightExcepted.width}}</span></td>
+                            <td><span>@{{weightExcepted.height}}</span></td>
+                            <td><span>@{{weightExcepted.bulk}}</span></td>
+                            <td><span>@{{weightExcepted.paperBoxName}}</span></td>
+                            <td><span>@{{weightExcepted.status}}</span></td>
                         @endif
                     </tr>
                 </table>
@@ -82,7 +82,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script>
         let vue = new Vue({

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

@@ -20,9 +20,9 @@
         <table class="table table-sm table-hover table-striped d-none d-xl-block p-0 text-nowrap table-bordered td-min-width-80" id="table">
             <tr v-for="(laborReport,i) in laborReports"  @click="selectedColor(laborReport.id)" :style="{'font-weight': laborReport.id==selectedStyle?'bold':''}" @click="selectTableRow(i,$event)">
                 <td>
-                    <input class="checkItem" type="checkbox" :value="laborReport.id"/>
+                    <label><input class="checkItem" type="checkbox" :value="laborReport.id"/></label>
                 </td>
-                <td>@{{ i+1  }}</td>
+                <td><span>@{{ i+1  }}</span></td>
                 <td >
                     @can('人事管理-门卫审核')
                         <span >
@@ -54,10 +54,10 @@
                     @endcan
                 </td>
                 <td><span v-if="laborReport.thisRoundRecordWorkingTime">@{{laborReport.thisRoundRecordWorkingTime}}</span></td>
-                <td>@{{laborReport.userWorkGroupName}}</td>
-                <td >@{{laborReport.name}}</td>
-                <td class="text-muted">@{{laborReport.mobile_phone}}</td>
-                <td class="text-muted">@{{laborReport.identity_number}}</td>
+                <td><span>@{{laborReport.userWorkGroupName}}</span></td>
+                <td><span>@{{laborReport.name}}</span></td>
+                <td class="text-muted"><span>@{{laborReport.mobile_phone}}</span></td>
+                <td class="text-muted"><span>@{{laborReport.identity_number}}</span></td>
                 @can('人事管理-临时工报表-修改劳务所')
                     <td class="text-muted">
                         <select  class="form-control-sm" name="labor_company" id="labor_company"  @change="updateLaborCompany(laborReport.labor_company_id,laborReport.enter_number)" v-model="laborReport.labor_company_id">
@@ -65,20 +65,20 @@
                         </select>
                     </td>
                 @else
-                    <td class="text-muted">@{{laborReport.labor_company}}</td>
+                    <td class="text-muted"><span>@{{laborReport.labor_company}}</span></td>
                 @endcan
-                <td class="text-muted">@{{laborReport.enter_at}}</td>
-                <td>@{{laborReport.checkInAt}}</td>
-                <td class="text-muted">@{{laborReport.checkOutAt}}</td>
-                <td class="text-muted">@{{laborReport.round_check_in_at}}</td>
-                <td class="text-muted">@{{laborReport.round_check_out_at}}</td>
-                <td >@{{ laborReport.exit_at }}</td>
-                <td class="text-muted">@{{laborReport.verifyAt}}</td>
+                <td class="text-muted"><span>@{{laborReport.enter_at}}</span></td>
+                <td><span>@{{laborReport.checkInAt}}</span></td>
+                <td class="text-muted"><span>@{{laborReport.checkOutAt}}</span></td>
+                <td class="text-muted"><span>@{{laborReport.round_check_in_at}}</span></td>
+                <td class="text-muted"><span>@{{laborReport.round_check_out_at}}</span></td>
+                <td><span>@{{ laborReport.exit_at }}</span></td>
+                <td class="text-muted"><span>@{{laborReport.verifyAt}}</span></td>
                 <td class="text-muted"><span v-if="laborReport.verifyPerson">@{{laborReport.verifyPerson}}</span></td>
                 <td class="text-muted"><span v-if="laborReport.relax_time">@{{laborReport.relax_time}}</span></td>
                 {{--                        <td class="text-muted"><span v-if="laborReport.onlineDuration">@{{laborReport.onlineDuration}}</span></td>--}}
                 <td class="text-muted"><span v-if="laborReport.thisRecordOnlineTime">@{{laborReport.thisRecordOnlineTime}}</span></td>
-                <td class="text-muted">@{{laborReport.enter_number}}</td>
+                <td class="text-muted"><span>@{{laborReport.enter_number}}</span></td>
                 {{--                        <td><span v-if="laborReport.workingDuration">@{{laborReport.workingDuration}}</span></td>--}}
                 <td>
                     @can('人事管理-临时工报表-编辑备注')
@@ -238,7 +238,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let today=(new Date());
         function isTomorrow(){

resources/views/personnel/report.blade.php

@@ -36,51 +36,43 @@
         </div>
         <div>
             <table class="table table-sm table-striped table-hover td-min-width-80" id="table">
-                <tr class="text-center">
-                    <td colspan="2"></td>
-                    <td colspan="2" class="bg-light-purple">日期信息</td>
-                    <td :colspan="type==0 ? '8' : (type==1 ? '7' : '8')" class="bg-light-khaki">项目信息</td>
-                    <td :colspan="type==0 ? '3' : (type==1 ? '3' : '3')" class="bg-light-info">盘点信息</td>
-                    <td :colspan="type==0 ? '4' : (type==1 ? '2' : '3')" class="bg-light-cyanogen">账单信息</td>
-                </tr>
-                <tr class="text-nowrap" id="header"></tr>
                 <tr v-for="(report,i) in reports">
                     <td>
                         <label><input type="checkbox" :value="report.id"></label>
                     </td>
-                    <td>@{{ i+1 }}</td>
-                    <td>@{{ report.countingMonth }}</td>
-                    <td>@{{ report.ownerStorageDuration }}</td>
-                    <td v-if="type == 0">@{{ report.ownerGroupName }}</td>
+                    <td><span>@{{ i+1 }}</span></td>
+                    <td><span>@{{ report.countingMonth }}</span></td>
+                    <td><span>@{{ report.ownerStorageDuration }}</span></td>
+                    <td v-if="type == 0"><span>@{{ report.ownerGroupName }}</span></td>
                     <td v-if="type == 0">
                         <small v-for="user in report.ownerGroupUserList">@{{ user }}</small><br>
                     </td>
-                    <td v-if="type == 0">@{{ report.ownerName }}</td>
-                    <td v-if="type == 0">@{{ report.warehouseName }}</td>
-                    <td v-if="type == 0">@{{ report.userWorkGroupName }}</td>
-                    <td v-if="type == 0 || type == 1">@{{ report.sell }}</td>
-                    <td v-if="type == 1">@{{ report.ownerName }}</td>
-                    <td v-if="type == 1">@{{ report.warehouseName }}</td>
-                    <td v-if="type == 1 || type == 2">@{{ report.userWorkGroupName }}</td>
-                    <td v-if="type == 1">@{{ report.ownerGroupName }}</td>
+                    <td v-if="type == 0"><span>@{{ report.ownerName }}</span></td>
+                    <td v-if="type == 0"><span>@{{ report.warehouseName }}</span></td>
+                    <td v-if="type == 0"><span>@{{ report.userWorkGroupName }}</span></td>
+                    <td v-if="type == 0 || type == 1"><span>@{{ report.sell }}</span></td>
+                    <td v-if="type == 1"><span>@{{ report.ownerName }}</span></td>
+                    <td v-if="type == 1"><span>@{{ report.warehouseName }}</span></td>
+                    <td v-if="type == 1 || type == 2"><span>@{{ report.userWorkGroupName }}</span></td>
+                    <td v-if="type == 1"><span>@{{ report.ownerGroupName }}</span></td>
                     <td v-if="type == 2">
                         <small v-for="user in report.userWorkGroupUserList">@{{ user }}</small><br>
                     </td>
-                    <td v-if="type == 2">@{{ report.ownerName }}</td>
-                    <td v-if="type == 2">@{{ report.warehouseName }}</td>
-                    <td v-if="type == 2">@{{ report.principal }}</td>
-                    <td v-if="type == 2">@{{ report.sell }}</td>
-                    <td>@{{ report.ownerStatus }}</td>
-                    <td>@{{ report.ownerCreatedAt }}</td>
-                    <td>@{{ report.dailyAverageOrderAmount }}</td>
-                    <td>@{{ report.lastMonthCountingArea }}</td>
-                    <td>@{{ report.currentMonthCountingArea }}</td>
-                    <td v-if="type == 0">@{{ report.ownerBillReportInitialFee }}</td>
-                    <td v-if="type == 0 || type == 1">@{{ report.ownerBillReportConfirmFee }}</td>
-                    <td v-if="type == 2">@{{ report.ownerBillReportWorkFee }}</td>
-                    <td v-if="type == 2">@{{ report.ownerAreaReportAccountingArea }}</td>
-                    <td>@{{ report.ownerBillReportConfirmUpdatedAt }}</td>
-                    <td v-if="type == 0">@{{ report.timeOut }}</td>
+                    <td v-if="type == 2"><span>@{{ report.ownerName }}</span></td>
+                    <td v-if="type == 2"><span>@{{ report.warehouseName }}</span></td>
+                    <td v-if="type == 2"><span>@{{ report.principal }}</span></td>
+                    <td v-if="type == 2"><span>@{{ report.sell }}</span></td>
+                    <td><span>@{{ report.ownerStatus }}</span></td>
+                    <td><span>@{{ report.ownerCreatedAt }}</span></td>
+                    <td><span>@{{ report.dailyAverageOrderAmount }}</span></td>
+                    <td><span>@{{ report.lastMonthCountingArea }}</span></td>
+                    <td><span>@{{ report.currentMonthCountingArea }}</span></td>
+                    <td v-if="type == 0"><span>@{{ report.ownerBillReportInitialFee }}</span></td>
+                    <td v-if="type == 0 || type == 1"><span>@{{ report.ownerBillReportConfirmFee }}</span></td>
+                    <td v-if="type == 2"><span>@{{ report.ownerBillReportWorkFee }}</span></td>
+                    <td v-if="type == 2"><span>@{{ report.ownerAreaReportAccountingArea }}</span></td>
+                    <td><span>@{{ report.ownerBillReportConfirmUpdatedAt }}</span></td>
+                    <td v-if="type == 0"><span>@{{ report.timeOut }}</span></td>
                 </tr>
             </table>
             {{$reports->appends($params)->links()}}
@@ -90,7 +82,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script>
         let vue = new Vue({
@@ -172,6 +164,13 @@
                     column: this._getRenderingHeader(),
                     data: this.reports,
                     fixedTop:($('#form_div').height())+2,
+                    before : [
+                        {colspan:2,value: '', class:"table-header-layer-1"},
+                        {colspan:2,value: '日期信息', class:"bg-light-purple"},
+                        {colspan:(this.type==1?7:8),value: '项目信息', class:"bg-light-khaki"},
+                        {colspan:3,value: '盘点信息', class:"bg-light-info"},
+                        {colspan:(this.type==0 ? '4' : (this.type==1 ? '2' : '3')),value: '账单信息', class:"bg-light-cyanogen"},
+                    ],
                 }).init();
             },
             methods : {

resources/views/process/index.blade.php

@@ -479,7 +479,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el:"#process",

resources/views/process/statistic.blade.php

@@ -20,26 +20,26 @@
         </span>
         <table class="table table-striped text-nowrap table-hover td-min-width-80" style="background: #fff;" id="table">
             <tr v-for="(processStatistic,i) in processStatistics" :class="processStatistic.gross_profit_rate?'text-success':''">
-                <td><input class="checkItem" type="checkbox" :value="processStatistic.process_id"></td>
-                <td>@{{ i+1 }}</td>
+                <td><label><input class="checkItem" type="checkbox" :value="processStatistic.process_id"></label></td>
+                <td><span>@{{ i+1 }}</span></td>
                 <td><span v-if="processStatistic.process">@{{ processStatistic.process.code }}</span></td>
                 <td><span v-if="processStatistic.operatorLog && processStatistic.operatorLog.user">@{{ processStatistic.operatorLog.user.name }}</span></td>
                 <td><span v-if="processStatistic.process">@{{ processStatistic.process.owner_name }}</span></td>
-                <td>@{{ processStatistic.started_at }}</td>
-                <td>@{{ processStatistic.ended_at }}</td>
+                <td><span>@{{ processStatistic.started_at }}</span></td>
+                <td><span>@{{ processStatistic.ended_at }}</span></td>
                 <td><span v-if="processStatistic.process">@{{ processStatistic.process.created_at }}</span></td>
                 <td><span v-if="processStatistic.process">@{{ processStatistic.process.unit_price }}</span></td>
                 <td><span v-if="processStatistic.process">@{{ processStatistic.process.amount }}</span></td>
                 <td><span v-if="processStatistic.process">@{{ processStatistic.process.completed_amount }}</span></td>
-                <td>@{{ processStatistic.revenue }}</td>
-                <td>@{{ processStatistic.duration_days }}</td>
+                <td><span>@{{ processStatistic.revenue }}</span></td>
+                <td><span>@{{ processStatistic.duration_days }}</span></td>
                 <td><span v-if="processStatistic.process">@{{ processStatistic.duration_man_hours }}</span></td>
                 <td><span v-if="processStatistic.process">@{{ processStatistic.process.process_method_name }}</span></td>
-                <td>@{{ processStatistic.top_capacity }}</td>
-                <td>@{{ processStatistic.bottom_capacity }}</td>
-                <td>@{{ processStatistic.average_capacity }}</td>
-                <td>@{{ processStatistic.total_cost }}</td>
-                <td>@{{ processStatistic.gross_profit }}</td>
+                <td><span>@{{ processStatistic.top_capacity }}</span></td>
+                <td><span>@{{ processStatistic.bottom_capacity }}</span></td>
+                <td><span>@{{ processStatistic.average_capacity }}</span></td>
+                <td><span>@{{ processStatistic.total_cost }}</span></td>
+                <td><span>@{{ processStatistic.gross_profit }}</span></td>
                 <td><b v-if="processStatistic.gross_profit_rate">@{{ (processStatistic.gross_profit_rate)*100 | money}}%</b></td>
                 <td><span v-if="processStatistic.process">@{{ processStatistic.process.status }}</span></td>
                 <td><span v-if="processStatistic.process">@{{ processStatistic.process.remark }}</span></td>
@@ -53,7 +53,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         new Vue({
             el:"#statistics",

resources/views/procurement/finance/checkBill.blade.php

@@ -22,17 +22,17 @@
                 <td>
                     <input class="checkItem" type="checkbox" :value="procurementCheckSheet.id">
                 </td>
-                <td class="">@{{ procurementCheckSheet.procurement_code }}</td>
-                <td class="text-muted">@{{ procurementCheckSheet.procurement_at }}</td>
-                <td class="text-muted">@{{ procurementCheckSheet.procurement_delivery_at }}</td>
-                <td class="text-muted">@{{ procurementCheckSheet.supplier_name }}</td>
-                <td class="tooltipTarget" style="max-width: 200px;overflow:hidden">@{{ procurementCheckSheet.material_code }}</td>
-                <td class="text-muted">@{{ procurementCheckSheet.material_name }}</td>
-                <td class="text-muted">@{{ procurementCheckSheet.procurement_quantity }}</td>
-                <td class="text-muted">@{{ procurementCheckSheet.amount }}</td>
-                <td class="text-muted">@{{ procurementCheckSheet.signer_name }}</td>
-                <td class="text-muted">@{{ procurementCheckSheet.signed_at }}</td>
-                <td class="text-muted">@{{ procurementCheckSheet.account_payable }}</td>
+                <td><span>@{{ procurementCheckSheet.procurement_code }}</span></td>
+                <td class="text-muted"><span>@{{ procurementCheckSheet.procurement_at }}</span></td>
+                <td class="text-muted"><span>@{{ procurementCheckSheet.procurement_delivery_at }}</span></td>
+                <td class="text-muted"><span>@{{ procurementCheckSheet.supplier_name }}</span></td>
+                <td class="tooltipTarget" style="max-width: 200px;overflow:hidden"><span>@{{ procurementCheckSheet.material_code }}</span></td>
+                <td class="text-muted"><span>@{{ procurementCheckSheet.material_name }}</span></td>
+                <td class="text-muted"><span>@{{ procurementCheckSheet.procurement_quantity }}</span></td>
+                <td class="text-muted"><span>@{{ procurementCheckSheet.amount }}</span></td>
+                <td class="text-muted"><span>@{{ procurementCheckSheet.signer_name }}</span></td>
+                <td class="text-muted"><span>@{{ procurementCheckSheet.signed_at }}</span></td>
+                <td class="text-muted"><span>@{{ procurementCheckSheet.account_payable }}</span></td>
                 <td><span>@{{ procurementCheckSheet.invoice_number }}</span></td>
                 <td><span>@{{ procurement_check_sheet_status[procurementCheckSheet.status] }}</span></td>
                 <td class="text-center">
@@ -51,7 +51,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el: '#list',

resources/views/procurement/finance/monthlyBillReport.blade.php

@@ -22,11 +22,11 @@
                 <td>
                     <input class="checkItem" type="checkbox" :value="procurementTotalBill.id">
                 </td>
-                <td >@{{ procurementTotalBill.id }}</td>
-                <td class="text-muted">@{{ procurementTotalBill.counting_month }}</td>
-                <td class="text-muted">@{{ procurementTotalBill.created_at.substr(0,10) }}</td>
-                <td class="text-muted">@{{ procurementTotalBill.supplier_name }}</td>
-                <td>@{{ procurementTotalBill.total_payable }}</td>
+                <td><span>@{{ procurementTotalBill.id }}</span></td>
+                <td class="text-muted"><span>@{{ procurementTotalBill.counting_month }}</span></td>
+                <td class="text-muted"><span>@{{ procurementTotalBill.created_at.substr(0,10) }}</span></td>
+                <td class="text-muted"><span>@{{ procurementTotalBill.supplier_name }}</span></td>
+                <td><span>@{{ procurementTotalBill.total_payable }}</span></td>
                 <td><span>@{{ procurement_total_bill_status[procurementTotalBill.status] }}</span></td>
             </tr>
         </table>
@@ -37,7 +37,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el: '#list',

resources/views/procurement/finance/procurementBill.blade.php

@@ -22,25 +22,25 @@
                 <td>
                     <input class="checkItem" type="checkbox" :value="procurement.id">
                 </td>
-                <td class="">@{{ procurement.code }}</td>
-                <td class="">@{{ procurement.created_at }}</td>
-                <td class=""><span v-if="procurement.supplier_id">@{{ procurement.deadline }}</span></td>
-                <td class=""><span v-if="procurement.signed_at">@{{ procurement.signed_at }}</span></td>
-                <td v-if="procurement.owner_material.owner">@{{ procurement.owner_material.owner.name }}</td>
-                <td v-if="procurement.owner_material.owner.customer">@{{ procurement.owner_material.owner.customer.company_name }}</td>
+                <td><span>@{{ procurement.code }}</span></td>
+                <td><span>@{{ procurement.created_at }}</span></td>
+                <td><span v-if="procurement.supplier_id">@{{ procurement.deadline }}</span></td>
+                <td><span v-if="procurement.signed_at">@{{ procurement.signed_at }}</span></td>
+                <td v-if="procurement.owner_material.owner"><span>@{{ procurement.owner_material.owner.name }}</span></td>
+                <td v-if="procurement.owner_material.owner.customer"><span>@{{ procurement.owner_material.owner.customer.company_name }}</span></td>
                 <td ><span v-if="procurement.supplier">@{{ procurement.supplier.name }}</span></td>
-                <td class="tooltipTarget" style="max-width: 200px;overflow:hidden" v-if="procurement.owner_material.material">@{{ procurement.owner_material.material.code }}</td>
-                <td class="text-muted" v-if="procurement.owner_material.material">@{{ procurement.owner_material.material.name }}</td>
-                <td class="text-muted" v-if="procurement.owner_material">@{{ procurement.owner_material.size }}</td>
-                <td class="text-muted" v-if="procurement.owner_material">@{{ procurement.owner_material.special }}</td>
-                <td class="text-muted" v-if="procurement.owner_material">@{{ procurement.owner_material.specification }}</td>
-                <td>@{{ procurement.quantity }}</td>{{--采购数量--}}
-                <td>@{{ procurement.amount }}</td> {{--销售数量--}}
+                <td class="tooltipTarget" style="max-width: 200px;overflow:hidden" v-if="procurement.owner_material.material"><span>@{{ procurement.owner_material.material.code }}</span></td>
+                <td class="text-muted" v-if="procurement.owner_material.material"><span>@{{ procurement.owner_material.material.name }}</span></td>
+                <td class="text-muted" v-if="procurement.owner_material"><span>@{{ procurement.owner_material.size }}</span></td>
+                <td class="text-muted" v-if="procurement.owner_material"><span>@{{ procurement.owner_material.special }}</span></td>
+                <td class="text-muted" v-if="procurement.owner_material"><span>@{{ procurement.owner_material.specification }}</span></td>
+                <td><span>@{{ procurement.quantity }}</span></td>{{--采购数量--}}
+                <td><span>@{{ procurement.amount }}</span></td> {{--销售数量--}}
                 <td><span v-if="procurement.receive_amount">@{{ procurement.receive_amount }}</span></td>
-                <td>@{{ procurement.cost_price }}</td> {{--采购单价--}}
-                <td>@{{ procurement.unit_price }}</td>  {{--销售单价--}}
-                <td>@{{ procurement.amount*procurement.cost_price }}</td> {{--应收--}}
-                <td>@{{ procurement.quantity*procurement.unit_price }}</td> {{--应付--}}
+                <td><span>@{{ procurement.cost_price }}</span></td> {{--采购单价--}}
+                <td><span>@{{ procurement.unit_price }}</span></td>  {{--销售单价--}}
+                <td><span>@{{ procurement.amount*procurement.cost_price }}</span></td> {{--应收--}}
+                <td><span>@{{ procurement.quantity*procurement.unit_price }}</span></td> {{--应付--}}
                 <td><span>@{{ procurement_status[procurement.status] }}</span></td>
                 <td>
                     <span v-if="procurement.status<9">
@@ -60,7 +60,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el: '#list',

resources/views/procurement/procurement/index.blade.php

@@ -66,15 +66,15 @@
                 <td>
                     <input class="checkItem" type="checkbox" :value="procurement.id">
                 </td>
-                <td class="">@{{ procurement.code }}</td>
+                <td><span>@{{ procurement.code }}</span></td>
                 <td><span v-if="procurement.owner_material.owner">@{{ procurement.owner_material.owner.name }}</span></td>
-                <td>@{{ procurement_type[procurement.type] }}</td>
+                <td><span>@{{ procurement_type[procurement.type] }}</span></td>
                 <td><span v-if="procurement.owner_material.owner.customer">@{{ procurement.owner_material.owner.customer.company_name }}</span></td>
                 <td class="tooltipTarget" style="max-width: 200px;overflow:hidden"><span v-if="procurement.owner_material.material">@{{ procurement.owner_material.material.code }}</span></td>
-                <td class=""><span v-if="procurement.owner_material.material">@{{ procurement.owner_material.material.name }}</span></td>
-                <td class=""><span v-if="procurement.owner_material">@{{ procurement.owner_material.size }}</span></td>
-                <td class=""><span v-if="procurement.owner_material">@{{ procurement.owner_material.special }}</span></td>
-                <td class=""><span v-if="procurement.owner_material">@{{ procurement.owner_material.specification }}</span></td>
+                <td><span v-if="procurement.owner_material.material">@{{ procurement.owner_material.material.name }}</span></td>
+                <td><span v-if="procurement.owner_material">@{{ procurement.owner_material.size }}</span></td>
+                <td><span v-if="procurement.owner_material">@{{ procurement.owner_material.special }}</span></td>
+                <td><span v-if="procurement.owner_material">@{{ procurement.owner_material.specification }}</span></td>
                 <td>
                     <div class="align-center text-center" >
                             <span v-if="procurement.owner_material.file">
@@ -116,7 +116,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el: '#list',

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

@@ -27,25 +27,25 @@
                     <input type="checkbox" :value="rejectedBill.id_owner">
                 </td>
                 <td class="text-muted" style="opacity:0.7">
-                    @{{ index+1 }}
+                    <span>@{{ index+1 }}</span>
                 </td>
                 <td>
-                    @{{ rejectedBill.owner_name }}
+                    <span>@{{ rejectedBill.owner_name }}</span>
                 </td>
                 <td class="text-muted">
-                    @{{ rejectedBill.bounce_amount }}
+                    <span>@{{ rejectedBill.bounce_amount }}</span>
                 </td>
                 <td class="text-success font-weight-bold">
-                    @{{ rejectedBill.check_amount }}
+                    <span>@{{ rejectedBill.check_amount }}</span>
                 </td>
                 <td>
-                    @{{ rejectedBill.bounce_amount-rejectedBill.check_amount }}
+                    <span>@{{ rejectedBill.bounce_amount-rejectedBill.check_amount }}</span>
                 </td>
                 <td class="text-success font-weight-bold">
-                    @{{ rejectedBill.in_storage_count }}
+                    <span>@{{ rejectedBill.in_storage_count }}</span>
                 </td>
                 <td>
-                    @{{ rejectedBill.not_in_storage_count }}
+                    <span>@{{ rejectedBill.not_in_storage_count }}</span>
                 </td>
             </tr>
         </table>
@@ -55,7 +55,7 @@
 @section('lastScript')
     <script src="{{mix('js/queryForm/export.js')}}"></script>
     <script src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el:"#list",

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

@@ -49,7 +49,7 @@
                 <table class="table table-striped table-sm table-bordered table-hover text-nowrap table-body td-min-width-80"  style="background: #fff;" id="table">
                     <tr v-for="(rejectedBill,i) in rejectedBills" :data-id="rejectedBill.id"  @click="selectTr===i+1?selectTr=0:selectTr=i+1" :class="selectTr===i+1?'focusing' : ''">
                         <td>
-                            <input type="checkbox" :value="rejectedBill.id"/>
+                            <label><input type="checkbox" :value="rejectedBill.id"/></label>
                         </td>
                         <td class="text-nowrap">
                             <span class="text-muted" style="opacity:0.7">@{{ i+1 }}</span> <span v-if="rejectedBill.order_issue_rejected_bill" class="badge badge-pill badge-danger">问题件</span>
@@ -67,18 +67,18 @@
                             </span>
                             <span v-else>@{{rejectedBill.is_loaded | yesNoIsLoaded}}</span>
                         </td>
-                        <td class="text-muted">@{{rejectedBill.created_at}}</td>
-                        <td><span v-if="rejectedBill.owner">@{{rejectedBill.owner.name}}</span></td>
-                        <td>@{{rejectedBill.logistic_number_return}}</td>
-                        <td class="text-muted"><span v-if="rejectedBill.logistic">@{{rejectedBill.logistic.name}}</span></td>
+                        <td class="text-muted"><span>@{{rejectedBill.created_at}}</span></td>
+                        <td><span v-if="rejectedBill.owner"><span>@{{rejectedBill.owner.name}}</span></span></td>
+                        <td><span>@{{rejectedBill.logistic_number_return}}</span></td>
+                        <td class="text-muted"><span v-if="rejectedBill.logistic"><span>@{{rejectedBill.logistic.name}}</span></span></td>
                         <td>@{{rejectedBill.order_number}}</td>
-                        <td class="text-muted text-overflow-replace-100" style="pointer-events:auto">@{{rejectedBill.sender}}</td>
-                        <td class="text-muted text-overflow-replace-200" style="pointer-events:auto">@{{rejectedBill.mobile_sender}}</td>
+                        <td class="text-muted text-overflow-replace-100" style="pointer-events:auto"><span>@{{rejectedBill.sender}}</span></td>
+                        <td class="text-muted text-overflow-replace-200" style="pointer-events:auto"><span>@{{rejectedBill.mobile_sender}}</span></td>
                         <td>@{{rejectedBill.logistic_number}}</td>
-                        @cannot('退货管理-到付费用')<td class="text-muted">@{{rejectedBill.fee_collected}}</td>@endcannot
-                        @can('退货管理-查询-客户定义-爱奇艺')<td class="text-muted">@{{rejectedBill.common_01}}</td>@endcan
-                        <td class="text-muted">@{{rejectedBill.common_02}}</td>
-                        <td class="text-muted">@{{rejectedBill.goods_amount}}</td>
+                        @cannot('退货管理-到付费用')<td class="text-muted"><span>@{{rejectedBill.fee_collected}}</span></td>@endcannot
+                        @can('退货管理-查询-客户定义-爱奇艺')<td class="text-muted"><span>@{{rejectedBill.common_01}}</span></td>@endcan
+                        <td class="text-muted"><span>@{{rejectedBill.common_02}}</span></td>
+                        <td class="text-muted"><span>@{{rejectedBill.goods_amount}}</span></td>
                         <td style="min-width: 900px">
                             <div class="w-100" :class="rejectedBill.items.length>1 ? 'up' : ''" :id="'rejected-'+rejectedBill.id">
                                 <div class="row" v-for="item in rejectedBill.items">
@@ -166,7 +166,7 @@
     </script>
     <script src="{{mix('js/queryForm/export.js')}}"></script>
     <script src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el:"#list",

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

@@ -44,14 +44,14 @@
 
     <table class="table table-striped table-sm text-nowrap table-hover mt-1 td-min-width-80" id="table">
         <tr v-for="(storeCheckingReceive,i) in storeCheckingReceives" @click="selectTr===i+1?selectTr=0:selectTr=i+1" :class="selectTr===i+1?'focusing' : ''">
-            <td>@{{ i+1 }}</td>
-            <td>@{{ storeCheckingReceive.id }}</td>
-            <td>@{{ storeCheckingReceive.owner_name }}</td>
-            <td class="font-weight-bold">@{{ storeCheckingReceive.status }}</td>
-            <td class="text-muted">@{{ storeCheckingReceive.is_receive_diff }}</td>
-            <td>@{{ storeCheckingReceive.asn }}</td>
-            <td>@{{ storeCheckingReceive.is_asn_diff }}</td>
-            <td>@{{ storeCheckingReceive.created_at }}</td>
+            <td><span>@{{ i+1 }}</span></td>
+            <td><span>@{{ storeCheckingReceive.id }}</span></td>
+            <td><span>@{{ storeCheckingReceive.owner_name }}</span></td>
+            <td class="font-weight-bold"><span>@{{ storeCheckingReceive.status }}</span></td>
+            <td class="text-muted"><span>@{{ storeCheckingReceive.is_receive_diff }}</span></td>
+            <td><span>@{{ storeCheckingReceive.asn }}</span></td>
+            <td><span>@{{ storeCheckingReceive.is_asn_diff }}</span></td>
+            <td><span>@{{ storeCheckingReceive.created_at }}</span></td>
             <td>
                 @can('入库管理-盘收一体-盘收')<a v-if="storeCheckingReceive.status != '已收货'" target="_blank" :href="'{{url('store/checkingReceive/mission')}}/'+storeCheckingReceive.id">
                     <button class="btn btn-sm btn-outline-dark">盘收</button>
@@ -75,7 +75,7 @@
 @stop
 
 @section('lastScript')
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
     <script>
         let vue = new Vue({

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

@@ -96,15 +96,15 @@
         <div class="d-none d-sm-block">
             <table class="table table-striped table-sm text-nowrap table-hover mt-1 td-min-width-80" id="table">
                 <tr v-for="(storeCheckingReceiveItem,i) in storeCheckingReceiveItems" @click="selectedColor(i,$event)">
-                    <td>@{{ i+1 }}</td>
-                    <td>@{{ storeCheckingReceiveItem.bin_number }}</td>
-                    <td>@{{ storeCheckingReceiveItem.commodity_name }}</td>
+                    <td><span>@{{ i+1 }}</span></td>
+                    <td><span>@{{ storeCheckingReceiveItem.bin_number }}</span></td>
+                    <td><span>@{{ storeCheckingReceiveItem.commodity_name }}</span></td>
                     <td>
                     <span v-for="commodity_barcode in storeCheckingReceiveItem.commodity_barcodes">
                         <small>@{{ commodity_barcode.code }}</small><br>
                     </span>
                     </td>
-                    <td>@{{ storeCheckingReceiveItem.imported_amount }}</td>
+                    <td><span>@{{ storeCheckingReceiveItem.imported_amount }}</span></td>
                     <td @click="showInput(storeCheckingReceiveItem.id)" v-if="is_show">
                         <div class="form-inline">
                             <input @focus="showInput(storeCheckingReceiveItem.id)"  @blur="delFocus()" :id = "'counted_amount_'+storeCheckingReceiveItem.id" :value="storeCheckingReceiveItem.counted_amount"
@@ -115,17 +115,15 @@
                                 @click.stop="disabledItemId = ''">取消</button>
                         </div>
                     </td>
-                    <td v-if="!is_show">@{{ storeCheckingReceiveItem.counted_amount }}</td>
-                    <td>@{{ storeCheckingReceiveItem.asn_amount }}</td>
-                    <td>@{{ storeCheckingReceiveItem.imported_diff_amount }}</td>
-                    <td>@{{ storeCheckingReceiveItem.asn_diff_amount }}</td>
-                    <td>@{{ storeCheckingReceiveItem.produced_at }}</td>
-                    <td>@{{ storeCheckingReceiveItem.invalid_at }}</td>
-                    <td>@{{ storeCheckingReceiveItem.batch_code }}</td>
-                    <td>@{{ storeCheckingReceiveItem.unique_code }}</td>
-                    <td>
-{{--                        @can('入库管理-盘收一体-盘收-编辑')<button @click="destroyItem(storeCheckingReceiveItem,i)" class="btn btn-sm btn-outline-danger">删除</button>@endcan--}}
-                    </td>
+                    <td v-if="!is_show"><span>@{{ storeCheckingReceiveItem.counted_amount }}</span></td>
+                    <td><span>@{{ storeCheckingReceiveItem.asn_amount }}</span></td>
+                    <td><span>@{{ storeCheckingReceiveItem.imported_diff_amount }}</span></td>
+                    <td><span>@{{ storeCheckingReceiveItem.asn_diff_amount }}</span></td>
+                    <td><span>@{{ storeCheckingReceiveItem.produced_at }}</span></td>
+                    <td><span>@{{ storeCheckingReceiveItem.invalid_at }}</span></td>
+                    <td><span>@{{ storeCheckingReceiveItem.batch_code }}</span></td>
+                    <td><span>@{{ storeCheckingReceiveItem.unique_code }}</span></td>
+                    <td></td>
                 </tr>
             </table>
         </div>
@@ -209,7 +207,7 @@
 @stop
 
 @section('lastScript')
-<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
 <script>
     new Vue({
         el:"#container",

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

@@ -13,14 +13,14 @@
                     <td>
                         <input class="checkItem" type="checkbox" :value="store.id">
                     </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>
+                    <td><span>@{{ i+1  }}</span></td>
+                    <td class="text-muted"><span>@{{store.asn_code}}</span></td>
+                    <td><span>@{{store.warehouse.name}}</span></td>
+                    <td class="text-muted"><span>@{{store.owner.name}}</span></td>
+                    <td class="text-muted"><span>@{{store.stored_method}}</span></td>
+                    <td class="text-muted"><span>@{{store.status}}</span></td>
+                    <td><span>@{{store.remark}}</span></td>
+                    <td class="text-muted"><span>@{{store.created_at}}</span></td>
                 </tr>
             </table>
             <div class="text-info h5 btn btn">{{$stores->count()}}/{{$stores->total()}}</div>
@@ -30,7 +30,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el:'#fast',

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

@@ -13,17 +13,17 @@
                     <td>
                         <input class="checkItem" type="checkbox" :value="storeItem.id">
                     </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>
+                    <td><span>@{{ i+1  }}</span></td>
+                    <td><span>@{{storeItem.store_asn_code}}</span></td>
+                    <td><span>@{{storeItem.asn_line_code}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.name}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.sku}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.barcode}}</span></td>
+                    <td><span>@{{storeItem.depository_name}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.amount}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.quality}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.status}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.created_at}}</span></td>
                 </tr>
             </table>
             <div class="text-info h5 btn btn">{{$storeItems->count()}}/{{$storeItems->total()}}</div>
@@ -33,7 +33,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el:'#item',

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

@@ -17,14 +17,14 @@
                     <button class="btn btn-sm btn-outline-info" v-if="!store.isOpenStoreItem" @click="openStoreItems(store,i,$event);store.isOpenStoreItem=true">查看明细</button>
                     <button v-if="store.isOpenStoreItem"  @click="closeStoreItems();store.isOpenStoreItem=false" class="btn btn-sm btn-dark">收起明细</button>
                 </td>
-                <td>@{{ i+1  }}</td>
-                <td >@{{store.asn_code}}</td>
-                <td class="text-muted">@{{store.warehouse.name}}</td>
-                <td >@{{store.owner.name}}</td>
-                <td >@{{store.stored_method}}</td>
-                <td >@{{store.status}}</td>
-                <td>@{{store.remark}}</td>
-                <td class="text-muted">@{{store.created_at}}</td>
+                <td><span>@{{ i+1  }}</span></td>
+                <td><span>@{{store.asn_code}}</span></td>
+                <td class="text-muted"><span>@{{store.warehouse.name}}</span></td>
+                <td><span>@{{store.owner.name}}</span></td>
+                <td><span>@{{store.stored_method}}</span></td>
+                <td><span>@{{store.status}}</span></td>
+                <td><span>@{{store.remark}}</span></td>
+                <td class="text-muted"><span>@{{store.created_at}}</span></td>
             </tr>
                         <tr id="showStoreItem" v-show="store.store_items">
                             <td colspan="2"></td>
@@ -61,7 +61,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el:'#list',

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

@@ -13,17 +13,17 @@
                     <td>
                         <input class="checkItem" type="checkbox" :value="storeItem.id">
                     </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>
+                    <td><span>@{{ i+1  }}</span></td>
+                    <td><span>@{{storeItem.store_asn_code}}</span></td>
+                    <td><span>@{{storeItem.asn_line_code}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.name}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.sku}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.barcode}}</span></td>
+                    <td><span>@{{storeItem.depository_name}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.amount}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.quality}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.status}}</span></td>
+                    <td class="text-muted"><span>@{{storeItem.created_at}}</span></td>
                 </tr>
             </table>
             <div class="text-info h5 btn btn">{{$storeItems->count()}}/{{$storeItems->total()}}</div>
@@ -33,7 +33,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el:'#item',

resources/views/transport/waybill/delivering.blade.php

@@ -52,14 +52,14 @@
                     <td>
                         <input class="checkItem" type="checkbox" :value="waybill.id">
                     </td>
-                    <td>@{{ i+1 }}</td>
-                    <td>@{{ waybill.created_at }}</td>
-                    <td>@{{ waybill.carrier_name }}</td>
-                    <td>@{{ waybill.waybill_number }}</td>
-                    <td>@{{ waybill.origination }}</td>
-                    <td>@{{ waybill.owner_name }}</td>
-                    <td>@{{ waybill.warehouse_weight_other }}</td>
-                    <td>@{{ waybill.warehouse_weight }}</td>
+                    <td><span>@{{ i+1 }}</span></td>
+                    <td><span>@{{ waybill.created_at }}</span></td>
+                    <td><span>@{{ waybill.carrier_name }}</span></td>
+                    <td><span>@{{ waybill.waybill_number }}</span></td>
+                    <td><span>@{{ waybill.origination }}</span></td>
+                    <td><span>@{{ waybill.owner_name }}</span></td>
+                    <td><span>@{{ waybill.warehouse_weight_other }}</span></td>
+                    <td><span>@{{ waybill.warehouse_weight }}</span></td>
                     <td><span v-if="waybill.status=='已完结'">已完成</span><span v-else><span v-if="waybill.carrier_bill">已提交</span><span v-if="!waybill.carrier_bill">待提交</span></span></td>
                     <td>
                         <span v-if="waybill.isBtn || !waybill.carrier_bill">
@@ -167,7 +167,7 @@
     .color2{background-color: cornflowerblue}
 </style>
 <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
-<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
 <script>
     new Vue({
         el:"#list",

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

@@ -47,11 +47,11 @@
                 @endif
             </div>
             <table class="table table-striped table-bordered table-hover text-nowrap waybill-table td-min-width-80" style="background: #fff;" id="table">
-                <tr v-for="(waybill,i) in waybills" :style="[{color:waybill.status=='待重审'?'red':''||waybill.status=='已完结'?'green':''}]"
-                    :id="'waybill'+waybill.id" @click="selectedColor(waybill.id,$event)" position="static" @mouseover="hidetop($event)" @mouseleave="showtop($event)">
+                <tr v-for="(waybill,i) in waybills" :class="waybill.status=='待重审'?'td-red':''||waybill.status=='已完结'?'td-green':''"
+                    :id="'waybill'+waybill.id" @click="selectedColor(waybill.id,$event)" @mouseover="hidetop($event)" @mouseleave="showtop($event)">
                     <td><input class="checkItem" type="checkbox" :value="waybill.id"></td>
                     <td>
-                        <span v-if=waybill.status==="未审核"||waybill.status==="待重审">
+                        <span v-if=waybill.status=="未审核"||waybill.status=="待重审">
                             @can('运输管理-运单-运单审核')
                                 <button class="btn btn-outline-primary btn-sm" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
                             @endcan
@@ -59,9 +59,9 @@
                                 <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('transport/waybill/waybillEdit')}}/'+waybill.id)">修改</a>
                             @endcan
                         </span>
-                        <span v-if=waybill.status==="已审核">
+                        <span v-if=waybill.status=="已审核">
                             @can('运输管理-运单-调度')
-                                <button class="btn btn-outline-secondary btn-sm" @click="waybillRetreatAudit(waybill.id,waybill.waybill_number)">取消审核</button>
+                                <button class="btn btn-outline-secondary btn-sm" @click="waybillRetreatAudit(waybill)">取消审核</button>
                                 <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('transport/waybill')}}/'+waybill.id+'/edit')">调度</a>
                             @endcan
                         </span>
@@ -75,19 +75,17 @@
                         </span>
                     </td>
                     @can('运输管理-运单-置顶')
-                        <td class="td-warm text-muted" v-if="waybill.remark" style="height: 55px">
-                            <button type="button" class="btn btn-sm btn-outline-danger " @click="cancelOnTop($event)" :data_id="waybill.id"  style="opacity: 0.75">取消</button>
-                        </td>
-                        <td v-else>
-                            <button type="button" class="btn btn-sm btn-outline-secondary" @click="waybillOnTop($event)" :data_id="waybill.id"  style="opacity: 0.75">置顶</button>
+                        <td class="td-warm text-muted" style="height: 55px">
+                            <button type="button" class="btn btn-sm btn-outline-danger" v-if="waybill.remark" @click="cancelOnTop($event)" :data_id="waybill.id"  style="opacity: 0.75">取消</button>
+                            <button type="button" class="btn btn-sm btn-outline-secondary" v-else @click="waybillOnTop($event)" :data_id="waybill.id"  style="opacity: 0.75">置顶</button>
                         </td>
                     @endcan
-                    <td :class="[waybill.status=='已审核'?'text-success':'']">@{{waybill.status}}</td>
-                    <td class="td-warm text-muted toptd" >
+                    <td :class="[waybill.status=='已审核'?'text-success':'']"><span>@{{waybill.status}}</span></td>
+                    <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>
                         @{{ i+1 }}</td>
-                    <td class="td-warm text-muted">@{{waybill.created_at}}</td>
+                    <td class="td-warm text-muted"><span>@{{waybill.created_at}}</span></td>
                     <td class="td-warm text-muted">
                         <a href="#" v-if="waybill.waybillAuditLogs.length>0" class="dropdown-toggle"  data-toggle="dropdown">
                             @{{ waybill.waybillAuditLogs[0].user ? waybill.waybillAuditLogs[0].user.name : '系统' }}<b class="caret"></b>
@@ -107,16 +105,16 @@
                             </table>
                         </div>
                     </td>
-                    <td class="td-warm">@{{waybill.type}} <span class="badge badge-sm bg-warning" v-if="(waybill.collect_fee && waybill.collect_fee>0) || waybill.is_to_pay=='1'">到付</span></td>
-                    <td class="td-warm">@{{waybill.owner}}</td>
-                    <td class="td-warm toptd" :title="waybill.remark? '置顶备注：'+waybill.remark :''">@{{waybill.source_bill}}</td>
+                    <td class="td-warm"><span>@{{waybill.type}}</span> <span class="badge badge-sm bg-warning" v-if="(waybill.collect_fee && waybill.collect_fee>0) || waybill.is_to_pay=='1'">到付</span></td>
+                    <td class="td-warm"><span>@{{waybill.owner}}</span></td>
+                    <td class="td-warm toptd" :title="waybill.remark? '置顶备注：'+waybill.remark :''"><span>@{{waybill.source_bill}}</span></td>
                     <td class="td-warm">
                         <span class="badge badge-pill badge-danger" v-if="waybill.is_cancel">取消</span>
-                        @{{waybill.wms_bill_number}}
+                        <span>@{{waybill.wms_bill_number}}</span>
                     </td>
-                    <td class="td-warm">@{{ waybill.order_status }}</td>
-                    <td class="td-warm">@{{waybill.end_date}}</td>
-                    <td class="td-warm">@{{waybill.waybill_number}}</td>
+                    <td class="td-warm"><span>@{{ waybill.order_status }}</span></td>
+                    <td class="td-warm"><span>@{{waybill.end_date}}</span></td>
+                    <td class="td-warm"><span>@{{waybill.waybill_number}}</span></td>
                     @can('运输管理-运单-运单编辑')
                     <td class="td-warm" >
                         <span v-if="waybill.charge" class="btn-sm btn-outline-secondary btn" @click="waybillChargeCheck($event)" :data_id="waybill.id">@{{waybill.charge|money}}</span>
@@ -126,8 +124,8 @@
                     @else
                         <td class="td-warm" ><span v-if="waybill.charge">@{{waybill.charge|money}}</span></td>
                     @endcan
-                    <td class="td-warm">@{{waybill.other_charge}}</td>
-                    <td class="td-warm">@{{waybill.other_charge_remark}}</td>
+                    <td class="td-warm"><span>@{{waybill.other_charge}}</span></td>
+                    <td class="td-warm"><span>@{{waybill.other_charge_remark}}</span></td>
                     <td class="td-warm">
                         <div align="center" @mouseleave="removeCommonImg('common_img_'+waybill.id)" @mouseenter="commonImg('img_'+waybill.id,waybill.url,waybill.suffix)">
                             <img v-if="waybill.url" :id="'img_'+waybill.id"  :src="waybill.url+'-thumbnail.'+waybill.suffix"
@@ -139,14 +137,14 @@
                             </div>@endcan
                         </div>
                     </td>
-                    <td class="td-cool">@{{waybill.recipient}}</td>
-                    <td class="td-cool">@{{waybill.recipient_mobile}}</td>
-                    <td class="td-cool text-muted">@{{waybill.origination}}</td>
-                    <td class="td-cool text-muted">@{{waybill.province}}</td>
-                    <td class="td-cool text-muted">@{{waybill.city}}</td>
-                    <td class="td-cool text-muted">@{{waybill.district}}</td>
-                    <td class="td-cool text-muted">@{{waybill.destination}}</td>
-                    <td class="td-cool">@{{waybill.carrier}}</td>
+                    <td class="td-cool"><span>@{{waybill.recipient}}</span></td>
+                    <td class="td-cool"><span>@{{waybill.recipient_mobile}}</span></td>
+                    <td class="td-cool text-muted"><span>@{{waybill.origination}}</span></td>
+                    <td class="td-cool text-muted"><span>@{{waybill.province}}</span></td>
+                    <td class="td-cool text-muted"><span>@{{waybill.city}}</span></td>
+                    <td class="td-cool text-muted"><span>@{{waybill.district}}</span></td>
+                    <td class="td-cool text-muted"><span>@{{waybill.destination}}</span></td>
+                    <td class="td-cool"><span>@{{waybill.carrier}}</span></td>
                     <td class="td-cool">
                         <span v-if="waybill.carrier_bill">
                             @{{waybill.carrier_bill}}<span v-if="waybill.carType">/@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></span>
@@ -171,23 +169,25 @@
                     </td>
                     <td class="td-cool"><span v-if="waybill.carrier_weight_other">@{{waybill.carrier_weight_other|filterZero}}  @{{waybill.carrier_weight_unit_other}}</span></td>
                     <td class="td-cool"><span v-if="waybill.amount">@{{waybill.amount}} @{{waybill.amount_unit_name }}</span></td>
-                    <td class="td-cool">@{{waybill.mileage|km}} </td>
+                    <td class="td-cool"><span>@{{waybill.mileage|km}}</span></td>
                     @can('运输管理-运单-可见费用项')
                         @can('运输管理-运单-运费')
-                            <td class="td-helpful" v-if="waybill.fee">
-                                <span v-if="waybill.type==='专线'"></span>
-                                <span v-else-if="waybill.fee" class="btn-sm btn-outline-secondary btn" @click="waybillFeeCheck($event)" :data_id="waybill.id">@{{waybill.fee|money}}</span>
-                                <input type="number" class="form-control form-control-sm"  @blur="updateWaybillFee($event)" :value="waybill.fee" :data_id="waybill.id" style="min-width:85px;display: none">
-                            </td>
-                            <td class="td-helpful" v-else>
-                                <span v-if="waybill.type==='专线'"></span>
-                                <input v-else type="number" class="form-control form-control-sm" @blur="addWaybillFee($event)" onfocus="$(this).css('width','85px')" :value="waybill.fee" :data_id="waybill.id" >
+                            <td class="td-helpful">
+                                <label v-if="waybill.fee">
+                                    <span v-if="waybill.type==='专线'"></span>
+                                    <span v-else-if="waybill.fee" class="btn-sm btn-outline-secondary btn" @click="waybillFeeCheck($event)" :data_id="waybill.id">@{{waybill.fee|money}}</span>
+                                    <input type="number" class="form-control form-control-sm"  @blur="updateWaybillFee($event)" :value="waybill.fee" :data_id="waybill.id" style="min-width:85px;display: none">
+                                </label>
+                                <label v-else>
+                                    <span v-if="waybill.type==='专线'"></span>
+                                    <input v-else type="number" class="form-control form-control-sm" @blur="addWaybillFee($event)" onfocus="$(this).css('width','85px')" :value="waybill.fee" :data_id="waybill.id" >
+                                </label>
                             </td>
                         @endcan
-                        <td class="td-helpful">@{{waybill.pick_up_fee}}</td>
-                        <td class="td-helpful">@{{waybill.other_fee}}</td>
+                        <td class="td-helpful"><span>@{{waybill.pick_up_fee}}</span></td>
+                        <td class="td-helpful"><span>@{{waybill.other_fee}}</span></td>
                     @endcan
-                    <td class="td-helpful">@{{waybill.deliver_at}}</td>
+                    <td class="td-helpful"><span>@{{waybill.deliver_at}}</span></td>
                     <td class="td-helpful"><span v-html="waybill.dispatch_remark"></span></td>
                     @can('运输管理-运单-删除')
                         <td class="td-operation">
@@ -275,7 +275,7 @@
     </style>
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
     <script>
         let vue = new Vue({
             el:'#list',
@@ -399,68 +399,71 @@
                     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', neglect: true,value: '创建时间', class:"td-warm"},
-                    {name:'operating',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:'order_status',value: '订单状态', class:"td-warm"},
-                    {name:'end_date',value: '完结时间', 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:'province',value: '省', class:"td-cool"},
-                    {name:'city',value: '市', class:"td-cool"},
-                    {name:'district',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:'car_owner_info',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
-                ];
-                new Header({
-                    el: "table",
-                    name: "waybill",
-                    column: column,
-                    data: this.waybills,
-                    restorationColumn: 'id',
-                    fixedTop:($('#form_div').height())+2,
-                    before : [
-                        {colspan:'4',value: '', class:"table-header-layer-1"},
-                        {colspan:'14',value: '运单信息',font:"fa fa-file-text-o", class:"table-header-layer-1"},
-                        {colspan:'16',value: '运输信息',font:"fa fa-truck", class:"table-header-layer-1"},
-                        {colspan:'5',value: '运输信息',font:"fa fa-rmb", class:"table-header-layer-1"},
-                        @can('运输管理-运单-删除'){colspan:'1',value: '',font:"", class:"table-header-layer-1"},@endcan
-                    ],
-                }).init();
+                this.rendingHeader();
                 this.paginate = $("#paginate").val();
                 let waybill =  $('.table-header-layer-1')[1];
                 $('.top').css('min-width', waybill.scrollWidth);
             },
             methods:{
+                rendingHeader(){
+                    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', neglect: true,value: '创建时间', class:"td-warm"},
+                        {name:'operating',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:'order_status',value: '订单状态', class:"td-warm"},
+                        {name:'end_date',value: '完结时间', 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:'province',value: '省', class:"td-cool"},
+                        {name:'city',value: '市', class:"td-cool"},
+                        {name:'district',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:'car_owner_info',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
+                    ];
+                    new Header({
+                        el: "table",
+                        name: "waybill",
+                        column: column,
+                        data: this.waybills,
+                        restorationColumn: 'id',
+                        fixedTop:($('#form_div').height())+2,
+                        before : [
+                            {colspan:'4',value: '', class:"table-header-layer-1"},
+                            {colspan:'14',value: '运单信息',font:"fa fa-file-text-o", class:"table-header-layer-1"},
+                            {colspan:'16',value: '运输信息',font:"fa fa-truck", class:"table-header-layer-1"},
+                            {colspan:'5',value: '运输信息',font:"fa fa-rmb", class:"table-header-layer-1"},
+                                @can('运输管理-运单-删除'){colspan:'1',value: '',font:"", class:"table-header-layer-1"},@endcan
+                        ],
+                    }).init();
+                },
                 btnRefreshWeightZoomIn(waybill){
                     waybill.btn_refresh_weight='zoomIn'
                 },
@@ -468,34 +471,27 @@
                     waybill.btn_refresh_weight='zoomOut'
                 },
                 waybillAudit(id,waybill_number){
-                    if(!confirm('确定要通过“'+waybill_number+'”的审核吗？')){return};
+                    if(!confirm('确定要通过“'+waybill_number+'”的审核吗？'))return
                     let _this=this;
-                    let w;
                     let url = '{{url('transport/waybill/waybillAudit')}}';
-                    axios.post(url, {id:id})
+                    window.axios.post(url, {id:id})
                         .then(
                             function (response) {
+                                window.tempTip.setDuration(3000);
                                 if (response.data.success){
                                     _this.waybills.forEach(function (waybill) {
                                         if (waybill.id===id){
                                             waybill.status=response.data.status;
                                             waybill.waybillAuditLogs.push(response.data.waybillAuditLog);
-                                            w=waybill.waybill_number;
                                         }
                                     });
-                                    tempTip.setDuration(3000);
-                                    tempTip.showSuccess('审核'+w+'成功!');
-                                }else if (response.data.exception!=null){
-                                    tempTip.setDuration(3000);
-                                    tempTip.show(response.data.exception);
-                                }else {
-                                    tempTip.setDuration(3000);
-                                    tempTip.show('审核失败!');
-                                }
+                                    window.tempTip.setDuration(2000);
+                                    window.tempTip.showSuccess('审核'+waybill_number+'成功!');
+                                }else if (response.data.exception!=null)window.tempTip.show(response.data.exception);
+                                else window.tempTip.show('审核失败!');
                             }
                         ).catch(function (err) {
-                        tempTip.setDuration(3000);
-                        tempTip.show('审核失败,网络连接错误!'+err);
+                        window.tempTip.show('审核失败,网络连接错误!'+err);
                     });
                 },
                 waybillDestroy(id,waybill_number,index){
@@ -519,36 +515,22 @@
                     });
 
                 },
-                waybillRetreatAudit(id,waybill_number){
-                    if(!confirm('确定要驳回“'+waybill_number+'”的审核吗？')){return};
-                    let _this=this;
-                    let w;
+                waybillRetreatAudit(waybill){
+                    if(!confirm('确定要驳回“'+waybill.waybill_number+'”的审核吗？'))return;
                     let url='{{url('transport/waybill/waybillRetreatAudit')}}';
-                    axios.post(url,{id:id})
-                        .then(
-                            function (response) {
+                    window.axios.post(url,{id:waybill.id})
+                        .then(response=> {
+                                window.tempTip.setDuration(3000);
                                 if (response.data.success){
-                                    _this.waybills.forEach(function (waybill){
-                                        if (waybill.id===id){
-                                            waybill.status=response.data.status;
-                                            waybill.waybillAuditLogs=[];
-                                            w=waybill.waybill_number;
-                                        }
-                                    });
-                                    tempTip.setDuration(3000);
-                                    tempTip.showSuccess(w+'审核驳回成功!');
-                                }else {
-                                    tempTip.setDuration(3000);
-                                    tempTip.show('审核驳回失败!');
-                                }
+                                    waybill.status = response.data.status;
+                                    waybill.waybillAuditLogs.push(response.data.log);
+                                    window.tempTip.showSuccess(waybill.waybill_number+'审核驳回成功!');
+                                }else window.tempTip.show('审核驳回失败!');
                             }
-                        ).catch(function (err) {
-                        tempTip.setDuration(3000);
-                        tempTip.show('审核驳回失败,网络连接错误!'+err);
-                    });
+                        ).catch(function (err){window.tempTip.show('审核驳回失败,网络连接错误!'+err)})
                 },
                 waybillEndAudit(id,waybill_number){
-                    if(!confirm('确定要通过“'+waybill_number+'”的终审吗？')){return};
+                    if(!confirm('确定要通过“'+waybill_number+'”的终审吗？'))return;
                     let _this=this;
                     let w;
                     let url='{{url('transport/waybill/waybillEndAudit')}}';

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

@@ -63,41 +63,39 @@
                 <input class="checkItem" type="checkbox" :value="json_content.waybill_id">
             </td>
             @endif
-            <td>@{{ i+1 }}</td>
-            <td>@{{json_content.type}}</td>
-            <td>@{{json_content.waybill_number}}</td>
-            <td>@{{json_content.owner_name}}</td>
-            <td>@{{json_content.wms_bill_number}}</td>
-            <td>@{{json_content.origination}}</td>
-            <td>@{{json_content.destination}}</td>
-            <td>@{{json_content.recipient}}</td>
-            <td>@{{json_content.recipient_mobile}}</td>
-            <td>@{{json_content.charge}}</td>
-            <td>@{{json_content.ordering_remark}}</td>
-            <td>@{{json_content.carrier_name}}</td>
-            <td>@{{json_content.carrier_bill}}</td>
-            <td>@{{json_content.origination_city_name}}</td>
-            <td>@{{json_content.destination_city_name}}</td>
-            <td>@{{json_content.warehouse_weight}}</td>
-            <td>@{{json_content.warehouse_weight_other}}</td>
-            <td>@{{json_content.carrier_weight_other}}</td>
-            <td>@{{json_content.carrier_weight_other}}</td>
-            <td>@{{json_content.car_type_name}}</td>
-            <td>@{{json_content.car_owner_info}}</td>
-            <td>@{{json_content.fee}}</td>
-            <td>@{{json_content.pick_up_fee}}</td>
-            <td>@{{json_content.other_fee}}</td>
-            <td>@{{json_content.collect_fee}}</td>
-            <td>@{{json_content.dispatch_remark}}</td>
-            <td>@{{json_content.created_at}}</td>
-            <td>@{{json_content.auditLog_user_name }}</td>
-            <td>@{{json_content.total_receivable}}</td>
-            <td>@{{json_content.total_expense}}</td>
-            <td>@{{json_content.gross_margin}}</td>
-            <td>@{{Math.round(json_content.gross_profit_rate*100)}}%</td>
-
+            <td><span>@{{ i+1 }}</span></td>
+            <td><span>@{{json_content.type}}</span></td>
+            <td><span>@{{json_content.waybill_number}}</span></td>
+            <td><span>@{{json_content.owner_name}}</span></td>
+            <td><span>@{{json_content.wms_bill_number}}</span></td>
+            <td><span>@{{json_content.origination}}</span></td>
+            <td><span>@{{json_content.destination}}</span></td>
+            <td><span>@{{json_content.recipient}}</span></td>
+            <td><span>@{{json_content.recipient_mobile}}</span></td>
+            <td><span>@{{json_content.charge}}</span></td>
+            <td><span>@{{json_content.ordering_remark}}</span></td>
+            <td><span>@{{json_content.carrier_name}}</span></td>
+            <td><span>@{{json_content.carrier_bill}}</span></td>
+            <td><span>@{{json_content.origination_city_name}}</span></td>
+            <td><span>@{{json_content.destination_city_name}}</span></td>
+            <td><span>@{{json_content.warehouse_weight}}</span></td>
+            <td><span>@{{json_content.warehouse_weight_other}}</span></td>
+            <td><span>@{{json_content.carrier_weight_other}}</span></td>
+            <td><span>@{{json_content.carrier_weight_other}}</span></td>
+            <td><span>@{{json_content.car_type_name}}</span></td>
+            <td><span>@{{json_content.car_owner_info}}</span></td>
+            <td><span>@{{json_content.fee}}</span></td>
+            <td><span>@{{json_content.pick_up_fee}}</span></td>
+            <td><span>@{{json_content.other_fee}}</span></td>
+            <td><span>@{{json_content.collect_fee}}</span></td>
+            <td><span>@{{json_content.dispatch_remark}}</span></td>
+            <td><span>@{{json_content.created_at}}</span></td>
+            <td><span>@{{json_content.auditLog_user_name }}</span></td>
+            <td><span>@{{json_content.total_receivable}}</span></td>
+            <td><span>@{{json_content.total_expense}}</span></td>
+            <td><span>@{{json_content.gross_margin}}</span></td>
+            <td><span>@{{Math.round(json_content.gross_profit_rate*100)}}%</span></td>
         </tr>
-
         </tbody>
     </table>
         <div class="text-info h5 btn btn">{{$waybillFinancialSnapshots->count()}}/{{$waybillFinancialSnapshots->total()}}</div>
@@ -114,7 +112,7 @@
 @stop
 
 @section('lastScript')
-<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版--}}
+<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
 <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
 <script>
     let vue = new Vue({