Merge branch 'master' of http://git.minpay.cc/SupplyChain/front

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

@@ -484,6 +484,8 @@ export default {
             this.issuedAmount = this.smallToBig(this.form.zfiAmount);
         },
         selectChecked() {
+            //清空选择
+            this.$refs.tablePay && this.$refs.tablePay.clearSelection();
             this.ticketList.forEach((item) => {
                 this.payList.forEach((row) => {
                     if (row.zbiId == item.zbiId) {
@@ -528,43 +530,38 @@ export default {
             if (this.chooseTicket) {
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if (this.chooseTicket.length > 0) {
+                if (this.chooseTicket.length > 1) {
                     //获取选中第一个的应收企业
                     var receiveName = this.chooseTicket[0].receiveName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for (var i = 0; i < this.chooseTicket.length; i++) {
+                    for (var i = 1; i < this.chooseTicket.length; i++) {
                         if (receiveName != this.chooseTicket[i].receiveName) {
                             flag = false
-                            this.chooseTicket.splice(i, 1)
                             this.$message({
                                 message: "请选择应收企业相同的应付账款",
                                 type: "warning",
                             });
-                            this.open = false;
-                            return false;
-                        }
-                        if (zbiPayDate != this.chooseTicket[i].zbiPayDate) {
-                            flag = false
-                            this.chooseTicket.splice(i, 1)
+                            break;
+                        }else if (zbiPayDate != this.chooseTicket[i].zbiPayDate) {
+                            flag = false;
                             this.$message({
                                 message: "请选择预计还款日期相同的应付账款",
                                 type: "warning",
                             });
-                            this.open = false;
-                            return false;
+                            break;
                         }
                     }
-                    if(flag){
-                        //合计
-                        this.getReTotal(this.chooseTicket);
-                        this.ticketList = this.chooseTicket;
-                        //更新附件信息
-                        this.getFile(this.ticketList);
-                    }
                 }
-              
-                this.open = false;
+                if(flag){
+                    //合计
+                    this.getReTotal(this.chooseTicket);
+                    this.ticketList = this.chooseTicket;
+                    //更新附件信息
+                    this.getFile(this.ticketList);
+                    this.open = false;
+                }
+                
             } else {
                 this.$message({
                     message: "请选择应付账款",

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

@@ -474,6 +474,8 @@ export default {
             });
         },
         selectChecked() {
+             //清空选择
+            this.$refs.tablePay && this.$refs.tablePay.clearSelection();
             this.ticketList.forEach((item) => {
                 this.payList.forEach(row => {
                 if (row.zbiId == item.zbiId) {
@@ -520,20 +522,19 @@ export default {
         // 确认选择
       closeTicket() {
         if(this.chooseTicket){
-                var flag = true;
+               var flag = true;
                 //如果长度大于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({
+                            flag = false;
+                             this.$message({
                                 message: '请选择预计还款日期相同的应收账款',
                                 type: 'warning'
                             });
-                            return false;
+                            break;
                         }
                     }
                     if(flag){
@@ -542,9 +543,10 @@ export default {
                         this.ticketList = this.chooseTicket;
                         //更新附件信息
                         this.getFile(this.ticketList);
+                        this.open = false;
                     }
                 }
-                this.open = false;
+                
         }else{
             this.$message({
             message: '请选择应收账款',

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

@@ -496,6 +496,8 @@ export default {
             this.issuedAmount = this.smallToBig(this.form.zfiAmount);
         },
         selectChecked() {
+              //清空选择
+            this.$refs.tablePay && this.$refs.tablePay.clearSelection();
             this.ticketList.forEach((item) => {
                 this.payList.forEach(row => {
                 if (row.zbiId == item.zbiId) {
@@ -523,29 +525,27 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 0){
+                if(this.chooseTicket.length > 1){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 0 ;i < this.chooseTicket.length;i++){
+                    for(var i = 1 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
                             flag = false
-                            this.chooseTicket.splice(i, 1)
                             this.$message({
                                 message: '请选择应付企业相同的应付账款',
                                 type: 'warning'
                             });
-                            return false;
-                        }
-                        if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
+                            break;
+                        }else if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
                             flag = false
                             this.chooseTicket.splice(i, 1)
                             this.$message({
                                 message: '请选择预计还款日期相同的应付账款',
                                 type: 'warning'
                             });
-                            return false;
+                            break;
                         }
                     }
                     if(flag){
@@ -554,11 +554,12 @@ export default {
                         this.ticketList = this.chooseTicket;
                         //更新附件信息
                         this.getFile(this.ticketList);
+                        this.open = false;
                         //开立方赋值
                         this.$set(this.form, "openName",this.chooseTicket[0].payName);
                     }
                 }
-                this.open = false;
+                
         }else{
             this.$message({
             message: '请选择应收账款',

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

@@ -393,6 +393,8 @@ export default {
             this.issuedAmount = this.smallToBig(this.form.zfiAmount);
         },
         selectChecked() {
+             //清空选择
+            this.$refs.tablePay && this.$refs.tablePay.clearSelection();
             this.ticketList.forEach((item) => {
                 this.payList.forEach(row => {
                 if (row.zbiId == item.zbiId) {
@@ -433,29 +435,26 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 0){
+                if(this.chooseTicket.length > 1){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 0 ;i < this.chooseTicket.length;i++){
+                    for(var i = 1 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
-                            flag = false
-                            this.chooseTicket.splice(i, 1)
+                            flag = false;
                             this.$message({
                                 message: '请选择应付企业相同的应付账款',
                                 type: 'warning'
                             });
-                            return false;
-                        }
-                        if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
-                            flag = false
-                            this.chooseTicket.splice(i, 1)
+                            break;
+                        }else if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
+                            flag = false;
                             this.$message({
                                 message: '请选择预计还款日期相同的应付账款',
                                 type: 'warning'
                             });
-                            return false;
+                           break;
                         }
                     }
                     if(flag){
@@ -464,11 +463,12 @@ export default {
                         this.ticketList = this.chooseTicket;
                         //更新附件信息
                         this.getFile(this.ticketList);
+                        this.open = false;
                         //开立方赋值
                         this.$set(this.form, "openName",this.chooseTicket[0].payName);
                     }
                 }
-                this.open = false;
+                
         }else{
             this.$message({
             message: '请选择应收账款',

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

@@ -520,6 +520,8 @@ export default {
             });
         },
         selectChecked() {
+             //清空选择
+            this.$refs.tablePay && this.$refs.tablePay.clearSelection();
             this.ticketList.forEach((item) => {
                 this.payList.forEach(row => {
                 if (row.zbiId == item.zbiId) {
@@ -555,29 +557,26 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 0){
+                if(this.chooseTicket.length > 1){
                     //获取选中第一个的应收企业
                     var receiveName = this.chooseTicket[0].receiveName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 0 ;i < this.chooseTicket.length;i++){
+                    for(var i = 1 ;i < this.chooseTicket.length;i++){
                         if(receiveName != this.chooseTicket[i].receiveName){
-                            flag = false
-                            this.chooseTicket.splice(i, 1)
+                            flag = false;
                             this.$message({
                                 message: '请选择应收企业相同的应付账款',
                                 type: 'warning'
                             });
-                            return false;
-                        }
-                        if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
-                            flag = false
-                            this.chooseTicket.splice(i, 1)
+                            break;
+                        }else if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
+                            flag = false;
                             this.$message({
                                 message: '请选择预计还款日期相同的应付账款',
                                 type: 'warning'
                             });
-                            return false;
+                            break;
                         }
                     }
                     if(flag){
@@ -586,9 +585,10 @@ export default {
                         this.ticketList = this.chooseTicket;
                         //更新附件信息
                         this.getFile(this.ticketList);
+                        this.open = false;
                     }
                 }
-                this.open = false;
+                
         }else{
             this.$message({
             message: '请选择应付账款',

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

@@ -469,6 +469,8 @@ export default {
             this.issuedAmount = this.smallToBig(this.form.zfiAmount);
         },
         selectChecked() {
+            //清空选择
+            this.$refs.tablePay && this.$refs.tablePay.clearSelection();
             this.ticketList.forEach((item) => {
                 this.payList.forEach(row => {
                 if (row.zbiId == item.zbiId) {
@@ -511,29 +513,26 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 0){
+                if(this.chooseTicket.length > 1){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 0 ;i < this.chooseTicket.length;i++){
+                    for(var i = 1 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
-                            flag = false
-                            this.chooseTicket.splice(i, 1)
+                            flag = false;
                             this.$message({
                                 message: '请选择应付企业相同的应付账款',
                                 type: 'warning'
                             });
-                            return false;
-                        }
-                        if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
-                            flag = false
-                            this.chooseTicket.splice(i, 1)
+                            break;
+                        }else if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
+                            flag = false;
                             this.$message({
                                 message: '请选择预计还款日期相同的应付账款',
                                 type: 'warning'
                             });
-                            return false;
+                           break;
                         }
                     }
                     if(flag){
@@ -544,9 +543,10 @@ export default {
                         this.getFile(this.ticketList);
                         //开立方赋值
                         this.$set(this.form, "openName",this.chooseTicket[0].payName);
+                        this.open = false;
                     }
                 }
-                this.open = false;
+                
         }else{
             this.$message({
             message: '请选择应收账款',

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

@@ -515,6 +515,8 @@ export default {
             this.issuedAmount = this.smallToBig(this.form.zfiAmount);
         },
         selectChecked() {
+             //清空选择
+            this.$refs.tablePay && this.$refs.tablePay.clearSelection();
             this.ticketList.forEach((item) => {
                 this.payList.forEach(row => {
                 if (row.zbiId == item.zbiId) {
@@ -557,29 +559,27 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 0){
+                if(this.chooseTicket.length > 1){
                     //获取选中第一个的应付企业
                     var payName = this.chooseTicket[0].payName;
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 0 ;i < this.chooseTicket.length;i++){
+                    for(var i = 1 ;i < this.chooseTicket.length;i++){
                         if(payName != this.chooseTicket[i].payName){
-                            flag = false
-                            this.chooseTicket.splice(i, 1)
+                            flag = false;
                             this.$message({
                                 message: '请选择应付企业相同的应付账款',
                                 type: 'warning'
                             });
-                            return false;
+                            break;
                         }
                         if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
-                            flag = false
-                            this.chooseTicket.splice(i, 1)
+                            flag = false;
                             this.$message({
                                 message: '请选择预计还款日期相同的应付账款',
                                 type: 'warning'
                             });
-                            return false;
+                            break;
                         }
                     }
                     if(flag){
@@ -590,9 +590,10 @@ export default {
                         this.getFile(this.ticketList);
                         //开立方赋值
                         this.$set(this.form, "openName",this.chooseTicket[0].payName);
+                        this.open = false;
                     }
                 }
-                this.open = false;
+                
         }else{
             this.$message({
             message: '请选择应收账款',

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

@@ -438,6 +438,8 @@ export default {
             });
         },
         selectChecked() {
+             //清空选择
+            this.$refs.tablePay && this.$refs.tablePay.clearSelection();
             this.ticketList.forEach((item) => {
                 this.payList.forEach(row => {
                 if (row.zbiId == item.zbiId) {
@@ -473,18 +475,17 @@ export default {
         if(this.chooseTicket){
                 var flag = true;
                 //如果长度大于1，则需要进行对比应收企业和预计还款日期是否一致
-                if(this.chooseTicket.length > 0){
+                if(this.chooseTicket.length > 1){
                     //获取选中第一个的预计还款日期
                     var zbiPayDate = this.chooseTicket[0].zbiPayDate;
-                    for(var i = 0 ;i < this.chooseTicket.length;i++){
+                    for(var i = 1 ;i < this.chooseTicket.length;i++){
                         if(zbiPayDate != this.chooseTicket[i].zbiPayDate){
-                            flag = false
-                            this.chooseTicket.splice(i, 1)
+                            flag = false;
                             this.$message({
                                 message: '请选择预计还款日期相同的应收账款',
                                 type: 'warning'
                             });
-                            return false;
+                           break;
                         }
                     }
                     if(flag){
@@ -493,9 +494,10 @@ export default {
                         this.ticketList = this.chooseTicket;
                         //更新附件信息
                         this.getFile(this.ticketList);
+                        this.open = false;
                     }
                 }
-                this.open = false;
+               
         }else{
             this.$message({
             message: '请选择应收账款',