Merge branch 'wangyang'

app/Http/Controllers/WaybillController.php

@@ -16,7 +16,6 @@ use App\Services\WaybillPayoffService;
 use App\Services\WaybillPriceModelService;
 use App\Services\WaybillService;
 use App\Traits\ModelLogChanging;
-use App\Terminal;
 use App\TerminalPrinter;
 use App\UploadFile;
 use App\WaybillAuditLog;

app/Services/DbOpenService.php

@@ -117,7 +117,7 @@ class DbOpenService
                 'totalWeight'       => $waybill->total_weight ?? '',
                 'totalVolume'       => '',
                 'packageService'    => $waybill->package_service ?? '',
-                'deliveryType'      => $waybill->deliveryType->name ?? '',
+                'deliveryType'      => $waybill->deliveryType->id ?? '',
             ],
             'gmtCommit'     =>  $date,
             'payType'       =>  $waybill->pay_type,

app/Utils/helpers.php

@@ -79,6 +79,7 @@ function httpPost($uri = '', $body = '', $header = ''):array
     return json_decode($data,  true);
 }
 
+//获取电脑的Mac地址
 function getMacAddr($type = PHP_OS):string
 {
     $return_array = []; $mac_addr = '';

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

@@ -750,7 +750,7 @@
                     this.waybill.amount_unit_id = 5;
                     this.waybill.inquire_tel = '13761413262';
                     this.waybill.dispatch_remark = '13761413262';
-                    let  date = new Date();
+                    let date = new Date();
                     this.waybill.deliver_at_date = date.getFullYear()+'-'+("0" + (date.getMonth() + 1)).slice(-2) + '-'+date.getDate();
                     this.waybill.deliver_at_time = date.getHours()+':'+date.getMinutes();
                 }

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

@@ -842,7 +842,7 @@
                 rendingHeader(){
                     let column = [
                         {name:'operation',value: '操作', neglect: true, class:"td-operation"},
-                        {name:'onTop',value: '置顶', neglect: true, class:"td-operation"},
+                         @can('运输管理-运单-置顶'){name:'onTop',value: '置顶', neglect: true, class:"td-operation"},@endcan
                         {name:'status',value: '状态', class:"td-operation"},
                         {name:'express_face_list',value: '快递面单是否打印', class:"td-warm"},
                         {name:'index',value: '序号', neglect: true, class:"td-warm"},
@@ -1448,7 +1448,6 @@
          */
         function printEWaybill(data, serialNo, barcode, wayNum){
             //打印内容
-            console.log(barcode);
             var printHtml = htmlTemplateObj.find("div#expressPrintArea").html();
 
             LODOP.PRINT_INIT("二级模板");
@@ -1460,7 +1459,8 @@
             LODOP.ADD_PRINT_BARCODE("117mm","45mm","50mm","8mm","128Auto", barcode);
 
             //设定固定打印机
-            if(LODOP.SET_PRINTER_INDEX('EK100B'))LODOP.SET_PRINTER_INDEX('EK100B');
+            let print_name = "{{$print_name}}";
+            if(LODOP.SET_PRINTER_INDEX(print_name))LODOP.SET_PRINTER_INDEX(print_name);
 
             //打印
             // LODOP.PREVIEW();