diff --git a/src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm b/src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm index 0073181b4cad00aae0bf32679ad8e58cfdd58d66..2ed90d52e469a828f35f51f0639a78bf259cd3a1 100644 --- a/src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm +++ b/src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm @@ -137,6 +137,7 @@ <bm:query-field field="posted_flag" queryOperator="="/> <bm:query-field field="returned_flag" queryOperator="="/> <bm:query-field field="reversed_flag" queryOperator="="/> + <bm:query-field field="confirmed_flag" queryOperator="="/> <bm:query-field field="period_name" queryOperator="="/> <bm:query-field field="payment_method_id" queryOperator="="/> <bm:query-field field="transaction_category" queryOperator="="/> @@ -170,7 +171,8 @@ <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/> <bm:data-filter name="query" expression="(not exists(select 1 from csh_transaction t where t.transaction_type = 'RECEIPT' and t.paid_byother_flag = 'T' and t.write_off_flag = 'FULL' and t.transaction_id = t1.transaction_id))"/> <!-- <bm:data-filter name="type" expression="t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT') and t1.returned_flag != 'FULL' and t1.reversed_flag = 'N' and nvl(t1.deposit_flag,'N')='N' "/>--> - <bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT',DECODE(t1.source_type,NULL,NULL,'DEPOSIT')) and t1.returned_flag != 'FULL' and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED')) "/> - <bm:data-filter name="position_code" expression="(((${@position_code} = '009' and t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'N') or (${@position_code} = '014' and t1.bp_category != 'TENANT') or (${@position_code} = '014' and t1.paid_byother_flag != 'N') and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1))" /> + <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.returned_flag != 'FULL' and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED')) "/> +<!-- <bm:data-filter name="position_code" expression="(((${@position_code} = '009' and t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'N') or ((${@position_code} = '014' and t1.bp_category != 'TENANT') or (${@position_code} = '014' and t1.paid_byother_flag != 'N')) and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1))" />--> + <bm:data-filter name="position_code" expression="((${@position_code} = '009' and (t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'F' and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)) or (${@position_code} = '014' and ((t1.bp_category != 'TENANT' or t1.paid_byother_flag != 'F') and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)))"/> </bm:data-filters> </bm:model> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/classes/hls/HLS301/hls_journal_header_v.lwm b/src/main/webapp/WEB-INF/classes/hls/HLS301/hls_journal_header_v.lwm index b7b9fc443a088584c5312c7fbb64165f752a847b..f8201ca9ea9b49d12ef4e09e877648e4335daad6 100644 --- a/src/main/webapp/WEB-INF/classes/hls/HLS301/hls_journal_header_v.lwm +++ b/src/main/webapp/WEB-INF/classes/hls/HLS301/hls_journal_header_v.lwm @@ -61,7 +61,7 @@ <bm:field name="re_journal_num"/> <bm:field name="re_sap_belnr"/> <bm:field name="created_by_n" expression="(select su.description from sys_user su where su.user_id = t1.CREATED_BY)"/> - <bm:field name="je_detail_count"/> + <bm:field name="je_detail_count"/> <bm:field name="sbo_num"/> <bm:field name="sbo_req_number"/> <bm:field name="reversed_19_flag"/> diff --git a/src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview b/src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview index 88f9973369772dff349fbe053174f0fb1d3f537d..7a157327838fd5afe2f2aa251050fa1e727ebd48 100644 --- a/src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview +++ b/src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview @@ -167,10 +167,10 @@ var updateData = []; for (var i = 0; i < datas.length; i++) { var confirmed_flag = datas[i].get('confirmed_flag'); - // if(confirmed_flag!='ACCAUDITING'&&confirmed_flag!='DEBTAUDITING'){ - // $L.showInfoMessage("提示",'请选择新增确认中的收款单据'); - // return; - // } + if(confirmed_flag!='ACCAUDITING'){ + $L.showInfoMessage("提示",'请选择收款确认中的收款单据'); + return; + } // //需要债权用户和会计担当才能驳回单据 // if(confirmed_flag=='ACCAUDITING'){ // if(!judgeRoles("00321")){ diff --git a/src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview b/src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview index 45aeecadd92b9e0571664672ed197449aae378c2..8a66132270a8caf8bb5a29d9905977e5c633da75 100644 --- a/src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview +++ b/src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview @@ -514,6 +514,13 @@ ]]></script> <a:dataSets> <a:dataSet id="batch_status_ds" lookupCode="CSH531_BATCH_STATUS"/> + <a:dataSet id="confirmed_flag_ds"> + <a:datas> + <a:record code_value="ACCAUDITED" code_value_name="收款已确认"/> + <a:record code_value="WF_APPROVING" code_value_name="核销确认中"/> + <a:record code_value="APPROVED" code_value_name="核销已确认"/> + </a:datas> + </a:dataSet> <a:dataSet id="csh531n_ds_collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES"/> <a:dataSet id="currency_ds"> <a:datas dataSource="/model/currency"/> @@ -528,6 +535,10 @@ <a:dataSet id="csh_transaction_receipt_write_off_query_ds" autoCreate="true"> <a:fields> <a:field name="write_off_flag"/> + <a:field name="cw_flag" defaultValue="Y"/> + <a:field name="confirmed_flag_desc" options="confirmed_flag_ds" valueField="code_value" + displayField="code_value_name" returnField="confirmed_flag" defaultValue="收款已确认"/> + <a:field name="confirmed_flag" defaultValue="ACCAUDITED"/> <a:field name="write_off_flag_desc" displayField="code_value_name" options="con_write_off_flag_ds" returnField="write_off_flag" valueField="code_value"/> <a:field name="status" displayField="code_value_name" options="status_ds" @@ -621,6 +632,8 @@ prompt="核销状态"/> <!-- <a:comboBox name="collection_classes_desc"--> <!-- bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="款项用途"/>--> + <a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" + prompt="单据审批状态"/> </a:box> </a:fieldSet> </a:form> diff --git a/src/main/webapp/modules/hls/HLS301/hls_journal_query.lview b/src/main/webapp/modules/hls/HLS301/hls_journal_query.lview index bcc87cd5709e5e8a842af3cc410ef63f66715494..4e74211f5f2983b6fdaee1432bad9963be295700 100644 --- a/src/main/webapp/modules/hls/HLS301/hls_journal_query.lview +++ b/src/main/webapp/modules/hls/HLS301/hls_journal_query.lview @@ -113,7 +113,7 @@ } function journal_import(datas) { - lock_current_window(); + lock_current_window('正在执行...'); Leaf.request({ url: $('export_jum_link').getUrl(), para: datas, @@ -319,7 +319,7 @@ }); }); } else { - lock_current_window2('正在传送,请勿离开当前界面。。。'); + Leaf.Masker.mask(Ext.getBody(),'正在传输...请勿离开当前界面...'); Leaf.request({ url: $('hls301_send_data').getUrl(), para: queryParams, @@ -328,14 +328,14 @@ msg: '已提交请求', duration: 3000 }); - lock_current_window2(); + Leaf.Masker.unmask(Ext.getBody()); $('hls_journal_header_result_ds').query(); }, failure: function() { - lock_current_window2(); + Leaf.Masker.unmask(Ext.getBody()); }, error: function() { - lock_current_window2(); + Leaf.Masker.unmask(Ext.getBody()); }, scope: this }); @@ -345,7 +345,7 @@ function hls301_bp_send() { Leaf.showConfirm('提示', '商业伙伴(项目已创建合同)同步至SBO,(上限400)您确定继续吗?', function() { - lock_current_window(); + Leaf.Masker.mask(Ext.getBody(),'正在传输...请勿离开当前界面...'); Leaf.request({ url: $('hls301_send_bp_to_sbo').getUrl(), success: function() { @@ -353,14 +353,14 @@ msg: '提交成功', duration: 3000 }); - unlock_current_window(); - //$('hls_journal_header_result_ds').query(); + Leaf.Masker.unmask(Ext.getBody()); + $('hls_journal_header_result_ds').query(); }, failure: function() { - unlock_current_window(); + Leaf.Masker.unmask(Ext.getBody()); }, error: function() { - unlock_current_window(); + Leaf.Masker.unmask(Ext.getBody()); }, scope: this }); diff --git a/src/main/webapp/modules/hls/HLS530/hls_journal_maintain.lview b/src/main/webapp/modules/hls/HLS530/hls_journal_maintain.lview index 722edddc82d0fbf7bf118ea6a250847cc1503928..8e6c0189d85c02deb640a6029389806698f1e237 100644 --- a/src/main/webapp/modules/hls/HLS530/hls_journal_maintain.lview +++ b/src/main/webapp/modules/hls/HLS530/hls_journal_maintain.lview @@ -41,11 +41,11 @@ parent.shMenu('show'); } - function lock_current_window() { - Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}'); - } + // function lock_current_window() { + // Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}'); + // } - function lock_current_window2(msg) { + function lock_current_window(msg) { Leaf.Masker.mask(Ext.getBody(), msg); } @@ -292,7 +292,7 @@ function hls301_bp_send() { Leaf.showConfirm('提示', '商业伙伴(项目已创建合同)同步至SBO,(上限400)您确定继续吗?', function() { - lock_current_window(); + Leaf.Masker.mask(Ext.getBody(),'正在传输...请勿离开当前界面...'); Leaf.request({ url: $('hls301_send_bp_to_sbo').getUrl(), success: function() { @@ -300,14 +300,14 @@ msg: '提交成功', duration: 3000 }); - unlock_current_window(); + Leaf.Masker.unmask(Ext.getBody()); //$('hls_journal_header_result_ds').query(); }, failure: function() { - unlock_current_window(); + Leaf.Masker.unmask(Ext.getBody()); }, error: function() { - unlock_current_window(); + Leaf.Masker.unmask(Ext.getBody()); }, scope: this }); @@ -361,7 +361,7 @@ queryParams['batch_flag'] = batch_flag; /* if (count > limit) { Leaf.showConfirm('提示', '由于凭证行数超过'+limit+'行,传输至SBO后不能立即得到返回结果,您确定继续吗?', function() { */ - lock_current_window2('正在传送,请勿离开当前界面。。。'); + Leaf.Masker.mask(Ext.getBody(),'正在传输...请勿离开当前界面...'); Leaf.request({ url: $('hls301_send_data').getUrl(), para: queryParams, @@ -370,14 +370,14 @@ msg: '已提交请求', duration: 3000 }); - unlock_current_window(); + Leaf.Masker.unmask(Ext.getBody()); $('hls_journal_header_result_ds').query(); }, failure: function() { - unlock_current_window(); + Leaf.Masker.unmask(Ext.getBody()); }, error: function() { - unlock_current_window(); + Leaf.Masker.unmask(Ext.getBody()); }, scope: this });