diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue index e30ed565..26972a7d 100644 --- a/src/views/emis/emisWaybill/emisWaybillRecord.vue +++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue @@ -625,19 +625,19 @@ - + - + - + @@ -914,12 +914,15 @@ data() { dispatchUnderlingSiteCode: [ { required: true, message: "目的地网点代码不能为空", trigger: "blur" } ], - // payee: [ - // { required: true, message: "销售回款人不能为空", trigger: "blur" } - // ], - // salesmen: [ - // { required: true, message: "销售联系人不能为空", trigger: "blur" } - // ], + custNo: [ + { required: true, message: "月结卡号不能为空", trigger: "blur" } + ], + payee: [ + { required: true, message: "销售回款人不能为空", trigger: "blur" } + ], + salesmen: [ + { required: true, message: "销售联系人不能为空", trigger: "blur" } + ], takePieceEmployeeCode: [ { required: true, message: "取件员代码不能为空", trigger: ["blur",'change'] } ], @@ -1046,76 +1049,101 @@ methods: { this.printerStatusMessage="打印组件已断开！"; }, handleBatchPrint(){ - - if(this.form.billCode){ - // 重要，设置为true才会把右上角X和取消区分开来 - this.$confirm("确定打印?", "提示", { - cancelButtonText: "不打印", - confirmButtonText: "确定打印", - type: "warning", - distinguishCancelAndClose: true, - closeOnClickModal: false - }).then(() => { - // 打印主单，子单 - let orderList=[]; - // this.currentSelection.forEach(item=>{ - // orderList.push(item.billCode); - // }); - // 打印主单 - orderList.push(this.form.billCode); - let selPrinterName=this.tanexPrinter.getDefaultPrinter(); - let selTplName="探路速运-主单联（通用）"; - this.tanexPrinter.batchPrint(selTplName,selPrinterName,orderList) + if(this.printerStatus == 1){ + if(this.form.billCode){ + // 重要，设置为true才会把右上角X和取消区分开来 + this.$confirm("确定打印?", "提示", { + cancelButtonText: "不打印", + confirmButtonText: "确定打印", + type: "warning", + distinguishCancelAndClose: true, + closeOnClickModal: false + }).then(() => { + // 打印主单，子单 + let orderList=[]; + // this.currentSelection.forEach(item=>{ + // orderList.push(item.billCode); + // }); + // 打印主单 + orderList.push(this.form.billCode); + let selPrinterName=this.tanexPrinter.getDefaultPrinter(); + let selTplName="探路速运-主单联（通用）"; + this.tanexPrinter.batchPrint(selTplName,selPrinterName,orderList) - // 打印子单 - selTplName="探路速运-子单联（通用）"; + // 打印子单 + selTplName="探路速运-子单联（通用）"; - let childOrderList=[] - orderList=this.form.billCodeSub.split(','); - orderList.forEach(item=>{ - if(item!=null && item!=''){ - childOrderList.push(item); - } - }); - this.tanexPrinter.batchPrint(selTplName,selPrinterName,childOrderList) + let childOrderList=[] + orderList=this.form.billCodeSub.split(','); + orderList.forEach(item=>{ + if(item!=null && item!=''){ + childOrderList.push(item); + } + }); + this.tanexPrinter.batchPrint(selTplName,selPrinterName,childOrderList) - }).catch(() => {}); + }).catch(() => {}); + } + } + else{ + this.$confirm("打印组件未连接，可【返回操作】稍后打印，或【操作下一单】", "提示", { + cancelButtonText: "返回操作", + confirmButtonText: "操作下一单", + type: "warning", + distinguishCancelAndClose: true, + closeOnClickModal: false + }).then(() => { + this.reset(); + }); } }, async handlePrintPreview(){ - if(this.form.billCode){ - let pdfUrlList=[]; - let selPrinterName=this.tanexPrinter.getDefaultPrinter(); - let selTplName="探路速运-主单联（通用）"; - let url=this.tanexPrinter.getPdfUrl(this.form.billCode,selTplName,selPrinterName); - pdfUrlList.push(url) - // 子单url - if(this.form.billCodeSub){ - selTplName="探路速运-子单联（通用）"; - let orderList=this.form.billCodeSub.split(','); - orderList.forEach(item=>{ - if(item!=null && item!=''){ - let url=this.tanexPrinter.getPdfUrl(item,selTplName,selPrinterName); - pdfUrlList.push(url) - } + if(this.printerStatus == 1){ + if(this.form.billCode){ + let pdfUrlList=[]; + let selPrinterName=this.tanexPrinter.getDefaultPrinter(); + let selTplName="探路速运-主单联（通用）"; + let url=this.tanexPrinter.getPdfUrl(this.form.billCode,selTplName,selPrinterName); + pdfUrlList.push(url) + // 子单url + if(this.form.billCodeSub){ + selTplName="探路速运-子单联（通用）"; + let orderList=this.form.billCodeSub.split(','); + orderList.forEach(item=>{ + if(item!=null && item!=''){ + let url=this.tanexPrinter.getPdfUrl(item,selTplName,selPrinterName); + pdfUrlList.push(url) + } + }); + } + let pdfUtils=new PdfUtils({}); + const loadingInstance = this.$loading({ + text: '正在生成预览...' + }) + pdfUtils.mergePdf2(pdfUrlList, (new Date()).getTime()+".pdf" ) + .then(url=>{ + loadingInstance.close(); + this.pdfUrl=url; + this.openPdfView = true; + }) + .catch(error => { + }); + } + } + else{ + this.$confirm("打印组件未连接，可【返回操作】稍后打印，或【操作下一单】", "提示", { + cancelButtonText: "返回操作", + confirmButtonText: "操作下一单", + type: "warning", + distinguishCancelAndClose: true, + closeOnClickModal: false + }).then(() => { + this.reset(); }); - } - let pdfUtils=new PdfUtils({}); - const loadingInstance = this.$loading({ - text: '正在生成预览...' - }) - pdfUtils.mergePdf2(pdfUrlList, (new Date()).getTime()+".pdf" ) - .then(url=>{ - loadingInstance.close(); - this.pdfUrl=url; - this.openPdfView = true; - }) - .catch(error => { - }); } }, @@ -1462,18 +1490,14 @@ methods: { }, handleCalcFeeItem(val,row){ - let childRealFee=0.0; if(row!=null){ if(row.calcExp){ - let expr=row.calcExp+"s+w*d"; + let expr="s+w*d"; expr=expr.replace("s",row.initialWeightFee); expr=expr.replace("d",row.addWeightPrice); expr=expr.replace("w",this.form.settlementWeight); - console.log(expr); - let childRealFee=parseFloat(eval(expr)).toFixed(2); - row.realFee=childRealFee; - console.log(childRealFee); + row.realFee=parseFloat(eval(expr)).toFixed(2); } } diff --git a/src/views/emis/emisWaybill/orderList.vue b/src/views/emis/emisWaybill/orderList.vue index 94a11ca3..749c561c 100644 --- a/src/views/emis/emisWaybill/orderList.vue +++ b/src/views/emis/emisWaybill/orderList.vue @@ -281,7 +281,7 @@ - - + @@ -307,10 +307,10 @@ - + - + @@ -327,11 +327,12 @@ 不发送 - + + - + @@ -351,9 +352,9 @@ - + - + @@ -376,9 +377,9 @@ - + - + - + - +