From ae2d90339c9b82680326aca2b7aace0bfa7193b4 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 8 Aug 2024 12:17:20 +0800 Subject: [PATCH] md --- .../panel/SiteWaitOpenBillPanel.vue | 11 +- .../emisSettleInvoiceRecordForm.vue | 172 +++++++++--------- .../panel/InvoiceRecordApplyListPanel.vue | 4 +- 3 files changed, 100 insertions(+), 87 deletions(-) diff --git a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue index 2dcebce1..f45ca991 100644 --- a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue +++ b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue @@ -173,7 +173,7 @@ - + @@ -189,6 +189,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker'; 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 emisSettleInvoiceRecordForm from '@/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm'; export default { name: "SiteConfimPanel", @@ -197,7 +198,7 @@ export default { type:[String,Number] } }, - components: { MergeBillForm,elDateSimplePicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker }, + components: { MergeBillForm,elDateSimplePicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker,emisSettleInvoiceRecordForm }, dicts: [ ], data() { @@ -227,6 +228,8 @@ export default { // 结算子账单表格数据 emisSettleSubBillList: [], + selectBillList:[], + currentSettleBillNo:null, queryOrderType:null, @@ -342,7 +345,7 @@ export default { // 申请开票 handleApplyOpenBill(){ this.currentId=null; - this.openForm= true; + this.openForm=true; this.titleForm = "新增开票申请"; }, handleSendDbClick(row){ @@ -476,6 +479,8 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { + this.selectBillList=selection; + this.ids = selection.map(item => item.id) this.single = selection.length!==1 this.multiple = !selection.length diff --git a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue index 2571d18f..9e5fb68e 100644 --- a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue +++ b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue @@ -2,60 +2,34 @@
- - - - - 开票抬头 @@ -78,7 +52,7 @@ - + --> - + - - + + - 账单名称 + 开票账单 - + + + + + - + + @@ -152,15 +129,20 @@ - + 开票金额 + (开票上限:{{ form.openMoneyMax }}) + + @@ -189,6 +171,9 @@ export default { props:{ id:{ type:Number + }, + billList:{ + type:Array } }, components: { CustomerInvoiceInfoPicker,SettleBillPicker }, @@ -224,13 +209,21 @@ export default { }; }, watch: { - "id": { + // "id": { + // handler (newValue, oldValue) { + // this.id = newValue; + // this.initData(); + // }, + // deep: true + // }, + "billList": { handler (newValue, oldValue) { - this.id = newValue; this.initData(); }, deep: true } + + }, created() { this.initData(); @@ -239,19 +232,32 @@ export default { methods: { initData() { - if(this.id !=null) { - this.loading = true; - getEmisSettleInvoiceRecord(this.id).then(response => { - this.form = response.data; - this.loading = false; - }); - }else{ - this.reset(); - - this.form.applySeqNo=genJsSeqNo(); - this.form.applyDate = parseTime(new Date()); + this.reset(); + console.log("===>billList==>",this.billList); + console.log("===>this.form==>",this.form); + let maxFee=0; + if(this.billList){ + this.form.settleBillNo=""; + this.billList.forEach(item=>{ + console.log("===>this.item==>",item); + this.form.settleBillNo=this.form.settleBillNo+item.settleBillNo+","; + this.form.settleBillName= this.form.settleBillName+item.settleBillName+","; + this.form.openMoneyMax=this.form.openMoneyMax+item.recMoney; + this.form.applyMoney=this.form.applyMoney+item.recMoney; + }); } + // if(this.id !=null) { + // this.loading = true; + // getEmisSettleInvoiceRecord(this.id).then(response => { + // this.form = response.data; + // this.loading = false; + // }); + // }else{ + // this.reset(); + // this.form.applySeqNo=genJsSeqNo(); + // this.form.applyDate = parseTime(new Date()); + // } }, onSelectBill(item){ this.form.settleBillName=item.settleBillName; @@ -338,11 +344,13 @@ export default { this.$refs["form"].validate(valid => { if (valid) { if (this.form.id != null) { - updateEmisSettleInvoiceRecord(this.form).then(response => { - this.$modal.msgSuccess("修改成功"); - this.$emit("on-changed"); - }); + // updateEmisSettleInvoiceRecord(this.form).then(response => { + // this.$modal.msgSuccess("修改成功"); + // this.$emit("on-changed"); + // }); } else { + this.form.applySeqNo=genJsSeqNo(); + this.form.applyDate = parseTime(new Date()); addEmisSettleInvoiceRecord(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.$emit("on-changed"); diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue index c73fed7d..f8563eea 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue @@ -374,7 +374,7 @@ @click="handleDownPDF" >下载发票PDF - +