I-19567 【建机】混合类款项校验注释

src/main/webapp/modules/csh/CSH1400/csh_abc_excel_import.lview

@@ -59,12 +59,12 @@
                         //不将这条数据传递到数组中
                         continue;
                     }
-                    if (record.get('collection_classes') == 'COMBINED') {
+                     /*if (record.get('collection_classes') == 'COMBINED') {
                         if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
                             Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
                             return;
                         }
-                    }
+                    }*/
                     //否则的话添加必要的字段
                     record.set('receipt_type', 'IMPORT');
                     record.set('bank_account_num', record.get('bank_num'));

src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview

@@ -80,12 +80,12 @@
 
         function csh511_receipt_save() {
             var record=$('csh_transaction_receipt_head_ds').getAt(0);
-			 if (record.get('collection_classes') == 'COMBINED') {
+			 /*if (record.get('collection_classes') == 'COMBINED') {
                 if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
                     Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
                     return;
                 }
-            }
+            } */
             // Leaf.Masker.mask(Ext.getBody());
             // Leaf.request({
             //     url: $('csh510_update_bp_info_link').getUrl(),

src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview

@@ -55,12 +55,12 @@
                         //不将这条数据传递到数组中
                         continue;
                     }
-					if (record.get('collection_classes') == 'COMBINED') {
+					/*if (record.get('collection_classes') == 'COMBINED') {
                         if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
                             Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
                             return;
                         }
-                    }
+                    }*/
                     //否则的话添加必要的字段
                     record.set('receipt_type', 'IMPORT');
                     record.set('bank_account_num', record.get('bank_num'));

src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview

@@ -95,13 +95,13 @@
             $('csh511_receipt_save').disable();
             if ($('csh_transaction_receipt_head_ds').validate()) {
                 var record = $('csh_transaction_receipt_head_ds').getAt(0);
-				if (record.get('collection_classes') == 'COMBINED') {
+				/*if (record.get('collection_classes') == 'COMBINED') {
                     if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
                         Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
                         $('csh511_receipt_save').enable();
                         return;
                     }
-                }
+                }*/
                 if (flag != 'Y') {
                     Leaf.Masker.mask(Ext.getBody(), '${l:HLS.SAVING}');
                 }