I-22424【建机】营业反冲违约金，涉及反冲会计核销的违约金和租金的不同处理调整

src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview

@@ -139,8 +139,8 @@
                             }
                             //校验必须先核销批次较大的  18083 2023/8/23
                            for (var j = 0; j < records.length; j++) {
-                           if (unR[i].get('gld_batch_id')>records[j].get('gld_batch_id')) {
-                                Leaf.showInfoMessage("提示", "此现金事务下存在核销批次较大的批次，请先反冲！");
+                           if (unR[i].get('gld_batch_id')>records[j].get('gld_batch_id') && unR[i].get('write_off_type')!='ADVANCE_ADVANCE_RECEIPT') {
+                                 Leaf.showInfoMessage("提示", "此现金事务下存在核销批次较大的批次，请先反冲！");
                                 return;
                                }
                             }

src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_wfl.lview

@@ -23,7 +23,14 @@
         <a:link id="csh514_write_wfl_attach_win_link" url="${/request/@context_path}/uploadFile.lview"/>
         <a:link id="csh514_write_wfl_attach_down_link" url="${/request/@context_path}/downloadFile.lview"/>
         <script type="text/javascript"><![CDATA[
+        function onLoad_reverseDs(ds) {
+           if ('${/model/advance_recipt_flag/record/@advance_recipt_flag}' =='Y'){
+           var records=ds.getCurrentRecord();
+           records.set('gld_rent_flag','Y');
+           }
+
 
+       }
         function csh514_write_off_reverse_return() {
             $('${/parameter/@winId}').close();
         }
@@ -129,6 +136,9 @@
                     <a:field name="extend_month_flag"/>
                     <a:field name="gld_rent_flag"/>
                 </a:fields>
+                <a:events>
+                     <a:event name="load" handler="onLoad_reverseDs"/>
+                </a:events>
             </a:dataSet>
             <a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_result_ds" autoQuery="true" fetchAll="true"
                        model="csh.CSH510.csh_write_off_wfl_query" pageSize="15"
@@ -210,8 +220,7 @@
                        }
                     if ('${/model/advance_recipt_flag/record/@advance_recipt_flag}' =='Y'){
                       headers_ds.getField('gld_rent_flag').setReadOnly(true);
-                      document.getElementById("gld_rent_id").checked = true;
-                   }
+                      }
 
                 }
 

src/main/webapp/modules/csh/CSH531C/csh_bank_transfer_confirme.lview

@@ -344,7 +344,8 @@
             var depositDisplayFlag = 'N';
             var advanceDisplayFlag = 'N';
             var approval_flag = '${/model/result_position/record/@approval_enbale}' || 'N';
-
+            //预收款标志
+            var advanceReciptFlag ='N';
             if (approval_flag == 'Y') {
                 readOnly = 'Y';
                 if (status == 'APPROVED') {
@@ -372,6 +373,10 @@
                     depositDisplayFlag = 'Y';
                 }
             }
+            //仅预收款展示预收款核销为预收款tab页
+            if(transaction_type=='ADVANCE_RECEIPT'){
+             advanceReciptFlag ='Y';
+            }
 
             var win = new Leaf.Window({
                 id: 'csh_write_off_window',
@@ -387,6 +392,7 @@
                     bp_bank_account_name: record.get('bp_bank_account_name'),
                     bp_id: record.get('bp_id'),
                     advanceDisplayFlag: advanceDisplayFlag,
+                    advanceReciptFlag:advanceReciptFlag,
                     readOnly: readOnly,
                     interfaceQueryFlag: interfaceQueryFlag,
                     approval_flag: approval_flag,