建机收款方式调整重新核销

src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview

@@ -848,6 +848,7 @@
             var operatRs_date_count=0;
             var interfaceRs_date_count=0;
             var interfaceRs_peanlty_count=0;
+			var interfaceRs_contract_number;
             var transaction_date = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord().get('transaction_date');
             var transaction_type = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord().get('transaction_type');
             //核销为融租保证金
@@ -879,17 +880,39 @@
             //校验当合同的扣款方式为“电汇”时，合同收款规则不包含罚息核销中含有罚息则提示
             for(var k=0;k<interfaceRs.length;k++){
               if(interfaceRs[k].get('is_include_pealty')=='N' &&interfaceRs[k].get('write_off_cf_item')=='9'){
-               interfaceRs_peanlty_count = plus(interfaceRs_peanlty_count, 1);
+               interfaceRs_contract_number=interfaceRs[k].get('contract_number');
+			   interfaceRs_peanlty_count = plus(interfaceRs_peanlty_count, 1);
                      break;
               }
             }
              var promt;
-            if(depositRs_date_count>0 ||operatRs_date_count>0){
-              promt =(transaction_date.getMonth()+1)+'月营业月结未确认,收款日期为'+Leaf.formatDate(transaction_date)+',与当前选择<br/>保证金的核销日期存在跨月,会影响会计凭证日期,确认<br/>要提交吗？'
+			 var promt1;
+			 var promt2;
+			 var promt3;
+             if((depositRs_date_count>0 ||operatRs_date_count>0)&&interfaceRs_peanlty_count>0){
+             if(depositRs_date_count>0 ||operatRs_date_count>0){
+              promt1 =(transaction_date.getMonth()+1)+'月营业月结未确认,收款日期为'+Leaf.formatDate(transaction_date)+',与当前选择保证金的核销日期存在跨月;'
+              }
+              if(interfaceRs_peanlty_count>0){
+         	  promt2 = '列表中待核销的现金流和当前合同'+interfaceRs_contract_number+'对应的收款规则不一致'
+			   }
+			  promt3 =',确认要提交吗？';
+              promt =promt1+promt2+promt3;
+            }else if(interfaceRs_date_count>0&&interfaceRs_peanlty_count>0){
+              if(interfaceRs_date_count>0){
+                promt1 = interfaceRs_date.split('-')[0]+'-'+interfaceRs_date.split('-')[1]+'月营业月结未确认,与当前选择的核销日期存在跨月，会影响会计凭证日期;'
+              }
+              if(interfaceRs_peanlty_count>0){
+                 promt2 = '列表中待核销的现金流和当前合同'+interfaceRs_contract_number+'对应的收款规则不一致'
+			   }
+			  promt3 =',确认要提交吗？';
+              promt=promt1+promt2+promt3;
+			}else if(depositRs_date_count>0 ||operatRs_date_count>0){
+			    promt =(transaction_date.getMonth()+1)+'月营业月结未确认,收款日期为'+Leaf.formatDate(transaction_date)+',与当前选择<br/>保证金的核销日期存在跨月,会影响会计凭证日期,确认<br/>要提交吗？'
             }else if(interfaceRs_date_count>0){
               promt = interfaceRs_date.split('-')[0]+'-'+interfaceRs_date.split('-')[1]+'月营业月结未确认,与当前选择的核销日期存在<br/>跨月，会影响会计凭证日期，确认要提交吗？'
             }else if(interfaceRs_peanlty_count>0){
-              promt = '列表中待核销的现金流和当前合同对应的收款规则不一致，请确认是否核销?'
+              promt = '列表中待核销的现金流和当前合同'+interfaceRs_contract_number+'对应的收款规则不一致，请确认是否核销?'
             }else{
               promt = '确认提交复核吗?'
             }