Skip to content

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

Merge branch 'feature/shouxin' into develop 

# Conflicts:
#	src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
[style] 修改状态
parents d442a026 796eb205
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 461 additions and 476 deletions
src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
View file @ 911e54b8
......@@ -20,93 +20,26 @@ VALUES
VALUES
('CON_ET002', '提前结清申请明细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733CF', '合同租金计划变更申请明细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733BPT', '合同承租人变更申请明细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733BPB', '合同回款账户变更申请明细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733BPBQ', '合同回款账户变更申请明细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733CF_Q','租金计划变更申请明细',1,SYSDATE,-1,SYSDATE,-1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733BPT_Q','承租人变更申请明细',1,SYSDATE,-1,SYSDATE,-1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON_REPO001D_Q','回购申请明细',1,SYSDATE,-1,SYSDATE,-1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON_ET002_Q','提前结清申请明细',1,SYSDATE,-1,SYSDATE,-1);
\ No newline at end of file
INSERT INTO sys_function_dynamic
(function_code,
function_name,
sequence,
creation_date,
created_by,
last_update_date,
last_updated_by)
VALUES
('HLS36103', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO sys_function_dynamic
(function_code,
function_name,
sequence,
creation_date,
created_by,
last_update_date,
last_updated_by)
VALUES
('HLS36101', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
end;
\ No newline at end of file
src/main/database/Init/Sys_prompt/CSH_TRANSACTION_PROMPT.sql → src/main/database/Init/Sys_prompt/INITIALIZE_CSH_TRANSACTION_PROMPT.sql
View file @ 911e54b8
......@@ -6,7 +6,10 @@ spool CSH_TRANSACTION_PROMPT.log
set feedback off
set define off
begin
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.RETURNED_AMOUNT',
p_language => 'ZHS',
p_description => '已退款金额',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM',
p_language => 'ZHS',
p_description => '收款金额从',
......@@ -135,6 +138,43 @@ sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.ACCT_CO
p_language => 'ZHS',
p_description => '会计确认人',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.NEW_APPLY_BTN',
p_language => 'ZHS',
p_description => '新增确认',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.REFUSE_BTN',
p_language => 'ZHS',
p_description => '新增驳回',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.DROP_BTN',
p_language => 'ZHS',
p_description => '作废',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.QUERY_BTN',
p_language => 'ZHS',
p_description => '查询',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.MANUAL_ADD',
p_language => 'ZHS',
p_description => '收款手动新增',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.CLASS_DESC',
p_language => 'ZHS',
p_description => '款项分类',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.STATEMENT',
p_language => 'ZHS',
p_description => '备注',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.BANK_INFO',
p_language => 'ZHS',
p_description => '账户信息',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.ATTACHMENT',
p_language => 'ZHS',
p_description => '附件',
p_created_by => 1);
end;
/
commit;
......
src/main/database/Register_function/REGISTER_CSH510.sql
View file @ 911e54b8
......@@ -15,6 +15,10 @@ 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');
--页面注册
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;
......
src/main/database/Register_function/REGISTER_CSH_TRANSACTION_HAND_RECEIPT_UPDATE.sql deleted 100644 → 0
View file @ d442a026
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/Register_function/REGISTER_HLS361N.sql
View file @ 911e54b8
......@@ -7,6 +7,18 @@ set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/hls/HLS361N/hls_bp_master_credit.lview','授信管理',1,1,0);
--功能定义 EXERCISES001 是功能号
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS361N','授信管理','授信管理','30','','','modules/hls/HLS361N/hls_bp_master_credit.lview','ZHS',-1);
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS361N','授信管理','授信管理','30','','','modules/hls/HLS361N/hls_bp_master_credit.lview','US',-1);
--分配页面 将页面分配给哪个功能号
sys_function_assign_pkg.func_service_load('HLS361N','modules/hls/HLS361N/hls_bp_master_credit.lview');
--分配菜单 p_function_group_code=>'DEMO1' 为功能EXERCISES001的菜单
sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_LEASE',p_function_code=>'HLS361N',p_enabled_flag=>'Y',P_USER_ID=>-1);
--分配bm
sys_function_assign_pkg.func_bm_load('HLS361N','csh.CSH509.query_roles_info');
......
src/main/database/Register_function/REGISTER_HLS361N_HLS_BP_MASTER_CREDIT.sql deleted 100644 → 0
View file @ d442a026
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/hls/HLS361N/hls_bp_master_credit.lview','授信管理',1,1,0);
--功能定义 EXERCISES001 是功能号
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS361N','授信管理','授信管理','30','','','modules/hls/HLS361N/hls_bp_master_credit.lview','ZHS',-1);
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS361N','授信管理','授信管理','30','','','modules/hls/HLS361N/hls_bp_master_credit.lview','US',-1);
--分配页面 将页面分配给哪个功能号
sys_function_assign_pkg.func_service_load('HLS361N','modules/hls/HLS361N/hls_bp_master_credit.lview');
--分配菜单 p_function_group_code=>'DEMO1' 为功能EXERCISES001的菜单
sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_LEASE',p_function_code=>'HLS361N',p_enabled_flag=>'Y',P_USER_ID=>-1);
end;
/
commit;
set feedback on
set define on
spool off
exit
src/main/database/Register_function/REGISTER_HLS361N_credit_entrance_detail.sql deleted 100644 → 0
View file @ d442a026
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/hls/HLS361N/hls_bp_master_credit.lview','授信管理',1,1,0);
--创建动态页面的虚拟功能号
INSERT INTO sys_function_dynamic
(function_code,
function_name,
sequence,
creation_date,
created_by,
last_update_date,
last_updated_by)
VALUES
('HLS36101', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
end;
/
commit;
set feedback on
set define on
spool off
exit
src/main/database/Register_function/REGISTER_HLS361N_credit_confirm.sql → src/main/database/Register_function/REGISTER_HLS362N.sql
View file @ 911e54b8
......@@ -23,6 +23,8 @@ sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code
--bm
sys_function_assign_pkg.func_bm_load('HLS362N','hls.HLS361N.hls_bp_master_credit_confirmed');
sys_function_assign_pkg.service_load('modules/hls/HLS362N/credit_entrance_detail_confirm.lview','授信详细',1,1,0);
sys_function_assign_pkg.func_service_load('HLS361N','modules/hls/HLS362N/credit_entrance_detail_confirm.lview');
end;
/
commit;
......
src/main/database/Register_function/REGISTER_HLS362N_credit_entrance_confirm_detail.sql deleted 100644 → 0
View file @ d442a026
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_REPO001.log
set feedback off
set define off
begin
--页面注册
begin
--页面注册
sys_function_assign_pkg.service_load('modules/hls/HLS362N/credit_entrance_detail_confirm.lview','授信详细',1,1,0);
sys_function_assign_pkg.func_service_load('HLS361N','modules/hls/HLS362N/credit_entrance_detail_confirm.lview');
end;
--创建动态页面的虚拟功能号
INSERT INTO sys_function_dynamic
(function_code,
function_name,
sequence,
creation_date,
created_by,
last_update_date,
last_updated_by)
VALUES
('HLS36103', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
/
commit;
set feedback on
set define on
spool off
exit
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_for_lov.lwm
View file @ 911e54b8
......@@ -41,6 +41,6 @@
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="query" expression="(t1.posted_flag in (&apos;N&apos;))"/>
<!-- <bm:data-filter name="query" expression="(t1.posted_flag in (&apos;N&apos;))"/>-->
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH515/csh_transaction_returned_list.lwm
View file @ 911e54b8
......@@ -8,76 +8,80 @@
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[select r.return_id,
t1.transaction_num,
t1.transaction_date,
t1.currency_code,
(select gc.currency_name
from gld_currency_vl gc
where gc.currency_code = t1.currency_code) as currency_name,
t1.transaction_amount,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select d.bp_name from hls_bp_master_v d where d.bp_id = t1.bp_id) as bp_name,
(select b.description
from hls_bp_category b
where b.bp_category = t1.bp_category) as bp_category_display,
t1.bank_slip_num,
t1.period_name,
(select cp.description
from csh_payment_method cp
where cp.payment_method_id = t1.payment_method_id) as payment_method_display,
t1.exchange_rate,
(select tv.type_name
from gld_exchangerate_types_vl tv
where tv.type_code = t1.exchange_rate_type) as exchange_rate_type_display,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select a.bank_account_num
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_num,
t1.bp_bank_account_num,
(select a.bank_account_code
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_code,
(select a.bank_account_name
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_name,
(select u.employee_name from sys_user_v u where u.user_id=t1.created_by )user_desc,
r.notes,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_tenant
from con_contract c
where contract_id = r.ref_contract_id)) bp_name_t,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_agent_level1
from con_contract c
where contract_id = r.ref_contract_id)) agent_name_t,
(select c.contract_number
from con_contract c
where contract_id = r.ref_contract_id) contract_number_t
from
csh_transaction t1, csh_transaction_return r
where
t1.return_from_csh_trx_id = r.transaction_id and
t1.transaction_id = r.return_transaction_id and
r.status = 'APPROVED' and
t1.return_from_csh_trx_id = ${@return_from_csh_trx_id}
<bm:query-sql><![CDATA[select r.return_id,
r.this_return_amount,
t1.transaction_num,
t1.transaction_date,
t1.currency_code,
b.bank_account_num,
b.bank_branch_name,
bank_slip_num,
t1.period_name,
(select gc.currency_name
from gld_currency_vl gc
where gc.currency_code = t1.currency_code) as currency_name,
t1.transaction_amount,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select d.bp_name from hls_bp_master_v d where d.bp_id = t1.bp_id) as bp_name,
(select b.description
from hls_bp_category b
where b.bp_category = t1.bp_category) as bp_category_display,
(select cp.description
from csh_payment_method cp
where cp.payment_method_id = t1.payment_method_id) as payment_method_display,
t1.exchange_rate,
(select tv.type_name
from gld_exchangerate_types_vl tv
where tv.type_code = t1.exchange_rate_type) as exchange_rate_type_display,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select a.bank_account_code
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_code,
(select a.bank_account_name
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_name,
(select u.employee_name
from sys_user_v u
where u.user_id = t1.created_by) user_desc,
r.notes,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_tenant
from con_contract c
where contract_id = r.ref_contract_id)) bp_name_t,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_agent_level1
from con_contract c
where contract_id = r.ref_contract_id)) agent_name_t,
(select c.contract_number
from con_contract c
where contract_id = r.ref_contract_id) contract_number_t
from csh_transaction t1,
csh_transaction_return r,
hls_bp_master_bank_account b
where
t1.transaction_id = r.transaction_id
and r.bp_id = b.bp_id
and r.status = 'APPROVED'
and t1.transaction_id = ${@return_from_csh_trx_id}
]]></bm:query-sql>
</bm:operation>
</bm:operations>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview
View file @ 911e54b8
......@@ -26,6 +26,7 @@
//附件上传
function upload_attachment_win() {
var record=$('csh_transaction_receipt_head_ds').getAt(0);
/* var record = $(ds_id).findById(record_id);
var mortgage_id = record.get('mortgage_id');*/
var win = new Leaf.Window({
......@@ -33,11 +34,11 @@
url: $('hn2050_upload_win_link').getUrl(),
params: {
winid: 'hn2050_upload_win',
table_name: 'hn_virtual_con_mortgage',
header_id: 1000
table_name: 'csh_transaction',
header_id: record.get('transaction_id')
},
width: 900,
hight: 400
height: 400
}).on('close', function() {
//record.ds.query();
});
......
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update_readonly.lview
View file @ 911e54b8
......@@ -14,7 +14,7 @@
<a:model-query fetchAll="true" model="csh.CSH511.csh_transaction_default_exchange_rate_type" rootPath="default_exchange_rate_type_path"/>
</a:init-procedure>
<a:view>
<a:link id="hn2050_upload_win_link" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="hn2050_upload_win_link" url="${/request/@context_path}/downloadFile.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="get_exchange_rate_link_id" model="csh.CSH511.csh_transaction_get_exchange_rate" modelaction="query"/>
......@@ -26,6 +26,8 @@
//附件上传
function upload_attachment_win() {
var record=$('csh_transaction_receipt_head_ds').getAt(0);
/* var record = $(ds_id).findById(record_id);
var mortgage_id = record.get('mortgage_id');*/
var win = new Leaf.Window({
......@@ -33,11 +35,11 @@
url: $('hn2050_upload_win_link').getUrl(),
params: {
winid: 'hn2050_upload_win',
table_name: 'hn_virtual_con_mortgage',
header_id: 1000
table_name: 'csh_transaction',
header_id: record.get('transaction_id')
},
width: 900,
hight: 400
height: 400
}).on('close', function() {
//record.ds.query();
});
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ 911e54b8
......@@ -728,7 +728,7 @@
<a:column name="description" prompt="CSH510.CSH_TRANSACTION.DESCRIPTION" align="center"/>
<a:column name="confirmed_flag_desc" prompt="CSH510.CSH_TRANSACTION.BILL_STATUS" align="center"/>
<a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT" >
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
......
src/main/webapp/modules/csh/CSH515/csh_amount_return.lview
View file @ 911e54b8
......@@ -15,20 +15,26 @@
<a:link id="${/parameter/@layout_code}_csh560_cdd_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="transaction_return_uploadFile_link_id" url="${/request/@context_path}/uploadFile.lview"/>
<script type="text/javascript"><![CDATA[
Leaf.onReady(function(){
// console.log('${/parameter}');
})
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
var transaction_amount = ${/parameter/@transaction_amount}||0;
/* var transaction_amount = ${/parameter/@transaction_amount}||0;
var return_amount = ${/parameter/@returned_amount}||0;
var write_off_amount = ${/parameter/@write_off_amount}||0;
var remain_total_amount = ${/parameter/@remain_total_amount}||0;
var bank_slip_num = '${/parameter/@bank_slip_num}';
var bank_slip_num = '${/parameter/@bank_slip_num}';*/
record.set('remain_total_amount',remain_total_amount);
record.set('bank_slip_num',bank_slip_num);
};
//提交按钮
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
console.log($(ds_id).getAt(0));
var return_id = $(ds_id).getAt(0).get('return_id');
var transaction_amount = $(ds_id).getAt(0).get('transaction_amount');
var this_return_amount = $(ds_id).getAt(0).get('this_return_amount');
var return_amount = $(ds_id).getAt(0).get('return_amount');
......@@ -43,7 +49,7 @@
Leaf.showMessage('提示', '退款金额不能大于可退款金额！');
return;
}
var fin_amount = '${/model/fin_amount_check/record/@fin_amount}';
/* var fin_amount = '${/model/fin_amount_check/record/@fin_amount}';*/
// if(check_amount < 0.1 * fin_amount){
// Leaf.showMessage('提示','退还后保证金不足融资余额10%！');
// return;
......
src/main/webapp/modules/csh/CSH515/csh_transaction_returned_list.lview
View file @ 911e54b8
......@@ -73,18 +73,19 @@
</a:screenTopToolbar>
<a:grid bindTarget="csh_transaction_returned_list_ds" marginHeight="130" marginWidth="30" navBar="true">
<a:columns>
<a:column name="transaction_num" prompt="退款编号" renderer="returned_list_transaction" width="120"/>
<a:column name="transaction_date" prompt="退款日期" renderer="Leaf.formatDate"/>
<a:column name="currency_name" prompt="HLS.CURRENCY"/>
<a:column name="transaction_amount" prompt="退款金额" renderer="Leaf.formatMoney"/>
<a:column name="transaction_num" prompt="退款编号" width="120" align="center"/>
<a:column name="transaction_date" prompt="退款日期" renderer="Leaf.formatDate" align="center"/>
<!-- <a:column name="currency_name" prompt="HLS.CURRENCY"/>-->
<a:column name="this_return_amount" prompt="退款金额" renderer="Leaf.formatMoney" align="right"/>
<!-- <a:column name="posted_flag" prompt="HLS.POST"/> -->
<a:column name="bank_account_code" prompt="退款账户"/>
<a:column name="bank_account_name" prompt="CSH511.BANK_ACCOUNT_NAME"/>
<!--<a:column name="bank_account_code" prompt="退款账户"/>-->
<a:column name="bank_account_num" prompt="退款账户" align="center"/>
<a:column name="bank_branch_name" prompt="CSH511.BANK_ACCOUNT_NAME" align="center"/>
<!-- <a:column name="bank_account_num" prompt="CSH511.BANK_ACCOUNT_NUM"/> -->
<a:column name="bp_name" prompt="HLS.BP_NAME"/>
<a:column name="bp_category_display" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY"/>
<a:column name="bank_slip_num" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM"/>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY"/>
<a:column name="bp_name" prompt="HLS.BP_NAME" align="center"/>
<a:column name="bp_category_display" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY" align="center"/>
<a:column name="bank_slip_num" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM" align="center"/>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/>
<a:column align="center" prompt="附件查看" renderer="csh515_attachment_download" width="80"/>
</a:columns>
</a:grid>
......
src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview
View file @ 911e54b8
......@@ -66,7 +66,7 @@ $Purpose: 商业伙伴授信维护
//设置为可以修改
//datas[0].getField('credit_total_amount').setReadOnly(false);
}
//1. 营业内勤/营业担当勾选授信状态为“启用”或“审批冻结
//1. 营业内勤/营业担当勾选授信状态为“启用”或“停用
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
//授信额度变更
var credit_ds=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd');
......@@ -77,8 +77,8 @@ $Purpose: 商业伙伴授信维护
}
//启用和审批冻结判断
var credit_status=datas[0].data.credit_status;
if(credit_status!='ENABLE'&&credit_status!='FREZZING'){
$L.showInfoMessage("提示",'请选择状态为启用和审批冻结的数据！',null,null)
if(credit_status!='ENABLE'&&credit_status!='DISABLE'){
$L.showInfoMessage("提示",'请选择状态为启用和停用的数据！',null,null)
return;
}
//角色判断 00215 营业内勤
......
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