Skip to content

L
leaf-hlcm
Commit db03706c authored by gzj34291's avatar gzj34291
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 2b403f8f 57cba346
Hide whitespace changes
Inline Side-by-side
Showing with 480 additions and 48 deletions
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm
View file @ db03706c
......@@ -104,6 +104,7 @@
<bm:field name="guarantor_name_duty" />
<bm:field name="extra_nam" expression="(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t1.bp_id))" forInsert="false" forUpdate="false"/>
<bm:field name="import_source"/>
<bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_query.lwm
View file @ db03706c
......@@ -82,6 +82,8 @@
<bm:field name="approval_status" expression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'))"/>
<bm:field name="approval_status_desc" expression="(Select v.code_value_name From sys_code_values_v v Where v.code = &apos;WFL_STATUS&apos; And v.code_value = decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')))"/>
<bm:field name="transaction_wfl_id"/>
<bm:field name="import_source"/>
<bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -147,5 +149,6 @@ and cc.data_class = 'NORMAL'
and cwo.csh_transaction_id = t1.transaction_id
and hbm.bp_name like ${@bp_name_r})"/>
<bm:query-field name="approval_status" queryExpression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')) = ${@approval_status}"/>
<bm:query-field field="import_source" queryOperator="="/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm
View file @ db03706c
......@@ -102,6 +102,8 @@
<bm:field name="confirm_user_name" expression="(select description from sys_user where user_id = t1.confirmed_by)" forceUpdate="false" forInsert="false"/>
<bm:field name="confirmed_flag_desc" expression="(select code_value_name from sys_code_values_v where code = 'CONFIRMED_FLAG' and code_value = t1.confirmed_flag)" forceUpdate="false" forInsert="false"/>
<bm:field name="confirmed_flag"/>
<bm:field name="import_source"/>
<bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
<!--end-->
</bm:fields>
<bm:features>
......@@ -164,7 +166,7 @@
<bm:query-field name="bp_bank_account_num" queryExpression="t1.bp_bank_account_num like ${@bp_bank_account_num}"/>
<bm:query-field name="bank_name" queryExpression="(select a.bank_short_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id) like ${@bank_name}"/>
<bm:query-field name="bank_branch_name" queryExpression="(select a.bank_branch_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id) like ${@bank_branch_name}"/>
<bm:query-field field="import_source" queryOperator="="/>
<!--end-->
</bm:query-fields>
<bm:data-filters>
......
src/main/webapp/WEB-INF/classes/hls/HLS301/hls_journal_header_v.lwm
View file @ db03706c
......@@ -72,7 +72,7 @@
</bm:features>
<bm:query-fields>
<bm:query-field field="merge_parent_flag" queryOperator="="/>
<bm:query-field name="contract_number" queryExpression="exists (select 1 from HLS_JOURNAL_DETAIL_LV hl where hl.journal_header_id = t1.journal_header_id and hl.reference3 = ${@contract_number})"/>
<bm:query-field name="contract_number" queryExpression="exists (select 1 from HLS_JOURNAL_DETAIL_LV hl where hl.journal_header_id = t1.journal_header_id and hl.reference3 like ${@contract_number})"/>
<bm:query-field field="journal_num" queryOperator="like"/>
<bm:query-field name="journal_date_from" queryExpression="t1.journal_date &gt;= to_date(${@journal_date_from},'yyyy-mm-dd')"/>
<bm:query-field name="journal_date_to" queryExpression="t1.journal_date &lt;= to_date(${@journal_date_to},'yyyy-mm-dd')"/>
......
src/main/webapp/WEB-INF/classes/hsbc/HSBC100/hsbc_paying_batch_create_return.lwm 0 → 100644
View file @ db03706c
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="delete">
<bm:update-sql><![CDATA[
delete from hl_hsbc_doc_temp t where t.session_id = ${/session/@session_id}
]]></bm:update-sql>
</bm:operation>
<bm:operation name="insert">
<bm:update-sql><![CDATA[
begin
hl_hsbc_interface_pkg.insert_doc_temp_return(
p_session_id=>${/session/@session_id},
p_return_id=>${@return_id},
p_return_transaction_id=>${@return_transaction_id},
p_tranamount =>${@this_return_amount},
p_user_id=>${/session/@user_id},
p_button_id => ${/parameter/@button_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
hl_hsbc_interface_pkg.create_batch_return(p_session_id => ${/session/@session_id},
p_bank_account_id => ${@bank_account_id},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_r_result_queryfields.js 0 → 100644
View file @ db03706c
var override_queryfields = [
{
name : 'payment_req_number',
queryexpression : "transaction_num = ${@payment_req_number}"
},
{
name : 'approval_date_from',
queryexpression : "trunc(t1.approval_date) >= to_date(${@approval_date_from},'yyyy-mm-dd')"
},
{
name : 'approval_date_to',
queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')"
}
];
override();
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc110_g_result_queryfields.js
View file @ db03706c
......@@ -12,7 +12,7 @@
var add_datafilters = [
{
name : 'init_filter',
expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR')"
expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR') and t1.cf_item = '0'"
}
];
......
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc110_r_result_queryfields.js 0 → 100644
View file @ db03706c
var override_queryfields = [
{
name : 'creationdate_from',
queryexpression : "trunc(t1.creationdate) >= to_date(${@creationdate_from},'yyyy-mm-dd')"
},
{
name : 'creationdate_to',
queryexpression : "trunc(t1.creationdate) <= to_date(${@creationdate_to},'yyyy-mm-dd')"
}
];
var add_datafilters = [
{
name : 'init_filter',
expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR') and t1.collection_classes = 'REFUND'"
}
];
add_datafilter();
override();
src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
View file @ db03706c
......@@ -451,6 +451,7 @@
debugger;
var ds_id_req = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_change_req');
if (ds_id_req == ds.id && ds_id_req) {
if(record.get('document_type')=='REPUR_CHAG'|| record.get('document_type')=='ET_CHAG'){
if (record.get('ccr_penalty') != record.get('penalty')) {
var req_change_id_1 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_CCR_PENALTY');
var req_change_input_1 = req_change_id_1.getElementsByTagName('input');
......@@ -473,12 +474,27 @@
}
;
//调整后留购价
var residual_value = record.get('residual_value')
if (residual_value != 0 && typeof (residual_value) != 'undefined') {
var req_change_id_4 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_RESIDUAL_VALUE');
var req_change_input_4 = req_change_id_4.getElementsByTagName('input');
req_change_input_4[0].style.setProperty('background-color', '#FF9965', 'important');
};
var residual_value = record.get('residual_value');
var ccr_residual_value = record.get('ccr_residual_value');
var amount_250 = record.get('amount_250');
if (amount_250 == 0){
if (residual_value != ccr_residual_value && typeof (residual_value) != 'undefined') {
var req_change_id_4 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_RESIDUAL_VALUE');
var req_change_input_4 = req_change_id_4.getElementsByTagName('input');
req_change_input_4[0].style.setProperty('background-color', '#FF9965', 'important');
}
}
if(amount_250 != 0){
if (residual_value != 0 && typeof (residual_value) != 'undefined') {
var req_change_id_4 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_RESIDUAL_VALUE');
var req_change_input_4 = req_change_id_4.getElementsByTagName('input');
req_change_input_4[0].style.setProperty('background-color', '#FF9965', 'important');
}
}
}
}
};
......
src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview
View file @ db03706c
......@@ -594,6 +594,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="position_code_ds">
<a:datas dataSource="/model/position_code"/>
</a:dataSet>
......@@ -818,7 +819,7 @@
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields>
<a:events>
<a:event name="update" handler="csh510_receipt_maintain_update"/>
......@@ -894,6 +895,8 @@
<!-- <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:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="新增路径"/>
</a:fieldSet>
......@@ -928,7 +931,7 @@
<a:column name="guarantor_name_duty" hidden="true" />
<a:column name="paid_byother_flag" hidden="true"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据审批状态"
align="center"/>
<!-- <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"-->
......
src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse.lview
View file @ db03706c
......@@ -147,6 +147,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="currency_ds">
<a:datas dataSource="/model/currency"/>
</a:dataSet>
......@@ -241,6 +242,7 @@
</a:mapping>
</a:field>
<a:field name="approval_status_desc" displayField="code_value_name" options="approval_status_ds" returnField="approval_status" valueField="code_value"/>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields>
<a:events>
<a:event name="update" handler="csh514_reversed_update"/>
......@@ -317,6 +319,7 @@
prompt="合同编号"/>
<a:comboBox name="approval_status_desc" bindTarget="csh_transaction_receipt_write_off_reverse_query_ds"
prompt="审批状态"/>
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_reverse_query_ds" prompt="新增路径"/>
</a:form>
<a:grid id="csh_transaction_receipt_write_off_grid_ds"
bindTarget="csh_transaction_receipt_write_off_reverse_result_ds" marginHeight="260" marginWidth="35"
......@@ -350,6 +353,7 @@
<a:column name="bank_account_name" width="120"/>
<a:column name="transaction_type_desc" align="center" prompt="事务类型" width="120"/>
<a:column name="receipt_type_des" align="center" prompt="收款类型" width="120"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="approval_status_desc" align="center" prompt="审批状态" width="120"/>
</a:columns>
<a:editors>
......
src/main/webapp/modules/csh/CSH515/csh_amount_return.lview
View file @ db03706c
......@@ -94,7 +94,7 @@
// return;
// }
$L.showConfirm("提示",'确认提交审批？',function(){
$L.showConfirm("提示",'确认提交审批？</br>【注意】“退款对方账户银行及分行”需填写完整的银行及分行全称，请检查填写是否正确！',function(){
var detail_mask = $('${/parameter/@winid}').wrap;
Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
Leaf.request({
......
src/main/webapp/modules/csh/CSH531C/csh_bank_transfer_confirme.lview
View file @ db03706c
......@@ -509,6 +509,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="batch_status_ds" lookupCode="CSH531_BATCH_STATUS"/>
<a:dataSet id="confirmed_flag_ds">
<a:datas>
......@@ -555,6 +556,7 @@
<a:field name="position_code" defaultValue="${/model/result_position/record/@position_code}"/>
<a:field name="receipt_type_desc" options="receipt_type_ds" valueField="code_value"
defaultValue="code_value_name" returnField="receipt_type"/>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields>
<a:events>
<a:event name="update" handler="csh513_receipt_write_off_update"/>
......@@ -630,6 +632,9 @@
<a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds"
prompt="单据审批状态"/>
</a:box>
<a:box column="4">
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="新增路径"/>
</a:box>
</a:fieldSet>
</a:form>
<a:grid id="csh_transaction_receipt_write_off_grid_ds"
......@@ -673,6 +678,7 @@
<!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>-->
<!-- <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>-->
<a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据审批状态" width="120" align="center"/>
<!-- <a:column name="review_status_desc" prompt="分配状态" width="80"/>-->
<!-- <a:column name="ref_v05" prompt="备注" width="100"/>-->
......
src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview
View file @ db03706c
......@@ -518,6 +518,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="batch_status_ds" lookupCode="CSH531_BATCH_STATUS"/>
<a:dataSet id="confirmed_flag_ds">
<a:datas>
......@@ -565,6 +566,7 @@
<a:field name="position_code" defaultValue="${/model/result_position/record/@position_code}"/>
<a:field name="receipt_type_desc" options="receipt_type_ds" valueField="code_value"
defaultValue="code_value_name" returnField="receipt_type"/>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields>
<a:events>
<a:event name="update" handler="csh513_receipt_write_off_update"/>
......@@ -642,6 +644,9 @@
<a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds"
prompt="单据审批状态"/>
</a:box>
<a:box column="4">
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="新增路径"/>
</a:box>
</a:fieldSet>
</a:form>
<a:grid id="csh_transaction_receipt_write_off_grid_ds"
......@@ -685,6 +690,7 @@
<!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>-->
<!-- <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>-->
<a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据审批状态" width="120" align="center"/>
<!-- <a:column name="review_status_desc" prompt="分配状态" width="80"/>-->
<!-- <a:column name="ref_v05" prompt="备注" width="100"/>-->
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ db03706c
......@@ -184,6 +184,28 @@
if ((ds.id).indexOf('hls_bp_master') != -1) {
if(record.get('bp_class') && record.get('bp_class') == 'ORG'){
if(record.get('bp_type') == 'TENANT'){
record.getField('etp_sts').setRequired(true);
record.getField('credit_code').setRequired(true);
record.getField('etp_sts_n').setRequired(true);
record.getField('org_type').setRequired(true);
record.getField('org_type_n').setRequired(true);
record.getField('org_type_sub').setRequired(true);
record.getField('org_type_sub_n').setRequired(true);
record.getField('enterprise_scale').setRequired(true);
record.getField('enterprise_scale_n').setRequired(true);
record.getField('due_date').setRequired(true);
record.getField('org_unit_property').setRequired(true);
record.getField('org_unit_property_n').setRequired(true);
record.getField('industry').setRequired(true);
record.getField('industry_n').setRequired(true);
record.getField('nationalities').setRequired(true);
}
}
// record.getField('cell_phone').setRequired(true);
//record.getField('cell_phone').setRequired(true);
//身份证验证
......@@ -308,7 +330,6 @@
}
return true;
}
function CheckSocialCreditCode(Code) {
var patrn = /^[0-9A-Z]+$/;
......@@ -366,17 +387,43 @@
// return true;
// }
// //新增和加载时调用form
// window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
// if ((ds.id).indexOf('hls_bp_master_credit') != -1 && (ds.id).indexOf('F_ORG_CREDIT') != -1) {
// // if (ds.fields.fin_institution_code) {
// // ds.fields.fin_institution_code.pro.validator = fin_institution_code_validate;
// // }
// // if (ds.fields.trade_type_code) {
// // ds.fields.trade_type_code.pro.validator = trade_type_code_validate;
// // }
// }
// };
//新增和加载时调用form
// window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
//
// };
//查询时调用(grid,table,gridBox)
// window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
// //商业伙伴类型校验
// debugger;
// var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
// var record = bp_ds_id.getCurrentRecord();
//
// };
//查询时调用(form,fieldboxcolumn)
// window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_query'] = function(ds,record, qpara, bp_seq) {
// //商业伙伴类型校验
// if(ds.fields.bp_class) {
// if(record.get('bp_class') == 'ORG'){
// if(record.get('bp_type') == 'TENANT'){
// record.getField('credit_code').setRequired(true);
// record.getField('etp_sts').setRequired(true);
// record.getField('etp_sts_n').setRequired(true);
// record.getField('org_type').setRequired(true);
// record.getField('org_type_n').setRequired(true);
// record.getField('org_type_sub').setRequired(true);
// record.getField('org_type_sub_n').setRequired(true);
// record.getField('enterprise_scale').setRequired(true);
// record.getField('enterprise_scale_n').setRequired(true);
// record.getField('due_date').setRequired(true);
// record.getField('org_unit_property').setRequired(true);
// record.getField('org_unit_property_n').setRequired(true);
// record.getField('industry').setRequired(true);
// record.getField('industry_n').setRequired(true);
// record.getField('nationalities').setRequired(true);
// }
// }
// }
// };
/*保存前调用，生成项目编号*/
// window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
......@@ -620,6 +667,30 @@
var gird_ds_id = 'BP_NP_CREATE_BP_ASSETS01_hls_bp_assets_ds';
var gird_ds_id2 = 'BP_NP_CREATE_BP_ASSETS04_hls_bp_assets_ds';
var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow');
debugger;
//中征码校验
if (record.get('bp_class') == 'ORG') {
if(record.get('bp_type') == 'TENANT'){
var credit_code = record.get('credit_code');
if (!Leaf.isEmpty(credit_code)) {
if (credit_code.length == '16'){
if(!(/^[A-Z][A-z0-9]*$/).test(credit_code)){
Leaf.showMessage('提示', '中征码首字母需要大写');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}else {
return true;
}
}else {
Leaf.showMessage('提示', '请输入16位中征码');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
}
}
}
if (gird_ds_id == ds.id || gird_ds_id2 == ds.id) {
if (name == 'relationship_with_bp') {
if (value == 'A7501') {
......@@ -834,6 +905,7 @@
}
}else if (value == 'NO_BILLING'){//暂时不开票
debugger;
//一般纳税人
record.getField('taxpayer_type').setRequired(true);
record.getField('taxpayer_type_n').setRequired(true);
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview
View file @ db03706c
......@@ -384,6 +384,26 @@
// }
if ((ds.id).indexOf('hls_bp_master') != -1 && (ds.id).indexOf('F_BASIC') != -1) {
if(record.get('bp_class') && record.get('bp_class') == 'ORG'){
if(record.get('bp_type') == 'TENANT'){
record.getField('etp_sts').setRequired(true);
record.getField('credit_code').setRequired(true);
record.getField('etp_sts_n').setRequired(true);
record.getField('org_type').setRequired(true);
record.getField('org_type_n').setRequired(true);
record.getField('org_type_sub').setRequired(true);
record.getField('org_type_sub_n').setRequired(true);
record.getField('enterprise_scale').setRequired(true);
record.getField('enterprise_scale_n').setRequired(true);
record.getField('due_date').setRequired(true);
record.getField('org_unit_property').setRequired(true);
record.getField('org_unit_property_n').setRequired(true);
record.getField('industry').setRequired(true);
record.getField('industry_n').setRequired(true);
record.getField('nationalities').setRequired(true);
}
}
var employee_type_id = '${/model/modify_user/record/@employee_type_id}';
old_bp_name = record.get('bp_name');
new_bp_name = record.get('bp_name');
......@@ -466,6 +486,31 @@
var gird_ds_id = 'BP_NP_MODIFY_N_BP_ASSETS01_hls_bp_assets_ds';
var gird_ds_id2 = 'BP_NP_MODIFY_N_BP_ASSETS04_hls_bp_assets_ds';
var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow');
//中征码校验
if (record.get('bp_class') == 'ORG') {
if(record.get('bp_type') == 'TENANT'){
var credit_code = record.get('credit_code');
if (!Leaf.isEmpty(credit_code)) {
if (credit_code.length == '16'){
if(!(/^[A-Z][A-z0-9]*$/).test(credit_code)){
Leaf.showMessage('提示', '中征码首字母需要大写');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}else {
return true;
}
}else {
Leaf.showMessage('提示', '请输入16位中征码');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
}
}
}
if (gird_ds_id == ds.id || gird_ds_id2 == ds.id) {
if (name == 'relationship_with_bp') {
if (value == 'A7501') {
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_req_modify.lview
View file @ db03706c
......@@ -407,6 +407,26 @@
if ((ds.id).indexOf('hls_bp_master_req') != -1 && (ds.id).indexOf('F_BASIC') != -1) {
if(record.get('bp_class') && record.get('bp_class') == 'ORG'){
if(record.get('bp_type') == 'TENANT'){
record.getField('etp_sts').setRequired(true);
record.getField('credit_code').setRequired(true);
record.getField('etp_sts_n').setRequired(true);
record.getField('org_type').setRequired(true);
record.getField('org_type_n').setRequired(true);
record.getField('org_type_sub').setRequired(true);
record.getField('org_type_sub_n').setRequired(true);
record.getField('enterprise_scale').setRequired(true);
record.getField('enterprise_scale_n').setRequired(true);
record.getField('due_date').setRequired(true);
record.getField('org_unit_property').setRequired(true);
record.getField('org_unit_property_n').setRequired(true);
record.getField('industry').setRequired(true);
record.getField('industry_n').setRequired(true);
record.getField('nationalities').setRequired(true);
}
}
var employee_type_id = '${/model/modify_user/record/@employee_type_id}';
old_bp_name = record.get('bp_name');
new_bp_name = record.get('bp_name');
......@@ -545,6 +565,30 @@
var gird_ds_id = 'BP_NP_MODIFY_N_BP_ASSETS01_hls_bp_assets_ds';
var gird_ds_id2 = 'BP_NP_MODIFY_N_BP_ASSETS04_hls_bp_assets_ds';
var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow');
//中征码校验
if (record.get('bp_class') == 'ORG') {
if(record.get('bp_type') == 'TENANT'){
var credit_code = record.get('credit_code');
if (!Leaf.isEmpty(credit_code)) {
if (credit_code.length == '16'){
if(!(/^[A-Z][A-z0-9]*$/).test(credit_code)){
Leaf.showMessage('提示', '中征码首字母需要大写');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}else {
return true;
}
}else {
Leaf.showMessage('提示', '请输入16位中征码');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
}
}
}
if (gird_ds_id == ds.id || gird_ds_id2 == ds.id) {
if (name == 'relationship_with_bp') {
if (value == 'A7501') {
......
src/main/webapp/modules/hsbc/HSBC100/csh_bank_account_choose.lview
View file @ db03706c
......@@ -2,14 +2,16 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
<a:view>
<a:link id="hsbc_paying_batch_create_link_id" url="${/request/@context_path}/modules/hsbc/HSBC100/hsbc_paying_batch_create.lsc"/>
<a:link id="hsbc_paying_batch_create_return_link_id" url="${/request/@context_path}/modules/hsbc/HSBC100/hsbc_paying_batch_create_return.lsc"/>
<script><![CDATA[
function create_paying_batch() {
Leaf.Masker.mask(Ext.getBody(), '付款单生成中...');
var winId = '${/parameter/@winId}';
Leaf.Masker.mask($(winId).wrap, '付款单生成中...');
var account_ds = $('csh_bank_account');
var bank_account_id = account_ds.getAt(0).get('bank_account_id');
if (Ext.isEmpty(bank_account_id)) {
Leaf.showMessage('提示', '请先选择账户代码！');
Leaf.Masker.unmask(Ext.getBody());
Leaf.Masker.unmask($(winId).wrap);
} else {
var req_ln_ds = $('${/parameter/@ds_id}');
var button_id = '${/parameter/@button_id}';
......@@ -25,23 +27,32 @@
param['details'] = saveData;
param['bank_account_id'] = bank_account_id;
param['button_id'] = button_id;
var pay_type = '${/parameter/@pay_type}';
var url;
if (pay_type == 'TJ'){
url = $('hsbc_paying_batch_create_link_id').getUrl();
}else if(pay_type == 'RETURN'){
url = $('hsbc_paying_batch_create_return_link_id').getUrl();
}
Leaf.request({
url: $('hsbc_paying_batch_create_link_id').getUrl(),
url: url,
para: param,
success: function() {
Leaf.SideBar.show({
msg: '付款单生成成功！',
duration: 2000
});
Leaf.Masker.unmask(Ext.getBody());
Leaf.Masker.unmask($(winId).wrap);
$('${/parameter/@winId}').close();
req_ln_ds.query();
},
failure: function() {
Leaf.Masker.unmask(Ext.getBody());
Leaf.Masker.unmask($(winId).wrap);
},
error: function() {
Leaf.Masker.unmask(Ext.getBody());
Leaf.Masker.unmask($(winId).wrap);
},
scope: this
});
......
src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview
View file @ db03706c
......@@ -14,15 +14,23 @@
//创建代付单
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var req_ln_ds = $(req_ln_ds_id);
var con_ds = $(con_ds_id);
var req_ln_records = req_ln_ds.getSelected();
var con_records = con_ds.getSelected();
if (req_ln_records.length == 0 || con_records.length > 0) {
Leaf.showMessage('${l:PROMPT}', '只能勾选铁甲付款单数据！');
return;
}
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: req_ln_ds_id,
button_id: 'create_with_sbo'
button_id: 'create_with_sbo',
pay_type: 'TJ'
},
title: '支付账号选择',
height: 260,
......@@ -33,15 +41,76 @@
//创建强制付款单生成
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var req_ln_ds = $(req_ln_ds_id);
var con_ds = $(con_ds_id);
var req_ln_records = req_ln_ds.getSelected();
var con_records = con_ds.getSelected();
if (req_ln_records.length == 0 || con_records.length > 0) {
Leaf.showMessage('${l:PROMPT}', '只能勾选铁甲付款单数据！');
return;
}
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: req_ln_ds_id,
button_id: 'create_without_sbo'
button_id: 'create_without_sbo',
pay_type: 'TJ'
},
title: '支付账号选择',
height: 260,
width: 680
});
};
//创建代付单
window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var req_ln_ds = $(req_ln_ds_id);
var con_ds = $(con_ds_id);
var req_ln_records = req_ln_ds.getSelected();
var con_records = con_ds.getSelected();
if (con_records.length == 0 || req_ln_records.length > 0) {
Leaf.showMessage('${l:PROMPT}', '只能勾选退款付款单数据！');
return;
}
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: con_ds_id,
button_id: 'create_with_sbo',
pay_type: 'RETURN'
},
title: '支付账号选择',
height: 260,
width: 680
});
};
//创建强制付款单生成
window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var req_ln_ds = $(req_ln_ds_id);
var con_ds = $(con_ds_id);
var req_ln_records = req_ln_ds.getSelected();
var con_records = con_ds.getSelected();
if (con_records.length == 0 || req_ln_records.length > 0) {
Leaf.showMessage('${l:PROMPT}', '只能勾选退款付款单数据！');
return;
}
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: con_ds_id,
button_id: 'create_without_sbo',
pay_type: 'RETURN'
},
title: '支付账号选择',
height: 260,
......
src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create_return.lsc 0 → 100644
View file @ db03706c
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
<a:init-procedure>
<a:model-delete model="hsbc.HSBC100.hsbc_paying_batch_create_return"/>
<batch-apply sourcePath="/parameter/details">
<a:model-insert model="hsbc.HSBC100.hsbc_paying_batch_create_return"/>
</batch-apply>
<a:model-update model="hsbc.HSBC100.hsbc_paying_batch_create_return"/>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
src/main/webapp/modules/hsbc/HSBC110/hsbc_paying_batch_modify.lview
View file @ db03706c
......@@ -36,10 +36,19 @@
//代付单发送
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'hl_hsbc_paying_batch');
var r_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'R_RESULT', 'hl_hsbc_paying_batch');
var batch_ds = $(ds_id);
var records = batch_ds.getSelected();
if (records.length == 0) {
var r_batch_ds = $(r_ds_id);
var r_records = r_batch_ds.getSelected();
if (records.length != 0 && r_records.length != 0) {
Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！');
return;
}
if (records.length == 0 && r_records.length == 0) {
Leaf.showMessage('${l:PROMPT}', '请选择至少一条数据！');
return;
}
......@@ -49,13 +58,23 @@
var send_url;
var bank_note='汇丰银行';
for (var i = 0;i < records.length;i++) {
var rec;
rec = records[i];
rec.set('_status', 'insert');
saveData.push(rec.data);
if (records.length != 0){
for (var i = 0;i < records.length;i++) {
var rec;
rec = records[i];
rec.set('_status', 'insert');
saveData.push(rec.data);
}
length = records.length;
}else{
for (var i = 0;i < r_records.length;i++) {
var rec;
rec = r_records[i];
rec.set('_status', 'insert');
saveData.push(rec.data);
}
length = r_records.length;
}
length = records.length;
param['details'] = saveData;
send_url=$('batch_hsbc_send_link').getUrl();
......@@ -68,6 +87,7 @@
success: function(res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
batch_ds.query();
r_batch_ds.query();
},
failure: function(res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
......@@ -85,31 +105,55 @@
//人工支付 --add by 24976
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'hl_hsbc_paying_batch');
var r_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'R_RESULT', 'hl_hsbc_paying_batch');
var batch_ds = $(ds_id);
var records = batch_ds.getSelected();
var r_batch_ds = $(r_ds_id);
var r_records = r_batch_ds.getSelected();
var lease_channel;
var reqsn;
var batch_id;
var bank_item;
if (records.length != 1) {
if (records.length != 0 && r_records.length != 0) {
Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！');
return;
}
if (records.length != 1 && r_records.length == 0) {
Leaf.showMessage('${l:PROMPT}', '请选择一条数据！');
return;
}
if (records.length == 0 && r_records.length != 1) {
Leaf.showMessage('${l:PROMPT}', '请选择一条数据！');
return;
}
if (records.length != 0){
reqsn = records[0].get('reqsn');
batch_id = records[0].get('batch_id');
bank_item=records[0].get('bank_item');
}else {
reqsn = r_records[0].get('reqsn');
batch_id = r_records[0].get('batch_id');
bank_item=r_records[0].get('bank_item');
}
var win = new Leaf.showConfirm('${l:HLS.PROMPT}', '使用人工支付将不能再使用银企直连，确认进行人工支付？', function() {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('manual_modify_link').getUrl(),
para: {
batch_id : records[0].get('batch_id'),
reqsn : records[0].get('reqsn'),
bank_item : records[0].get('bank_item')
batch_id : batch_id,
reqsn : reqsn,
bank_item : bank_item
},
success: function(res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
batch_ds.query();
r_batch_ds.query();
},
failure: function(res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
......@@ -125,26 +169,50 @@
//付款单取消
window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'hl_hsbc_paying_batch');
var r_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'R_RESULT', 'hl_hsbc_paying_batch');
var batch_ds = $(ds_id);
var records = batch_ds.getSelected();
if (records.length != 1 ) {
var r_batch_ds = $(r_ds_id);
var r_records = r_batch_ds.getSelected();
if (records.length != 0 && r_records.length != 0) {
Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！');
return;
}
if (records.length != 1 && r_records.length == 0) {
Leaf.showMessage('${l:PROMPT}', '请选择一条数据！');
return;
}
if (records.length == 0 && r_records.length != 1) {
Leaf.showMessage('${l:PROMPT}', '请选择一条数据！');
return;
}
if (records.length != 0){
reqsn = records[0].get('reqsn');
batch_id = records[0].get('batch_id');
bank_item=records[0].get('bank_item');
}else {
reqsn = r_records[0].get('reqsn');
batch_id = r_records[0].get('batch_id');
bank_item=r_records[0].get('bank_item');
}
Leaf.showConfirm('${l:HLS.PROMPT}', '确认取消？', function() {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('batch_cancel_link').getUrl(),
para: {
batch_id : records[0].get('batch_id'),
reqsn : records[0].get('reqsn'),
bank_item : records[0].get('bank_item')
batch_id : batch_id,
reqsn : reqsn,
bank_item : bank_item
},
success: function(res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
batch_ds.query();
r_batch_ds.query();
},
failure: function(res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
......@@ -166,7 +234,7 @@
});
]]></script>
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
\ No newline at end of file
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