融信新增往来账款功能

front-vue/src/views/service/bill/addBill.vue

@@ -51,7 +51,6 @@
             <el-select
               style="width: 300px"
               v-model="form.zbiPayerId"
-              :disabled="true"
               filterable
               clearable
               remote
@@ -120,7 +119,6 @@
             <el-select
               style="width: 300px"
               v-model="form.zbiPayeeId"
-              :disabled="true"
               filterable
               clearable
               remote

front-vue/src/views/service/credit/addCredit.vue

@@ -520,7 +520,7 @@ export default {
             if (this.chooseTicket) {
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if (this.chooseTicket.length > 1) {
+                if (this.chooseTicket.length > 0) {
                     //获取选中第一个的应收企业
                     var receiveName = this.chooseTicket[0].receiveName;
                     //获取选中第一个的预计还款日期
@@ -528,29 +528,34 @@ export default {
                     for (var i = 0; i < this.chooseTicket.length; i++) {
                         if (receiveName != this.chooseTicket[i].receiveName) {
                             flag = false
+                            this.chooseTicket.splice(i, 1)
                             this.$message({
                                 message: "请选择应收企业相同的应付账款",
                                 type: "warning",
                             });
-                            return false;
+                            this.open = false;
+                            return true;
                         }
                         if (zbiPayDate != this.chooseTicket[i].zbiPayDate) {
                             flag = false
+                            this.chooseTicket.splice(i, 1)
                             this.$message({
                                 message: "请选择预计还款日期相同的应付账款",
                                 type: "warning",
                             });
-                            return false;
+                            this.open = false;
+                            return true;
                         }
                     }
+                    if(flag){
+                        //合计
+                        this.getReTotal(this.chooseTicket);
+                        this.ticketList = this.chooseTicket;
+                        //更新附件信息
+                        this.getFile(this.ticketList);
+                    }
                 }
-                if(flag){
-                    //合计
-                    this.getReTotal(this.chooseTicket);
-                    this.ticketList = this.chooseTicket;
-                    //更新附件信息
-                    this.getFile(this.ticketList);
-                }
+              
                 this.open = false;
             } else {
                 this.$message({

front-vue/src/views/service/credit/addInformation.vue

@@ -522,12 +522,13 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
                     for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
                             flag = false
+                            this.chooseTicket.splice(i, 1)
                             this.$message({
                                 message: '请选择预计还款日期相同的应收账款',
                                 type: 'warning'
@@ -535,13 +536,13 @@ export default {
                             return false;
                         }
                     }
-                }
-                if(flag){
-                    //合计
-                    this.getReTotal(this.chooseTicket);
-                    this.ticketList = this.chooseTicket;
-                    //更新附件信息
-                    this.getFile(this.ticketList);
+                    if(flag){
+                        //合计
+                        this.getReTotal(this.chooseTicket);
+                        this.ticketList = this.chooseTicket;
+                        //更新附件信息
+                        this.getFile(this.ticketList);
+                    }
                 }
                 this.open = false;
         }else{

front-vue/src/views/service/credit/applyCreditEdit.vue

@@ -523,7 +523,7 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
@@ -531,6 +531,7 @@ export default {
                     for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
                             flag = false
+                            this.chooseTicket.splice(i, 1)
                             this.$message({
                                 message: '请选择应付企业相同的应付账款',
                                 type: 'warning'
@@ -539,6 +540,7 @@ export default {
                         }
                         if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
                             flag = false
+                            this.chooseTicket.splice(i, 1)
                             this.$message({
                                 message: '请选择预计还款日期相同的应付账款',
                                 type: 'warning'
@@ -546,15 +548,15 @@ export default {
                             return false;
                         }
                     }
-                }
-                if(flag){
-                    //合计
-                    this.getReTotal(this.chooseTicket);
-                    this.ticketList = this.chooseTicket;
-                    //更新附件信息
-                    this.getFile(this.ticketList);
-                    //开立方赋值
-                    this.$set(this.form, "openName",this.chooseTicket[0].payName);
+                    if(flag){
+                        //合计
+                        this.getReTotal(this.chooseTicket);
+                        this.ticketList = this.chooseTicket;
+                        //更新附件信息
+                        this.getFile(this.ticketList);
+                        //开立方赋值
+                        this.$set(this.form, "openName",this.chooseTicket[0].payName);
+                    }
                 }
                 this.open = false;
         }else{

front-vue/src/views/service/credit/creditApply.vue

@@ -433,7 +433,7 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
@@ -441,6 +441,7 @@ export default {
                     for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
                             flag = false
+                            this.chooseTicket.splice(i, 1)
                             this.$message({
                                 message: '请选择应付企业相同的应付账款',
                                 type: 'warning'
@@ -449,6 +450,7 @@ export default {
                         }
                         if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
                             flag = false
+                            this.chooseTicket.splice(i, 1)
                             this.$message({
                                 message: '请选择预计还款日期相同的应付账款',
                                 type: 'warning'
@@ -456,15 +458,15 @@ export default {
                             return false;
                         }
                     }
-                }
-                if(flag){
-                    //合计
-                    this.getReTotal(this.chooseTicket);
-                    this.ticketList = this.chooseTicket;
-                    //更新附件信息
-                    this.getFile(this.ticketList);
-                    //开立方赋值
-                    this.$set(this.form, "openName",this.chooseTicket[0].payName);
+                    if(flag){
+                        //合计
+                        this.getReTotal(this.chooseTicket);
+                        this.ticketList = this.chooseTicket;
+                        //更新附件信息
+                        this.getFile(this.ticketList);
+                        //开立方赋值
+                        this.$set(this.form, "openName",this.chooseTicket[0].payName);
+                    }
                 }
                 this.open = false;
         }else{

front-vue/src/views/service/credit/creditUpdate.vue

@@ -97,6 +97,7 @@
             </el-row>  
             <el-divider content-position="left" >应付账款</el-divider>
             <el-form-item  style="margin-left: 100px">
+                <el-button size="mini" type="success" @click="addPay">新增应付账款</el-button>
                  <el-button size="mini" type="primary" @click="openTicket">选择</el-button>
                  <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
                 <el-form-item label="合计金额:"> 
@@ -272,6 +273,12 @@
             <el-button size="mini" type="primary" @click="closeTicket">确认</el-button>
         </span>
         </el-dialog>
+        
+        <!-- 新增往来账款 -->
+        <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
+            <add-bill :companyId="form.zfiSupplierId" companyType="00" @addClick="emitAddClick"></add-bill>
+        </el-dialog>
+
         <!--预览-->
         <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
             <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
@@ -283,9 +290,10 @@
 import {getCreditDetail,getReceiverList,listCreditLine,getAvailableBalance,getAccountsPay,updateCredit,getFile} from "@/api/service/credit/credit";
 import {accAdd} from "@/utils/calculation";
 import {getToken} from "@/utils/auth";
+import AddBill from "@/views/service/bill/addBill";
 export default {
     name: "addCredit",
-    components: {},
+    components: {AddBill},
     data() {
         return {
             // 总条数
@@ -345,6 +353,7 @@ export default {
             },
             // 是否显示弹出层
             open: false,
+            openAddBill: false,
            //选择的应付账款
            payList:[],
            //现有的应付账款
@@ -403,7 +412,8 @@ export default {
             openFile:false,
             wordUrl: "",
             show:false,
-            heid:false    
+            heid:false,
+            chooseTicket:[]    
         };
     },
     watch:{
@@ -494,10 +504,11 @@ export default {
         },   
         //应付账款查询列表
         getAccountsPay() {
-            getAccountsPay(this.queryParamsPay).then((response) => {
+           return getAccountsPay(this.queryParamsPay).then((response) => {
                 this.payList = response.data.records;
                 this.selectChecked();
                 this.total = response.data.total;
+                return Promise.resolve(response)
             });
         },
         selectChecked() {
@@ -534,34 +545,41 @@ export default {
         // 确认选择
       closeTicket() {
         if(this.chooseTicket){
+                var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的应收企业
                     var receiveName = this.chooseTicket[0].receiveName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
                     for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(receiveName != this.chooseTicket[i].receiveName){
-                                this.$message({
-                                    message: '请选择应收企业相同的应付账款',
-                                    type: 'warning'
-                                });
-                                return;
+                            flag = false
+                            this.chooseTicket.splice(i, 1)
+                            this.$message({
+                                message: '请选择应收企业相同的应付账款',
+                                type: 'warning'
+                            });
+                            return false;
                         }
                         if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
-                                this.$message({
-                                    message: '请选择预计还款日期相同的应付账款',
-                                    type: 'warning'
-                                });
-                                return;
+                            flag = false
+                            this.chooseTicket.splice(i, 1)
+                            this.$message({
+                                message: '请选择预计还款日期相同的应付账款',
+                                type: 'warning'
+                            });
+                            return false;
                         }
                     }
+                    if(flag){
+                        //合计
+                        this.getReTotal(this.chooseTicket);
+                        this.ticketList = this.chooseTicket;
+                        //更新附件信息
+                        this.getFile(this.ticketList);
+                    }
                 }
-                //合计
-                this.getReTotal(this.chooseTicket);
-                this.ticketList = this.chooseTicket;
-                //更新附件信息
-                this.getFile(this.ticketList);
                 this.open = false;
         }else{
             this.$message({
@@ -920,6 +938,27 @@ export default {
       this.input=e.target.value
       this.form.zfiAmount=this.input
     },
+    //新增应付
+    addPay(){
+        this.openAddBill = true
+    },
+    //新增账款回调
+    emitAddClick(val){
+        var self = this
+        this.getAccountsPay().then((response) => {
+            //新增付款返回id直接选中
+            if (val) {
+                self.payList.forEach(element => {
+                    if(element.zbiId == val){
+                        // 将当前点击项选中
+                        self.chooseTicket.push(element)
+                        self.closeTicket()
+                    }
+                });
+            }
+        })
+        self.openAddBill = false
+    }
     
   }
 };

front-vue/src/views/service/credit/financeOpen.vue

@@ -4,6 +4,7 @@
                 <el-row>
                     <el-divider content-position="left" >应收账款</el-divider>
                 <el-form-item  style="margin-left: 100px">
+                    <el-button size="mini" type="success" @click="addPay">新增应收账款</el-button>
                     <el-button size="mini" type="primary" @click="openTicket">选择</el-button>
                     <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
                     <el-form-item label="合计金额:"> 
@@ -248,6 +249,12 @@
             <el-button size="mini" type="primary" @click="closeTicket">确认</el-button>
         </span>
         </el-dialog>
+        
+        <!-- 新增往来账款 -->
+        <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
+            <add-bill :companyId="form.zfiCoreId" companyType="01" @addClick="emitAddClick"></add-bill>
+        </el-dialog>
+
          <!--预览-->
         <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
             <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
@@ -260,9 +267,10 @@ import {listSupplierCreditLine,getAccountsCollection,getSupplierAvailableBalance
 import {getRandom} from "@/api/common/getRandom";
 import {accAdd} from "@/utils/calculation";
 import {getToken} from "@/utils/auth";
+import AddBill from "@/views/service/bill/addBill";
 export default {
     name: "financeOpen",
-    components: {},
+    components: {AddBill},
     data() {
         return {
             // 总条数
@@ -336,6 +344,7 @@ export default {
             },
             // 是否显示弹出层
             open: false,
+            openAddBill: false,
            //授信
            creditLineList:[],
            //接收方
@@ -382,7 +391,8 @@ export default {
             openFile:false,
             wordUrl: "",
             show:false,
-            heid:false
+            heid:false,
+            chooseTicket:[]
         };
     },
     created() {
@@ -430,10 +440,11 @@ export default {
         },
         //应收账款查询列表
         getAccountsCollection() {
-            getAccountsCollection(this.queryParamsPay).then((response) => {
+           return getAccountsCollection(this.queryParamsPay).then((response) => {
                 this.payList = response.data.records;
                 this.selectChecked();
                 this.total = response.data.total;
+                return Promise.resolve(response)
             });
         },
         resetQuerys() {
@@ -498,36 +509,43 @@ export default {
         // 确认选择
       closeTicket() {
         if(this.chooseTicket){
+                var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
                     for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
-                                this.$message({
-                                    message: '请选择应付企业相同的应付账款',
-                                    type: 'warning'
-                                });
-                                return;
+                            flag = false
+                            this.chooseTicket.splice(i, 1)
+                            this.$message({
+                                message: '请选择应付企业相同的应付账款',
+                                type: 'warning'
+                            });
+                            return false;
                         }
                         if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
-                                this.$message({
-                                    message: '请选择预计还款日期相同的应付账款',
-                                    type: 'warning'
-                                });
-                                return;
+                            flag = false
+                            this.chooseTicket.splice(i, 1)
+                            this.$message({
+                                message: '请选择预计还款日期相同的应付账款',
+                                type: 'warning'
+                            });
+                            return false;
                         }
                     }
+                    if(flag){
+                        //合计
+                        this.getReTotal(this.chooseTicket);
+                        this.ticketList = this.chooseTicket;
+                        //更新附件信息
+                        this.getFile(this.ticketList);
+                        //开立方赋值
+                        this.$set(this.form, "openName",this.chooseTicket[0].payName);
+                    }
                 }
-                //合计
-                this.getReTotal(this.chooseTicket);
-                this.ticketList = this.chooseTicket;
-                //更新附件信息
-                this.getFile(this.ticketList);
-                //开立方赋值
-                 this.$set(this.form, "openName",this.chooseTicket[0].payName);
                 this.open = false;
         }else{
             this.$message({
@@ -922,6 +940,27 @@ export default {
       this.input=e.target.value
       this.form.zfiAmount=this.input
     },
+    //新增应付
+    addPay(){
+        this.openAddBill = true
+    },
+    //新增账款回调
+    emitAddClick(val){
+        var self = this
+        this.getAccountsCollection().then((response) => {
+            //新增付款返回id直接选中
+            if (val) {
+                self.payList.forEach(element => {
+                    if(element.zbiId == val){
+                        // 将当前点击项选中
+                        self.chooseTicket.push(element)
+                        self.closeTicket()
+                    }
+                });
+            }
+        })
+        self.openAddBill = false
+    }
        
     }
 };

front-vue/src/views/service/credit/financeOpenUpdate.vue

@@ -22,6 +22,7 @@
                 <el-row>
                     <el-divider content-position="left" >应收账款</el-divider>
                 <el-form-item  style="margin-left: 100px">
+                    <el-button size="mini" type="success" @click="addPay">新增应收账款</el-button>
                     <el-button size="mini" type="primary" @click="openTicket">选择</el-button>
                     <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
                     <el-form-item label="合计金额:"> 
@@ -265,6 +266,12 @@
             <el-button size="mini" type="primary" @click="closeTicket">确认</el-button>
         </span>
         </el-dialog>
+        
+        <!-- 新增往来账款 -->
+        <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
+            <add-bill :companyId="form.zfiCoreId" companyType="01" @addClick="emitAddClick"></add-bill>
+        </el-dialog>
+
         <!--预览-->
         <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
             <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
@@ -276,9 +283,10 @@
 import {listSupplierCreditLine,getCreditDetail,getAccountsCollection,getSupplierAvailableBalance,updateCredit,getFile} from "@/api/service/credit/credit";
 import {accAdd} from "@/utils/calculation";
 import {getToken} from "@/utils/auth";
+import AddBill from "@/views/service/bill/addBill";
 export default {
     name: "addCredit",
-    components: {},
+    components: {AddBill},
     data() {
         return {
             // 总条数
@@ -355,6 +363,7 @@ export default {
             },
             // 是否显示弹出层
             open: false,
+            openAddBill: false,
            //授信
            creditLineList:[],
            //接收方
@@ -401,7 +410,8 @@ export default {
             openFile:false,
             wordUrl: "",
             show:false,
-            heid:false
+            heid:false,
+            chooseTicket:[]
         };
     },
     watch:{
@@ -476,10 +486,11 @@ export default {
         },
         //应收账款查询列表
         getAccountsCollection() {
-            getAccountsCollection(this.queryParamsPay).then((response) => {
+           return getAccountsCollection(this.queryParamsPay).then((response) => {
                 this.payList = response.data.records;
                 this.selectChecked();
                 this.total = response.data.total;
+                return Promise.resolve(response)
             });
         },
         resetQuerys() {
@@ -544,36 +555,43 @@ export default {
         // 确认选择
       closeTicket() {
         if(this.chooseTicket){
+                var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
                     for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
-                                this.$message({
-                                    message: '请选择应付企业相同的应付账款',
-                                    type: 'warning'
-                                });
-                                return;
+                            flag = false
+                            this.chooseTicket.splice(i, 1)
+                            this.$message({
+                                message: '请选择应付企业相同的应付账款',
+                                type: 'warning'
+                            });
+                            return false;
                         }
                         if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
-                                this.$message({
-                                    message: '请选择预计还款日期相同的应付账款',
-                                    type: 'warning'
-                                });
-                                return;
+                            flag = false
+                            this.chooseTicket.splice(i, 1)
+                            this.$message({
+                                message: '请选择预计还款日期相同的应付账款',
+                                type: 'warning'
+                            });
+                            return false;
                         }
                     }
+                    if(flag){
+                        //合计
+                        this.getReTotal(this.chooseTicket);
+                        this.ticketList = this.chooseTicket;
+                        //更新附件信息
+                        this.getFile(this.ticketList);
+                        //开立方赋值
+                        this.$set(this.form, "openName",this.chooseTicket[0].payName);
+                    }
                 }
-                //合计
-                this.getReTotal(this.chooseTicket);
-                this.ticketList = this.chooseTicket;
-                //附件
-                this.getFile(this.ticketList);
-                //开立方赋值
-                 this.$set(this.form, "openName",this.chooseTicket[0].payName);
                 this.open = false;
         }else{
             this.$message({
@@ -957,6 +975,27 @@ export default {
       this.input=e.target.value
       this.form.zfiAmount=this.input
     },
+    //新增应付
+    addPay(){
+        this.openAddBill = true
+    },
+    //新增账款回调
+    emitAddClick(val){
+        var self = this
+        this.getAccountsCollection().then((response) => {
+            //新增付款返回id直接选中
+            if (val) {
+                self.payList.forEach(element => {
+                    if(element.zbiId == val){
+                        // 将当前点击项选中
+                        self.chooseTicket.push(element)
+                        self.closeTicket()
+                    }
+                });
+            }
+        })
+        self.openAddBill = false
+    }
        
     }
 };

front-vue/src/views/service/credit/signFor.vue

@@ -3,6 +3,7 @@
         <el-form ref="form" :model="form" :rules="rules" :inline="true" style="margin-top: 20px" label-width="auto" >
             <el-divider content-position="left">签收</el-divider>
             <el-form-item  style="margin-left: 100px">
+                 <el-button size="mini" type="success" :disabled="isClick" @click="addPay">新增应收账款</el-button>
                  <el-button size="mini" type="primary" :disabled="isClick" @click="openTicket">选择</el-button>
                  <el-button size="mini" @click="deleteTicekt" :disabled="isClick" >清空全部</el-button>
                 <el-form-item label="合计金额:"> 
@@ -171,6 +172,12 @@
             <el-button size="mini" type="primary" @click="closeTicket">确认</el-button>
         </span>
         </el-dialog>
+        
+        <!-- 新增往来账款 -->
+        <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
+            <add-bill :companyId="form.zfiCoreId" companyType="01" @addClick="emitAddClick"></add-bill>
+        </el-dialog>
+
         <!--预览-->
         <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
             <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
@@ -183,9 +190,10 @@ import {getCreditDetail,getAvailableBalance,getAccountsCollection,getFile} from
 import {signFor} from "@/api/service/credit/creditHandle";
 import {accAdd} from "@/utils/calculation";
 import {getToken} from "@/utils/auth";
+import AddBill from "@/views/service/bill/addBill";
 export default {
     name: "addCredit",
-    components: {},
+    components: {AddBill},
     data() {
         return {
             // 总条数
@@ -200,6 +208,7 @@ export default {
             },
             // 是否显示弹出层
             open: false,
+            openAddBill: false,
            //选择的应收账款
            payList:[],
            //现有的应收账款
@@ -258,7 +267,8 @@ export default {
           openFile:false,
           wordUrl: "",
           show:false,
-          heid:false
+          heid:false,
+          chooseTicket:[]
           
         };
     },
@@ -355,10 +365,11 @@ export default {
             this.queryParamsPay.payId = this.zfiCoreId;
             //接收方
             this.queryParamsPay.zfiSupplierId = this.zfiSupplierId;
-            getAccountsCollection(this.queryParamsPay).then((response) => {
+           return getAccountsCollection(this.queryParamsPay).then((response) => {
                 this.payList = response.data.records;
                 this.selectChecked();
                 this.total = response.data.total;
+                return Promise.resolve(response)
             });
         },
         selectChecked() {
@@ -395,25 +406,30 @@ export default {
         // 确认选择
       closeTicket() {
         if(this.chooseTicket){
+                var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 1){
+                if(this.chooseTicket.length > 0){
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
                     for(var i = 0 ;i < this.chooseTicket.length;i++){
                         if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
-                                this.$message({
-                                    message: '请选择预计还款日期相同的应收账款',
-                                    type: 'warning'
-                                });
-                                return;
+                            flag = false
+                            this.chooseTicket.splice(i, 1)
+                            this.$message({
+                                message: '请选择预计还款日期相同的应收账款',
+                                type: 'warning'
+                            });
+                            return false;
                         }
                     }
+                    if(flag){
+                        //合计
+                        this.getReTotal(this.chooseTicket);
+                        this.ticketList = this.chooseTicket;
+                        //更新附件信息
+                        this.getFile(this.ticketList);
+                    }
                 }
-                //合计
-                this.getReTotal(this.chooseTicket);
-                this.ticketList = this.chooseTicket;
-                //更新附件信息
-                this.getFile(this.ticketList);
                 this.open = false;
         }else{
             this.$message({
@@ -728,6 +744,34 @@ export default {
         }
         this.openFile = true;
     },
+    //新增应付
+    addPay(){
+        if(this.form.zfiCoreId){
+            this.openAddBill = true
+        }else{
+            this.$message({
+                message: "开立方不能为空",
+                type: "warning",
+            });
+        }
+    },
+    //新增账款回调
+    emitAddClick(val){
+        var self = this
+        this.getAccountsCollection().then((response) => {
+            //新增付款返回id直接选中
+            if (val) {
+                self.payList.forEach(element => {
+                    if(element.zbiId == val){
+                        // 将当前点击项选中
+                        self.chooseTicket.push(element)
+                        self.closeTicket()
+                    }
+                });
+            }
+        })
+        self.openAddBill = false
+    }
   }
 };
 </script>