收款反冲调整04

src/main/webapp/WEB-INF/classes/csh/CSH531F/csh_transaction_recoi_query.lwm

@@ -173,7 +173,7 @@
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} AND t1.reversed_flag = 'N' and t1.returned_flag != 'FULL')"/>
-        <bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT',DECODE(${@cw_flag},'Y',NULL,DECODE(t1.source_type,NULL,NULL,'DEPOSIT')))  and t1.confirmed_flag in ('ACCAUDITED','APPROVED','WF_REJECTED')) "/>
+        <bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT','DEPOSIT',DECODE(${@cw_flag},'Y',NULL,DECODE(t1.source_type,NULL,NULL,'DEPOSIT')))  and t1.confirmed_flag in ('ACCAUDITED','APPROVED','WF_REJECTED')) "/>
         <bm:data-filter name="position_code" expression="(((${@cw_flag} = 'Y') or (${@position_code} = '009' and t1.created_by != ${/session/@user_id} and (t1.paid_byother_flag = 'F' and t1.bp_category = 'TENANT' and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)) or (${@position_code} = '014' and t1.created_by != ${/session/@user_id} and ((((t1.paid_byother_flag != 'F' or t1.bp_category != 'TENANT')) or t1.transaction_type = 'DEPOSIT') and t1.confirmed_flag != 'ACCAUDITED' and t1.created_by != ${/session/@user_id}) or (${/session/@user_id} = 1))))"/>
         <bm:data-filter name="write_off_flag_desc" expression="(t1.write_off_flag not in('FULL','PARTIAL'))"/>
 

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

@@ -107,8 +107,8 @@
                     return;
                 }
                 //不是新增就报错
-                if (confirmed_flag != 'NEW' && confirmed_flag != 'CT_REJECTED') {
-                    $L.showInfoMessage("提示", '请选择单据为新建或收款退回的数据', null, null);
+                if (confirmed_flag != 'NEW' && confirmed_flag != 'CT_REJECTED' && confirmed_flag != 'ACCAUDITED_RECOI') {
+                    $L.showInfoMessage("提示", '请选择单据为新建、收款确认反冲、收款退回的数据', null, null);
                     $('csh510_csh_trx_bank_apply_new').enable();
                     return;
                 }
@@ -252,7 +252,7 @@
                 } else {
                     return value;
                 }*/
-                if(record.get('confirmed_flag')=='NEW' || record.get('confirmed_flag') == 'CT_REJECTED'){
+                if(record.get('confirmed_flag')=='NEW' || record.get('confirmed_flag') == 'CT_REJECTED' || record.get('confirmed_flag')=='ACCAUDITED_RECOI'){
                     url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true'+'&import_source='+ record.get('import_source');
                 }else{
                     url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false';