From 4d03253f534e0b0182aa01a03b301db32403f00c Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 11 Jul 2024 06:40:54 +0800 Subject: [PATCH] md --- src/api/emis/emisSettleBill.js | 10 + .../PdfViewer/xdpdf/pdfjsWrapper.js | 60 +-- src/utils/TanexPrinterSdk.js | 24 +- .../EmisBaseTools/EmisUserSimplePicker.vue | 6 +- .../emis/EmisBaseTools/TanexPrinterPanel.vue | 55 +- .../emisSettleBill/SettleMainBillList.vue | 69 +-- .../emis/emisSettleSubBill/MergeBillForm.vue | 281 ---------- .../SubBillConfirmByMoneyList.vue | 4 +- .../SubBillConfirmByMonthList.vue | 3 +- .../SubBillConfirmBySiteList.vue | 3 +- .../emisSettleSubBill/subBillMergeMgnt.vue | 6 +- .../emis/emisTmsPack/packageManagement.vue | 81 +-- .../emis/emisTmsScanRecord/unpackScan.vue | 9 +- .../emis/emisWaybill/batchWaybillRecord.vue | 2 + .../emis/emisWaybill/centerWaybillList.vue | 4 +- .../emis/emisWaybill/dispatchWaybillList.vue | 4 +- .../emis/emisWaybill/sendWaybillList.vue | 57 +-- .../emis/emisWaybill/sendWaybillListNew.vue | 480 ++++++++---------- src/views/emis/emisWaybill/waybillRecord.vue | 17 +- .../WaybillAjustApplyList.vue | 22 +- .../WaybillAjustCenterConfirm.vue | 22 +- .../WaybillAjustDestConfirm.vue | 11 +- .../WaybillAjustStatList.vue | 12 +- .../emisWaybillProblemInfo/problemEntry.vue | 16 +- 24 files changed, 493 insertions(+), 765 deletions(-) delete mode 100644 src/views/emis/emisSettleSubBill/MergeBillForm.vue diff --git a/src/api/emis/emisSettleBill.js b/src/api/emis/emisSettleBill.js index 1c0268c7..1be27cf2 100644 --- a/src/api/emis/emisSettleBill.js +++ b/src/api/emis/emisSettleBill.js @@ -17,6 +17,16 @@ export function getEmisSettleBill(id) { }) } + +// 查询结算总账单详细 +export function getInfoBySettleBillNo(settleBillNo) { + return request({ + url: '/emis/emisSettleBill/getInfoBySettleBillNo' , + method: 'get', + params: {settleBillNo:settleBillNo} + }) +} + // 新增结算总账单 export function addEmisSettleBill(data) { return request({ diff --git a/src/components/PdfViewer/xdpdf/pdfjsWrapper.js b/src/components/PdfViewer/xdpdf/pdfjsWrapper.js index 6c8a8901..4519efab 100644 --- a/src/components/PdfViewer/xdpdf/pdfjsWrapper.js +++ b/src/components/PdfViewer/xdpdf/pdfjsWrapper.js @@ -228,41 +228,43 @@ export default function(PDFJS) { pendingOperation = pendingOperation.then(function() { - var getAnnotationsOperation = - pdfPage.getAnnotations({ intent: 'display' }) - .then(function(annotations) { + if(pdfPage){ + var getAnnotationsOperation = pdfPage.getAnnotations({ intent: 'display' }) + .then(function(annotations) { - PDFJS.AnnotationLayer.render({ - viewport: viewport.clone({ dontFlip: true }), - div: annotationLayerElt, - annotations: annotations, - page: pdfPage, - linkService: linkService, - renderInteractiveForms: false - }); - }); + PDFJS.AnnotationLayer.render({ + viewport: viewport.clone({ dontFlip: true }), + div: annotationLayerElt, + annotations: annotations, + page: pdfPage, + linkService: linkService, + renderInteractiveForms: false + }); + }); - var pdfRenderOperation = - pdfRender.promise - .then(function() { + var pdfRenderOperation = + pdfRender.promise + .then(function() { - annotationLayerElt.style.visibility = ''; - canceling = false; - pdfRender = null; - }) - .catch(function(err) { + annotationLayerElt.style.visibility = ''; + canceling = false; + pdfRender = null; + }) + .catch(function(err) { - pdfRender = null; - if ( err instanceof PDFJS.RenderingCancelledException ) { + pdfRender = null; + if ( err instanceof PDFJS.RenderingCancelledException ) { - canceling = false; - this.renderPage(rotate); - return; - } - emitEvent('error', err); - }.bind(this)) + canceling = false; + this.renderPage(rotate); + return; + } + emitEvent('error', err); + }.bind(this)) + + return Promise.all([getAnnotationsOperation, pdfRenderOperation]); + } - return Promise.all([getAnnotationsOperation, pdfRenderOperation]); }.bind(this)); } diff --git a/src/utils/TanexPrinterSdk.js b/src/utils/TanexPrinterSdk.js index 39756cd2..526fda0b 100644 --- a/src/utils/TanexPrinterSdk.js +++ b/src/utils/TanexPrinterSdk.js @@ -532,7 +532,7 @@ class TanexPrinterSdk { } innerGetPrintTplList(msg){ - // console.log("innerGetPrintTplList") + // console.log("innerGetPrintTplList",msg) this.isSendGetTpl=false; @@ -563,13 +563,15 @@ class TanexPrinterSdk { if(this.recievePdfFileList.length { - if (this.getWSReadyState() === this.WS_OPEN ) { - // this.ws.ping(); - this.ws.send(0x9); - } - }, 1000); + // this.heartbeatInterval = setInterval(() => { + // if (this.getWSReadyState() === this.WS_OPEN ) { + // // this.ws.ping(); + // this.ws.send(0x9); + // } + // }, 1000); } } diff --git a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue index 8edad340..02dc147f 100644 --- a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue +++ b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue @@ -116,10 +116,12 @@ import { getStaffList } from "@/api/emis/emisStaff"; }, watch: { value(newVal,oldVal) { - if(this.value!=null && this.isInit){ this.svalue=this.value; this.queryData(null,this.svalue); - } + + if(!this.svalue){ + this.slable=null; + } }, siteCode(newVal){ this.queryParams.ownerSiteCode=newVal; diff --git a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue index 39e759e6..c0655b09 100644 --- a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue +++ b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue @@ -213,7 +213,7 @@ this.selPrinterName=this.tanexPrinter.getDefaultPrinter(); }, onGetPrintTpl(msg){ - // console.log("onGetPrintTpl") + console.log("onGetPrintTpl") this.printTplList=[]; @@ -224,9 +224,11 @@ this.printTplList=newList; } - // console.log(this.printTplList) + // console.log("====onGetPrintTpl==>",this.printTplList); - this.selTplCode=this.printTplList[0].tplCode; + if(this.printTplList&&this.printTplList.length>0){ + this.selTplCode=this.printTplList[0].tplCode; + } }, getDefaultPrinter(){ return this.tanexPrinter.getDefaultPrinter(); @@ -338,12 +340,16 @@ let orderSeqMap = new Map(); // console.log("printPreviewAdv===>",printDataList); + let j=0; printDataList.forEach(item=>{ let billArr = item.orderList.split(","); billArr.forEach(objBillCodeStr=>{ - orderSeqMap[objBillCodeStr]=j+1; - j++; + if(!(objBillCodeStr in orderSeqMap)){ + orderSeqMap[objBillCodeStr]=j+1; + console.log("orderSeqMap===>",objBillCodeStr,j+1); + j++; + } }); }); @@ -362,6 +368,7 @@ "billCode":pdfData.ydSn, "pdfUrl":null, "pdfBase64":pdfData.file, + "tplCode":pdfData.tplCode, "seqNo":orderSeqMap[pdfData.ydSn] } @@ -380,11 +387,15 @@ else if(code == 800){ // 全部获取完成 // console.log("===全部获取完成ADV====>"); - let newTmpList = that.pdfList.sort((one, two) => { - return one.seqNo - two.seqNo; + that.pdfList.sort((one, two) => { + let v=one.seqNo-two.seqNo; + if(one.seqNo==two.seqNo){ + return one.tplCode.localeCompare(two.tplCode) + }else{ + return v; + } }); - // console.log("===newTmpList====>",newTmpList); - that.pdfList=newTmpList; + that.refreshKey(); } @@ -480,6 +491,7 @@ "billCode":pdfData.ydSn, "pdfUrl":null, "pdfBase64":pdfData.file, + "tplCode":pdfData.tplCode, "seqNo":orderSeqMap[pdfData.ydSn] } @@ -495,12 +507,15 @@ else if(code == 800){ // 全部获取完成 console.log("===全部获取完成2====>"); - let newTmpList = that.pdfList.sort((one, two) => { - return one.seqNo - two.seqNo; + that.pdfList.sort((one, two) => { + let v=one.seqNo-two.seqNo; + if(one.seqNo==two.seqNo){ + return one.tplCode.localeCompare(two.tplCode) + }else{ + return v; + } }); - console.log("===newTmpList====>",newTmpList); - that.pdfList=newTmpList; - + console.log("===that.pdfList====>",that.pdfList); that.refreshKey(); } }); @@ -584,6 +599,7 @@ "billCode":pdfData.ydSn, "pdfUrl":null, "pdfBase64":pdfData.file, + "tplCode":pdfData.tplCode, "seqNo":orderSeqMap[pdfData.ydSn] } that.pdfList.push(pdfInfo); @@ -626,9 +642,16 @@ let needGenList=[]; let newTmpList=[...this.pdfList]; - newTmpList= newTmpList.sort((one, two) => { - return one.seqNo - two.seqNo; + newTmpList.sort((one, two) => { + let v=one.seqNo-two.seqNo; + if(one.seqNo==two.seqNo){ + return one.tplCode.localeCompare(two.tplCode) + }else{ + return v; + } }); + + for(let j=0;j - + - + - - - - @@ -403,9 +394,9 @@ - - - + + + 新增 --> - + >修改账单 + - - + + @@ -639,7 +630,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue' import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue'; -import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue'; +import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue'; import { parseTime,genJsSeqNo } from "@/utils/custom"; @@ -666,12 +657,14 @@ export default { EmisSiteSimplePicker2, ProblemTypePicker, - TraceWaybillDetailView + TraceWaybillDetailView, + MergeBillForm }, dicts: [ ], data() { return { + activeTab:'billList', // 遮罩层 loading: true, // 选中数组 @@ -757,26 +750,20 @@ export default { this.getList(); }, methods: { + handleTabsClick(tab, event) { + // console.log(tab, event); + if (tab.name == 'billList') { + // this.queryParams.blConfirmCenter=null; + } + else if (tab.name == 'dtlList') { + // this.queryParams.blConfirmCenter='0'; + } + this.getList(); + }, /** 查询结算总账单列表 */ getList() { this.loading = true; - this.queryParams.params = {}; - if (null != this.daterangeSettleStartDate && '' != this.daterangeSettleStartDate) { - this.queryParams.params["beginSettleStartDate"] = this.daterangeSettleStartDate[0]; - this.queryParams.params["endSettleStartDate"] = this.daterangeSettleStartDate[1]; - } - if (null != this.daterangeSettleEndDate && '' != this.daterangeSettleEndDate) { - this.queryParams.params["beginSettleEndDate"] = this.daterangeSettleEndDate[0]; - this.queryParams.params["endSettleEndDate"] = this.daterangeSettleEndDate[1]; - } - if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) { - this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0]; - this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1]; - } - if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) { - this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0]; - this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1]; - } + listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => { this.emisSettleBillList = response.rows; this.total = response.total; @@ -817,9 +804,9 @@ export default { }, /** 修改按钮操作 */ handleUpdate(row) { - this.currentId= row.id; + this.currentId= row.id || this.ids; this.openForm = true; - this.titleForm = "修改"; + this.titleForm = "账单信息"; }, handleView(row) { this.id=row.id; diff --git a/src/views/emis/emisSettleSubBill/MergeBillForm.vue b/src/views/emis/emisSettleSubBill/MergeBillForm.vue deleted file mode 100644 index ca84ccda..00000000 --- a/src/views/emis/emisSettleSubBill/MergeBillForm.vue +++ /dev/null @@ -1,281 +0,0 @@ - - - diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue index 530bf273..a3694280 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue @@ -511,11 +511,9 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue' import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue'; -import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue'; - +import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue'; import { parseTime,genJsSeqNo } from "@/utils/custom"; - export default { name: "SubBillConfirmByMoneyList", // name: "SubBillConfirmByMonthList", diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue index 530bf273..41c0ee62 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue @@ -511,8 +511,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue' import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue'; -import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue'; - +import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue'; import { parseTime,genJsSeqNo } from "@/utils/custom"; diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue index 530bf273..41c0ee62 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue @@ -511,8 +511,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue' import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue'; -import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue'; - +import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue'; import { parseTime,genJsSeqNo } from "@/utils/custom"; diff --git a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue index 530bf273..07810351 100644 --- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue +++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue @@ -511,8 +511,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue' import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue'; -import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue'; - +import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue'; import { parseTime,genJsSeqNo } from "@/utils/custom"; @@ -1064,11 +1063,12 @@ export default { subBillList:this.selectBillList, } + // 生成合账单号 addEmisSettleBill(settleBillForm).then(response => { this.$modal.msgSuccess("合并成功"); this.$emit("on-changed"); - this.titleMergeForm="合并账单"; + this.titleMergeForm="账单-"+this.currentSettleBillNo; this.openMergeForm=true; }); diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue index 04e3877a..f738a017 100644 --- a/src/views/emis/emisTmsPack/packageManagement.vue +++ b/src/views/emis/emisTmsPack/packageManagement.vue @@ -111,9 +111,8 @@ - - - + + + @@ -275,7 +274,7 @@ --> - - - + + + - + - - - + + + - + @@ -348,33 +347,33 @@ - - + + - - + + - - - + + + - + @@ -386,7 +385,10 @@ - + + + +