From 910e31bdee7d6268b8d18008318598f231a959a8 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 29 Oct 2024 18:46:58 +0800
Subject: [PATCH] md

---
 .../emisSettleInvoiceRecordForm.vue           | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
index 08ea0d90..917187f4 100644
--- a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
@@ -301,11 +301,25 @@ export default {
         let maxFee=0;
         // 总可开金额
         let totalBillFee=0.0;
-        if(this.form.openBillScope==1){
-          if(this.billList){
+        this.form.invoiceRelList=[];
+        if(this.billList){
+
               this.form.settleBillNo="";
               this.form.settleBillName="";
-              this.form.invoiceRelList=[];
+
+              for(let i=0;i<this.billList.length;i++){
+                let item=this.billList[i];
+
+                this.form.settleBillNo=this.form.settleBillNo+item.settleBillNo+",";
+                this.form.settleBillName= this.form.settleBillName+item.settleBillName+",";
+              }
+              this.form.settleBillNo=this.removeEndChar(this.form.settleBillNo,',','');
+              this.form.settleBillName=this.removeEndChar(this.form.settleBillName,',','');
+        }
+
+
+        if(this.form.openBillScope==1){
+          if(this.billList){
 
               let settleBillNoArr = this.billList.map(item=>item.settleBillNo);
               let settleBillNoStr=settleBillNoArr.join(",");
@@ -322,8 +336,9 @@ export default {
               for(let i=0;i<this.billList.length;i++){
                   let item=this.billList[i];
 
-                  this.form.settleBillNo=this.form.settleBillNo+item.settleBillNo+",";
-                  this.form.settleBillName= this.form.settleBillName+item.settleBillName+",";
+                  // this.form.settleBillNo=this.form.settleBillNo+item.settleBillNo+",";
+                  // this.form.settleBillName= this.form.settleBillName+item.settleBillName+",";
+
                   let qParam={
                       settleBillNo:item.settleBillNo,
                       pageNum:1,
@@ -440,6 +455,17 @@ export default {
         this.handleCalcFeeItem();
       }
     },
+    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, '');
+    },
     deleteFeeItem(row){
       this.$confirm('确定删除?', '提示', {
           confirmButtonText: '确定',