Commit 3e422152 authored by 18083's avatar 18083

跨域核销反冲追加会计罚息改造

parent 251c8c8e
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
t.ref_d04, t.ref_d04,
t.ref_d05, t.ref_d05,
t.wfl_instance_id, t.wfl_instance_id,
t.csh_transaction_atm_id,
nvl(t.gld_rent_flag,'N') gld_rent_flag,
t.approval_status, t.approval_status,
nvl(t.ignore_invoice_check_flag,'N') ignore_invoice_check_flag, nvl(t.ignore_invoice_check_flag,'N') ignore_invoice_check_flag,
nvl(t.extend_month_flag,'N') extend_month_flag nvl(t.extend_month_flag,'N') extend_month_flag
......
...@@ -28,8 +28,11 @@ ...@@ -28,8 +28,11 @@
p_transaction_wfl_id =>${@transaction_wfl_id}, p_transaction_wfl_id =>${@transaction_wfl_id},
p_check_flag =>${@check_flag}, p_check_flag =>${@check_flag},
p_extend_month_flag =>${@extend_month_flag}, p_extend_month_flag =>${@extend_month_flag},
p_gld_rent_flag =>${@gld_rent_flag},
p_user_id => ${/session/@user_id} p_user_id => ${/session/@user_id}
); );
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model> </bm:model>
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
p_transaction_date => to_date(${@transaction_date}, 'yyyy-mm-dd'), p_transaction_date => to_date(${@transaction_date}, 'yyyy-mm-dd'),
p_description => ${@description}, p_description => ${@description},
p_note => ${@note}, p_note => ${@note},
p_csh_transaction_atm_id => ${@csh_transaction_atm_id},
p_user_id => ${/session/@user_id} p_user_id => ${/session/@user_id}
); );
end; end;
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2025-02-10下午03:25:19
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select csh_transaction_wfl_pkg.extend_gld_rent_check(p_transaction_wfl_id => ${@transaction_wfl_id}) rent_check_flag from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select csh_transaction_list_s.nextval transaction_list_id from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="transaction_list_id"/>
</bm:fields>
</bm:model>
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<a:init-procedure> <a:init-procedure>
<a:model-query fetchAll="true" model="basic.hls_sys_time_default_value" rootPath="default_value"/> <a:model-query fetchAll="true" model="basic.hls_sys_time_default_value" rootPath="default_value"/>
<a:model-query fetchAll="true" model="csh.CSH510.csh_transaction_query" rootPath="csh_value"/> <a:model-query fetchAll="true" model="csh.CSH510.csh_transaction_query" rootPath="csh_value"/>
<a:model-query model="csh.CSH514.get_csh_transaction_list_id" rootPath="csh_transaction_list_id"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="csh_transaction_write_off_reverse_link_id" <a:link id="csh_transaction_write_off_reverse_link_id"
...@@ -16,7 +17,9 @@ ...@@ -16,7 +17,9 @@
<!--<a:link id="csh514_write_off_reverse_link_id" model="csh.CSH514.csh_transaction_write_off_reverse" modelaction="batch_update"/>--> <!--<a:link id="csh514_write_off_reverse_link_id" model="csh.CSH514.csh_transaction_write_off_reverse" modelaction="batch_update"/>-->
<a:link id="csh514_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse.lsc"/> <a:link id="csh514_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse.lsc"/>
<a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/> <a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/>
<a:link id="csh514_write_off_attach_win_link" url="${/request/@context_path}/uploadFile.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
var csh_transaction_atm_id = '${/model/csh_transaction_list_id/record/@transaction_list_id}';
function csh514_write_off_reverse() { function csh514_write_off_reverse() {
...@@ -33,6 +36,7 @@ ...@@ -33,6 +36,7 @@
} }
var param = head_record.data; var param = head_record.data;
param['transaction_id'] = '${/parameter/@transaction_id}'; param['transaction_id'] = '${/parameter/@transaction_id}';
param['csh_transaction_atm_id'] = csh_transaction_atm_id;
if (records[0].get('history_flag') === 'Y') { if (records[0].get('history_flag') === 'Y') {
Leaf.showConfirm('${l:PROMPT}', '该事务是历史事务,请检查是否进行了补生成凭证', function () { Leaf.showConfirm('${l:PROMPT}', '该事务是历史事务,请检查是否进行了补生成凭证', function () {
var saveData = []; var saveData = [];
...@@ -236,6 +240,22 @@ ...@@ -236,6 +240,22 @@
} }
} }
//附件上传
function upload_attachment_win() {
var win = new Leaf.Window({
id: 'csh514_upload_win',
url: $('csh514_write_off_attach_win_link').getUrl(),
params: {
winid: 'csh514_upload_win',
table_name: 'CSH_TRANSACTION_WFL',
header_id: csh_transaction_atm_id
},
width: 900,
height: 400
}).on('close', function() {
});
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_head_ds" autoCreate="true"> <a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_head_ds" autoCreate="true">
...@@ -283,6 +303,7 @@ ...@@ -283,6 +303,7 @@
<a:hBox> <a:hBox>
<a:textArea name="note" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" <a:textArea name="note" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds"
prompt="备注" width="600"/> prompt="备注" width="600"/>
<a href="javascript:upload_attachment_win()" style="color:red">附件上传</a>
</a:hBox> </a:hBox>
</a:form> </a:form>
<a:grid id="csh_transaction_receipt_write_off_reverse_detail_grid_ds" <a:grid id="csh_transaction_receipt_write_off_reverse_detail_grid_ds"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/> <a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
<a:model-query model="csh.CSH514.workflow_info" defaultWhereClause="t2.transaction_wfl_id=${/parameter/@transaction_wfl_id}" rootPath="wolkflow_path"></a:model-query> <a:model-query model="csh.CSH514.workflow_info" defaultWhereClause="t2.transaction_wfl_id=${/parameter/@transaction_wfl_id}" rootPath="wolkflow_path"></a:model-query>
<a:model-query model="csh.CSH514.extend_next_month_check" rootPath="extend_month" /> <a:model-query model="csh.CSH514.extend_next_month_check" rootPath="extend_month" />
<a:model-query model="csh.CSH514.extend_gld_rent_check" rootPath="extend_gld_rent" />
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="csh_transaction_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse_new.lsc"/> <a:link id="csh_transaction_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse_new.lsc"/>
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
<a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/> <a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/>
<a:link id="csh514_check_contract_invoice_link_id" model="csh.CSH514.check_contract_invoice" modelaction="batch_update"/> <a:link id="csh514_check_contract_invoice_link_id" model="csh.CSH514.check_contract_invoice" modelaction="batch_update"/>
<a:link id="csh514_save_invoice_flag_id" model="csh.CSH514.check_contract_invoice" modelaction="execute"/> <a:link id="csh514_save_invoice_flag_id" model="csh.CSH514.check_contract_invoice" modelaction="execute"/>
<a:link id="csh514_write_wfl_attach_win_link" url="${/request/@context_path}/uploadFile.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function csh514_write_off_reverse_return() { function csh514_write_off_reverse_return() {
...@@ -42,7 +44,8 @@ ...@@ -42,7 +44,8 @@
para: { para: {
transaction_wfl_id:record.get('transaction_wfl_id'), transaction_wfl_id:record.get('transaction_wfl_id'),
check_flag :record.get('ignore_invoice_check_flag'), check_flag :record.get('ignore_invoice_check_flag'),
extend_month_flag:record.get('extend_month_flag') extend_month_flag:record.get('extend_month_flag'),
gld_rent_flag:record.get('gld_rent_flag')
}, },
success: function () { success: function () {
}, },
...@@ -87,6 +90,23 @@ ...@@ -87,6 +90,23 @@
}else return true; }else return true;
}); });
} }
//附件上传
function upload_attachment_win() {
var record = $('csh_transaction_receipt_write_off_reverse_detail_head_ds').getCurrentRecord();
var csh_transaction_atm_id = record.get('csh_transaction_atm_id');
var win = new Leaf.Window({
id: 'csh514_upload_win',
url: $('csh514_write_wfl_attach_win_link').getUrl(),
params: {
winid: 'csh514_upload_win',
table_name: 'CSH_TRANSACTION_WFL',
header_id: csh_transaction_atm_id
},
width: 900,
height: 400
}).on('close', function() {
});
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
...@@ -135,10 +155,12 @@ ...@@ -135,10 +155,12 @@
prompt="HLS.NOTE" width="300"/> prompt="HLS.NOTE" width="300"/>
<a:checkBox name="ignore_invoice_check_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否跳过合同开票校验"/> <a:checkBox name="ignore_invoice_check_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否跳过合同开票校验"/>
<a:checkBox id="extend_month_id" name="extend_month_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否允许跨月反冲"/> <a:checkBox id="extend_month_id" name="extend_month_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否允许跨月反冲"/>
<a:checkBox id="gld_rent_id" name="gld_rent_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否反冲后不出具凭证"/>
</a:hBox> </a:hBox>
<a:hBox> <a:hBox>
<a:textArea name="note" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" <a:textArea name="note" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds"
prompt="备注" width="600"/> prompt="备注" width="600"/>
<a href="javascript:upload_attachment_win()" style="color:red">附件上传</a>
</a:hBox> </a:hBox>
</a:form> </a:form>
<a:grid id="csh_transaction_receipt_write_off_reverse_detail_grid_ds" <a:grid id="csh_transaction_receipt_write_off_reverse_detail_grid_ds"
...@@ -171,6 +193,9 @@ ...@@ -171,6 +193,9 @@
if ('${/model/extend_month/record/@check_flag}' =='N'){ if ('${/model/extend_month/record/@check_flag}' =='N'){
$('extend_month_id').hide(); $('extend_month_id').hide();
} }
if ('${/model/extend_month/record/@check_flag}' =='N' && '${/model/extend_gld_rent/record/@rent_check_flag}' =='N'){
$('gld_rent_id').hide();
}
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment