Skip to content

L
leaf-hlcm
Commit fc3b8f20 authored by stone's avatar stone
Browse files
Options

[fix] 完成收款功能

parent 1a9f1f96
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2459 additions and 159 deletions
src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_CSH_TRANSATION.sql
View file @ fc3b8f20
...@@ -18,6 +18,7 @@ sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','MKTAUDITING','营业新增 ...@@ -18,6 +18,7 @@ sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','MKTAUDITING','营业新增
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','ACCAUDITING','会计新增确认中','ZHS',''); sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','ACCAUDITING','会计新增确认中','ZHS','');
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','CANCELLED','已作废','ZHS',''); sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','CANCELLED','已作废','ZHS','');
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','RETURNED','已退款','ZHS',''); sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','RETURNED','已退款','ZHS','');
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','DEBTAUDITING','债权新增确认中','ZHS','');
sys_code_pkg.delete_sys_code('PAID_BYOTHER_FLAG'); sys_code_pkg.delete_sys_code('PAID_BYOTHER_FLAG');
sys_code_pkg.insert_sys_code('PAID_BYOTHER_FLAG', '代付', '代付', '代付', 'ZHS', ''); sys_code_pkg.insert_sys_code('PAID_BYOTHER_FLAG', '代付', '代付', '代付', 'ZHS', '');
......
src/main/database/Init/Sys_message/CSH_TRANSACTION_SYS_MESSAGE.sql 0 → 100644
View file @ fc3b8f20
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool INITIALIZE_SYSCODE_CSH_TRANSACTION.log
set feedback off
set define off
<!--系统代码取值-->
BEGIN
sys_message_pkg.delete_message('E_SAME_RECODER');
sys_message_pkg.insert_message('E_SAME_RECODER',
'错误',
'制单人和确认人不能为同一人！','ZHS');
END;
commit;
set feedback on
set define on
spool off
exit
\ No newline at end of file
src/main/database/Register_function/REGISTER_CSH510.sql
View file @ fc3b8f20
...@@ -12,6 +12,8 @@ begin ...@@ -12,6 +12,8 @@ begin
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510N.csh_transaction_list_tmp'); sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510N.csh_transaction_list_tmp');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_for_lov'); sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_for_lov');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update'); sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update');
sys_function_assign_pkg.func_bm_load('CSH509','csh.CSH509.query_roles_info');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update_bp_info');
end; end;
/ /
......
src/main/database/Register_function/REGISTER_CSH_TRANSACTION_HAND_RECEIPT_UPDATE.sql 0 → 100644
View file @ fc3b8f20
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_REPO001.log
set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/csh/CSH510/csh_transaction_hand_receipt_update.lview','收款维护',1,1,0);
sys_function_assign_pkg.func_service_load('CSH510','modules/csh/CSH510/csh_transaction_hand_receipt_update.lview');
end;
/
commit;
set feedback on
set define on
spool off
exit
src/main/database/Table/CON_CONTRACT.sql
View file @ fc3b8f20
...@@ -23,7 +23,6 @@ alter table CSH_TRANSACTION add (PAID_BYOTHER_FLAG varchar2(10)); ...@@ -23,7 +23,6 @@ alter table CSH_TRANSACTION add (PAID_BYOTHER_FLAG varchar2(10));
alter table CON_CONTRACT add (LAST_RENT_DUE_DATE date); alter table CON_CONTRACT add (LAST_RENT_DUE_DATE date);
alter table CON_CONTRACT add (REPURCHASE_DATE date); alter table CON_CONTRACT add (REPURCHASE_DATE date);
alter table CON_CONTRACT add (PAYMENGT_DEADLINEDATE date); alter table CON_CONTRACT add (PAYMENGT_DEADLINEDATE date);
comment on column CSH_TRANSACTION.PAID_BYOTHER_FLAG is '代付'; comment on column CSH_TRANSACTION.PAID_BYOTHER_FLAG is '代付';
COMMENT ON column CSH_TRANSACTION.CONFIRMED_DATE COMMENT ON column CSH_TRANSACTION.CONFIRMED_DATE
IS '确认时间'; IS '确认时间';
...@@ -41,7 +40,6 @@ comment on column CON_CONTRACT.SUBJECT_MATTER_RESCISSIO ...@@ -41,7 +40,6 @@ comment on column CON_CONTRACT.SUBJECT_MATTER_RESCISSIO
is '解约事由'; is '解约事由';
comment on column CON_CONTRACT.REPURCHASE_TYPES comment on column CON_CONTRACT.REPURCHASE_TYPES
is '回购类型'; is '回购类型';
comment on column CON_CONTRACT.LAST_RENT_DUE_DATE is '前期租金支付约定日'; comment on column CON_CONTRACT.LAST_RENT_DUE_DATE is '前期租金支付约定日';
comment on column CON_CONTRACT.REPURCHASE_DATE is '解约回购日'; comment on column CON_CONTRACT.REPURCHASE_DATE is '解约回购日';
comment on column CON_CONTRACT.PAYMENGT_DEADLINEDATE is '支付预定期限（第1期）'; comment on column CON_CONTRACT.PAYMENGT_DEADLINEDATE is '支付预定期限（第1期）';
......
src/main/database/Table/CSH_TRANSACTION.sql
View file @ fc3b8f20
...@@ -26,6 +26,12 @@ comment on column csh_transaction.ACC_CONFIRMED_DATE is '会计确认时间'; ...@@ -26,6 +26,12 @@ comment on column csh_transaction.ACC_CONFIRMED_DATE is '会计确认时间';
comment on column csh_transaction.MKT_CONFIRMED_BY is '营业确认人'; comment on column csh_transaction.MKT_CONFIRMED_BY is '营业确认人';
comment on column csh_transaction.ACC_CONFIRMED_BY is '会计确认人 '; comment on column csh_transaction.ACC_CONFIRMED_BY is '会计确认人 ';
comment on column CSH_TRANSACTION.PAID_BYOTHER_FLAG is '代付'; comment on column CSH_TRANSACTION.PAID_BYOTHER_FLAG is '代付';
--将营业确认人改为债权确认人
ALTER TABLE csh_transaction RENAME COLUMN MKT_CONFIRMED_DATE TO DEBT_CONFIRMED_DATE;
ALTER TABLE csh_transaction RENAME COLUMN MKT_CONFIRMED_BY TO DEBT_CONFIRMED_BY;
comment on column csh_transaction.DEBT_CONFIRMED_DATE is '债权确认时间';
comment on column csh_transaction.DEBT_CONFIRMED_BY is '债权确认人';
COMMENT ON column CSH_TRANSACTION.CONFIRMED_DATE COMMENT ON column CSH_TRANSACTION.CONFIRMED_DATE
IS '确认时间'; IS '确认时间';
COMMENT ON column CSH_TRANSACTION.CONFIRMED_FLAG COMMENT ON column CSH_TRANSACTION.CONFIRMED_FLAG
......
src/main/webapp/WEB-INF/classes/csh/CSH509/query_roles_info.lwm 0 → 100644
View file @ fc3b8f20
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2019-01-14 16:29:48
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select *
from exp_emp_assign_e_v t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
csh_transaction_pkg.update_confirmFlag_byCondition(
p_transaction_id =>${@transaction_id},
p_wanted_confirmed_flag =>${@wanted_confirmed_flag},
p_wanted_written_off_flag=>${@wanted_written_off_flag},
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="insert">
<bm:update-sql><![CDATA[
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="user_id" queryOperator="="/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm
View file @ fc3b8f20
...@@ -93,6 +93,10 @@ ...@@ -93,6 +93,10 @@
<bm:field name="sus_belnr"/> <bm:field name="sus_belnr"/>
<bm:field name="bp_virtual_bank_account"/> <bm:field name="bp_virtual_bank_account"/>
<bm:field name="confirmed_flag" /> <bm:field name="confirmed_flag" />
<bm:field name="debt_confirmed_by"/>
<bm:field name="debt_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.debt_confirmed_by)" forInsert="false" forUpdate="false"/>
<bm:field name="acc_confirmed_by"/>
<bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
......
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_update.lwm
View file @ fc3b8f20
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
begin begin
csh_transaction_pkg.update_confirmed_flag( csh_transaction_pkg.update_confirmed_flag(
p_transaction_id =>${@transaction_id}, p_transaction_id =>${@transaction_id},
p_wanted_confirmed_flag =>${@wanted_confirmed_flag}, p_user_id =>${/session/@user_id}
p_user_id =>${session/@user_id}
); );
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
......
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_update_bp_info.lwm 0 → 100644
View file @ fc3b8f20
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2019-9-12 下午07:57:46
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
update csh_transaction c
set bp_id=${@bp_id}
where transaction_id=${@transaction_id}
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH510N/csh_transaction_list_tmp.lwm
View file @ fc3b8f20
...@@ -69,9 +69,73 @@ ...@@ -69,9 +69,73 @@
<bm:operation name="insert"> <bm:operation name="insert">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
DS_IMPORT_CORE_PKG.csh_trx_bank_import( csh_transaction_pkg.save_receipt_import(
p_header_id =>${/parameter/@header_id}, p_transaction_id =>${@transaction_id},
p_user_id =>${/session/@user_id}); p_transaction_num =>${@transaction_num},
p_transaction_category =>'BUSINESS',
p_transaction_type =>'RECEIPT',
p_transaction_date =>to_date(${@transaction_date},'yyyy-mm-dd'),
p_penalty_calc_date =>to_date(${@transaction_date},'yyyy-mm-dd'),
p_bank_slip_num =>${@bank_slip_num},
p_company_id =>${/session/@company_id},
p_internal_period_num =>${@internal_period_num},
p_period_name =>${@period_name},
p_payment_method_id =>${@payment_method_id},
p_distribution_set_id =>${@distribution_set_id},
p_cashflow_amount =>${@transaction_amount},
p_currency_code =>${@currency_code},
p_transaction_amount =>${@transaction_amount},
p_exchange_rate_type =>${@exchange_rate_type},
p_exchange_rate_quotation =>${@exchange_rate_quotation},
p_exchange_rate =>${@exchange_rate},
p_bank_account_id =>${@bank_account_id},
p_bp_category =>${@bp_category},
p_bp_id =>${@bp_id},
p_bp_bank_account_id =>${@bp_bank_account_id},
p_bp_bank_account_num =>${@bp_bank_account_num},
p_description =>${@description},
p_handling_charge =>${@handling_charge},
p_posted_flag =>nvl(${@posted_flag},'N'),
p_reversed_flag =>nvl(${@reversed_flag},'N'),
p_reversed_date =>to_date(${@reversed_date},'yyyy-mm-dd 24hh:mi:ss'),
p_returned_flag =>nvl(${@returned_flag},'NOT'),
p_returned_amount =>${@returned_amount},
p_write_off_flag =>nvl(${@write_off_flag},'NOT'),
p_write_off_amount =>${@write_off_amount},
p_full_write_off_date =>to_date(${@full_write_off_date},'yyyy-mm-dd 24hh:mi:ss'),
p_twin_csh_trx_id =>${@twin_csh_trx_id},
p_return_from_csh_trx_id =>${@return_from_csh_trx_id},
p_reversed_csh_trx_id =>${@reversed_csh_trx_id},
p_source_csh_trx_type =>${@source_csh_trx_type},
p_source_csh_trx_id =>${@source_csh_trx_id},
p_source_doc_category =>${@source_doc_category},
p_source_doc_type =>${@source_doc_type},
p_source_doc_id =>${@source_doc_id},
p_source_doc_line_id =>${@source_doc_line_id},
p_create_je_mothed =>${@create_je_mothed},
p_create_je_flag =>nvl(${@create_je_flag},'N'),
p_gld_interface_flag =>nvl(${@gld_interface_flag},'N'),
p_user_id =>${/session/@user_id},
p_ref_contract_id => ${@ref_contract_id},
p_receipt_type => ${@receipt_type},
p_csh_bp_name => ${@csh_bp_name},
p_ref_n01 =>${@ref_n01},
p_bp_bank_name =>${@bp_bank_name},
p_bp_bank_branch_name =>${@bp_bank_branch_name},
p_collection_classes =>${@collection_classes},
p_bp_bank_account_name =>${@bp_bank_account_name},
p_opposite_band_na =>${@opposite_band_na},
p_banka =>${@banka},
p_purpose =>${@purpose},
p_gsber =>${@gsber},
p_sus_belnr =>${@sus_belnr},
p_bp_virtual_bank_account =>${@bp_virtual_bank_account},
p_zuonr =>${@bank_slip_num},
p_paid_byother_flag =>${@paid_byother_flag},
p_ref_v05 =>${@ref_v05},
p_status =>${@status},
p_bank_account_num =>${@bank_account_num}
);
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
......
src/main/webapp/WEB-INF/classes/csh/CSH511/csh_transaction_receipt_save.lwm
View file @ fc3b8f20
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<bm:operation name="insert"> <bm:operation name="insert">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
csh_transaction_pkg.insert_csh_transaction( csh_transaction_pkg.insert_csh_transaction(
p_transaction_id=>${@transaction_id}, p_transaction_id=>${@transaction_id},
p_transaction_num=>${@transaction_num}, p_transaction_num=>${@transaction_num},
p_transaction_category=>'BUSINESS', p_transaction_category=>'BUSINESS',
...@@ -73,7 +73,8 @@ ...@@ -73,7 +73,8 @@
p_bp_virtual_bank_account =>${@bp_virtual_bank_account}, p_bp_virtual_bank_account =>${@bp_virtual_bank_account},
p_zuonr=>${@bank_slip_num}, p_zuonr=>${@bank_slip_num},
p_paid_byother_flag =>${@paid_byother_flag}, p_paid_byother_flag =>${@paid_byother_flag},
p_ref_v05 =>${@ref_v05} p_ref_v05 =>${@ref_v05},
p_status =>${@status}
); );
end; end;
......
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ fc3b8f20
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
<a:event name="update" handler="acr510n_query_update"/> <a:event name="update" handler="acr510n_query_update"/>
</a:events> </a:events>
</a:dataSet> </a:dataSet>
<a:dataSet id="ar510n_cashflow_ds" autoPageSize="true" autoQuery="true" <a:dataSet id="ar510n_cashflow_ds" autoPageSize="true" autoQuery="true" fetchAll="false"
model="acr.ACR510N.acr_inovice_cf_v_n" queryDataSet="allConditionDs" selectable="true"> model="acr.ACR510N.acr_inovice_cf_v_n" queryDataSet="allConditionDs" selectable="true">
<a:fields> <a:fields>
<a:field name="invoice_title" required="true" prompt="发票抬头"/> <a:field name="invoice_title" required="true" prompt="发票抬头"/>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ fc3b8f20
...@@ -17,8 +17,10 @@ ...@@ -17,8 +17,10 @@
<a:link id="csh_transaction_receipt_link" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt.lview"/> <a:link id="csh_transaction_receipt_link" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt.lview"/>
<a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/> <a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/>
<a:link id="csh_transaction_receipt_update_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_receipt_update.lview"/> <a:link id="csh_transaction_receipt_update_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_receipt_update.lview"/>
<a:link id="csh_transaction_receipt_maintain_post_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_receipt_update.lview"/> <!-- <a:link id="csh_transaction_receipt_maintain_post_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_receipt_update.lview"/>-->
<!-- <a:link id="csh_transaction_receipt_maintain_post_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_receipt_post_query.lview"/> --> <a:link id="csh_transaction_receipt_maintain_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview"/>
<a:link id="csh_transaction_receipt_maintain_readonly_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_hand_receipt_update_readonly.lview"/>
<a:link id="csh510_csh_transaction_batch_update" model="csh.CSH510.csh_transaction_delete" modelaction="batch_update"/> <a:link id="csh510_csh_transaction_batch_update" model="csh.CSH510.csh_transaction_delete" modelaction="batch_update"/>
<a:link id="csh511_csh_transaction_batch_post_link" model="csh.CSH511.csh_transaction_post" modelaction="batch_update"/> <a:link id="csh511_csh_transaction_batch_post_link" model="csh.CSH511.csh_transaction_post" modelaction="batch_update"/>
<!--更新收款单据的状态--> <!--更新收款单据的状态-->
...@@ -28,7 +30,53 @@ ...@@ -28,7 +30,53 @@
<a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510N/csh_transaction_import.lview"/> <a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510N/csh_transaction_import.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//新增单据的作废
function csh510_csh_trx_bank_drop(){
var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
if (datas.length == 0) {
$L.showMessage("提示", '请选择要作废的单据');
return;
}
var post_data=[];
for(var i=0;i<datas.length;i=i+1) {
var confirmed_flag= datas[i].get('confirmed_flag');
//不是新增就报错
if(confirmed_flag!='NEW'&&confirmed_flag!=undefined){
$L.showInfoMessage("提示", '请选择单据为未提交的数据', null, null);
return;
}
//将对象封装到json对象数组
post_data.push({
'transaction_id': datas[i].get('transaction_id'),
//提交想改变之后的状态
'wanted_confirmed_flag': 'CANCELLED',
'_status': 'update'
});
};
//弹出确认修改的提示框
$L.showConfirm("提示",'确认执行该操作？',function(){
//锁屏
lock_current_window();
//作废单据
Leaf.request({
url: $('csh510N_csh_transaction_batch_update_confirmed_flag').getUrl(),
para: post_data,
success: function () {
unlock_current_window();
$('csh_transaction_receipt_maintain_result_ds').query();
Leaf.showMessage('${l:PROMPT}', '该单据已作废！');
}, failure: function () {
unlock_current_window();
},
error: function () {
unlock_current_window();
},
scope: this
});
})
}
//新增申请按钮’ //新增申请按钮’
function csh510_csh_trx_bank_apply_new() { function csh510_csh_trx_bank_apply_new() {
var datas = $('csh_transaction_receipt_maintain_result_ds').selected; var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
...@@ -40,49 +88,42 @@ ...@@ -40,49 +88,42 @@
var post_data=[]; var post_data=[];
for(var i=0;i<datas.length;i=i+1) { for(var i=0;i<datas.length;i=i+1) {
var confirmed_flag= datas[i].get('confirmed_flag'); var confirmed_flag = datas[i].get('confirmed_flag');
//不是新增就报错 //不是新增就报错
if(confirmed_flag!='NEW'&&confirmed_flag!=undefined){ if (confirmed_flag != 'NEW' && confirmed_flag != undefined) {
$L.showInfoMessage("提示", '请选择单据为未提交的数据', null, null); $L.showInfoMessage("提示", '请选择单据为未提交的数据', null, null);
return; return;
} }
//弹出确认修改的提示框
var execute_flag=$L.showConfirm("提示",'确认执行该操作？')
//用户取消操作
if(flag==false) return ;
//将对象封装到json对象数组 //将对象封装到json对象数组
post_data.push({ post_data.push({
'transaction_id': datas[i].get('transaction_id'), 'transaction_id': datas[i].get('transaction_id'),
//提交想改变之后的状态
'wanted_confirmed_flag': 'MKTAUDITING',
'_status': 'update' '_status': 'update'
}); });
}; }
console.log(post_data); //弹出确认修改的提示框
//锁屏 $L.showConfirm("提示", '确认执行该操作？', function () {
lock_current_window(); //锁屏
//改变未提交单据数据的状态 lock_current_window();
Leaf.request({ //改变未提交单据数据的状态
url: $('csh510N_csh_transaction_batch_update_confirmed_flag').getUrl(), Leaf.request({
para: post_data, url: $('csh510N_csh_transaction_batch_update_confirmed_flag').getUrl(),
success: function () { para: post_data,
unlock_current_window(); success: function () {
$('csh_transaction_receipt_maintain_result_ds').query(); unlock_current_window();
Leaf.showMessage('${l:PROMPT}', '修改成功！'); $('csh_transaction_receipt_maintain_result_ds').query();
}, failure: function () { Leaf.showMessage('${l:PROMPT}', '修改成功！');
unlock_current_window(); }, failure: function () {
}, unlock_current_window();
error: function () { },
unlock_current_window(); error: function () {
}, unlock_current_window();
scope: this },
}); scope: this
});
});
}
}
//跳转到收款新增页面 //跳转到收款新增页面
function csh510_csh_trx_bank_hand_add(){ function csh510_csh_trx_bank_hand_add(){
...@@ -166,15 +207,24 @@ ...@@ -166,15 +207,24 @@
} }
function seedetail_transaction_num(value, record, name) { function seedetail_transaction_num(value, record, name) {
console.log(record.get('receipt_type'));
console.log( record.get('bp_name'));
console.log( record.get('confirmed_flag'));
if (record.get('transaction_id')) { if (record.get('transaction_id')) {
var url; var url;
if (record.get('posted_flag') == 'N') { /*if (record.get('posted_flag') == 'N') {
url = $('csh_transaction_receipt_maintain_post_link').getUrl() + '?transaction_id=' + record.get('transaction_id'); url = $('csh_transaction_receipt_maintain_post_link').getUrl() + '?transaction_id=' + record.get('transaction_id');
} /*else*/ else if (record.get('posted_flag') == 'Y') { } /!*else*!/ else if (record.get('posted_flag') == 'Y') {
url = $('csh_transaction_receipt_update_link').getUrl() + '?transaction_id=' + record.get('transaction_id'); url = $('csh_transaction_receipt_update_link').getUrl() + '?transaction_id=' + record.get('transaction_id');
} else { } else {
return value; return value;
}*/
if(record.get('receipt_type')=='IMPORT'&&record.get('bp_name')==null&&record.get('confirmed_flag')=='NEW'){
url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true';
}else{
url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false';
} }
return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>'; return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>';
} }
} }
...@@ -655,8 +705,8 @@ ...@@ -655,8 +705,8 @@
<a:column prompt="账号" name="bp_bank_account_num"/> <a:column prompt="账号" name="bp_bank_account_num"/>
</a:column> </a:column>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY"/> <a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY"/>
<a:column name="mkt_confirmed_by" prompt="营业确认人"/> <a:column name="debt_confirmed_by_desc" prompt="债权确认人"/>
<a:column name="acc_confirmed_by" prompt="会计确认人"/> <a:column name="acc_confirmed_by_desc" prompt="会计确认人"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:fieldSet> </a:fieldSet>
......
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
View file @ fc3b8f20
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="import_csh_transaction_receipt_data_link_id" model="csh.CSH510N.csh_transaction_list_tmp" modelaction="execute"/> <a:link id="import_csh_transaction_receipt_data_link_id" model="csh.CSH510N.csh_transaction_list_tmp" modelaction="execute"/>
<a:link id="save_import_csh_transaction_receipt_data_link_id" model="csh.CSH510N.csh_transaction_list_tmp" modelaction="batch_update"/>
<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"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
...@@ -28,21 +29,29 @@ ...@@ -28,21 +29,29 @@
if(import_flag==0){ if(import_flag==0){
for (var i = 0;i < records.length;i++) { for (var i = 0;i < records.length;i++) {
var record=records[i]; var record=records[i];
if (record.get('status') == 'ERROR') {
/*if (record.get('status') == 'ERROR') {
//错误的行不导入，其他行正常导入，这里不再判断cuo，在插入数据的时候
Leaf.showMessage('${l:PROMPT}', '导入的数据存在错误，请查看错误信息！'); Leaf.showMessage('${l:PROMPT}', '导入的数据存在错误，请查看错误信息！');
return; //将该条数据从导入的ds中
} //return;
}*/
//获得周期时间 //获得周期时间
var r_date = record.get('attribute_3'); /* var r_date = record.get('attribute_3');
r_date = Leaf.formatDate(r_date); r_date = Leaf.formatDate(r_date);
Leaf.request({ Leaf.request({
url: $('get_period_name_id').getUrl(), url: $('get_period_name_id').getUrl(),
para: { para: {
p_date: r_date p_date: r_date,
date : new Date().getMilliseconds()
}, },
success: function(res){ success: function(res){
var period_name = res.result.record.period_name, var period_name = res.result.record.period_name,
internal_period_num = res.result.record.internal_period_num; internal_period_num = res.result.record.internal_period_num;
record.set('period_name', period_name);
record.set('internal_period_num', internal_period_num);
if (period_name) { if (period_name) {
record.set('period_name', period_name); record.set('period_name', period_name);
record.set('internal_period_num', internal_period_num); record.set('internal_period_num', internal_period_num);
...@@ -56,10 +65,11 @@ ...@@ -56,10 +65,11 @@
} }
}, },
scope: this scope: this
}); });*/
//否则的话添加必要的字段 //否则的话添加必要的字段
record.set('receipt_type','import'); record.set('receipt_type','IMPORT');
record.set('transaction_date',record.get('attribute_3')); record.set('bank_account_num',record.get('attribute_1'));
record.set('transaction_date', Leaf.formatDate(record.get('attribute_3')));
record.set('bank_slip_num',record.get('attribute_5')); record.set('bank_slip_num',record.get('attribute_5'));
record.set('currency_code', 'CNY'); record.set('currency_code', 'CNY');
record.set('transaction_amount',record.get('attribute_14')); record.set('transaction_amount',record.get('attribute_14'));
...@@ -69,35 +79,49 @@ ...@@ -69,35 +79,49 @@
record.set('opposite_band_na',record.get('attribute_10')); record.set('opposite_band_na',record.get('attribute_10'));
record.set('description',record.get('attribute_23')); record.set('description',record.get('attribute_23'));
record.set('ref_v05',record.get('attribute_24')); record.set('ref_v05',record.get('attribute_24'));
record.set('paid_byother_flag','F');
record.set('write_off_flag','DISABLED'); record.set('write_off_flag','DISABLED');
record.set('_status','insert');
//根据银行卡号设置我方的银行账号 //根据银行卡号设置我方的银行账号
Leaf.request({ /*Leaf.request({
url: $('import_csh_transaction_receipt_data_link_id').getUrl(), url: $('import_csh_transaction_receipt_data_link_id').getUrl(),
para: { para: {
bank_account_num:record.get('attribute_1'), bank_account_num:record.get('attribute_1'),
bp_bank_account_num:record.get('attribute_8') bp_bank_account_num:record.get('attribute_8')
}, },
success: function(res){ success: function(res){
record.set('bank_account_id',res.result.bank_account_id); record.set('bank_account_id',res.result.bank_account_id);
//根据对方的银行卡号获取商业伙伴信息 //根据对方的银行卡号获取商业伙伴信息
record.set('bp_category',res.result.bp_category); record.set('bp_category',res.result.bp_category);
record.set('bp_id',res.result.bp_id);
record.set('csh_bp_name',res.result.csh_bp_name); record.set('csh_bp_name',res.result.csh_bp_name);
//i. 若能找到唯一值且该商业伙伴类型为承租人，则代付字段为“否”、商业伙伴字段为匹配到的商业伙伴；
// ii. 若能找到唯一值且该商业伙伴类型为代理店，则代付字段为“是”、商业伙伴字段为匹配到的商业伙伴；
//iii. 若无法找到匹配项或匹配到多项，则代付字段为“是”、商业伙伴字段为空；
if(res.result.bp_id!=-1&&res.result.bp_category=='TENANT'){
record.set('paid_byother_flag','F');
record.set('bp_id',res.result.bp_id);
}else if(res.result.bp_id!=-1&&res.result.bp_category=='AGENCY'){
record.set('paid_byother_flag','T');
record.set('bp_id',res.result.bp_id);
}else{
record.set('paid_byother_flag','T');
record.set('bp_id',null);
}
}, },
scope: this scope: this
}); });*/
record.set('_status','insert');
saveData.push(record.data); saveData.push(record.data);
} }
//开始导入数据 //开始导入数据
Leaf.showConfirm('提示', '确定要导入信息吗？', function() {
Leaf.showConfirm('提示', '确定要导入信息吗,有错误信息的数据将不会被导入', function() {
Leaf.request({ Leaf.request({
url: '${/request/@context_path}/autocrud/csh.CSH511.csh_transaction_receipt_save/batch_update', url: $('save_import_csh_transaction_receipt_data_link_id').getUrl(),
para: saveData, para: saveData,
scope: this, scope: this,
success: function () { success: function () {
......
src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview
View file @ fc3b8f20
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<a:model-query fetchAll="true" model="csh.CSH511.csh_transaction_default_exchange_rate_type" rootPath="default_exchange_rate_type_path"/> <a:model-query fetchAll="true" model="csh.CSH511.csh_transaction_default_exchange_rate_type" rootPath="default_exchange_rate_type_path"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="hn2050_upload_win_link" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="csh_receipt_import_link" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt_impiort.lview"/> <a:link id="csh_receipt_import_link" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt_impiort.lview"/>
<a:link id="csh_transaction_receipt_id" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt.lview"/> <a:link id="csh_transaction_receipt_id" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt.lview"/>
<a:link id="get_exchange_rate_link_id" model="csh.CSH511.csh_transaction_get_exchange_rate" modelaction="query"/> <a:link id="get_exchange_rate_link_id" model="csh.CSH511.csh_transaction_get_exchange_rate" modelaction="query"/>
...@@ -21,6 +22,26 @@ ...@@ -21,6 +22,26 @@
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/> <script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
<a:link id="transaction_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/> <a:link id="transaction_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//附件上传
function upload_attachment_win() {
/* var record = $(ds_id).findById(record_id);
var mortgage_id = record.get('mortgage_id');*/
console.log($('csh_transaction_receipt_head_ds').getAt(0).id);
var win = new Leaf.Window({
id: 'hn2050_upload_win',
url: $('hn2050_upload_win_link').getUrl(),
params: {
winid: 'hn2050_upload_win',
table_name: 'csh_transaction',
header_id: $('csh_transaction_receipt_head_ds').getAt(0).id
},
width: 900,
hight: 400
}).on('close', function() {
//record.ds.query();
});
}
var transaction_id; var transaction_id;
<!--增加重置功能--> <!--增加重置功能-->
function csh511_receipt_reset(){ function csh511_receipt_reset(){
...@@ -107,6 +128,7 @@ ...@@ -107,6 +128,7 @@
record.set('bp_bank_account_code', ''); record.set('bp_bank_account_code', '');
record.set('bp_bank_account_name', ''); record.set('bp_bank_account_name', '');
record.set('bp_bank_account_num', ''); record.set('bp_bank_account_num', '');
record.set('opposite_band_na', '');
} }
record.getField('bp_bank_account_code').setLovPara('bp_id', value); record.getField('bp_bank_account_code').setLovPara('bp_id', value);
} else if (name == 'currency_code') { } else if (name == 'currency_code') {
...@@ -117,7 +139,7 @@ ...@@ -117,7 +139,7 @@
record.set('exchange_rate_type_display', ''); record.set('exchange_rate_type_display', '');
record.set('exchange_rate_quotation', ''); record.set('exchange_rate_quotation', '');
if (oldvalue != null && oldvalue != '') { if (oldvalue != null && oldvalue != '') {
record.set('transaction_amount', ''); //record.set('transaction_amount', '');
record.set('transaction_functional_amount', ''); record.set('transaction_functional_amount', '');
} }
} }
...@@ -522,9 +544,13 @@ ...@@ -522,9 +544,13 @@
</a:box> </a:box>
</a:fieldSet> </a:fieldSet>
<a:fieldSet title="附件"> <a:fieldSet title="附件">
<input type="file" name="uploadFile"/> <a:hBox>
<input type="button" value="上传"/> <a>附件上传：</a>：<a href="javascript:upload_attachment_win()" style="color:red">上传</a>
</a:hBox>
</a:fieldSet> </a:fieldSet>
<!-- <a:form title="对方账户信息" width="1200"> <!-- <a:form title="对方账户信息" width="1200">
<a:box column="4"> <a:box column="4">
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_head_ds"/> <a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_head_ds"/>
......
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