Skip to content

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

[fix] 完成授信功能，添加失效启用按钮

parent 223bb6e5
Hide whitespace changes
Inline Side-by-side
Showing with 330 additions and 108 deletions
src/main/database/Init/Sys_prompt/CSH_TRANSACTION_PROMPT.sql
View file @ 0da55362
...@@ -83,6 +83,58 @@ sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'HLS.DOCUMENT_CONFIRMED_BY', ...@@ -83,6 +83,58 @@ sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'HLS.DOCUMENT_CONFIRMED_BY',
sys_message_pkg.insert_message('E_NO_THIS_ACCOUNT', sys_message_pkg.insert_message('E_NO_THIS_ACCOUNT',
'错误', '错误',
'我方没有此银行账号！','ZHS'); '我方没有此银行账号！','ZHS');
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM',
p_language => 'ZHS',
p_description => '现金事务编号',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.RECEIPT_TYPE',
p_language => 'ZHS',
p_description => '收款类型',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT',
p_language => 'ZHS',
p_description => '收款金额',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.RETURN_AMOUNT',
p_language => 'ZHS',
p_description => '退款金额',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.USEFUL_AMOUNT',
p_language => 'ZHS',
p_description => '可用金额',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.DESCRIPTION',
p_language => 'ZHS',
p_description => '摘要',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.MY_ACCOUNT',
p_language => 'ZHS',
p_description => '我方账户',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.YOUR_ACCOUNT',
p_language => 'ZHS',
p_description => '对方账户',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.ACCOUNT_NAME',
p_language => 'ZHS',
p_description => '户名',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.ACCOUNT_BANK',
p_language => 'ZHS',
p_description => '银行',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.ACCOUNT_NUM',
p_language => 'ZHS',
p_description => '账号',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.DEPT_CONFIRMER',
p_language => 'ZHS',
p_description => '债权确认人',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.ACCT_CONFIRMER',
p_language => 'ZHS',
p_description => '会计确认人',
p_created_by => 1);
end; end;
/ /
commit; commit;
......
src/main/database/Register_function/REGISTER_HLS362N_credit_entrance_confirm_detail.sql 0 → 100644
View file @ 0da55362
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/database/View/CREDIT_AGENT_DETAILS_V.sql 0 → 100644
View file @ 0da55362
create or replace view credit_agent_details_v as
select
hv.bp_id,
hv.bp_code,
hv.bp_name,
c.contract_number,
(select bp_name from hls_bp_master hbm where hbm.bp_id=hv.bp_id)BP_ID_TENANT,
--占用额度
(select c.total_rental+c.down_payment from dual) used_amount,
--释放额度
( select nvl(sum(co.csh_write_off_amount),0)
from CSH_WRITE_OFF co
where
( co.cf_item=1 and co.cf_type=1 and co.reversed_flag='N' and co.contract_id=c.contract_id)
or ( co.cf_item=2 and co.cf_type=2 and co.reversed_flag='N' and co.contract_id=c.contract_id)
or ( co.cf_item=200 and co.cf_type=1 and co.reversed_flag='N' and co.contract_id=c.contract_id)
or ( co.cf_item=250 and co.cf_type=1 and co.reversed_flag='N' and co.contract_id=c.contract_id) )RELEASED_AMOUNT
from hls_bp_master_v hv,con_contract c
where hv.bp_category='AGENT' and c.bp_id_agent_level1=bp_id
src/main/database/View/CREDIT_TENANT_DETAILS_V.sql 0 → 100644
View file @ 0da55362
create or replace view credit_tenant_details_v as
select
hv.bp_id,
hv.bp_code,
hv.bp_name,
c.contract_number,
(select bp_name from hls_bp_master hbm where hbm.bp_id=hv.bp_id)BP_ID_TENANT,
--占用额度
(select c.total_rental+c.down_payment from dual) used_amount,
--释放额度
( select nvl(sum(co.csh_write_off_amount),0)
from CSH_WRITE_OFF co
where
( co.cf_item=1 and co.cf_type=1 and co.reversed_flag='N' and co.contract_id=c.contract_id)
or ( co.cf_item=2 and co.cf_type=2 and co.reversed_flag='N' and co.contract_id=c.contract_id)
or ( co.cf_item=200 and co.cf_type=1 and co.reversed_flag='N' and co.contract_id=c.contract_id)
or ( co.cf_item=250 and co.cf_type=1 and co.reversed_flag='N' and co.contract_id=c.contract_id) )RELEASED_AMOUNT
from hls_bp_master_v hv,con_contract c
where hv.bp_category='TENANT' and c.bp_id_tenant=bp_id
\ No newline at end of file
src/main/webapp/WEB-INF/classes/csh/CSH511/csh_transaction.lwm
View file @ 0da55362
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<bm:field name="transaction_type" databaseType="VARCHAR2" datatype="java.lang.String" lookupCode="CSH513_WRITE_OFF_TYPE" lookupField="transaction_type_desc" physicalName="TRANSACTION_TYPE" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_TYPE"/> <bm:field name="transaction_type" databaseType="VARCHAR2" datatype="java.lang.String" lookupCode="CSH513_WRITE_OFF_TYPE" lookupField="transaction_type_desc" physicalName="TRANSACTION_TYPE" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_TYPE"/>
<bm:field name="transaction_date" databaseType="DATE" datatype="java.util.Date" physicalName="TRANSACTION_DATE" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_DATE"/> <bm:field name="transaction_date" databaseType="DATE" datatype="java.util.Date" physicalName="TRANSACTION_DATE" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_DATE"/>
<bm:field name="penalty_calc_date" databaseType="DATE" datatype="java.util.Date" physicalName="PENALTY_CALC_DATE" prompt="CSH511.CSH_TRANSACTION.PENALTY_CALC_DATE"/> <bm:field name="penalty_calc_date" databaseType="DATE" datatype="java.util.Date" physicalName="PENALTY_CALC_DATE" prompt="CSH511.CSH_TRANSACTION.PENALTY_CALC_DATE"/>
<bm:field name="bank_slip_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_SLIP_NUM" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM"/> <bm:field name="bank_slip_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_SLIP_NUM" prompt="银行流水号"/>
<bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="CSH511.CSH_TRANSACTION.COMPANY_ID"/> <bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="CSH511.CSH_TRANSACTION.COMPANY_ID"/>
<bm:field name="internal_period_num" databaseType="NUMBER" datatype="java.lang.Long" physicalName="INTERNAL_PERIOD_NUM" prompt="CSH511.CSH_TRANSACTION.INTERNAL_PERIOD_NUM"/> <bm:field name="internal_period_num" databaseType="NUMBER" datatype="java.lang.Long" physicalName="INTERNAL_PERIOD_NUM" prompt="CSH511.CSH_TRANSACTION.INTERNAL_PERIOD_NUM"/>
<bm:field name="period_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PERIOD_NAME" prompt="HLS.ACCOUNT_PERIOD_NAME"/> <bm:field name="period_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PERIOD_NAME" prompt="HLS.ACCOUNT_PERIOD_NAME"/>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<bm:field name="exchange_rate_type_display" expression="(select tv.type_name from gld_exchangerate_types_vl tv where tv.type_code=t1.exchange_rate_type)" forInsert="false" forUpdate="false" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/> <bm:field name="exchange_rate_type_display" expression="(select tv.type_name from gld_exchangerate_types_vl tv where tv.type_code=t1.exchange_rate_type)" forInsert="false" forUpdate="false" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
<bm:field name="transaction_functional_amount" expression="gld_exchange_rate_pkg.get_currency_exchange(t1.transaction_amount,t1.exchange_rate,t1.exchange_rate_quotation)" forInsert="false" forUpdate="false" prompt="HLS.FUNCTIONAL_AMOUNT"/> <bm:field name="transaction_functional_amount" expression="gld_exchange_rate_pkg.get_currency_exchange(t1.transaction_amount,t1.exchange_rate,t1.exchange_rate_quotation)" forInsert="false" forUpdate="false" prompt="HLS.FUNCTIONAL_AMOUNT"/>
<bm:field name="bank_account_code" expression="(select a.bank_account_code from csh_bank_account a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_ACCOUNT_CODE"/> <bm:field name="bank_account_code" expression="(select a.bank_account_code from csh_bank_account a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_ACCOUNT_CODE"/>
<bm:field name="bank_account_name" expression="(select a.bank_account_name from csh_bank_account a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_ACCOUNT_NAME"/> <bm:field name="bank_account_name" expression="(select a.bank_account_name from csh_bank_account a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="我方银行名称"/>
<bm:field name="bank_account_num" expression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_ACCOUNT_NUM"/> <bm:field name="bank_account_num" expression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_ACCOUNT_NUM"/>
<bm:field name="bank_branch_name" expression="(select a.bank_branch_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_BRANCH_NAME"/> <bm:field name="bank_branch_name" expression="(select a.bank_branch_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_BRANCH_NAME"/>
<bm:field name="bank_account_type_name" expression="(select a.bank_account_type_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_ACCOUNT_TYPE_NAME"/> <bm:field name="bank_account_type_name" expression="(select a.bank_account_type_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_ACCOUNT_TYPE_NAME"/>
...@@ -94,10 +94,11 @@ ...@@ -94,10 +94,11 @@
<bm:field name="purpose"/> <bm:field name="purpose"/>
<bm:field name="gsber"/> <bm:field name="gsber"/>
<bm:field name="sus_belnr"/> <bm:field name="sus_belnr"/>
<bm:field name="bp_bank_account_name" prompt="CSH511.BANK_ACCOUNT_NAME"/> <bm:field name="bp_bank_account_name" prompt="对方账户名称"/>
<bm:field name="receipt_type"/> <bm:field name="receipt_type"/>
<bm:field name="bp_virtual_bank_account"/> <bm:field name="bp_virtual_bank_account"/>
<bm:field name="paid_byother_flag_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'PAID_BYOTHER_FLAG' and v.code_value =t1.paid_byother_flag)" forInsert="false" forUpdate="false"/> <bm:field name="paid_byother_flag_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'PAID_BYOTHER_FLAG' and v.code_value =t1.paid_byother_flag)" forInsert="false" forUpdate="false" prompt="代付字段"/>
<bm:field name="paid_byother_flag" />
</bm:fields> </bm:fields>
<bm:features> <bm:features>
......
src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview
View file @ 0da55362
...@@ -61,6 +61,9 @@ ...@@ -61,6 +61,9 @@
unlock_current_window(); unlock_current_window();
$('csh_transaction_receipt_maintain_result_ds').query(); $('csh_transaction_receipt_maintain_result_ds').query();
Leaf.showMessage('${l:PROMPT}', '修改成功！'); Leaf.showMessage('${l:PROMPT}', '修改成功！');
$('csh509_csh_trx_bank_business_confirm').enable();
$('csh509_csh_trx_bank_refuse').enable();
$('csh509_csh_trx_bank_drop').enable();
}, failure: function () { }, failure: function () {
unlock_current_window(); unlock_current_window();
}, },
...@@ -74,8 +77,8 @@ ...@@ -74,8 +77,8 @@
} }
//营业人员确认 //营业人员确认
function csh509_csh_trx_bank_business_confirm(){ function csh509_csh_trx_bank_business_confirm(){
console.log('${/session/@user_id}'); //console.log('${/session/@user_id}');
$('csh509_csh_trx_bank_business_confirm').disable();
//根据身份判断所选择的数据是否可以确认 //根据身份判断所选择的数据是否可以确认
var datas = $('csh_transaction_receipt_maintain_result_ds').selected; var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
var updateData=[]; var updateData=[];
...@@ -122,6 +125,7 @@ ...@@ -122,6 +125,7 @@
//营业人员驳回单据 //营业人员驳回单据
function csh509_csh_trx_bank_refuse(){ function csh509_csh_trx_bank_refuse(){
//驳回收款单 //驳回收款单
$('csh509_csh_trx_bank_refuse').disable();
//根据身份判断所选择的数据是否可以确认 //根据身份判断所选择的数据是否可以确认
var datas = $('csh_transaction_receipt_maintain_result_ds').selected; var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
if(datas.length==0){ if(datas.length==0){
...@@ -163,6 +167,7 @@ ...@@ -163,6 +167,7 @@
function csh509_csh_trx_bank_drop(){ function csh509_csh_trx_bank_drop(){
//驳回收款单 //驳回收款单
//根据身份判断所选择的数据是否可以确认 //根据身份判断所选择的数据是否可以确认
$('csh509_csh_trx_bank_drop').disable();
var datas = $('csh_transaction_receipt_maintain_result_ds').selected; var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
if(datas.length==0){ if(datas.length==0){
$L.showInfoMessage("提示",'请先选择数据'); $L.showInfoMessage("提示",'请先选择数据');
...@@ -231,6 +236,7 @@ ...@@ -231,6 +236,7 @@
} }
function csh510_receipt_query() { function csh510_receipt_query() {
var record = $('csh_transaction_receipt_maintain_query_ds').getAt(0); var record = $('csh_transaction_receipt_maintain_query_ds').getAt(0);
var dirty_flag = 'N'; var dirty_flag = 'N';
for (var name in record.data) { for (var name in record.data) {
...@@ -244,6 +250,7 @@ ...@@ -244,6 +250,7 @@
return; return;
}, function () { }, function () {
$('csh_transaction_receipt_maintain_result_ds').query(); $('csh_transaction_receipt_maintain_result_ds').query();
}, null, null); }, null, null);
} else { } else {
$('csh_transaction_receipt_maintain_result_ds').query(); $('csh_transaction_receipt_maintain_result_ds').query();
...@@ -684,10 +691,10 @@ ...@@ -684,10 +691,10 @@
<!-- <a:gridButton click="csh510_receipt_back" text="HLS.BACK"/> <!-- <a:gridButton click="csh510_receipt_back" text="HLS.BACK"/>
<a:gridButton click="csh510_receipt_forward" text="HLS.FORWARD"/> --> <a:gridButton click="csh510_receipt_forward" text="HLS.FORWARD"/> -->
<!-- <a:gridButton click="csh510_receipt_quit" text="HLS.EXIT"/> --> <!-- <a:gridButton click="csh510_receipt_quit" text="HLS.EXIT"/> -->
<a:gridButton click="csh509_csh_trx_bank_business_confirm" text="新增确认"/> <a:gridButton click="csh509_csh_trx_bank_business_confirm" text="CSH509.CSH_RECEIPT_CONFIRM.NEW_APPLY_BTN" id="csh509_csh_trx_bank_business_confirm"/>
<a:gridButton click="csh509_csh_trx_bank_refuse" text="新增驳回"/> <a:gridButton click="csh509_csh_trx_bank_refuse" text="CSH509.CSH_RECEIPT_CONFIRM.REFUSE_BTN" id="csh509_csh_trx_bank_refuse"/>
<a:gridButton click="csh509_csh_trx_bank_drop" text="作废"/> <a:gridButton click="csh509_csh_trx_bank_drop" text="CSH509.CSH_RECEIPT_CONFIRM.DROP_BTN" id="csh509_csh_trx_bank_drop"/>
<a:gridButton click="csh510_receipt_query" text="查询"/> <a:gridButton click="csh510_receipt_query" text="CSH509.CSH_RECEIPT_CONFIRM.QUERY_BTN" id="csh510_receipt_query"/>
<!--<a:gridButton click="csh510_receipt_remove" text="HLS.REMOVE"/>--> <!--<a:gridButton click="csh510_receipt_remove" text="HLS.REMOVE"/>-->
<!-- <a:gridButton click="csh510_csh_trx_bank_apply_new" text="CSH510.CSH_TRANSACTION.APPLY_NEW_BTN"/> <!-- <a:gridButton click="csh510_csh_trx_bank_apply_new" text="CSH510.CSH_TRANSACTION.APPLY_NEW_BTN"/>
<a:gridButton click="csh510_csh_trx_bank_drop" text="CSH510.CSH_TRANSACTION.DROP_BTN"/>--> <a:gridButton click="csh510_csh_trx_bank_drop" text="CSH510.CSH_TRANSACTION.DROP_BTN"/>-->
...@@ -732,31 +739,31 @@ ...@@ -732,31 +739,31 @@
</a:toolBar>--> </a:toolBar>-->
<a:columns> <a:columns>
<a:column name="transaction_num" prompt="现金事务编号" renderer="seedetail_transaction_num" width="110"/> <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110"/>
<a:column name="receipt_type" align="center" prompt="收款类型" width="100"/> <a:column name="receipt_type" align="center" prompt="CSH510.CSH_TRANSACTION.RECEIPT_TYPE" width="100"/>
<a:column name="transaction_amount" align="right" prompt="收款金额" width="100" renderer="Leaf.formatMoney"/> <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/> <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="returned_amount" prompt="退款金额" align="right" renderer="Leaf.formatMoney" /> <a:column name="returned_amount" prompt="CSH510.CSH_TRANSACTION.RETURN_AMOUNT" align="right" renderer="Leaf.formatMoney" />
<a:column name="use_money_amount" prompt="可用金额" align="right" renderer="Leaf.formatMoney"/> <a:column name="use_money_amount" prompt="CSH510.CSH_TRANSACTION.USEFUL_AMOUNT" align="right" renderer="Leaf.formatMoney"/>
<a:column name="collection_classes_desc" prompt="款项用途" align="center"/> <a:column name="collection_classes_desc" prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS" align="center"/>
<a:column name="bp_name" prompt="商业伙伴" align="center"/> <a:column name="bp_name" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER" align="center"/>
<a:column name="bank_slip_num" prompt="银行流水号" align="center"/> <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
<a:column name="description" prompt="摘要" align="center"/> <a:column name="description" prompt="CSH510.CSH_TRANSACTION.DESCRIPTION" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据状态" align="center"/> <a:column name="confirmed_flag_desc" prompt="CSH510.CSH_TRANSACTION.BILL_STATUS" align="center"/>
<a:column name="written_off_flag_desc" prompt="核销状态" align="center"/> <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS" align="center"/>
<a:column prompt="我方账户" align="center"> <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT" align="center">
<a:column prompt="户名" name="bank_account_name" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
<a:column prompt="银行" name="bank_branch_name" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
<a:column prompt="账号" name="bank_account_num" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
</a:column> </a:column>
<a:column prompt="对方账户"> <a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
<a:column prompt="户名" name="bp_bank_account_name" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/>
<a:column prompt="银行" name="opposite_band_na" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/>
<a:column prompt="账号" name="bp_bank_account_num" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
</a:column> </a:column>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/> <a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/>
<a:column name="debt_confirmed_by_desc" prompt="债权确认人" align="center"/> <a:column name="debt_confirmed_by_desc" prompt="CSH510.CSH_TRANSACTION.DEPT_CONFIRMER" align="center"/>
<a:column name="acc_confirmed_by_desc" prompt="会计确认人" align="center"/> <a:column name="acc_confirmed_by_desc" prompt="CSH510.CSH_TRANSACTION.ACCT_CONFIRMER" align="center"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:fieldSet> </a:fieldSet>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ 0da55362
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
}) })
//新增单据的作废 //新增单据的作废
function csh510_csh_trx_bank_drop(){ function csh510_csh_trx_bank_drop(){
$('csh510_csh_trx_bank_drop').disable();
var datas = $('csh_transaction_receipt_maintain_result_ds').selected; var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
if (datas.length == 0) { if (datas.length == 0) {
$L.showMessage("提示", '请选择要作废的单据'); $L.showMessage("提示", '请选择要作废的单据');
...@@ -70,11 +71,14 @@ ...@@ -70,11 +71,14 @@
unlock_current_window(); unlock_current_window();
$('csh_transaction_receipt_maintain_result_ds').query(); $('csh_transaction_receipt_maintain_result_ds').query();
Leaf.showMessage('${l:PROMPT}', '该单据已作废！'); Leaf.showMessage('${l:PROMPT}', '该单据已作废！');
$('csh510_csh_trx_bank_drop').enable();
}, failure: function () { }, failure: function () {
unlock_current_window(); unlock_current_window();
$('csh510_csh_trx_bank_drop').enable();
}, },
error: function () { error: function () {
unlock_current_window(); unlock_current_window();
$('csh510_csh_trx_bank_drop').enable();
}, },
scope: this scope: this
}); });
...@@ -83,6 +87,7 @@ ...@@ -83,6 +87,7 @@
} }
//新增申请按钮’ //新增申请按钮’
function csh510_csh_trx_bank_apply_new() { function csh510_csh_trx_bank_apply_new() {
$('csh510_csh_trx_bank_apply_new').disable();
var datas = $('csh_transaction_receipt_maintain_result_ds').selected; var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
//获得所选择的的未提交的单据，如果有不是未提交的数据，提示重新进行选择 //获得所选择的的未提交的单据，如果有不是未提交的数据，提示重新进行选择
if (datas.length == 0) { if (datas.length == 0) {
...@@ -123,10 +128,16 @@ ...@@ -123,10 +128,16 @@
unlock_current_window(); unlock_current_window();
$('csh_transaction_receipt_maintain_result_ds').query(); $('csh_transaction_receipt_maintain_result_ds').query();
Leaf.showMessage('${l:PROMPT}', '修改成功！'); Leaf.showMessage('${l:PROMPT}', '修改成功！');
//启用按钮
$('csh510_csh_trx_bank_apply_new').enable();
}, failure: function () { }, failure: function () {
//启用按钮
$('csh510_csh_trx_bank_apply_new').enable();
unlock_current_window(); unlock_current_window();
}, },
error: function () { error: function () {
//启用按钮
$('csh510_csh_trx_bank_apply_new').enable();
unlock_current_window(); unlock_current_window();
}, },
scope: this scope: this
...@@ -136,6 +147,8 @@ ...@@ -136,6 +147,8 @@
//跳转到收款新增页面 //跳转到收款新增页面
function csh510_csh_trx_bank_hand_add(){ function csh510_csh_trx_bank_hand_add(){
//按钮失效
$('csh510_csh_trx_bank_hand_add').disable();
var url = $('csh_transaction_receipt_link').getUrl(); var url = $('csh_transaction_receipt_link').getUrl();
var win = new Leaf.Window({ var win = new Leaf.Window({
title:'${l:CSH510.NEW_MANUAL_RECEIPT}', title:'${l:CSH510.NEW_MANUAL_RECEIPT}',
...@@ -143,6 +156,9 @@ ...@@ -143,6 +156,9 @@
id: 'csh_trx_receipt_id', id: 'csh_trx_receipt_id',
fullScreen: true, fullScreen: true,
draggable: true draggable: true
}).on('close', function() {
//按钮启用
$('csh510_csh_trx_bank_hand_add').enable();
}); });
} }
...@@ -179,6 +195,7 @@ ...@@ -179,6 +195,7 @@
} }
function csh510_receipt_query() { function csh510_receipt_query() {
var record = $('csh_transaction_receipt_maintain_query_ds').getAt(0); var record = $('csh_transaction_receipt_maintain_query_ds').getAt(0);
var dirty_flag = 'N'; var dirty_flag = 'N';
for (var name in record.data) { for (var name in record.data) {
...@@ -427,8 +444,9 @@ ...@@ -427,8 +444,9 @@
} }
function csh510_csh_trx_bank_import(){ function csh510_csh_trx_bank_import(){
//按钮失效
$('csh510_csh_trx_bank_import').disable();
//只有债权内勤才能 //只有债权内勤才能
var url_l = $('csh510_csh_transaction_import_link').getUrl(); var url_l = $('csh510_csh_transaction_import_link').getUrl();
var win = new Leaf.Window({ var win = new Leaf.Window({
...@@ -446,9 +464,10 @@ ...@@ -446,9 +464,10 @@
}); });
win.on('close', function () { win.on('close', function () {
$('csh_transaction_receipt_maintain_result_ds').query(); $('csh_transaction_receipt_maintain_result_ds').query();
//按钮启用
$('csh510_csh_trx_bank_import').enable();
}); });
} }
function csh510_export() { function csh510_export() {
...@@ -650,12 +669,12 @@ ...@@ -650,12 +669,12 @@
<!-- <a:gridButton click="csh510_receipt_back" text="HLS.BACK"/> <!-- <a:gridButton click="csh510_receipt_back" text="HLS.BACK"/>
<a:gridButton click="csh510_receipt_forward" text="HLS.FORWARD"/> --> <a:gridButton click="csh510_receipt_forward" text="HLS.FORWARD"/> -->
<!-- <a:gridButton click="csh510_receipt_quit" text="HLS.EXIT"/> --> <!-- <a:gridButton click="csh510_receipt_quit" text="HLS.EXIT"/> -->
<a:gridButton click="csh510_receipt_query" text="HLS.QUERY"/> <a:gridButton click="csh510_receipt_query" text="HLS.QUERY" id="csh510_receipt_query"/>
<a:gridButton click="csh510_csh_trx_bank_import" text="CSH510.CSH_TRANSACTION.RECEIVE_MONEY_IMPORT_BTN"/> <a:gridButton click="csh510_csh_trx_bank_import" text="CSH510.CSH_TRANSACTION.RECEIVE_MONEY_IMPORT_BTN" id="csh510_csh_trx_bank_import"/>
<a:gridButton click="csh510_csh_trx_bank_hand_add" text="CSH510.CSH_TRANSACTION.MONEY_HAND_ADD_BTN"/> <a:gridButton click="csh510_csh_trx_bank_hand_add" text="CSH510.CSH_TRANSACTION.MONEY_HAND_ADD_BTN" id="csh510_csh_trx_bank_hand_add"/>
<!--<a:gridButton click="csh510_receipt_remove" text="HLS.REMOVE"/>--> <!--<a:gridButton click="csh510_receipt_remove" text="HLS.REMOVE"/>-->
<a:gridButton click="csh510_csh_trx_bank_apply_new" text="CSH510.CSH_TRANSACTION.APPLY_NEW_BTN"/> <a:gridButton click="csh510_csh_trx_bank_apply_new" text="CSH510.CSH_TRANSACTION.APPLY_NEW_BTN" id="csh510_csh_trx_bank_apply_new"/>
<a:gridButton click="csh510_csh_trx_bank_drop" text="CSH510.CSH_TRANSACTION.DROP_BTN"/> <a:gridButton click="csh510_csh_trx_bank_drop" text="CSH510.CSH_TRANSACTION.DROP_BTN" id="csh510_csh_trx_bank_drop"/>
<a:gridButton click="csh510_receipt_reset" text="HLS.RESET"/> <a:gridButton click="csh510_receipt_reset" text="HLS.RESET"/>
<!-- <a:gridButton click="csh510_csh_transaction_batch_update" text="批量过账"/>--> <!-- <a:gridButton click="csh510_csh_transaction_batch_update" text="批量过账"/>-->
<!-- <a:gridButton click="csh510_receipt" text="财务认领"/> --> <!-- <a:gridButton click="csh510_receipt" text="财务认领"/> -->
...@@ -697,31 +716,31 @@ ...@@ -697,31 +716,31 @@
</a:toolBar>--> </a:toolBar>-->
<a:columns> <a:columns>
<a:column name="transaction_num" prompt="现金事务编号" renderer="seedetail_transaction_num" width="110" align="center"/> <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110" align="center"/>
<a:column name="receipt_type_n" align="center" prompt="收款类型" width="100"/> <a:column name="receipt_type_n" align="center" prompt="CSH510.CSH_TRANSACTION.RECEIPT_TYPE" width="100"/>
<a:column name="transaction_amount" align="right" prompt="收款金额" width="100" renderer="Leaf.formatMoney"/> <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/> <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="returned_amount" prompt="退款金额" align="right" renderer="Leaf.formatMoney"/> <a:column name="returned_amount" prompt="CSH510.CSH_TRANSACTION.RETURN_AMOUNT" align="right" renderer="Leaf.formatMoney"/>
<a:column name="use_money_amount" prompt="可用金额" align="right" renderer="Leaf.formatMoney"/> <a:column name="use_money_amount" prompt="CSH510.CSH_TRANSACTION.USEFUL_AMOUNT" align="right" renderer="Leaf.formatMoney"/>
<a:column name="collection_classes_desc" prompt="款项用途" align="center"/> <a:column name="collection_classes_desc" prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS" align="center"/>
<a:column name="bp_name" prompt="商业伙伴" align="center"/> <a:column name="bp_name" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER" align="center"/>
<a:column name="bank_slip_num" prompt="银行流水号" align="center"/> <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
<a:column name="description" prompt="摘要" align="center"/> <a:column name="description" prompt="CSH510.CSH_TRANSACTION.DESCRIPTION" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据状态" align="center"/> <a:column name="confirmed_flag_desc" prompt="CSH510.CSH_TRANSACTION.BILL_STATUS" align="center"/>
<a:column name="written_off_flag_desc" prompt="核销状态" align="center"/> <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS" align="center"/>
<a:column prompt="我方账户" > <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT" >
<a:column prompt="户名" name="bank_account_name" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
<a:column prompt="银行" name="bank_branch_name" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
<a:column prompt="账号" name="bank_account_num" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
</a:column> </a:column>
<a:column prompt="对方账户"> <a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
<a:column prompt="户名" name="bp_bank_account_name" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/>
<a:column prompt="银行" name="opposite_band_na" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/>
<a:column prompt="账号" name="bp_bank_account_num" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
</a:column> </a:column>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/> <a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/>
<a:column name="debt_confirmed_by_desc" prompt="债权确认人" align="center"/> <a:column name="debt_confirmed_by_desc" prompt="CSH510.CSH_TRANSACTION.DEPT_CONFIRMER" align="center"/>
<a:column name="acc_confirmed_by_desc" prompt="会计确认人" align="center"/> <a:column name="acc_confirmed_by_desc" prompt="CSH510.CSH_TRANSACTION.ACCT_CONFIRMER" align="center"/>
</a:columns> </a:columns>
<a:editors> <a:editors>
<a:numberField id="number_editor" allowDecimals="true" decimalPrecision="2" editable="false"/> <a:numberField id="number_editor" allowDecimals="true" decimalPrecision="2" editable="false"/>
......
src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview
View file @ 0da55362
...@@ -22,27 +22,35 @@ ...@@ -22,27 +22,35 @@
<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[
var transaction_id='';
//附件上传 //附件上传
function upload_attachment_win() { function upload_attachment_win() {
/* var record = $(ds_id).findById(record_id); console.log(transaction_id)
var mortgage_id = record.get('mortgage_id');*/ var flag=true;
console.log($('csh_transaction_receipt_head_ds').getAt(0).id); if(transaction_id==''){
var win = new Leaf.Window({ $L.showInfoMessage("提示",'请先保存数据',null,null);
id: 'hn2050_upload_win', flag=false;
url: $('hn2050_upload_win_link').getUrl(), return;
params: { }
winid: 'hn2050_upload_win', //防止并发
table_name: 'csh_transaction', if(flag){
header_id: $('csh_transaction_receipt_head_ds').getAt(0).id var win = new Leaf.Window({
}, id: 'hn2050_upload_win',
width: 900, url: $('hn2050_upload_win_link').getUrl(),
hight: 400 params: {
}).on('close', function() { winid: 'hn2050_upload_win',
//record.ds.query(); table_name: 'csh_transaction',
}); header_id: transaction_id
},
width: 900,
hight: 400
}).on('close', function() {
//record.ds.query();
});
}
} }
var transaction_id;
<!--增加重置功能--> <!--增加重置功能-->
function csh511_receipt_reset(){ function csh511_receipt_reset(){
$('csh_transaction_receipt_head_ds').reset(); $('csh_transaction_receipt_head_ds').reset();
...@@ -72,11 +80,13 @@ ...@@ -72,11 +80,13 @@
} }
function csh511_receipt_save(flag) { function csh511_receipt_save(flag) {
$('csh511_receipt_save').disable();
if ($('csh_transaction_receipt_head_ds').validate()) { if ($('csh_transaction_receipt_head_ds').validate()) {
var record = $('csh_transaction_receipt_head_ds').getAt(0); var record = $('csh_transaction_receipt_head_ds').getAt(0);
if (flag != 'Y') { if (flag != 'Y') {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.SAVING}'); Leaf.Masker.mask(Ext.getBody(), '${l:HLS.SAVING}');
} }
var saveData = []; var saveData = [];
record.set('receipt_type', 'MANUAL'); record.set('receipt_type', 'MANUAL');
if (flag == 'Y') { if (flag == 'Y') {
...@@ -92,21 +102,27 @@ ...@@ -92,21 +102,27 @@
success: function (res) { success: function (res) {
// //
transaction_id = res.result.transaction_id; transaction_id = res.result.transaction_id;
Leaf.SideBar.show({ Leaf.SideBar.show({
msg: '${l:HLS.SUBMIT_SUCCESS}', msg: '${l:HLS.SUBMIT_SUCCESS}',
duration: 2000 duration: 2000
}); });
// window.location.href = $('csh_transaction_receipt_id').getUrl(); // window.location.href = $('csh_transaction_receipt_id').getUrl();
$('csh511_receipt_save').enable();
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
}, },
failure: function () { failure: function () {
$('csh511_receipt_save').enable();
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
}, },
error: function () { error: function () {
$('csh511_receipt_save').enable();
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
}, },
scope: this scope: this
}); });
}else{
$('csh511_receipt_save').enable();
} }
} }
...@@ -153,7 +169,7 @@ ...@@ -153,7 +169,7 @@
record.set('exchange_rate_type', '${/model/fnd_financial_option_path/record/@default_exchange_rate_type}'); record.set('exchange_rate_type', '${/model/fnd_financial_option_path/record/@default_exchange_rate_type}');
record.set('rate_method_code', '${/model/fnd_financial_option_path/record/@rate_method_code}'); record.set('rate_method_code', '${/model/fnd_financial_option_path/record/@rate_method_code}');
record.set('exchange_rate_type_display', '${/model/fnd_financial_option_path/record/@exchange_rate_type_display}'); record.set('exchange_rate_type_display', '${/model/fnd_financial_option_path/record/@exchange_rate_type_display}');
record.getField('exchange_rate_type_display').setRequired(true); // record.getField('exchange_rate_type_display').setRequired(true);
record.getField('exchange_rate_type_display').setReadOnly(false); record.getField('exchange_rate_type_display').setReadOnly(false);
} }
} else if (name == 'rate_method_code' || name == 'period_name') { } else if (name == 'rate_method_code' || name == 'period_name') {
...@@ -344,6 +360,7 @@ ...@@ -344,6 +360,7 @@
<a:dataSet id="csh_transaction_receipt_head_ds" autoCreate="true" loadData="true" model="csh.CSH511.csh_transaction"> <a:dataSet id="csh_transaction_receipt_head_ds" autoCreate="true" loadData="true" model="csh.CSH511.csh_transaction">
<a:fields> <a:fields>
<a:field name="transaction_date" required="true"/> <a:field name="transaction_date" required="true"/>
<a:field name="bank_slip_num" required="true"/>
<!--<a:field name="period_name" lovGridHeight="300" lovHeight="500" lovService="gld.gld_period_lov" lovWidth="500" readOnly="true" required="true" title="GLD_PERIODS.PERIOD_NAME"> <!--<a:field name="period_name" lovGridHeight="300" lovHeight="500" lovService="gld.gld_period_lov" lovWidth="500" readOnly="true" required="true" title="GLD_PERIODS.PERIOD_NAME">
<a:mapping> <a:mapping>
<a:map from="period_name" to="period_name"/> <a:map from="period_name" to="period_name"/>
...@@ -386,10 +403,10 @@ ...@@ -386,10 +403,10 @@
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="exchange_rate_type"/> <a:field name="exchange_rate_type"/>
<a:field name="exchange_rate" readOnly="true" required="true"/> <a:field name="exchange_rate" readOnly="true"/>
<a:field name="rate_method_code"/> <a:field name="rate_method_code"/>
<a:field name="transaction_amount" required="true"/> <a:field name="transaction_amount" required="true"/>
<a:field name="transaction_functional_amount" readOnly="true" required="true"/> <a:field name="transaction_functional_amount" readOnly="true"/>
<a:field name="bank_account_name" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" required="true" title="CSH511.BANK_ACCOUNT_CODE"> <a:field name="bank_account_name" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" required="true" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping> <a:mapping>
<a:map from="precision" to="precision"/> <a:map from="precision" to="precision"/>
...@@ -437,7 +454,7 @@ ...@@ -437,7 +454,7 @@
<a:field name="bp_bank_account_num"/> <a:field name="bp_bank_account_num"/>
<a:field name="bp_bank_account_name" required="true"/> <a:field name="bp_bank_account_name" required="true"/>
<a:field name="collection_classes_desc" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/> <a:field name="collection_classes_desc" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<a:field name="paid_byother_flag_n" options="PAID_BYOTHER_FLAG_DS" returnField="paid_byother_flag" displayField="code_value_name" valueField="code_value"/> <a:field name="paid_byother_flag_n" options="PAID_BYOTHER_FLAG_DS" returnField="paid_byother_flag" displayField="code_value_name" valueField="code_value" required="true"/>
</a:fields> </a:fields>
<a:events> <a:events>
<a:event name="update" handler="onUpdate_csh511_receipt"/> <a:event name="update" handler="onUpdate_csh511_receipt"/>
...@@ -449,7 +466,7 @@ ...@@ -449,7 +466,7 @@
<a:screenBody> <a:screenBody>
<a:screenTopToolbar> <a:screenTopToolbar>
<a:screenTitle/> <a:screenTitle/>
<a:gridButton id="csh511_receipt_save_id" click="csh511_receipt_save" text="HLS.SAVE"/> <a:gridButton id="csh511_receipt_save" click="csh511_receipt_save" text="HLS.SAVE"/>
<a:gridButton id="csh511_receipt_reset_id" click="csh511_receipt_reset" text="HLS.RESET"/> <a:gridButton id="csh511_receipt_reset_id" click="csh511_receipt_reset" text="HLS.RESET"/>
<!--<a:gridButton id="csh511_receipt_posted_id" click="csh511_receipt_posted" text="HLS.POST"/>--> <!--<a:gridButton id="csh511_receipt_posted_id" click="csh511_receipt_posted" text="HLS.POST"/>-->
<!--<a:gridButton id="csh511_receipt_upload_id" click="attachment_upload" text="附件上传"/>--> <!--<a:gridButton id="csh511_receipt_upload_id" click="attachment_upload" text="附件上传"/>-->
...@@ -492,7 +509,7 @@ ...@@ -492,7 +509,7 @@
<!--</a:form>--> <!--</a:form>-->
<!--#删除表格头,添加fieldSet--> <!--#删除表格头,添加fieldSet-->
<!-- <a:form title="收款信息" width="1200">--> <!-- <a:form title="收款信息" width="1200">-->
<a:fieldSet title="收款手动新增"> <a:fieldSet title="CSH511.CSH_TRANSACTION.MANUAL_ADD">
<a:box column="3"> <a:box column="3">
<a:datePicker name="transaction_date" bindTarget="csh_transaction_receipt_head_ds"/> <a:datePicker name="transaction_date" bindTarget="csh_transaction_receipt_head_ds"/>
<a:numberField name="transaction_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_receipt_head_ds"/> <a:numberField name="transaction_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_receipt_head_ds"/>
...@@ -500,14 +517,14 @@ ...@@ -500,14 +517,14 @@
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" required="true"/> <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" required="true"/>
<a:comboBox name="paid_byother_flag_n" prompt="代付" bindTarget="csh_transaction_receipt_head_ds" required="true"/> <a:comboBox name="paid_byother_flag_n" prompt="代付" bindTarget="csh_transaction_receipt_head_ds" required="true"/>
<a:lov name="bp_name" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/> <a:lov name="bp_name" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/>
<a:comboBox name="collection_classes_desc" bindTarget="csh_transaction_receipt_head_ds" prompt="款项分类"/> <a:comboBox name="collection_classes_desc" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH511.CSH_TRANSACTION.CLASS_DESC"/>
</a:box> </a:box>
<a:hBox style="width:800px"> <a:hBox style="width:800px">
<a:textField width="350" name="description" bindTarget="csh_transaction_receipt_head_ds"/> <a:textField width="350" name="description" bindTarget="csh_transaction_receipt_head_ds"/>
</a:hBox> </a:hBox>
<!--#添加备注字段--> <!--#添加备注字段-->
<a:hBox style="width:800px"> <a:hBox style="width:800px">
<a:textField width="350" name="ref_v05" prompt="备注" bindTarget="csh_transaction_receipt_head_ds"/> <a:textField width="350" name="ref_v05" prompt="CSH511.CSH_TRANSACTION.STATEMENT" bindTarget="csh_transaction_receipt_head_ds"/>
</a:hBox> </a:hBox>
</a:fieldSet> </a:fieldSet>
<!--删除下面的字段 currency_name,bank_account_name,banka,bank_branch_name,bank_account_num,bank_account_type_name,exchange_rate_type_display--> <!--删除下面的字段 currency_name,bank_account_name,banka,bank_branch_name,bank_account_num,bank_account_type_name,exchange_rate_type_display-->
...@@ -532,7 +549,7 @@ ...@@ -532,7 +549,7 @@
</a:box>--> </a:box>-->
<!-- </a:form>--> <!-- </a:form>-->
<!--添加两方的账户信息和附件--> <!--添加两方的账户信息和附件-->
<a:fieldSet title="账户信息"> <a:fieldSet title="CSH511.CSH_TRANSACTION.BANK_INFO">
<a:box column="3" labelWidth="100"> <a:box column="3" labelWidth="100">
<a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/> <a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>
<a:textField name="bank_branch_name" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME" readOnly="true"/> <a:textField name="bank_branch_name" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME" readOnly="true"/>
...@@ -543,7 +560,7 @@ ...@@ -543,7 +560,7 @@
<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/> <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
</a:box> </a:box>
</a:fieldSet> </a:fieldSet>
<a:fieldSet title="附件"> <a:fieldSet title="CSH511.CSH_TRANSACTION.ATTACHMENT">
<a:hBox> <a:hBox>
<a>附件上传：</a>：<a href="javascript:upload_attachment_win()" style="color:red">上传</a> <a>附件上传：</a>：<a href="javascript:upload_attachment_win()" style="color:red">上传</a>
</a:hBox> </a:hBox>
......
src/main/webapp/modules/hls/HLS361N/credit_entrance_detail.lview
View file @ 0da55362
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
$Author: chenlingfeng7543 $Author: sf
$Date: 2018/12/20 21:19 $Date: 2019/09/24 21:19
$Revision: 1.0 $Revision: 1.0
$Purpose: 商业伙伴授信维护 $Purpose: 商业伙伴授信维护
--> -->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure> <a:init-procedure>
<!--<a:model-query fetchAll="true" model="basic.get_sys_default_time" rootPath="sys_default_time"/>--> <a:model-query fetchAll="true" model="basic.get_sys_default_time" rootPath="sys_default_time"/>-->
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="credit_enhance_detail_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="credit_enhance_detail_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
Leaf.onReady(function(){ Leaf.onReady(function(){
console.log('${/parameter/@bp_credit_hd_id}')
console.log('${/parameter/@bp_id}') var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
console.log('${/parameter/@bp_category}') var record = $(ds_id).getCurrentRecord();
$(ds_id).setQueryParameter('bp_id','${/parameter/@bp_id}');
$(ds_id).query();
}) })
//确认按钮 //确认按钮
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
......
src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview
View file @ 0da55362
...@@ -13,7 +13,8 @@ $Purpose: 商业伙伴授信维护 ...@@ -13,7 +13,8 @@ $Purpose: 商业伙伴授信维护
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="hn1150_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="hn1150_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="hls361_hls_bp_master_credit_detail_link" url="${/request/@context_path}/modules/hls/HLS361N/credit_entrance_detail.lview"/> <a:link id="hls361_hls_bp_master_credit_tenant_detail_link" url="${/request/@context_path}/modules/hls/HLS361N/credit_entrance_detail.lview"/>
<a:link id="hls361_hls_bp_master_credit_agent_detail_link" url="${/request/@context_path}/modules/hls/HLS362N/credit_entrance_detail_confirm.lview"/>
<a:link id="hls361N_update_credit_status_link_id" model="hls.HLS361N.hls_bp_master_credit_update_status" modelaction="update"/> <a:link id="hls361N_update_credit_status_link_id" model="hls.HLS361N.hls_bp_master_credit_update_status" modelaction="update"/>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="check_roles" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="check_roles" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
...@@ -37,11 +38,17 @@ $Purpose: 商业伙伴授信维护 ...@@ -37,11 +38,17 @@ $Purpose: 商业伙伴授信维护
} }
//超链接渲染 //超链接渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
//console.log(record);
var link_function = ''; var link_function = '';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record; window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'bp_code' && value) { if (name == 'bp_code' && value) {
if (record.get('bp_category')=='TENANT'){
link_function = 'on_business_tenant_detail_window';
}else if ( record.get('bp_category')=='AGENT'){
link_function = 'on_business_agent_detail_window';
}
link_function = 'on_business_partner_detail_window';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + value + '</a>'; return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + value + '</a>';
} }
} }
...@@ -136,17 +143,30 @@ $Purpose: 商业伙伴授信维护 ...@@ -136,17 +143,30 @@ $Purpose: 商业伙伴授信维护
} }
function on_business_partner_detail_window(id, name) { //--承租人的详细信息
function on_business_tenant_detail_window(id, name) {
//获得该条record的所有数据 //获得该条record的所有数据
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name]; var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
console.log(record)
var param = record.data; var param = record.data;
param['function_code'] = 'HLS36101'; param['function_code'] = 'HLS36101';
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE'; param['maintain_type'] = 'UPDATE';
param['url_title'] = '商业伙伴授信详细'; param['url_title'] = '商业伙伴授信详细';
hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_detail_link', null); hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_tenant_detail_link', null);
} }
//--经销商的详细信息
function on_business_agent_detail_window(id, name) {
//获得该条record的所有数据
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var param = record.data;
param['function_code'] = 'HLS36103';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
param['url_title'] = '商业伙伴授信详细';
hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_agent_detail_link', null);
}
]]></script> ]]></script>
......
src/main/webapp/modules/hls/HLS362N/credit_entrance_detail_confirm.lview
View file @ 0da55362
...@@ -15,9 +15,12 @@ $Purpose: 商业伙伴授信维护 ...@@ -15,9 +15,12 @@ $Purpose: 商业伙伴授信维护
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
Leaf.onReady(function(){ Leaf.onReady(function(){
console.log('${/parameter/@bp_credit_hd_id}')
console.log('${/parameter/@bp_id}') var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
console.log('${/parameter/@bp_category}') var record = $(ds_id).getCurrentRecord();
$(ds_id).setQueryParameter('bp_id','${/parameter/@bp_id}');
$(ds_id).query();
}) })
//确认按钮 //确认按钮
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
......
src/main/webapp/modules/hls/HLS362N/hls_bp_master_credit_confirm.lview
View file @ 0da55362
...@@ -13,7 +13,8 @@ $Purpose: 商业伙伴授信维护 ...@@ -13,7 +13,8 @@ $Purpose: 商业伙伴授信维护
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="hn1150_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="hn1150_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="hls361_hls_bp_master_credit_detail_link" url="${/request/@context_path}/modules/hls/HLS361N/credit_entrance_detail.lview"/> <a:link id="hls361_hls_bp_master_credit_tenant_detail_link" url="${/request/@context_path}/modules/hls/HLS361N/credit_entrance_detail.lview"/>
<a:link id="hls361_hls_bp_master_credit_agent_detail_link" url="${/request/@context_path}/modules/hls/HLS362N/credit_entrance_detail_confirm.lview"/>
<a:link id="hls362N_update_credit_confirmed_link_id" model="hls.HLS361N.hls_bp_master_credit_confirmed" modelaction="update"/> <a:link id="hls362N_update_credit_confirmed_link_id" model="hls.HLS361N.hls_bp_master_credit_confirmed" modelaction="update"/>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
...@@ -25,11 +26,17 @@ $Purpose: 商业伙伴授信维护 ...@@ -25,11 +26,17 @@ $Purpose: 商业伙伴授信维护
//超链接渲染 //超链接渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
//console.log(record);
var link_function = ''; var link_function = '';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record; window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'bp_code' && value) { if (name == 'bp_code' && value) {
if (record.get('bp_category')=='TENANT'){
link_function = 'on_business_tenant_detail_window';
}else if ( record.get('bp_category')=='AGENT'){
link_function = 'on_business_agent_detail_window';
}
link_function = 'on_business_partner_detail_window';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + value + '</a>'; return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + value + '</a>';
} }
}; };
...@@ -127,19 +134,31 @@ $Purpose: 商业伙伴授信维护 ...@@ -127,19 +134,31 @@ $Purpose: 商业伙伴授信维护
}) })
} }
function on_business_partner_detail_window(id, name) { //--承租人的详细信息
function on_business_tenant_detail_window(id, name) {
//获得该条record的所有数据 //获得该条record的所有数据
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name]; var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
console.log(record)
var param = record.data; var param = record.data;
param['function_code'] = 'HLS36101'; param['function_code'] = 'HLS36101';
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE'; param['maintain_type'] = 'UPDATE';
param['url_title'] = '商业伙伴授信详细'; param['url_title'] = '商业伙伴授信详细';
hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_detail_link', null); hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_tenant_detail_link', null);
} }
//--经销商的详细信息
function on_business_agent_detail_window(id, name) {
//获得该条record的所有数据
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var param = record.data;
param['function_code'] = 'HLS36103';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
param['url_title'] = '商业伙伴授信详细';
hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_agent_detail_link', null);
}
]]></script> ]]></script>
......
src/main/webapp/modules/hn/HN9010/hn_prj_check_actual_entrance.lview
View file @ 0da55362
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
'header_id': check_id 'header_id': check_id
}, },
width: 900, width: 900,
hight: 400 height: 400
}).on('close', function() { }).on('close', function() {
record.ds.query(); record.ds.query();
}); });
......
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