diff --git a/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue b/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue
index 00cfd815..3db11bca 100644
--- a/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue
+++ b/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue
@@ -4,11 +4,12 @@
-
+
-
+
+
@@ -49,12 +50,12 @@ export default {
// console.log(tab, event);
if (tab.name == 'billList') {
this.$nextTick(() => {
- this.$refs.billList.doLayout()
+ // this.$refs.billList.doLayout()
})
}
else if (tab.name == 'hasOpenBillList') {
this.$nextTick(() => {
- this.$refs.hasOpenBillList.doLayout()
+ // this.$refs.hasOpenBillList.doLayout()
})
}
else if (tab.name == 'dtlList') {
@@ -86,7 +87,7 @@ export default {
};
-
diff --git a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
index d3aa3e1f..3b391b73 100644
--- a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
@@ -331,21 +331,34 @@ export default {
let res=await listEmisSettleSubBill(qParam);
console.log("===>=res==>",res)
if(res.code==200){
- res.rows.forEach(itemSubBill=>{
- let relItem={...itemSubBill};
- relItem.money=itemSubBill.billFee;
- relItem.canApplyFee=itemSubBill.billFee;
+ let len=res.rows.length;
- if(itemSubBill.billNo in hasOpenMap){
- relItem.canApplyFee=relItem.billFee-hasOpenMap[itemSubBill.billNo];
- relItem.money=itemSubBill.billFee-hasOpenMap[itemSubBill.billNo];
- }
+ for(let j=0;j0){
- this.form.invoiceRelList.push(relItem);
- }
- });
+ if(itemSubBill.blConfirmSite!="1"){
+ this.$modal.msgError("运单号:"+itemSubBill.billNo+" 业务出账未确认/确认不出账,不允许开票");
+ return;
+ }
+
+ let relItem={...itemSubBill};
+ relItem.money=itemSubBill.billFee;
+ relItem.canApplyFee=itemSubBill.billFee;
+
+ if(itemSubBill.billNo in hasOpenMap){
+ relItem.canApplyFee=relItem.billFee-hasOpenMap[itemSubBill.billNo];
+ relItem.money=itemSubBill.billFee-hasOpenMap[itemSubBill.billNo];
+ }
+
+ if(relItem.canApplyFee>0){
+ this.form.invoiceRelList.push(relItem);
+ }
+ }
+
+
+ // res.rows.forEach(itemSubBill=>{
+ // });
}
@@ -396,6 +409,12 @@ export default {
for(let i=0;i
-