Merge branch 'wangyang'

resources/js/lodop/myPrintKit.js

@@ -143,6 +143,7 @@ function templateDataProcess(data, index){
     htmlTemplateObj.find("span.stationNumber").text(data.stationNumber);
     htmlTemplateObj.find("span.custOrderLine").text(data.custOrderLine);
     htmlTemplateObj.find("span.transNote").text(data.transNote);
+    htmlTemplateObj.find("span.originalNumber").text(data.orderNumber);
 
     if ("" == data.markerPen) {
 
@@ -218,7 +219,7 @@ function print(billList, wayNum){
 
             //模板数据处理
             templateDataProcess(data, j);
-            console.log("XXXX: "+ htmlTemplateObj.find("span.shipperName").text())
+            // console.log("XXXX: "+ htmlTemplateObj.find("span.shipperName").text())
             //打印电子运单1
             printEWaybill(data, serialNo, barcode, wayNum);
 
@@ -259,8 +260,8 @@ function printEWaybill(data, serialNo, barcode, wayNum){
     LODOP.ADD_PRINT_BARCODE("117mm","45mm","50mm","8mm","128C", data.waybillNumber);
 
     //打印
-    LODOP.PREVIEW();
-    //LODOP.PRINT();
+    // LODOP.PREVIEW();
+    LODOP.PRINT();
 //	LODOP.PRINT_DESIGN();
 
     //记录打印日志
@@ -272,48 +273,48 @@ function printEWaybill(data, serialNo, barcode, wayNum){
     } catch (e) {
     }
 }
-function printTest(item = '') {
-    var printOrder = {};
-
-    printOrder.waybillNumber = item.waybill_number??'';
-    printOrder.shipperCompanyPhone = '021-6316561';
-    printOrder.shipperCompanyAddress = item.order.warehouse.province.name +'-'+item.order.warehouse.city.name+'-'+item.order.warehouse.county.name+'-'+item.order.warehouse.address
-    printOrder.shipperTel = '021-6316561';
-    printOrder.saddress = item.order.warehouse.province.name +'-'+item.order.warehouse.city.name+'-'+item.order.warehouse.county.name+'-'+item.order.warehouse.address;
-    printOrder.shipperPhone = '021-6316561';
-    printOrder.conPhone = item.order.consignee_phone;
-    printOrder.conTel = item.order.consignee_phone;
-    printOrder.shipperName = '宝时物流';
-    printOrder.conName = item.order.consignee_name;
-    printOrder.caddress = item.order.province+'-'+item.order.city+'-'+item.order.district+'-'+item.order.address;
-    printOrder.cargoName = item.cargo_name;
-    printOrder.cargoWeight = item.total_weight;
-    printOrder.refundPayment = item.is_to_pay ? item.collect_fee : 0;  //代收款
-    printOrder.payType = '月结';
-    printOrder.transType = item.transport_type == "JZQY_LONG" ? '精确汽运' : '精准卡航';
-    printOrder.destination = item.destination_city.name;
-    printOrder.billWeight = item.total_weight;
-    printOrder.transportCharge = item.fee;
-    printOrder.totalCharge = item.charge;
-    printOrder.insuranceMoney = 0; //保价
-    printOrder.signSheet = item.back_sign_bill ? (item.back_sign_bill == 1 ? '签收单原件返回' : '电子签收单' ) : '无需返单';
-    printOrder.outerField1 = ''; //受理部门
-    printOrder.lastOutLoadOrgName = item.arrived_org_simple_name??'';  //最终外场
-    printOrder.departCityName = '上海市'; //原寄地
-    printOrder.secondLoadOrgName = '';  //第二外场
-    printOrder.stationNumber = item.station_no??''; //提货网点id
-    printOrder.custOrderLine = item.wms_bill_number;
-    printOrder.transNote = item.ordering_remark;
-    printOrder.markerPen = item.origination;
-    printOrder.orderNumber = item.source_bill;
-    printOrder.billTime = item.order.created_at;
-    printOrder.cargoCount = item.total_number;
-    printOrder.reciveLoanAccount = ''; //代收账号
-    printOrder.printSerialNos = ''; //流水号
-    printOrder.isHideWareHouse = '';
-    printOrder.originalNumber = '';
-
+function printTest(items ='') {
     var printList = [];
-    printList.push(printOrder);
+    items.forEach((item, index)=>{
+        var printOrder = {};
+        printOrder.waybillNumber = item.waybill_number??'';
+        printOrder.shipperCompanyPhone = '021-6316561';
+        printOrder.shipperCompanyAddress = item.order.warehouse.province.name +'-'+item.order.warehouse.city.name+'-'+item.order.warehouse.county.name+'-'+item.order.warehouse.address
+        printOrder.shipperTel = '021-6316561';
+        printOrder.saddress = item.order.warehouse.province.name +'-'+item.order.warehouse.city.name+'-'+item.order.warehouse.county.name+'-'+item.order.warehouse.address;
+        printOrder.shipperPhone = '021-6316561';
+        printOrder.conPhone = item.order.consignee_phone;
+        printOrder.conTel = item.order.consignee_phone;
+        printOrder.shipperName = '宝时物流';
+        printOrder.conName = item.order.consignee_name;
+        printOrder.caddress = item.order.province+'-'+item.order.city+'-'+item.order.district+'-'+item.order.address;
+        printOrder.cargoName = item.cargo_name;
+        printOrder.cargoWeight = item.total_weight;
+        printOrder.refundPayment = item.is_to_pay ? item.collect_fee : 0;  //代收款
+        printOrder.payType = '月结';
+        printOrder.transType = item.transport_type == "JZQY_LONG" ? '精确汽运' : '精准卡航';
+        printOrder.destination = item.destination_city.name;
+        printOrder.billWeight = item.total_weight;
+        printOrder.transportCharge = item.fee;
+        printOrder.totalCharge = item.charge;
+        printOrder.insuranceMoney = 0; //保价
+        printOrder.signSheet = item.back_sign_bill ? (item.back_sign_bill == 1 ? '签收单原件返回' : '电子签收单' ) : '无需返单';
+        printOrder.outerField1 = ''; //受理部门
+        printOrder.lastOutLoadOrgName = item.arrived_org_simple_name??'';  //最终外场
+        printOrder.departCityName = '上海市'; //原寄地
+        printOrder.secondLoadOrgName = '';  //第二外场
+        printOrder.stationNumber = item.station_no??''; //提货网点id
+        printOrder.custOrderLine = item.wms_bill_number;
+        printOrder.transNote = item.ordering_remark;
+        printOrder.markerPen = item.origination;
+        printOrder.orderNumber = item.source_bill;
+        printOrder.billTime = item.order.created_at;
+        printOrder.cargoCount = item.total_number;
+        printOrder.reciveLoanAccount = ''; //代收账号
+        printOrder.printSerialNos = ''; //流水号
+        printOrder.isHideWareHouse = '';
+        printOrder.originalNumber = '';
+        printList.push(printOrder);
+    })
     PrintTable(printList);
 }

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

@@ -280,7 +280,7 @@
                     background-size: 104mm 175mm;
                     padding: 4mm 0.5mm 0.5mm 2.3mm;
                 }
-                td {
+                #expressPrintArea td {
                     border: 0.15mm solid #cecece;
                     padding-left: 1mm;
                     font-size: 12px;
@@ -288,7 +288,7 @@
                     vertical-align: middle;
                     text-align: left;
                 }
-                tr {
+                #expressPrintArea tr {
                     width: 100%;
                     border-left:0mm;
                     border-right:0mm;
@@ -744,17 +744,18 @@
                         window.tempTip.show("未选择任何记录");
                         return;
                     }
-                    window.tempTip.confirm("确定要打印快递面单吗？",()=>{
-                        window.tempTip.setDuration(2000);
-                        window.tempTip.waitingTip("打印中，请稍等...");
-                        window.tempTip.postBasicRequest("{{url('transport/waybill/expressFaceList')}}",{ids:checkData},res=>{
-                            window.tempTip.cancelWaitingTip();
+                    window.tempTip.postBasicRequest("{{url('transport/waybill/expressFaceList')}}",{ids:checkData},res=>{
+                        let msg = '';
+                        res.forEach((item,index)=>{
+                            if (item.express_face_list == 1 )msg += item.waybill_number + " "
+                        })
+                        if(msg)msg += '已打印过,确定重复打印？ '
+                        window.tempTip.confirm(msg ?? "确定要打印快递面单吗？",()=>{
                             window.tempTip.setDuration(4000);
-                            res.forEach((item, index)=>{
-                               printTest(item)
-                            })
-                        });
-                    })
+                            window.tempTip.waitingTip("打印中，请稍等...");
+                            printTest(res)
+                        })
+                    });
                 },
                 rendingFloatBtn(){
                     let parent = $('.pick-btn :visible');