Skip to content

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

[fix] 修复收款bug

parent edc60cb3
Hide whitespace changes
Inline Side-by-side
Showing with 610 additions and 88 deletions
src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_CSH_TRANSATION.sql
View file @ 18be16ea
......@@ -14,10 +14,8 @@ sys_code_pkg.insert_sys_code('CONFIRMED_FLAG', '单据状态', '单据状态', '
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','NEW','未提交','ZHS','');
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','APPROVED','新增确认','ZHS','');
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','REJECTED','新增退回','ZHS','');
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','MKTAUDITING','营业新增确认中','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','RETURNED','已退款','ZHS','');
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','DEBTAUDITING','债权新增确认中','ZHS','');
sys_code_pkg.delete_sys_code('PAID_BYOTHER_FLAG');
......
src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_HLS_BP_MASTER_CREDIT_HD.sql 0 → 100644
View file @ 18be16ea
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool INITIALIZE_SYSCODE_CSH_TRANSACTION.log
set feedback off
set define off
<!--系统代码取值-->
BEGIN
sys_code_pkg.delete_sys_code('CREDIT_STATUS');
sys_code_pkg.insert_sys_code('CREDIT_STATUS', '授信状态', '授信状态', '授信状态', 'ZHS', '');
sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','ENABLE','启用','ZHS','');
sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','FREZZING','审批冻结','ZHS','');
sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','DISABLE','停用','ZHS','');
END;
/
commit;
set feedback on
set define on
spool off
exit
\ No newline at end of file
src/main/database/Register_function/REGISTER_HLS361N.sql 0 → 100644
View file @ 18be16ea
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_REPO001.log
set feedback off
set define off
begin
--分配bm
sys_function_assign_pkg.func_bm_load('HLS361N','csh.CSH509.query_roles_info');
end;
/
commit;
set feedback on
set define on
spool off
exit
src/main/database/Register_function/REGISTER_HLS361N_credit_confirm.sql 0 → 100644
View file @ 18be16ea
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/HLS362N/hls_bp_master_credit_confirm.lview','授信变更确认',1,1,0);
--功能定义 EXERCISES001 是功能号
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS362N','授信变更确认','授信变更确认','30','','','modules/hls/HLS362N/hls_bp_master_credit_confirm.lview','ZHS',-1);
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS362N','授信变更确认','授信变更确认','30','','','modules/hls/HLS362N/hls_bp_master_credit_confirm.lview','US',-1);
--分配页面 将页面分配给哪个功能号
sys_function_assign_pkg.func_service_load('HLS362N','modules/hls/HLS362N/hls_bp_master_credit_confirm.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=>'HLS362N',p_enabled_flag=>'Y',P_USER_ID=>-1);
--bm
sys_function_assign_pkg.func_bm_load('HLS362N','hls.HLS361N.hls_bp_master_credit_confirmed');
end;
/
commit;
set feedback on
set define on
spool off
exit
src/main/database/Register_function/REGISTER_HLS361N_credit_entrance_detail.sql 0 → 100644
View file @ 18be16ea
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/Table/HLS_BP_MASTER_CREDIT_HD.sql 0 → 100644
View file @ 18be16ea
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool CON_CONTRACT.log
PROMPT
PROMPT CREATING TABLE TRAIN_CONFIG
PROMPT ============================
PROMPT
WHENEVER SQLERROR CONTINUE
DROP TABLE CON_CONTRACT;
WHENEVER SQLERROR EXIT FAILURE ROLLBACK
alter table hls_bp_master_credit_hd add (credit_status varchar2(100));
comment on column hls_bp_master_credit_hd.credit_status is '授信状态';
alter table hls_bp_master_credit_hd add (credit_total_amount_tmp number);
comment on column hls_bp_master_credit_hd.credit_total_amount_tmp is '临时总额度';
alter table hls_bp_master_credit_hd add (CREDIT_DATE_FROM_TMP date);
comment on column hls_bp_master_credit_hd.CREDIT_DATE_FROM_TMP is '临时授信时间从';
alter table hls_bp_master_credit_hd add (CREDIT_DATE_TO_TMP date);
comment on column hls_bp_master_credit_hd.CREDIT_DATE_TO_TMP is '临时授信时间到';
SPOOL OFF
EXIT
\ No newline at end of file
src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_lov.lwm
View file @ 18be16ea
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2013-4-15 下午01:13:07
$Revision: 1.0
$Purpose:
$Author: gaoyang
$Date: 2013-4-15 下午01:13:07
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:s="leaf.plugin.script" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_BP_MASTER_V">
<bm:fields>
......@@ -15,7 +15,7 @@
<bm:field name="company_short_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_SHORT_NAME" prompt="HLS_BP_MASTER_V.COMPANY_SHORT_NAME"/>
<bm:field name="company_full_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_FULL_NAME" prompt="HLS_BP_MASTER_V.COMPANY_FULL_NAME"/>
<bm:field name="bp_category" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY"/>
<bm:field name="bp_category_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY_NAME"/>
<bm:field name="bp_category_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY_NAME" forDisplay="true" forQuery="true" prompt="商业伙伴类型"/>
<bm:field name="bp_class" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS"/>
<bm:field name="bp_class_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS_NAME"/>
<bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG"/>
......@@ -34,6 +34,7 @@
<bm:query-field field="bp_name" queryExpression="t1.bp_name like &apos;%&apos;||${@bp_name}||&apos;%&apos;"/>
<!-- <bm:query-field field="bp_category" queryOperator="="/> -->
<bm:query-field field="bp_category" queryExpression="(t1.bp_category = ${@bp_category} or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id and br.bp_category = ${@bp_category} and br.bp_type = ${@bp_category}))"/>
<bm:query-field field="bp_category_name" queryExpression="(t1.bp_category_name like &apos;%&apos;||${@bp_category_name}||&apos;%&apos;)"/>
<!-- <bm:query-field name="contract_bp_flag" queryExpression="(exists (select 1 from con_contract_bp b where b.contract_id in (${:@contract_id}) and b.bp_id = t1.bp_id and b.bp_category in (&apos;VENDER&apos;,&apos;TENANT&apos;,&apos;TENANT_SEC&apos;) )or nvl(${@contract_bp_flag},&apos;N&apos;) != &apos;Y&apos; )"/> -->
</bm:query-fields>
<bm:data-filters>
......
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm
View file @ 18be16ea
......@@ -5,7 +5,7 @@
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.creation_date desc,t1.transaction_num desc" needAccessControl="false">
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false">
<bm:fields>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
......@@ -21,7 +21,7 @@
<bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
<bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
<bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
<bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT"/>
<bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" expression="(select to_char(transaction_amount,'99999999.99') from dual)"/>
<bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
<bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
<bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
......@@ -97,6 +97,7 @@
<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:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -116,8 +117,8 @@
<bm:query-field field="opposite_band_na" queryOperator="="/>
<bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
<bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
<bm:query-field name="bank_slip_num_from" queryExpression="t1.bank_slip_num &gt;= ${@bank_slip_num_from}"/>
<bm:query-field name="bank_slip_num_to" queryExpression="t1.bank_slip_num &lt;= ${@bank_slip_num_to}"/>
<bm:query-field name="bank_slip_num" queryExpression="t1.bank_slip_num like &apos;%&apos;||${@bank_slip_num}||&apos;%&apos;"/>
<!-- <bm:query-field name="bank_slip_num_to" queryExpression="t1.bank_slip_num &lt;= ${@bank_slip_num_to}"/>-->
<bm:query-field name="transaction_amount_from" queryExpression="t1.transaction_amount &gt;= ${@transaction_amount_from}"/>
<bm:query-field name="transaction_amount_to" queryExpression="t1.transaction_amount &lt;= ${@transaction_amount_to}"/>
<bm:query-field name="currency_code_from" queryExpression="t1.currency_code &gt;= ${@currency_code_from}"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_update.lwm
View file @ 18be16ea
......@@ -12,7 +12,7 @@
begin
csh_transaction_pkg.update_confirmer_by_condition(
p_transaction_id =>${@transaction_id},
p_user_id =>${session/@user_id}
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
......
src/main/webapp/WEB-INF/classes/csh/CSH511/csh_transaction.lwm
View file @ 18be16ea
......@@ -97,6 +97,8 @@
<bm:field name="bp_bank_account_name" prompt="CSH511.BANK_ACCOUNT_NAME"/>
<bm:field name="receipt_type"/>
<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:fields>
<bm:features>
<f:standard-who/>
......
src/main/webapp/WEB-INF/classes/hls/HLS361N/hls_bp_master_credit_confirmed.lwm 0 → 100644
View file @ 18be16ea
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2019-09-23 18:30:34
$Revision: 1.0
$Purpose: 修改授信的状态
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
hls_bp_master_credit_pkg.confirmed_credit_status(
p_bp_credit_hd_id =>${@bp_credit_hd_id},
p_wanted_status =>${@wanted_status},
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS361N/hls_bp_master_credit_update_status.lwm 0 → 100644
View file @ 18be16ea
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2019-09-23 18:30:34
$Revision: 1.0
$Purpose: 修改授信的状态
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
hls_bp_master_credit_pkg.update_credit_status(
p_bp_credit_hd_id =>${@bp_credit_hd_id},
p_credit_total_amount =>${@credit_total_amount},
p_credit_date_from =>to_date(${@credit_date_from},'yyyy-mm-dd'),
p_credit_date_to =>to_date(${@credit_date_to},'yyyy-mm-dd'),
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview
View file @ 18be16ea
......@@ -734,29 +734,29 @@
<a:columns>
<a:column name="transaction_num" prompt="现金事务编号" renderer="seedetail_transaction_num" width="110"/>
<a:column name="receipt_type" align="center" prompt="收款类型" width="100"/>
<a:column name="transaction_amount" align="center" prompt="收款金额" width="100"/>
<a:column name="transaction_date" renderer="Leaf.formatDate"/>
<a:column name="returned_amount" prompt="退款金额" align="right" />
<a:column name="use_money_amount" prompt="可用金额" align="right"/>
<a:column name="collection_classes_desc" prompt="款项用途"/>
<a:column name="bp_name" prompt="商业伙伴"/>
<a:column name="bank_slip_num" prompt="银行流水号"/>
<a:column name="description" prompt="摘要"/>
<a:column name="confirmed_flag_desc" prompt="单据状态"/>
<a:column name="written_off_flag_desc" prompt="核销状态"/>
<a:column prompt="我方账户">
<a:column prompt="户名" name="bank_account_name"/>
<a:column prompt="银行" name="bank_branch_name"/>
<a:column prompt="账号" name="bank_account_num"/>
<a:column name="transaction_amount" align="right" prompt="收款金额" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="returned_amount" prompt="退款金额" align="right" renderer="Leaf.formatMoney" />
<a:column name="use_money_amount" prompt="可用金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="collection_classes_desc" prompt="款项用途" align="center"/>
<a:column name="bp_name" prompt="商业伙伴" align="center"/>
<a:column name="bank_slip_num" prompt="银行流水号" align="center"/>
<a:column name="description" prompt="摘要" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据状态" align="center"/>
<a:column name="written_off_flag_desc" prompt="核销状态" align="center"/>
<a:column prompt="我方账户" align="center">
<a:column prompt="户名" name="bank_account_name" align="center"/>
<a:column prompt="银行" name="bank_branch_name" align="center"/>
<a:column prompt="账号" name="bank_account_num" align="center"/>
</a:column>
<a:column prompt="对方账户">
<a:column prompt="户名" name="bp_bank_account_name"/>
<a:column prompt="银行" name="opposite_band_na"/>
<a:column prompt="账号" name="bp_bank_account_num"/>
<a:column prompt="户名" name="bp_bank_account_name" align="center"/>
<a:column prompt="银行" name="opposite_band_na" align="center"/>
<a:column prompt="账号" name="bp_bank_account_num" align="center"/>
</a:column>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY"/>
<a:column name="debt_confirmed_by_desc" prompt="债权确认人"/>
<a:column name="acc_confirmed_by_desc" prompt="会计确认人"/>
<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="acc_confirmed_by_desc" prompt="会计确认人" align="center"/>
</a:columns>
</a:grid>
</a:fieldSet>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ 18be16ea
......@@ -24,12 +24,16 @@
<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="csh509N_batch_update_confirmed_flag" model="csh.CSH509.query_roles_info" modelaction="batch_update"/>
<a:link id="csh510N_csh_transaction_batch_update_confirmed_flag" model="csh.CSH510.csh_transaction_update" modelaction="batch_update"/>
<!-- <a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510/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[
Leaf.onReady(function(){
//console.log($('csh_transaction_receipt_maintain_result_ds'));
})
//新增单据的作废
function csh510_csh_trx_bank_drop(){
var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
......@@ -60,7 +64,7 @@
lock_current_window();
//作废单据
Leaf.request({
url: $('csh510N_csh_transaction_batch_update_confirmed_flag').getUrl(),
url: $('csh509N_batch_update_confirmed_flag').getUrl(),
para: post_data,
success: function () {
unlock_current_window();
......@@ -89,6 +93,11 @@
for(var i=0;i<datas.length;i=i+1) {
var confirmed_flag = datas[i].get('confirmed_flag');
var bp_name=datas[i].get('bp_name');
if(bp_name==''||bp_name==undefined){
$L.showInfoMessage("提示", '商业伙伴为空，不能提交', null, null);
return;
}
//不是新增就报错
if (confirmed_flag != 'NEW' && confirmed_flag != undefined) {
$L.showInfoMessage("提示", '请选择单据为未提交的数据', null, null);
......@@ -449,7 +458,8 @@
]]></script>
<a:dataSets>
<a:dataSet id="write_off_flag_ds" lookupCode="WRITE_OFF_FLAG"/>
<a:dataSet id="bp_category_ds" lookupCode="BP_CATEGORY">
</a:dataSet>
<a:dataSet id="confirmed_flag_ds" lookupCode="CONFIRMED_FLAG">
</a:dataSet>
<a:dataSet id="payment_method_ds">
......@@ -481,6 +491,7 @@
</a:dataSet>
<a:dataSet id="csh_transaction_receipt_maintain_query_ds" autoCreate="true">
<a:fields>
<a:field name="bank_account_name" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping>
<a:map from="precision" to="precision"/>
......@@ -599,6 +610,7 @@
<a:map from="bp_name" to="bp_name"/>
</a:mapping>
</a:field>
<a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<!--对方账户的-->
<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
......@@ -628,7 +640,9 @@
<a:event name="update" handler="csh510_receipt_maintain_update"/>
</a:events>
</a:dataSet>
<a:dataSet id="csh_transaction_receipt_maintain_result_ds" autoPageSize="true" autoQuery="true" model="csh.CSH510.csh_transaction_miantain_query" queryDataSet="csh_transaction_receipt_maintain_query_ds" selectable="true"/>
<a:dataSet id="csh_transaction_receipt_maintain_result_ds" autoPageSize="true" autoQuery="true" model="csh.CSH510.csh_transaction_miantain_query" queryDataSet="csh_transaction_receipt_maintain_query_ds" selectable="true">
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
......@@ -683,32 +697,35 @@
</a:toolBar>-->
<a:columns>
<a:column name="transaction_num" prompt="现金事务编号" renderer="seedetail_transaction_num" width="110"/>
<a:column name="receipt_type" align="center" prompt="收款类型" width="100"/>
<a:column name="transaction_amount" align="center" prompt="收款金额" width="100"/>
<a:column name="transaction_date" renderer="Leaf.formatDate"/>
<a:column name="returned_amount" prompt="退款金额" align="right" />
<a:column name="use_money_amount" prompt="可用金额" align="right"/>
<a:column name="collection_classes_desc" prompt="款项用途"/>
<a:column name="bp_name" prompt="商业伙伴"/>
<a:column name="bank_slip_num" prompt="银行流水号"/>
<a:column name="description" prompt="摘要"/>
<a:column name="confirmed_flag_desc" prompt="单据状态"/>
<a:column name="written_off_flag_desc" prompt="核销状态"/>
<a:column prompt="我方账户">
<a:column prompt="户名" name="bank_account_name"/>
<a:column prompt="银行" name="bank_branch_name"/>
<a:column prompt="账号" name="bank_account_num"/>
<a:column name="transaction_num" prompt="现金事务编号" renderer="seedetail_transaction_num" width="110" align="center"/>
<a:column name="receipt_type_n" align="center" prompt="收款类型" width="100"/>
<a:column name="transaction_amount" align="right" prompt="收款金额" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="returned_amount" prompt="退款金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="use_money_amount" prompt="可用金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="collection_classes_desc" prompt="款项用途" align="center"/>
<a:column name="bp_name" prompt="商业伙伴" align="center"/>
<a:column name="bank_slip_num" prompt="银行流水号" align="center"/>
<a:column name="description" prompt="摘要" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据状态" align="center"/>
<a:column name="written_off_flag_desc" prompt="核销状态" align="center"/>
<a:column prompt="我方账户" >
<a:column prompt="户名" name="bank_account_name" align="center"/>
<a:column prompt="银行" name="bank_branch_name" align="center"/>
<a:column prompt="账号" name="bank_account_num" align="center"/>
</a:column>
<a:column prompt="对方账户">
<a:column prompt="户名" name="bp_bank_account_name"/>
<a:column prompt="银行" name="opposite_band_na"/>
<a:column prompt="账号" name="bp_bank_account_num"/>
<a:column prompt="户名" name="bp_bank_account_name" align="center"/>
<a:column prompt="银行" name="opposite_band_na" align="center"/>
<a:column prompt="账号" name="bp_bank_account_num" align="center"/>
</a:column>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY"/>
<a:column name="debt_confirmed_by_desc" prompt="债权确认人"/>
<a:column name="acc_confirmed_by_desc" prompt="会计确认人"/>
<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="acc_confirmed_by_desc" prompt="会计确认人" align="center"/>
</a:columns>
<a:editors>
<a:numberField id="number_editor" allowDecimals="true" decimalPrecision="2" editable="false"/>
</a:editors>
</a:grid>
</a:fieldSet>
</a:screenBody>
......
src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview
View file @ 18be16ea
......@@ -497,8 +497,8 @@
<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:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<a:comboBox name="paid_byother_flag_n" prompt="代付" bindTarget="csh_transaction_receipt_head_ds"/>
<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: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:box>
......
src/main/webapp/modules/hls/HLS361N/credit_entrance_detail.lview 0 → 100644
View file @ 18be16ea
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: chenlingfeng7543
$Date: 2018/12/20 21:19
$Revision: 1.0
$Purpose: 商业伙伴授信维护
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<!--<a:model-query fetchAll="true" model="basic.get_sys_default_time" rootPath="sys_default_time"/>-->
</a:init-procedure>
<a:view>
<a:link id="credit_enhance_detail_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[
Leaf.onReady(function(){
console.log('${/parameter/@bp_credit_hd_id}')
console.log('${/parameter/@bp_id}')
console.log('${/parameter/@bp_category}')
})
//确认按钮
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
}
//退回按钮
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
}
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview
View file @ 18be16ea
......@@ -8,51 +8,146 @@ $Purpose: 商业伙伴授信维护
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<!--<a:model-query fetchAll="true" model="basic.get_sys_default_time" rootPath="sys_default_time"/>-->
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(00215,00215)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/>
</a:init-procedure>
<a:view>
<!-- <a:link id="hls361_hls_bp_master_credit_assign_link" url="${/request/@context_path}/modules/hls/HLS361/hls_bp_master_credit_assign.lview"/>
<a:link id="hls361_hls_bp_master_credit_detail_link" url="${/request/@context_path}/modules/hls/HLS361/hls_bp_master_credit_detail.lview"/>-->
<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="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="check_roles" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[
var user_code='';
Leaf.onReady(function(){
user_code='${/model/position_code/record/@position_code}';
})
//判断角色是否可以操作
function judgeRoles(position_code){
/* function open_assign_win(id, name) {
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var param = record.data;
param['function_code'] = 'HLS361A';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
param['url_title'] = '信息维护';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_assign_link', null);
var datas='${/model/position_code}'.data;
for(var i=0;i<datas.length;i++){
if(datas[i].data.position_code==position_code){
return true;
}
}
return false;
}
//超链接渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
var link_function = '';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'bp_code' && value) {
link_function = 'on_business_partner_detail_window';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + value + '</a>';
}
}
function open_detail_win(id, name) {
//
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
//获取ds
var credit_ds=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd');
var datas=$(credit_ds).selected;
//只能选择一条数据
if(datas.length!=1){
$L.showInfoMessage("提示",'请选择一条数据',null,null)
return;
}
//设置为可以修改
//datas[0].getField('credit_total_amount').setReadOnly(false);
}
//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');
var datas=$(credit_ds).selected;
if(datas.length!=1){
$L.showInfoMessage("提示",'请选择一条数据',null,null)
return;
}
//启用和审批冻结判断
var credit_status=datas[0].data.credit_status;
if(credit_status!='ENABLE'&&credit_status!='FREZZING'){
$L.showInfoMessage("提示",'请选择状态为启用和审批冻结的数据！',null,null)
return;
}
//角色判断 00215 营业内勤
//00213 营业担当
if(user_code==''||user_code==undefined){
$L.showInfoMessage("提示",'只有营业内勤和营业担当才能操作数据！');
return;
}
var credit_date_from=Leaf.formatDate(datas[0].data.credit_date_from)
var credit_date_to=Leaf.formatDate(datas[0].data.credit_date_to)
//进行数据的校验
//1) “授信总额度”录入值不能小于“已使用额度”；若小于，则报错提示：“修改后剩余授信额度小于0！”；
//2) “授信时间到”录入值需大于“授信时间从”录入值；若小于，则报错提示：“终止日需大于生效日！”；
// 3) “授信时间到”录入值需大于系统当前时间；若小于，则报错提示：“终止日早于当前时间！”
var total_amount=datas[0].data.credit_total_amount;
var used_credit_amount=datas[0].data.used_amount;
if(total_amount<used_credit_amount){
$L.showErrorMessage("错误",'修改后剩余授信额度小于0',null,null);
return;
}
if(credit_date_from>credit_date_to){
$L.showErrorMessage("错误",'终止日需大于生效日',null,null);
return;
}
if(datas[0].data.credit_date_to<new Date()){
$L.showErrorMessage("错误",'终止日早于当前时间',null,null);
return;
}
//用户点击“授信额度变更”按钮后，授信状态变为“审批冻结”，该商业伙伴无法提报单据，同时需要记录变更前的“授信总额度”录入值（后台表）；
//锁屏
console.log(datas[0]);
$L.showConfirm("提示",'确认变更该条记录的相关信息？',function(){
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('hls361N_update_credit_status_link_id').getUrl(),
para: {
bp_credit_hd_id : datas[0].data.bp_credit_hd_id,
credit_total_amount: total_amount,
credit_date_from : credit_date_from,
credit_date_to : credit_date_to
},
success: function () {
Leaf.SideBar.show({
msg: '操作成功',
duration: 2000
});
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$(credit_ds).query();
},
error: function() {
},
failure: function() {
},
sync: true,
scope: this
});
})
}
function on_business_partner_detail_window(id, name) {
//获得该条record的所有数据
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var param = record.data;
param['function_code'] = 'HLS361D';
param['function_code'] = 'HLS36101';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
param['url_title'] = '信息维护';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_detail_link', null);
param['url_title'] = '商业伙伴授信详细';
hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_detail_link', null);
}
//超链接渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
var link_function = '';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'record_detail') {
link_function = 'open_detail_win';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + config_record.get('prompt') + '</a>';
}
if (name == 'assign_record') {
link_function = 'open_assign_win';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + config_record.get('prompt') + '</a>';
}
};*/
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
......
src/main/webapp/modules/hls/HLS362N/credit_entrance_detail_confirm.lview 0 → 100644
View file @ 18be16ea
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: chenlingfeng7543
$Date: 2018/12/20 21:19
$Revision: 1.0
$Purpose: 商业伙伴授信维护
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<!--<a:model-query fetchAll="true" model="basic.get_sys_default_time" rootPath="sys_default_time"/>-->
</a:init-procedure>
<a:view>
<a:link id="credit_enhance_detail_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[
Leaf.onReady(function(){
console.log('${/parameter/@bp_credit_hd_id}')
console.log('${/parameter/@bp_id}')
console.log('${/parameter/@bp_category}')
})
//确认按钮
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
}
//退回按钮
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
}
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
src/main/webapp/modules/hls/HLS362N/hls_bp_master_credit_confirm.lview 0 → 100644
View file @ 18be16ea
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: chenlingfeng7543
$Date: 2018/12/20 21:19
$Revision: 1.0
$Purpose: 商业伙伴授信维护
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(002)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/>
</a:init-procedure>
<a:view>
<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="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"/>
<script type="text/javascript"><![CDATA[
var user_code='';
Leaf.onReady(function(){
user_code='${/model/position_code/record/@position_code}';
})
//判断角色是否可以操作
//超链接渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
var link_function = '';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'bp_code' && value) {
link_function = 'on_business_partner_detail_window';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + value + '</a>';
}
};
//变更确认
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
//授信额度变更
var credit_ds=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd');
var datas=$(credit_ds).selected;
if(datas.length!=1){
$L.showInfoMessage("提示",'请选择一条数据',null,null)
return;
}
//审批冻结判断
var credit_status=datas[0].data.credit_status;
if(credit_status!='FREZZING'){
$L.showInfoMessage("提示",'请选择状态为审批冻结的数据！',null,null)
return;
}
//角色判断
// 002 营业本部长
if(user_code==''||user_code==undefined){
$L.showInfoMessage("提示",'只有营业本部长才能操作数据！');
return;
}
$L.showConfirm("提示",'确认该条记录的相关信息？',function(){
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('hls362N_update_credit_confirmed_link_id').getUrl(),
para: {
bp_credit_hd_id : datas[0].data.bp_credit_hd_id,
wanted_status : 'ENABLE',
},
success: function () {
Leaf.SideBar.show({
msg: '操作成功',
duration: 2000
});
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$(credit_ds).query();
},
error: function() {
},
failure: function() {
},
scope: this
});
})
};
//驳回单据.
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');
var datas=$(credit_ds).selected;
if(datas.length!=1){
$L.showInfoMessage("提示",'请选择一条数据',null,null)
return;
}
//审批冻结判断
var credit_status=datas[0].data.credit_status;
if(credit_status!='FREZZING'){
$L.showInfoMessage("提示",'请选择状态为审批冻结的数据！',null,null)
return;
}
//角色判断
// 002 营业本部长
if(user_code==''||user_code==undefined){
$L.showInfoMessage("提示",'只有营业本部长才能操作数据！');
return;
}
$L.showConfirm("提示",'确认该条记录的相关信息？',function(){
// window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('hls362N_update_credit_confirmed_link_id').getUrl(),
para: {
bp_credit_hd_id : datas[0].data.bp_credit_hd_id,
wanted_status : 'REFUSE',
},
success: function () {
Leaf.SideBar.show({
msg: '操作成功',
duration: 2000
});
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$(credit_ds).query();
},
error: function() {
},
failure: function() {
},
scope: this
});
})
}
function on_business_partner_detail_window(id, name) {
//获得该条record的所有数据
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var param = record.data;
param['function_code'] = 'HLS36101';
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_detail_link', null);
}
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
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