Skip to content

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

[feat] 完成新增申请功能 

[fix]  修改收款导入界面
[docs] 增加sql内容
parent 227ad82e
Show whitespace changes
Inline Side-by-side
Showing with 731 additions and 101 deletions
src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_CSH_TRANSATION.sql
View file @ e235da85
......@@ -13,14 +13,24 @@ sys_code_pkg.delete_sys_code('CONFIRMED_FLAG');
sys_code_pkg.insert_sys_code('CONFIRMED_FLAG', '单据状态', '单据状态', '单据状态', 'ZHS', '');
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','AUDITING','新增确认中','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.delete_sys_code('PAID_BYOTHER_FLAG');
sys_code_pkg.insert_sys_code('PAID_BYOTHER_FLAG', '代付', '代付', '代付', 'ZHS', '');
sys_code_pkg.insert_sys_code_value('PAID_BYOTHER_FLAG','T','是','ZHS','');
sys_code_pkg.insert_sys_code_value('PAID_BYOTHER_FLAG','F','否','ZHS','');
sys_code_pkg.delete_sys_code('WRITE_OFF_FLAG');
sys_code_pkg.insert_sys_code('WRITE_OFF_FLAG', '核销状态', '核销状态', '核销状态', 'ZHS', '');
sys_code_pkg.insert_sys_code_value('WRITE_OFF_FLAG','NOT','未核销','ZHS','');
sys_code_pkg.insert_sys_code_value('WRITE_OFF_FLAG','FULL','全部核销','ZHS','');
sys_code_pkg.insert_sys_code_value('WRITE_OFF_FLAG','DEPOSIT','保证金','ZHS','');
sys_code_pkg.insert_sys_code_value('WRITE_OFF_FLAG','ADVRECEIVED','预收款','ZHS','');
sys_code_pkg.insert_sys_code_value('WRITE_OFF_FLAG','DISABLED','不可用','ZHS','');
end;
/
commit;
......
src/main/database/Register_function/REGISTER_CON_REPO001.sql
View file @ e235da85
......@@ -9,21 +9,9 @@ set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/cus/CUS300/csh_payment_req_selected.lview','返佣支付',1,1,0);
--功能定义
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CON_REPO001','回购申请创建','回购申请创建','100','','','modules/cus/CUS300/csh_payment_req_selected.lview','ZHS',-1);
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CON_REPO001','回购申请创建','回购申请创建','100','','','modules/cus/CUS300/csh_payment_req_selected.lview','US',-1);
sys_function_assign_pkg.service_load('modules/csh/CSH510N/csh_transaction_import.lview','打开收款导入',1,1,0);
--分配页面
sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cus/CUS300/csh_payment_req_selected.lview');
--分配bm
sys_function_assign_pkg.func_bm_load('CON_REPO001','cont.CON500.con_contract_get_layout_code');
--分配菜单
sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_CHANGE_REQ',p_function_code=>'CON_REPO001',p_enabled_flag=>'Y',P_USER_ID=>-1);
sys_function_assign_pkg.func_service_load('CSH510','modules/csh/CSH510N/csh_transaction_import.lview');
end;
/
commit;
......
src/main/database/Register_function/REGISTER_CSH510.sql 0 → 100644
View file @ e235da85
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('CSH510','csh.CSH510N.csh_transaction_list_tmp');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_for_lov');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update');
end;
/
commit;
set feedback on
set define on
spool off
exit
src/main/database/Table/CSH_TRANSACTION.sql
View file @ e235da85
......@@ -16,7 +16,15 @@ ALTER TABLE CSH_TRANSACTION ADD (CONFIRMED_FLAG VARCHAR2(100));
ALTER TABLE CSH_TRANSACTION ADD (CONFIRMED_DATE DATE);
ALTER TABLE CSH_TRANSACTION ADD (CONFIRMED_BY NUMBER);
alter table CSH_TRANSACTION add (PAID_BYOTHER_FLAG varchar2(10));
alter table csh_transaction add (MKT_CONFIRMED_DATE date);
alter table csh_transaction add (ACC_CONFIRMED_DATE date);
alter table csh_transaction add (MKT_CONFIRMED_BY varchar2(100));
alter table csh_transaction add (ACC_CONFIRMED_BY varchar2(100));
comment on column csh_transaction.MKT_CONFIRMED_DATE is '营业确认时间';
comment on column csh_transaction.ACC_CONFIRMED_DATE is '会计确认时间';
comment on column csh_transaction.MKT_CONFIRMED_BY is '营业确认人';
comment on column csh_transaction.ACC_CONFIRMED_BY is '会计确认人 ';
comment on column CSH_TRANSACTION.PAID_BYOTHER_FLAG is '代付';
COMMENT ON column CSH_TRANSACTION.CONFIRMED_DATE
IS '确认时间';
......
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_for_lov.lwm 0 → 100644
View file @ e235da85
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2019-9-11 下午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="csh_transaction">
<bm:fields>
<bm:field name="transaction_id" databaseType="number" datatype="java.lang.Long" physicalName="transaction_id" forDisplay="false"/>
<bm:field name="bp_bank_account_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="bp_bank_account_name" prompt="对方账户户名" forQuery="true" forDisplay="true"/>
<bm:field name="opposite_band_na" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="opposite_band_na" prompt="对方银行信息"/>
<bm:field name="bp_bank_account_num" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="bp_bank_account_num" prompt="对方账户账号"/>
<!-- <bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/>
<bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/>
<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_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"/>-->
<!--<bm:field name="id_card_no" displayWidth="200" forDisplay="true" prompt="身份证"/>-->
</bm:fields>
<bm:features>
<f:standard-who/>
<s:bm-script><![CDATA[
var cx = Packages.leaf.javascript.Context.getCurrentContext();
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
]]></s:bm-script>
</bm:features>
<bm:query-fields>
<bm:query-field field="bp_bank_account_name" queryExpression="t1.bp_bank_account_name like &apos;%&apos;||${@bp_bank_account_name}||&apos;%&apos;"/>
<bm:query-field field="opposite_band_na" queryExpression="t1.opposite_band_na like &apos;%&apos;||${@opposite_band_na}||&apos;%&apos;"/>
<bm:query-field field="bp_bank_account_num" queryExpression="t1.bp_bank_account_num like &apos;%&apos;||${@bp_bank_account_num}||&apos;%&apos;"/>
<!--<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 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>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="query" expression="(t1.posted_flag in (&apos;N&apos;))"/>
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm
View file @ e235da85
......@@ -82,12 +82,17 @@
<bm:field name="contract_number" expression="(select cc.contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="collection_classes"/>
<bm:field name="collection_classes_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DS_COLLECTION_CLASSES' and v.code_value =t1.collection_classes)" forInsert="false" forUpdate="false"/>
<bm:field name="confirmed_flag_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CONFIRMED_FLAG' and v.code_value =t1.confirmed_flag)" forInsert="false" forUpdate="false"/>
<bm:field name="written_off_flag_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'WRITE_OFF_FLAG' and v.code_value =t1.WRITE_OFF_FLAG)" forInsert="false" forUpdate="false"/>
<bm:field name="bank_branch_name" expression="(select bank_branch_name from csh_bank_branch where bank_branch_id = (select bank_branch_id from csh_bank_account where bank_account_id = t1.bank_account_id))" forInsert="false" forUpdate="false"/>
<bm:field name="use_money_amount" expression="(select t1.transaction_amount-t1.returned_amount from dual)" forInsert="false" forUpdate="false"/>
<bm:field name="opposite_band_na"/>
<bm:field name="banka"/>
<bm:field name="purpose"/>
<bm:field name="gsber"/>
<bm:field name="sus_belnr"/>
<bm:field name="bp_virtual_bank_account"/>
<bm:field name="confirmed_flag" />
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -100,8 +105,11 @@
<bm:data-filter name="query" expression="(t1.posted_flag in (&apos;N&apos;))"/>
</bm:data-filters>
<bm:query-fields>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
<bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
<bm:query-field field="bp_bank_account_name" queryOperator="like"/>
<bm:query-field field="receipt_type" queryOperator="="/>
<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}"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_update.lwm 0 → 100644
View file @ e235da85
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2019-9-12 下午07:57:46
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
csh_transaction_pkg.update_confirmed_flag(
p_transaction_id =>${@transaction_id},
p_wanted_confirmed_flag =>${@wanted_confirmed_flag},
p_user_id =>${session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH510N/csh_transaction_list_tmp.lwm 0 → 100644
View file @ e235da85
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: chenlingfeng
$Date: 2019-01-14 16:29:48
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT t1.*
FROM (SELECT li.line_id,
li.error_message,
li.status,
li.header_id,
li.line_number,
hd.created_by,
li.source_table,
li.attribute_1,
li.attribute_2,
li.attribute_3,
li.attribute_4,
li.attribute_5,
li.attribute_6,
li.attribute_7,
li.attribute_8,
li.attribute_9,
li.attribute_10,
li.attribute_11,
li.attribute_12,
li.attribute_13,
li.attribute_14,
li.attribute_15,
li.attribute_16,
li.attribute_17,
li.attribute_18,
li.attribute_19,
li.attribute_20,
li.attribute_21,
li.attribute_22,
li.attribute_23,
li.attribute_24,
li.attribute_25,
li.attribute_26
FROM fnd_interface_headers hd,
fnd_interface_lines li
WHERE hd.header_id = li.header_id
AND hd.template_code = 'CSH_TRX_BANK'
AND li.line_number >0
AND HD.CREATED_BY = ${/session/@user_id}
) t1
#WHERE_CLAUSE#
order by t1.line_number
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
csh_transaction_pkg.csh_transaction_import_check(
p_header_id => ${/model/header/record/@header_id},
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="insert">
<bm:update-sql><![CDATA[
begin
DS_IMPORT_CORE_PKG.csh_trx_bank_import(
p_header_id =>${/parameter/@header_id},
p_user_id =>${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="header_id" queryExpression="t1.header_id=${@header_id}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH511/csh_transaction_manual_receipt_save.lwm 0 → 100644
View file @ e235da85
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2019-9-10 下午06:42:00
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="insert">
<bm:update-sql><![CDATA[
begin
csh_transaction_pkg.save_csh_transaction_data(
p_transaction_date =>${@transaction_date},
p_cashflow_amount =>${@cashflow_amount},
p_bank_slip_num =>${@bank_slip_num},
p_paid_byother_flag =>${@paid_byother_flag},
p_bp_id =>${@bp_id},
p_collection_classes =>${@collection_classes},
p_description =>${@description},
p_bp_bank_account_id =>${@bp_bank_account_id},
p_bp_bank_name =>${@bp_bank_name},
p_bp_bank_account_num =>${@bp_bank_account_num},
p_bank_account_id =>${@bank_account_id},
p_user_id =>${session/@user_id}
);
end;
]]></bm:update-sql>
<!-- <bm:parameters>
<bm:parameter name="transaction_id" dataType="java.lang.Long" input="false" inputPath="@transaction_id" output="true" outputPath="/parameter/@transaction_id"/>
</bm:parameters>-->
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH511/csh_transaction_receipt_save.lwm
View file @ e235da85
......@@ -70,7 +70,12 @@
p_purpose =>${@purpose},
p_gsber =>${@gsber},
p_sus_belnr =>${@sus_belnr},
p_bp_virtual_bank_account =>${@bp_virtual_bank_account},p_zuonr=>${@bank_slip_num});
p_bp_virtual_bank_account =>${@bp_virtual_bank_account},
p_zuonr=>${@bank_slip_num},
p_paid_byother_flag =>${@paid_byother_flag},
p_ref_v05 =>${@ref_v05}
);
end;
]]></bm:update-sql>
<bm:parameters>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ e235da85
......@@ -21,14 +21,74 @@
<!-- <a:link id="csh_transaction_receipt_maintain_post_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_receipt_post_query.lview"/> -->
<a:link id="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="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/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[
//新增申请按钮’
function csh510_csh_trx_bank_apply_new() {
var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
//获得所选择的的未提交的单据，如果有不是未提交的数据，提示重新进行选择
if (datas.length == 0) {
$L.showMessage("${l:prompt}", '请至少选择一条数据');
return;
}
var post_data=[];
for(var i=0;i<datas.length;i=i+1) {
var confirmed_flag= datas[i].get('confirmed_flag');
//不是新增就报错
if(confirmed_flag!='NEW'&&confirmed_flag!=undefined){
$L.showInfoMessage("提示", '请选择单据为未提交的数据', null, null);
return;
}
//弹出确认修改的提示框
var execute_flag=$L.showConfirm("提示",'确认执行该操作？')
//用户取消操作
if(flag==false) return ;
//将对象封装到json对象数组
post_data.push({
'transaction_id': datas[i].get('transaction_id'),
//提交想改变之后的状态
'wanted_confirmed_flag': 'MKTAUDITING',
'_status': 'update'
});
};
console.log(post_data);
//锁屏
lock_current_window();
//改变未提交单据数据的状态
Leaf.request({
url: $('csh510N_csh_transaction_batch_update_confirmed_flag').getUrl(),
para: post_data,
success: function () {
unlock_current_window();
$('csh_transaction_receipt_maintain_result_ds').query();
Leaf.showMessage('${l:PROMPT}', '修改成功！');
}, failure: function () {
unlock_current_window();
},
error: function () {
unlock_current_window();
},
scope: this
});
}
//跳转到收款新增页面
function csh510_csh_trx_bank_hand_add(){
var url = $('csh_transaction_receipt_link').getUrl();
var win = new Leaf.Window({
title:'${l:CSH510.NEW_MANUAL_RECEIPT}',
url: url,
id: 'csh_trx_receipt_id',
fullScreen: true,
......@@ -337,6 +397,8 @@
]]></script>
<a:dataSets>
<a:dataSet id="write_off_flag_ds" lookupCode="WRITE_OFF_FLAG"/>
<a:dataSet id="confirmed_flag_ds" lookupCode="CONFIRMED_FLAG">
</a:dataSet>
<a:dataSet id="payment_method_ds">
......@@ -368,8 +430,52 @@
</a:dataSet>
<a:dataSet id="csh_transaction_receipt_maintain_query_ds" autoCreate="true">
<a:fields>
<a:field name="confirmed_flag" options="confirmed_flag_ds" valueField="code_value" displayField="code_value_name" returnField="payment_method_id"/>
<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"/>
<a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
<a:map from="bank_account_id" to="bank_account_id"/>
<a:map from="bank_account_num" to="bank_account_num"/>
<a:map from="bank_account_name" to="bank_account_name"/>
<a:map from="bank_account_code" to="bank_account_code"/>
<a:map from="currency_code" to="currency_code"/>
<a:map from="currency_name" to="currency_name"/>
<a:map from="bank_account_type" to="bank_account_type"/>
<a:map from="bank_account_type_name" to="bank_account_type_name"/>
<a:map from="bank_branch_name" to="bank_branch_name"/>
</a:mapping>
</a:field>
<a:field name="bank_branch_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"/>
<a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
<a:map from="bank_account_id" to="bank_account_id"/>
<a:map from="bank_account_num" to="bank_account_num"/>
<a:map from="bank_account_name" to="bank_account_name"/>
<a:map from="bank_account_code" to="bank_account_code"/>
<a:map from="currency_code" to="currency_code"/>
<a:map from="currency_name" to="currency_name"/>
<a:map from="bank_account_type" to="bank_account_type"/>
<a:map from="bank_account_type_name" to="bank_account_type_name"/>
<a:map from="bank_branch_name" to="bank_branch_name"/>
</a:mapping>
</a:field>
<a:field name="bank_account_num" 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"/>
<a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
<a:map from="bank_account_id" to="bank_account_id"/>
<a:map from="bank_account_num" to="bank_account_num"/>
<a:map from="bank_account_name" to="bank_account_name"/>
<a:map from="bank_account_code" to="bank_account_code"/>
<a:map from="currency_code" to="currency_code"/>
<a:map from="currency_name" to="currency_name"/>
<a:map from="bank_account_type" to="bank_account_type"/>
<a:map from="bank_account_type_name" to="bank_account_type_name"/>
<a:map from="bank_branch_name" to="bank_branch_name"/>
</a:mapping>
</a:field>
<a:field name="confirmed_flag_desc" options="confirmed_flag_ds" valueField="code_value" displayField="code_value_name" returnField="confirmed_flag"/>
<a:field name="payment_method_display" displayField="description" options="payment_method_ds" returnField="payment_method_id" valueField="payment_method_id"/>
<a:field name="bp_name_from" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE">
<a:mapping>
......@@ -431,7 +537,7 @@
<a:field name="currency_code_to"/>
<a:field name="transaction_type" defaultValue="RECEIPT"/>
<a:field name="transaction_category" defaultValue="BUSINESS"/>
<a:field name="write_off_flag"/>
<a:field name="write_off_flag_desc" displayField="code_value_name" options="write_off_flag_ds" returnField="write_off_flag" valueField="code_value"/>
<a:field name="not_reversed_flag_r" defaultValue="NOT"/>
<a:field name="receipt_type"/>
<a:field name="receipt_type_des" displayField="code_value_name" options="receipt_type_ds" returnField="receipt_type" valueField="code_value"/>
......@@ -443,6 +549,28 @@
</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="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
</a:fields>
<a:events>
......@@ -473,26 +601,24 @@
<a:fieldSet column="4" labelWidth="150" title="HLS.QUERY_TITLE">
<a:datePicker name="transaction_date_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_FROM"/>
<a:datePicker name="transaction_date_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_TO"/>
<a:numberField name="cashflow_amount_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM"/>
<a:numberField name="cashflow_amount_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_TO"/>
<a:numberField name="transaction_amount_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM" align="right"/>
<a:numberField name="transaction_amount_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_TO" align="right"/>
<!--我方账户户名-->
<a:comboBox name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>
<!--银行名称-->
<a:comboBox name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>
<!--我方账户账号-->
<a:comboBox name="bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/>
<a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>
<a:lov name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>
<a:lov name="bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/>
<!--银行流水号-->
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<!--对方账户户名-->
<a:lov name="bp_bank_account_id" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<!--对方银行名称-->
<a:lov name="your_bank_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<!--对方账户账号-->
<a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField style="display:none"/>
<a:lov name="business_partner" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/>
<a:comboBox name="confirmed_flag" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BILL_STATUS"/>
<a:comboBox name="WRITE_OFF_FLAG" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"/>
<a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/>
<a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BILL_STATUS"/>
<a:comboBox name="write_off_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"/>
<a:comboBox name="collection_classes_n" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS"/>
</a:fieldSet>
......@@ -508,28 +634,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="receipt_money_amount" 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="back_money_amount" prompt="退款金额" align="right"/>
<a:column name="returned_amount" prompt="退款金额" align="right" />
<a:column name="use_money_amount" prompt="可用金额" align="right"/>
<a:column name="collection_classes" prompt="款项用途"/>
<a:column name="business_partner" prompt="商业伙伴"/>
<a:column name="bank_cash_code" prompt="银行流水号"/>
<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" prompt="单据状态"/>
<a:column name="written_off_status" 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="my_bank_name"/>
<a:column prompt="账号" name="my_account_username"/>
<a:column prompt="银行" name="bank_branch_name"/>
<a:column prompt="账号" name="bank_account_num"/>
</a:column>
<a:column prompt="对方账户">
<a:column prompt="户名" name="your_account_name"/>
<a:column prompt="银行" name="your_bank_name"/>
<a:column prompt="账号" name="your_account_username"/>
<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>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY"/>
<a:column name="confirmed_user" prompt="HLS.DOCUMENT_CONFIRMED_BY"/>
<a:column name="mkt_confirmed_by" prompt="营业确认人"/>
<a:column name="acc_confirmed_by" prompt="会计确认人"/>
</a:columns>
</a:grid>
</a:fieldSet>
......
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview 0 → 100644
View file @ e235da85
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: chenlingfeng
$Date: 2015-04-09 上午10:07:29
$Revision: 1.0
$Purpose:
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<a:init-procedure outputPath="/parameter">
<a:model-query model="basic.hls_fnd_attribute_sequence" rootPath="header"/>
<a:import-excel header_id="${/model/header/record/@header_id}" separator="," status_field="/parameter/@ImportSuccess" template_code="CSH_TRX_BANK" user_id="${/session/@user_id}"/>
<a:model-query defaultWhereClause="header_id=${/model/header/record/@header_id} and TEMPLATE_CODE = &apos;CSH_TRX_BANK&apos;" model="basic.hls_fnd_attribute_status" rootPath="status"/>
<a:model-update model="csh.CSH510N.csh_transaction_list_tmp"/>
</a:init-procedure>
<a:view>
<a:link id="import_csh_transaction_receipt_data_link_id" model="csh.CSH510N.csh_transaction_list_tmp" modelaction="insert"/>
<script type="text/javascript"><![CDATA[
function backBtn() {
parent._input_window.close();
}
var import_flag=0;
function import_btn() {
var ds = $('tre_withdraw_subscriber_import_ds');
var record = ds.getAll();
if(import_flag==0){
for (var i = 0;i < record.length;i++) {
if (record[i].get('status') == 'ERROR') {
Leaf.showMessage('${l:PROMPT}', '导入的数据存在错误，请查看错误信息！');
return;
}
}
Leaf.showConfirm('提示', '确定要导入信息吗？', function() {
Leaf.request({
url: $('import_csh_transaction_receipt_data_link_id').getUrl(),
para: {
batch_id: '${/parameter/@batch_id}',
header_id: '${/model/header/record/@header_id}'
},
scope: this,
success: function () {
import_flag = import_flag + 1;
Leaf.SideBar.show({
msg: '操作成功',
duration: 2000
});
backBtn();
}
});
});
}else{
Leaf.showMessage('${l:PROMPT}', '数据已导入不能重复导入！');
return;
}
}
]]></script>
<a:dataSets>
<a:dataSet id="tre_withdraw_subscriber_import_ds" autoQuery="true" fetchAll="true" model="csh.CSH510N.csh_transaction_list_tmp" queryUrl="${/request/@context_path}/autocrud/csh.CSH510N.csh_transaction_list_tmp/query?header_id=${/model/header/record/@header_id}">
<a:fields>
<a:field name="error_message" readOnly="true"/>
<a:field name="attribute_4" readOnly="true"/>
</a:fields>
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:form id="success_form" height="400" title="THE_IMPORTED_DATA" width="980">
<a:screenTopToolbar>
<a:gridButton click="backBtn" text="退出"/>
<a:gridButton click="import_btn" text="导入"/>
</a:screenTopToolbar>
<a:grid id="grid_ds_id" bindTarget="tre_withdraw_subscriber_import_ds" height="340" navBar="true" width="980">
<a:columns>
<a:column name="error_message" editor="textArea_e" prompt="错误信息" width="180"/>
<a:column name="attribute_1" prompt="账号" width="80"/>
<a:column name="attribute_2" prompt="货币" width="80"/>
<a:column name="attribute_3" prompt="交易日期" width="80"/>
<!-- <a:column name="attribute_4" prompt="交易时间" width="80"/>-->
<a:column name="attribute_5" prompt="日志号" width="80"/>
<a:column name="attribute_8" prompt="对方账号" width="80"/>
<a:column name="attribute_9" prompt="对方账号户名" width="80"/>
<a:column name="attribute_24" prompt="摘要" width="80"/>
<a:column name="attribute_25" prompt="附言" width="80"/>
</a:columns>
<a:editors>
<a:textArea id="textArea_e" height="50" width="240"/>
</a:editors>
</a:grid>
</a:form>
</a:screenBody>
<script type="text/javascript"><![CDATA[
]]></script>
</a:view>
</a:screen>
src/main/webapp/modules/csh/CSH510N/csh_transaction_import.lview 0 → 100644
View file @ e235da85
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2015-4-8 上午09:03:15
$Revision: 1.0
$Purpose: excel导入收款
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<a:init-procedure/>
<a:view>
<script type="text/javascript"><![CDATA[
function saveClick() {
if (document.getElementById('importFile').value) {
var fileName = document.getElementById('importFile').value;
var fileType = fileName.substr(fileName.lastIndexOf("."));
if (fileType != '.xls' && fileType != '.xlsx' && fileType != '.xlsm') {
alert('${l:SELECT_CORRECT_IMPORT_FILE}');
} else {
doSubmit();
}
}
}
var _input_window;
function doSubmit() {
_input_window = new $L.Window({
title: '${l:HLS.IMPORT}',
width: 1050,
height: 500
});
new Ext.Template('<iframe id ="_input_window" name="_input_window" border="0" frameborder="0" height="100%" width="100%" style="border:none;padding:0px;margin:0px;"></iframe>').insertFirst(_input_window.body.dom, {}, true);
var form = document.getElementById('importForm');
var url = '${/request/@context_path}/modules/csh/CSH510N/csh_transaction_excel_import.lview?session_id=${/parameter/@session_id}&winid=${/parameter/@winid}&batch_id=${/parameter/@batch_id}&_csrf=${/session/@_csrf.token}';
form.action = url;
form.submit();
$('${/parameter/@winid}').close();
_input_window.on('close', function() {
// $('${/parameter/@parent_ds_id}').setQueryParameter('batch_id','${/parameter/@batch_id}');
$('${/parameter/@parent_ds_id}').query();
});
}
]]></script>
<a:dataSets>
<a:dataSet id="label_ds" autoCreate="true">
<a:fields>
<!--<a:field name="label1" defaultValue="注意："/>-->
<a:field name="label2" defaultValue="${l:STRICT_IMPORTED_TEMPLATE_DATA}"/>
<a:field name="label3" defaultValue="${l:PRODUCT_MASTER_DATA_IMPORT}"/>
<a:field name="label4" defaultValue="${l:IMPORTER_ONLY_SUPPORTS}"/>
<a:field name="label5" defaultValue="${l:READ_THE_ABOVE_CAREFULLY}"/>
<a:field name="label6" defaultValue="${l:THE_IMPORT_IS_COMPLETE}"/>
</a:fields>
</a:dataSet>
</a:dataSets>
<a:fieldSet style="margin-left:10px;margin-top:10px;" title="IMPORT_CONSIDERATIONS" width="400">
<!--<a:label name="label1" bindTarget="label_ds" width="380"/>-->
<a:label name="label2" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
<a:label name="label3" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
<a:label name="label4" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
<a:label name="label5" bindTarget="label_ds" style="color:#055A78;font-weight:bold;margin-left:10px;" width="380"/>
<a:label name="label6" bindTarget="label_ds" style="color:#055A78;font-weight:bold;margin-left:10px;" width="380"/>
</a:fieldSet>
<a:fieldSet style="margin-left:10px;margin-top:10px;" title="TMPLT_IMPORT_FILE" width="400">
<form name="upload" id="importForm" action="modules/prj/PRJ501N/prj_lease_item_trans_upload.lview?session_id=${/parameter/@session_id}&amp;project_id=${/parameter/@project_id}&amp;parent_ds_id=${/parameter/@parent_ds_id}&amp;type=${/parameter/@type}&amp;_csrf=${/session/@_csrf.token}" enctype="multipart/form-data" method="post" target="_input_window">
<label style="margin-left:10px;margin-top:10px;font-size:13px"><![CDATA[${l:PLEASE_SELECT_A_FILE}]]></label>
<input name="CONTENT" id="importFile" style="font-size:15px" type="file"/>
<!-- <input onclick="downloadFile()" style="margin-left:10px;margin-top:10px;width:60px;height:23px" type="button" value="模板下载"/> -->
<input onclick="saveClick()" style="margin-left:25px;margin-top:10px;width:60px;height:23px" type="button" value="${l:TMPLT_IMPORT}"/>
</form>
</a:fieldSet>
</a:view>
</a:screen>
src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview
View file @ e235da85
......@@ -21,12 +21,11 @@
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
<a:link id="transaction_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
<script type="text/javascript"><![CDATA[
//重置收款收据
var transaction_id;
<!--增加重置功能-->
function csh511_receipt_reset(){
$('csh_transaction_receipt_head_ds').reset();
}
var transaction_id;
function csh511_receipt_import_and_write_off() {
new Leaf.Window({
url: $('csh_receipt_import_link').getUrl(),
......@@ -66,6 +65,8 @@
}
record.set('_status', 'insert');
saveData.push(record.data);
console.log(saveData);
return;
Leaf.request({
url: '${/request/@context_path}/autocrud/csh.CSH511.csh_transaction_receipt_save/batch_update',
para: saveData,
......@@ -310,37 +311,35 @@
]]></script>
<a:dataSets>
<a:dataSet id="PAID_BYOTHER_FLAG_DS" lookupCode="PAID_BYOTHER_FLAG"/>
<a:dataSet id="csh_payment_method_ds">
<!-- <a:dataSet id="payment_method_ds">
<a:datas dataSource="/model/payment_method_path"/>
</a:dataSet>
<a:dataSet id="csh_currency_ds">
</a:dataSet>-->
<!--<a:dataSet id="currency_ds">
<a:datas dataSource="/model/currency"/>
</a:dataSet>
</a:dataSet>-->
<a:dataSet id="exchangerate_type_ds">
<a:datas dataSource="/model/exchangerate_type_path"/>
</a:dataSet>
<a:dataSet id="csh_collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES"/>
<!-- <a:dataSet id="ds_collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES"/>-->
<a:dataSet id="csh_transaction_receipt_head_ds" autoCreate="true" loadData="true" model="csh.CSH511.csh_transaction">
<a:fields>
<a:field name="transaction_date" 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:map from="period_name" to="period_name"/>
</a:mapping>
</a:field>
<a:field name="internal_period_num"/>-->
<a:field name="payment_method_display" displayField="description" options="csh_payment_method_ds" returnField="payment_method_id" valueField="payment_method_id"/>
<!-- <a:field name="currency_name" displayField="currency_name" options="csh_currency_ds" readOnly="true" required="true" returnField="currency_code" valueField="currency_code">
</a:field>-->
<!--<a:field name="internal_period_num"/>-->
<!--<a:field name="payment_method_display" displayField="description" options="payment_method_ds" returnField="payment_method_id" valueField="payment_method_id"/>-->
<a:field name="currency_name" displayField="currency_name" options="currency_ds" readOnly="true" required="true" returnField="currency_code" valueField="currency_code">
<a:mapping>
<a:map from="precision" to="precision"/>
</a:mapping>
</a:field>-->
<!-- <a:field name="currency_code"/>-->
<!-- <a:field name="precision"/>-->
<!-- <a:field name="functional_currency_code" defaultValue="${/model/default_exchange_rate_type_path/record/@functional_currency_code}"/>-->
<!--商业伙伴-->
<a:field name="bp_name" lovGridHeight="350" lovHeight="550" lovLabelWidth="50" lovWidth="550" lovService="basic.hls_bp_master_v_for_lov" title="HLS.BP_TITLE">
</a:field>
<a:field name="currency_code"/>
<a:field name="precision"/>
<a:field name="functional_currency_code" defaultValue="${/model/default_exchange_rate_type_path/record/@functional_currency_code}"/>
<a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovLabelWidth="90" lovService="basic.hls_bp_master_v_for_lov" lovWidth="550" title="HLS.BP_TITLE">
<a:mapping>
<a:map from="bp_id" to="bp_id"/>
<a:map from="bp_name" to="bp_name"/>
......@@ -349,7 +348,15 @@
<a:map from="bp_category_name" to="bp_category_display"/>
</a:mapping>
</a:field>
<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="bank_slip_num" lovGridHeight="350" lovHeight="600" lovService="csh.CSH510.csh_transaction_contract_query" lovWidth="1200" title="合同编号">
<a:mapping>
<a:map from="bp_id" to="bp_id"/>
<a:map from="bp_name" to="bp_name"/>
<a:map from="bp_category" to="bp_category"/>
<a:map from="bp_category_n" to="bp_category_display"/>
<a:map from="contract_number" to="bank_slip_num"/>
</a:mapping>
</a:field> -->
<a:field name="bp_category_display" readOnly="true"/>
<a:field name="transaction_num" readOnly="true"/>
<a:field name="exchange_rate_type_display" displayField="type_name" options="exchangerate_type_ds" readOnly="true" returnField="exchange_rate_type" valueField="type_code">
......@@ -358,11 +365,11 @@
<a:map from="rate_method_code" to="rate_method_code"/>
</a:mapping>
</a:field>
<!-- <a:field name="exchange_rate_type"/>-->
<!-- <a:field name="exchange_rate" readOnly="true" required="true"/>-->
<!-- <a:field name="rate_method_code"/>-->
<a:field name="exchange_rate_type"/>
<a:field name="exchange_rate" readOnly="true" required="true"/>
<a:field name="rate_method_code"/>
<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" required="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:mapping>
<a:map from="precision" to="precision"/>
......@@ -390,10 +397,27 @@
</a:mapping>
</a:field>
<!-- <a:field name="ref_contract_number" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH511.csh_con_contract_lov" lovWidth="580" title="CON301.CONTRACT_QUERY">
<a:mapping>
<a:map from="contract_number" to="ref_contract_number"/>
<a:map from="contract_id" to="ref_contract_id"/>
</a:mapping>
</a:field> -->
<a:field name="ref_contract_number" lovGridHeight="320" lovHeight="530" lovService="csh.CSH510.csh_transaction_contract_query" lovWidth="800" title="合同编号">
<a:mapping>
<a:map from="bp_id" to="bp_id"/>
<a:map from="bp_name" to="bp_name"/>
<a:map from="bp_category" to="bp_category"/>
<a:map from="bp_category_n" to="bp_category_display"/>
<a:map from="contract_id" to="ref_contract_id"/>
<a:map from="contract_number" to="ref_contract_number"/>
<a:map from="bp_id_agent_level1_n" to="bp_id_agent_level1_n"/>
</a:mapping>
</a:field>
<a:field name="bp_bank_account_num"/>
<a:field name="bp_bank_account_name" required="true"/>
<a:field name="collection_classes_desc" options="csh_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:fields>
<a:events>
<a:event name="update" handler="onUpdate_csh511_receipt"/>
......@@ -404,42 +428,112 @@
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
<a:screenTitle/>
<a:gridButton id="csh511_receipt_save_id" 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_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_back_id" click="csh511_receipt_back" text="HLS.EXIT"/>-->
</a:screenTopToolbar>
<!--<a:form title="CSH511.CSH_RECEIPT">-->
<!--<a:box column="4">-->
<!--<a:datePicker name="transaction_date" bindTarget="csh_transaction_receipt_head_ds"/>-->
<!--<a:lov name="period_name" bindTarget="csh_transaction_receipt_head_ds"/>-->
<!--<a:comboBox name="currency_name" bindTarget="csh_transaction_receipt_head_ds"/>-->
<!--&lt;!&ndash; <a:comboBox name="exchange_rate_type_display" bindTarget="csh_transaction_receipt_head_ds"/> &ndash;&gt;-->
<!--</a:box>-->
<!--<a:box column="4">-->
<!--<a:lov name="ref_contract_num" bindTarget="csh_transaction_receipt_head_ds" prompt="合同编号"/>-->
<!--<a:comboBox name="payment_method_display" bindTarget="csh_transaction_receipt_head_ds"/>-->
<!--<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_head_ds" prompt="银行凭证号"/>-->
<!--<a:numberField name="exchange_rate" allowNegative="false" bindTarget="csh_transaction_receipt_head_ds" decimalPrecision="-1"/>-->
<!--</a:box>-->
<!--<a:box column="4">-->
<!--<a:numberField name="transaction_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_receipt_head_ds"/>-->
<!--<a:numberField name="ref_n01" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_receipt_head_ds" prompt="税额"/>-->
<!--&lt;!&ndash; <a:numberField name="transaction_functional_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_receipt_head_ds"/> &ndash;&gt;-->
<!---->
<!--<a:lov name="bp_name" bindTarget="csh_transaction_receipt_head_ds"/>-->
<!--<a:textField name="bp_category_display" bindTarget="csh_transaction_receipt_head_ds"/>-->
<!--</a:box>-->
<!--<a:box column="4">-->
<!--<a:lov name="bank_account_code" bindTarget="csh_transaction_receipt_head_ds"/>-->
<!--<a:textField name="bank_account_num" bindTarget="csh_transaction_receipt_head_ds"/>-->
<!--<a:lov name="bp_bank_account_code" bindTarget="csh_transaction_receipt_head_ds"/>-->
<!--<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_head_ds"/>-->
<!--</a:box>-->
<!--<a:box column="2">-->
<!--<a:textField name="bank_account_name" bindTarget="csh_transaction_receipt_head_ds" width="383"/>-->
<!--<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_head_ds" width="383"/>-->
<!--</a:box>-->
<!--<a:box column="4">-->
<!--<a:textArea name="description" bindTarget="csh_transaction_receipt_head_ds" width="383"/>-->
<!--</a:box>-->
<!--</a:form>-->
<!--#删除表格头,添加fieldSet-->
<!-- <a:form title="收款信息" width="1200">-->
<a:fieldSet title="收款手动新增">
<a:box column="3">
<a:datePicker name="transaction_date" bindTarget="csh_transaction_receipt_head_ds"/>
<!--<a:lov name="period_name" bindTarget="csh_transaction_receipt_head_ds"/>-->
<a:numberField name="cashflow_amount" prompt="收款金额" 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"/>
<!-- # 新增现金流字段,代付，商业伙伴,摘要字段-->
<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: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="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS"/>
<a:comboBox name="collection_classes_desc" bindTarget="csh_transaction_receipt_head_ds" prompt="款项分类"/>
</a:box>
<a:hBox style="width:800px">
<a:textField width="350" name="description" bindTarget="csh_transaction_receipt_head_ds"/>
</a:hBox>
<!--#添加备注字段-->
<a:hBox style="width:800px">
<a:textField width="350" name="ref_v05" prompt="备注" bindTarget="csh_transaction_receipt_head_ds"/>
</a:hBox>
</a:fieldSet>
<!--删除下面的字段 currency_name,bank_account_name,banka,bank_branch_name,bank_account_num,bank_account_type_name,exchange_rate_type_display-->
<!-- <a:comboBox name="currency_name" bindTarget="csh_transaction_receipt_head_ds"/>
<a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_head_ds"/>
&lt;!&ndash;<a:textField name="banka" bindTarget="csh_transaction_receipt_head_ds" prompt="账户类型"/>&ndash;&gt;
<a:textField name="bank_branch_name" bindTarget="csh_transaction_receipt_head_ds" readOnly="true" prompt="分行名称"/>
<a:textField name="bank_account_num" bindTarget="csh_transaction_receipt_head_ds" readOnly="true"/>
<a:textField name="bank_account_type_name" bindTarget="csh_transaction_receipt_head_ds" readOnly="true" prompt="账户类型"/>
&lt;!&ndash; <a:comboBox name="exchange_rate_type_display" bindTarget="csh_transaction_receipt_head_ds"/> &ndash;&gt;
</a:box>-->
<!--删除下面的两个box-->
<!-- <a:box column="4">
<a:textField name="description" bindTarget="csh_transaction_receipt_head_ds"/>
<a:textField name="purpose" bindTarget="csh_transaction_receipt_head_ds" prompt="用途"/>
</a:box>
<a:box column="4">
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_head_ds" prompt="银行流水号"/>
<a:textField name="gsber" bindTarget="csh_transaction_receipt_head_ds" prompt="业务范围"/>
<a:textField name="sus_belnr" bindTarget="csh_transaction_receipt_head_ds" prompt="SAP凭证号"/>
</a:box>-->
<!-- </a:form>-->
<!--添加两方的账户信息和附件-->
<a:fieldSet title="账户信息">
<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:comboBox name="my_bank_name" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>
<a:comboBox name="my_account_username" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/>
<a:textField name="your_account_name" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<a:textField name="your_bank_name" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<a:textField name="your_account_username" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<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_account_num" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME" readOnly="true"/>
<!--对方账户-->
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
</a:box>
</a:fieldSet>
<a:fieldSet title="附件">
<form name="upload" id="general_importForm" action="general_excel_execute.lview" enctype="multipart/form-data" method="post">
<input name="CONTENT" id="general_importFile" style="margin-bottom:4px;width:250px;height:22px;" type="file"/>
<input onclick="saveClick()" style="margin-left:10px;margin-top:10px;width:60px;" type="button" value="导入"/>
</form>
<input type="file" name="uploadFile"/>
<input type="button" value="上传"/>
</a:fieldSet>
<!-- <a:form title="对方账户信息" width="1200">
<a:box column="4">
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_head_ds"/>
<a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_head_ds" prompt="银行名称"/>
<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_head_ds"/>
</a:box>
</a:form>-->
</a:screenBody>
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ e235da85
......@@ -19,8 +19,8 @@
url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/>
<a:link id="hls213_sap_eai_create_vender_link"
url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/>
<a:link id="Identity_ccx_link"
url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>
<!-- <a:link id="Identity_ccx_link"
url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>-->
<script src="${/request/@context_path}/javascripts/identity_card_info_query.js" type="text/javascript"/>
<a:link id="identity_query_link" model="interface.CCX_INTERFACE.identity_query" modelaction="update"/>
<script type="text/javascript"><![CDATA[
......@@ -129,7 +129,7 @@
//身份证验证
if (ds.fields.id_card_no) {
ds.fields.id_card_no.pro.validator = id_card_no_validate;
//ds.fields.id_card_no.pro.validator = id_card_no_validate;
}
if (ds.fields.parent_id) {
......@@ -157,9 +157,9 @@
//由于中诚信测试环境只能测试张三，所以这里限定身份证号为张三的123456199001011233
// if(value=='123456199001011233'){
//
var url1 = $('identity_query_link').getUrl();
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
// var url1 = $('identity_query_link').getUrl();
// window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
/* Leaf.request({
url: url1,
para: {
id_card_no: value,//身份证号码
......@@ -229,7 +229,7 @@
},
scope: this,
sync: true
});
});*/
}
if (value.length == 18) {
......
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