diff --git a/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue b/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue index 6483638b..a0abbc8d 100644 --- a/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue +++ b/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue @@ -3,7 +3,7 @@ 删除 + + 废弃 + - { + this.getList(); + this.$modal.msgSuccess("操作成功"); + }).catch(() => {}); + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; diff --git a/src/views/emis/emisSettleInvoiceChRecord/index.vue b/src/views/emis/emisSettleInvoiceChRecord/index.vue index f92a97c0..c86292f5 100644 --- a/src/views/emis/emisSettleInvoiceChRecord/index.vue +++ b/src/views/emis/emisSettleInvoiceChRecord/index.vue @@ -19,12 +19,13 @@ - - - - - - + + + + + + + @@ -151,6 +152,28 @@ v-hasPermi="['emis:emisSettleInvoiceChRecord:remove']" >删除 --> + + + + + 废弃 + 未发送 已发送 开票成功 - 开票失败 + 开票作废 @@ -204,9 +227,6 @@ - - - @@ -226,7 +246,20 @@ - + + + + + @@ -249,6 +282,10 @@ + + + + @@ -260,13 +297,15 @@ import {timeDiffTime,timeFormat} from '@/utils/dateUtils' import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue'; import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue'; import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; +import PayRecordInputByInvoice from '@/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue'; export default { name: "EmisSettleInvoiceChRecord", components: { elDateAdvPicker, emisSettleInvoiceChRecordForm, - PayeePicker,SalemanPicker,EmisMonthpayAccountPicker + PayeePicker,SalemanPicker,EmisMonthpayAccountPicker, + PayRecordInputByInvoice }, dicts: ['emis_invoice_ch_type' ], @@ -411,6 +450,59 @@ export default { this.queryParams.isAsc = column.order; this.getList(); }, + handlePayRecord(row){ + this.currentId= row.id || this.ids; + this.openForm = true; + this.titleForm = "收款核销"; + }, + handleInvalid(row){ + const ids = row.id || this.ids; + this.$modal.confirm('是否废弃').then(function() { + // return delEmisSettleInvoiceChRecord(ids); + let postForm={ + id:ids[0], + openChStatus:'3' + } + return updateEmisSettleInvoiceChRecord(postForm); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("操作成功"); + }).catch(() => {}); + + }, + handleDownPDF(row) { + let downUrl=row.filePath; + if (navigator.clipboard && window.isSecureContext) { + // navigator clipboard 向剪贴板写文本 + this.$modal.msgSuccess('复制成功') + return navigator.clipboard.writeText(downUrl) + } else { + // 创建text area + const textArea = document.createElement('textarea') + textArea.value = downUrl + // 使text area不在viewport，同时设置不可见 + document.body.appendChild(textArea) + textArea.focus() + textArea.select() + this.$modal.msgSuccess('复制成功') + return new Promise((res, rej) => { + // 执行复制命令并移除文本框 + document.execCommand('copy') ? res() : rej() + textArea.remove() + }) + } + }, + removeEndChar(str,char, type) { + if (char) { + if (type == 'left') { + return str.replace(new RegExp('^\\'+char+'+', 'g'), ''); + } else if (type == 'right') { + return str.replace(new RegExp('\\'+char+'+$', 'g'), ''); + } + return str.replace(new RegExp('^\\'+char+'+|\\'+char+'+$', 'g'), ''); + } + return str.replace(/^\s+|\s+$/g, ''); + }, /** 新增按钮操作 */ handleAdd(row) { this.currentId=null; diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue index c45ed270..c7346953 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue @@ -471,6 +471,8 @@ export default { }) } + }else{ + this.$modal.msgError('复制失败,无可用发票文件'); } }); }, diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue index 4904c2d8..3326dd58 100644 --- a/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue +++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue @@ -29,13 +29,9 @@ - + @@ -88,8 +84,7 @@ export default { } }, components: { elDateSimplePicker }, - dicts: [ - ], + dicts: ['emis_settlebill_pay_type'], data() { return { // 遮罩层 diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index e71480f5..d396d342 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -1847,8 +1847,6 @@ methods: { async handleCalcFeeItem(row){ if(row!=null && this.form.settlementWeight!=null){ - // console.log("===>calcExp====>",row.calcExp); - // console.log("===>calcExp111==row==>",row); if(row.calcExp&&row.calcExp!='undefined'){ let expr=row.calcExp; // 如果公式包含变量，使用变量进行计算 @@ -1876,13 +1874,6 @@ methods: { } - - - - - - - let feeRemark=""; let totalFee=Number(0); if(this.form.feeItems&&this.form.feeItems.length>0){ let len=this.form.feeItems.length; @@ -1898,14 +1889,9 @@ methods: { } newFee=newFee.toFixed(2); - // feeRemark= feeRemark+item.feeName+'('+item.currency+"):" + item.realFee+","; - // feeRemark = feeRemark.slice(0, -1); - totalFee=Number(totalFee)+Number(newFee); } } - - // this.form.feeRemark=feeRemark; this.form.freight = totalFee.toFixed(2); }, // 计算体积重量 diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index 6aa1e7e1..b931118b 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -1731,27 +1731,42 @@ export default { }, async handleCalcFeeItem(row){ - - if(row!=null){ - if(row.calcExp){ + if(row!=null && this.form.settlementWeight!=null){ + if(row.calcExp&&row.calcExp!='undefined'){ let expr=row.calcExp; - expr=expr.replace("s",row.initialWeightFee); - expr=expr.replace("d",row.addWeightPrice); - expr=expr.replace("w",this.form.settlementWeight); - row.realFee=parseFloat(eval(expr)).toFixed(2); + // 如果公式包含变量，使用变量进行计算 + if(expr.indexOf('s')!=-1 || expr.indexOf('d')!=-1){ + expr=expr.replace("s",row.initialWeightFee); + expr=expr.replace("d",row.addWeightPrice); + expr=expr.replace("w",this.form.settlementWeight); + row.realFee=parseFloat(eval(expr)).toFixed(2); + }else{ + // + } + + }else{ + let expr="s+w*d"; + if(row.initialWeightFee>0||row.addWeightPrice>0){ + + expr=expr.replace("s",row.initialWeightFee); + expr=expr.replace("d",row.addWeightPrice); + expr=expr.replace("w",this.form.settlementWeight); + row.realFee=parseFloat(eval(expr)).toFixed(2); + // console.log("===>calcExp222==expr==>",expr); + // console.log("===>calcExp222==row==>",row); + } } + } - let feeRemark=""; let totalFee=Number(0); if(this.form.feeItems&&this.form.feeItems.length>0){ let len=this.form.feeItems.length; for(let i=0;ires===>",res); if(res.code==200){ newFee=newFee*Number(res.data); item.remark="汇率:"+res.data+","+newFee+"(CNY)" @@ -1759,16 +1774,11 @@ export default { } newFee=newFee.toFixed(2); - feeRemark= feeRemark+item.feeName+'('+item.currency+"):" + item.realFee+","; - - totalFee=Number(totalFee)+Number(newFee); } } - - this.form.feeRemark=feeRemark; this.form.freight = totalFee.toFixed(2); - }, + }, calcBillFee(){ if(this.form.settlementWeight