md

src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue

@@ -4,11 +4,12 @@
       <div class="tab-container">
         <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick"  @tab-remove="removeTab">
           <el-tab-pane label="开票申请记录" name="billList" >
-            <CenterInvoiceRecordDealListPanel  ref="billList" @onSelect="onSelectApply"> </CenterInvoiceRecordDealListPanel>
+            <CenterInvoiceRecordDealListPanel v-if="activeTab=='billList'"  ref="billList" @onSelect="onSelectApply"> </CenterInvoiceRecordDealListPanel>
           </el-tab-pane>
           <el-tab-pane label="已开票" name="hasOpenBillList" >
-            <CenterInvoiceHasOpenPanel ref="hasOpenBillList" :invoiceStatus="2" @onSelect="onSelectApply"> </CenterInvoiceHasOpenPanel>
+            <CenterInvoiceHasOpenPanel v-if="activeTab=='hasOpenBillList'" ref="hasOpenBillList" :invoiceStatus="2" @onSelect="onSelectApply"> </CenterInvoiceHasOpenPanel>
           </el-tab-pane>
+
           <!-- <el-tab-pane label="开票申请记录" name="invoiceApplyList" >
             <ChargeBillMoneyPanel @onSelect="onSelectBill"> </ChargeBillMoneyPanel>
           </el-tab-pane> -->
@@ -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 {
 };
 </script>
 
-<style>
+<style lang="scss">
 .el-descriptions-item__label {
   width: 80px;
 }
@@ -101,8 +102,20 @@ export default {
   width: 100%;
 }
 
-.el-tabs__nav{
+// .el-tabs__nav{
-    display: flex !important;
+//     display: flex !important;
-    flex-wrap: wrap !important;
+//     flex-wrap: wrap !important;
-}
+// }
+
+
+// .el-table {
+// 	width: 100%;
+// 	display: flex;
+// 	flex-direction: column;
+// 	.el-table__body-wrapper {
+// 		flex: 1;
+// 	 }
+// }
+
+
 </style>

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};
+                    let len=res.rows.length;
-                      relItem.money=itemSubBill.billFee;
-                      relItem.canApplyFee=itemSubBill.billFee;
 
-                      if(itemSubBill.billNo in hasOpenMap){
+                    for(let j=0;j<len;j++){
-                        relItem.canApplyFee=relItem.billFee-hasOpenMap[itemSubBill.billNo];
+                       let itemSubBill=res.rows[j];
-                        relItem.money=itemSubBill.billFee-hasOpenMap[itemSubBill.billNo];
-                      }
 
-                      if(relItem.canApplyFee>0){
+                       if(itemSubBill.blConfirmSite!="1"){
-                        this.form.invoiceRelList.push(relItem);
+                          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<subBillList.length;i++){
           let itemSubBill=subBillList[i];
+
+          if(itemSubBill.blConfirmSite!="1"){
+            this.$modal.msgError("运单号:"+itemSubBill.billNo+" 业务出账未确认/确认不出账，不允许开票");
+            return;
+          }
+
           let relItem={...itemSubBill};
           relItem.money=itemSubBill.billFee;
           relItem.canApplyFee=itemSubBill.billFee;

src/views/emis/emisWaybill/recordScanStatistics.vue

@@ -13,19 +13,19 @@
       </el-col>
     </el-row>
 
-    <div v-show="activeTab==='a1'">
+    <div v-if="activeTab==='a1'">
         <SendStatPanel @onSelect="onSendSelect"></SendStatPanel>
     </div>
 
-    <div v-show="activeTab==='a2'">
+    <div v-if="activeTab==='a2'">
         <DestStatPanel  @onSelect="onDestSelect"></DestStatPanel>
     </div>
 
-    <div v-show="activeTab==='a3'">
+    <div v-if="activeTab==='a3'">
         <ScanDtlListPanel :queryObj="queryDtlObj"></ScanDtlListPanel>
     </div>
 
-    <div v-show="activeTab==='a4'">
+    <div v-if="activeTab==='a4'">
         <ScanDtlAllListPanel></ScanDtlAllListPanel>
     </div>