Skip to content

L
leaf-hlcm
Commit 235bae84 authored by Luochenglong's avatar Luochenglong
Browse files
Options

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

parents cd364332 c6c26e56
Hide whitespace changes
Inline Side-by-side
Showing with 258 additions and 53 deletions
src/main/webapp/WEB-INF/classes/csh/CSH501C/req_acp_inf_import_total.lwm
View file @ 235bae84
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
p_total_amount => ${@total_amount}, p_total_amount => ${@total_amount},
p_invoice_date => ${@invoice_date}, p_invoice_date => ${@invoice_date},
p_payment_req_id => ${@payment_req_id}, p_payment_req_id => ${@payment_req_id},
p_user_id => ${/session/@user_id} p_user_id => ${/session/@user_id});
end; end;
]]> ]]>
</bm:update-sql> </bm:update-sql>
......
src/main/webapp/WEB-INF/classes/csh/CSH501R/csh_payment_req_comm_selected.lwm
View file @ 235bae84
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select * from( select * from(
select hb.batch_number, select hb.batch_number,
hc.batch_id, hc.batch_id,
hc.policy_hd_id, hc.policy_hd_id,
hc.bp_id, hc.bp_id,
(select cc.contract_number (select cc.contract_number
from con_contract cc from con_contract cc
where cc.contract_id = hc.contract_id) contract_number, where cc.contract_id = hc.contract_id) contract_number,
(select cc.contract_name (select cc.contract_name
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
from con_contract cc,hls_division hd from con_contract cc,hls_division hd
where cc.division= hd.division and cc.contract_id = hc.contract_id) con_business_type_n, where cc.division= hd.division and cc.contract_id = hc.contract_id) con_business_type_n,
hc.rental_re_times, hc.rental_re_times,
hc.overdue_max_days, nvl(hc.overdue_max_days,0) overdue_max_days,
hc.comsn_rate*100||'%' comsn_rate, round(hc.comsn_rate*100,2)||'%' comsn_rate,
hc.comsn_amount, hc.comsn_amount,
(select sum(i.unearned_finance_income) (select sum(i.unearned_finance_income)
from con_unearned_finance_income i from con_unearned_finance_income i
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
WHERE l.ref_doc_line_id=hc.cashflow_id WHERE l.ref_doc_line_id=hc.cashflow_id
AND l.ref_doc_category='CONTRACT' AND l.ref_doc_category='CONTRACT'
and l.payment_req_id=hd.payment_req_id and l.payment_req_id=hd.payment_req_id
and hd.approval_status in ('NEW','REJECT','APPROVED','APPROVING','RETURN') and hd.approval_status in ('NEW','APPROVED','APPROVING','RETURN')
) )
AND ('Y' = 'Y' AND EXISTS AND ('Y' = 'Y' AND EXISTS
(SELECT 1 (SELECT 1
...@@ -69,32 +69,13 @@ ...@@ -69,32 +69,13 @@
AND a1.trx_category = a2.trx_category AND a1.trx_category = a2.trx_category
AND a2.authorized_user_id = ${/session/@user_id} AND a2.authorized_user_id = ${/session/@user_id}
AND trunc(SYSDATE) BETWEEN a2.start_date AND AND trunc(SYSDATE) BETWEEN a2.start_date AND
nvl(a2.end_date, trunc(SYSDATE)))) nvl(a2.end_date, trunc(SYSDATE))))
AND NOT EXISTS (
SELECT 1
FROM csh_payment_req_ln l,csh_payment_req_hd hd
WHERE l.ref_doc_line_id=hc.cashflow_id
AND l.ref_doc_category='CONTRACT'
and l.payment_req_id=hd.payment_req_id
and hd.approval_status in ('NEW','REJECT','APPROVED','APPROVING','RETURN')
)
AND ('Y' = 'Y' AND EXISTS
(SELECT 1
FROM aut_trx_user_authorize a1, aut_owner_user_authorize a2
WHERE a1.trx_category = 'CONTRACT'
AND a1.trx_id = hc.contract_id
AND trunc(SYSDATE) BETWEEN a1.start_date AND
nvl(a1.end_date, trunc(SYSDATE))
AND a1.user_id = a2.owner_user_id
AND a1.trx_category = a2.trx_category
AND a2.authorized_user_id = ${/session/@user_id}
AND trunc(SYSDATE) BETWEEN a2.start_date AND
nvl(a2.end_date, trunc(SYSDATE))))
order by hc.overdue_max_days desc
) t1 ) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
#ORDER_BY_CLAUSE# order by t1.overdue_max_days desc
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
...@@ -103,11 +84,13 @@ order by hc.overdue_max_days desc ...@@ -103,11 +84,13 @@ order by hc.overdue_max_days desc
<bm:query-field name="batch_number" <bm:query-field name="batch_number"
queryExpression="t1.batch_number like &apos;%&apos;||${@batch_number}||&apos;%&apos;"/> queryExpression="t1.batch_number like &apos;%&apos;||${@batch_number}||&apos;%&apos;"/>
<bm:query-field name="contract_number" <bm:query-field name="contract_number"
queryExpression="t1.batch_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/> queryExpression="t1.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_id_agent_level1_n" queryExpression="t1.bp_id_agent_level1_n like &apos;%&apos;||${@bp_id_agent_level1_n}||&apos;%&apos;"/> <bm:query-field name="bp_id_agent_level1_n" queryExpression="t1.bp_id_agent_level1_n like &apos;%&apos;||${@bp_id_agent_level1_n}||&apos;%&apos;"/>
<bm:query-field name="division_n" queryExpression="t1.division_n like &apos;%&apos;||${@division_n}||&apos;%&apos;"/> <bm:query-field name="division_n" queryExpression="t1.division_n like &apos;%&apos;||${@division_n}||&apos;%&apos;"/>
<bm:query-field name="policy_name" queryExpression="t1.policy_name=${@policy_name}"/> <bm:query-field name="policy_name" queryExpression="t1.policy_name=${@policy_name}"/>
<bm:query-field name="overdue_max_days_f" queryExpression="t1.overdue_max_days &gt;= ${@overdue_max_days_f}"/> <bm:query-field name="overdue_max_days_f" queryExpression="t1.overdue_max_days &gt;= ${@overdue_max_days_f}"/>
<bm:query-field name="overdue_max_days_t" queryExpression="t1.overdue_max_days &lt;= ${@overdue_max_days_t}"/> <bm:query-field name="overdue_max_days_t" queryExpression="t1.overdue_max_days &lt;= ${@overdue_max_days_t}"/>
</bm:query-fields> <bm:query-field name="lease_start_date_f" queryExpression="t1.lease_start_date &gt;= TO_CHAR(TO_DATE(${@lease_start_date_f}, 'YYYY-MM-DD'), 'YYYY/MM/DD')"/>
<bm:query-field name="lease_start_date_t" queryExpression="t1.lease_start_date &lt;= TO_CHAR(TO_DATE(${@lease_start_date_t}, 'YYYY-MM-DD'), 'YYYY/MM/DD')"/>
</bm:query-fields>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/wx/WX100/con_ele_agent_contract_signer_query.lwm
View file @ 235bae84
...@@ -37,13 +37,15 @@ ...@@ -37,13 +37,15 @@
where cb.bp_id = hm.bp_id where cb.bp_id = hm.bp_id
and cb.contract_id = cs.contract_id and cb.contract_id = cs.contract_id
and hm.social_code = cs.id_no and hm.social_code = cs.id_no
and cb.bp_class = 'ORG') legal_person, and cb.bp_class = 'ORG'
and rownum=1) legal_person,
(select hm.id_card_no_leg (select hm.id_card_no_leg
from con_contract_bp cb, hls_bp_master hm from con_contract_bp cb, hls_bp_master hm
where cb.bp_id = hm.bp_id where cb.bp_id = hm.bp_id
and cb.contract_id = cs.contract_id and cb.contract_id = cs.contract_id
and hm.social_code = cs.id_no and hm.social_code = cs.id_no
and cb.bp_class = 'ORG') id_card_no_leg and cb.bp_class = 'ORG'
and rownum=1) id_card_no_leg
from con_contract_ele_signer cs, hls_doc_file_templet_signer hs,con_contract_content cc,con_clause_templet ct from con_contract_ele_signer cs, hls_doc_file_templet_signer hs,con_contract_content cc,con_clause_templet ct
where cs.templet_signer_id = hs.templet_signer_id where cs.templet_signer_id = hs.templet_signer_id
and ct.doc_template_id = hs.templet_id and ct.doc_template_id = hs.templet_id
......
src/main/webapp/WEB-INF/classes/wx/WX100/con_file_download.lwm
View file @ 235bae84
...@@ -67,7 +67,44 @@ select fa.file_name,fa.file_path,fa.attachment_id ...@@ -67,7 +67,44 @@ select fa.file_name,fa.file_path,fa.attachment_id
'CON_CONTRACT_MORTGAGE_KJ_E','CON_CONTRACT_MORTGAGE_KJ_E', 'CON_CONTRACT_MORTGAGE_KJ_E','CON_CONTRACT_MORTGAGE_KJ_E',
'LEASE_CONTRACT_PAR_KJ_E','LEASE_CONTRACT_PAR_KJ_E', 'LEASE_CONTRACT_PAR_KJ_E','LEASE_CONTRACT_PAR_KJ_E',
'LEASE_CONTRACT_PAR_KJ_1_E','LEASE_CONTRACT_PAR_KJ_1_E', 'LEASE_CONTRACT_PAR_KJ_1_E','LEASE_CONTRACT_PAR_KJ_1_E',
'CON_COLLECTION_PAYMENT_KJ_E','CON_COLLECTION_PAYMENT_KJ_E' 'CON_COLLECTION_PAYMENT_KJ_E','CON_COLLECTION_PAYMENT_KJ_E',
--博雷顿
'PERSONAL_CREDIT_BLD_E',
'CREDIT_AUTHOR',
'ENTERPRISE_CREDIT_BLD_E',
'CREDIT_AUTHOR',
'PERSONAL_CREDIT_GUTA_BLD_E',
'CREDIT_AUTHOR',
'ENTERPRISE_CREDIT_GUTA_BLD_E',
'CREDIT_AUTHOR',
'ACCEPTANCE_BLD_E',
'GUARANTEE_LETTER_OEC',
'PAR_TENANT_BLD_E',
'SPOUSE_COMMITMENT',
'PAR_GUTA_BLD_E',
'SPOUSE_COMMITMENT',
'SURE_LEASE_GR_BLD_E',
'GUARANTEE_LETTER_OEC',
'SURE_LEASE_FR_BLD_E',
'GUARANTEE_LETTER_OEC',
'PROOF_RECEIPT_LEASE_BLD_E',
'CHECK_INFO',
'LEASE_SALE_BLD_E',
'PUR_CONTRACT',
'FINANCE_LEASE_CONTRACT_BLD_E',
'CONTRACT',
'SURE_LEASEBACK_GR_BLD_E',
'GUARANTEE_LETTER_OEC',
'SURE_LEASEBACK_FR_BLD_E',
'GUARANTEE_LETTER_OEC',
'PROOF_RECEIPT_LEASEBACK_BLD_E',
'CHECK_INFO',
'LEASE_ORDER_LEASEBACK_BLD_E',
'ITEM_TRAN_NOTICE',
'CON_CONTRACT_MORTGAGE_BLD_E',
'MORT_CONTRACT',
'CON_CONTRACT_LEASEBACK_BLD_E',
'CONTRACT'
) )
from con_ele_signer_file cf, con_contract_ele_signer cs from con_ele_signer_file cf, con_contract_ele_signer cs
where cf.con_ele_signer_id = cs.con_ele_signer_id where cf.con_ele_signer_id = cs.con_ele_signer_id
...@@ -87,12 +124,23 @@ select fa.file_name,fa.file_path,fa.attachment_id ...@@ -87,12 +124,23 @@ select fa.file_name,fa.file_path,fa.attachment_id
and ht.templet_code = ct.templet_code and ht.templet_code = ct.templet_code
and ct.templet_id = cf.templet_id and ct.templet_id = cf.templet_id
and hs.enable_flag = 'Y' and hs.enable_flag = 'Y'
and hs.signer_category not in ('AGENCY_STORE_SEAL','AGENCY_STORE_SIGN','HONGLING_SEAL','HONGLING_SIGN'))) and hs.signer_category not in ('AGENCY_STORE_SEAL','AGENCY_STORE_SIGN','HONGLING_SEAL','HONGLING_SIGN',
'MAN_FACTURER_SEAL',
'MAN_FACTURER_SIGN',
'SUPPLIER_SEAL',
'SUPPLIER_SIGN',
'LEASE_SUPPLIER_SEAL',
'LEASE_SUPPLIER_SIGN')))
or 'AGENT' in (select cb.bp_category or 'AGENT' in (select cb.bp_category
from con_contract_bp cb, hls_bp_master hm from con_contract_bp cb, hls_bp_master hm
where cb.bp_id = hm.bp_id where cb.bp_id = hm.bp_id
and hm.social_code = ${@id_no} and hm.social_code = ${@id_no}
and cb.contract_id = cs.contract_id))) and cb.contract_id = cs.contract_id)
or 'VENDER' in (select cb.bp_category
from con_contract_bp cb, hls_bp_master hm
where cb.bp_id = hm.bp_id
and hm.social_code = ${@id_no}
and cb.contract_id = cs.contract_id)))
and pi.cdd_list_id = and pi.cdd_list_id =
(select cc.cdd_list_id (select cc.cdd_list_id
from con_contract cc from con_contract cc
......
src/main/webapp/WEB-INF/classes/wx/WX100/con_file_list_query.lwm
View file @ 235bae84
...@@ -47,12 +47,24 @@ select fa.file_name, fa.file_path, fa.file_size, ct.order_seq ...@@ -47,12 +47,24 @@ select fa.file_name, fa.file_path, fa.file_size, ct.order_seq
('AGENCY_STORE_SEAL', ('AGENCY_STORE_SEAL',
'AGENCY_STORE_SIGN', 'AGENCY_STORE_SIGN',
'HONGLING_SEAL', 'HONGLING_SEAL',
'HONGLING_SIGN'))) or 'HONGLING_SIGN',
'MAN_FACTURER_SEAL',
'MAN_FACTURER_SIGN',
'SUPPLIER_SEAL',
'SUPPLIER_SIGN',
'LEASE_SUPPLIER_SEAL',
'LEASE_SUPPLIER_SIGN'))) or
'AGENT' in (select cb.bp_category 'AGENT' in (select cb.bp_category
from con_contract_bp cb, hls_bp_master hm from con_contract_bp cb, hls_bp_master hm
where cb.bp_id = hm.bp_id where cb.bp_id = hm.bp_id
and hm.social_code = ${@id_no} and hm.social_code = ${@id_no}
and cb.contract_id = cc.contract_id))) and cb.contract_id = cc.contract_id)
or
'VENDER' in (select cb.bp_category
from con_contract_bp cb, hls_bp_master hm
where cb.bp_id = hm.bp_id
and hm.social_code = ${@id_no}
and cb.contract_id = cc.contract_id)))
order by ct.order_seq order by ct.order_seq
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
......
src/main/webapp/WEB-INF/server-script/layoutconfig/csh_asset_create_entrance_t_csh_req_asset_queryfields.js
View file @ 235bae84
...@@ -14,7 +14,7 @@ var override_queryfields = [ ...@@ -14,7 +14,7 @@ var override_queryfields = [
}, },
{ {
name : 'req_date_to', name : 'req_date_to',
queryexpression : "trunc(T1.req_date)<=to_date(${@req_date_to},'yyyy-mm-dd')" queryexpression : "T1.req_date<to_date(${@req_date_to},'yyyy-mm-dd')+1"
}, },
{ {
name:'payment_req_number', name:'payment_req_number',
...@@ -29,10 +29,8 @@ var add_datafilters = [ ...@@ -29,10 +29,8 @@ var add_datafilters = [
{ {
name : '', name : '',
expression : "exists(select 1\n" + expression : "exists(select 1\n" +
" from csh_payment_req_ln l,con_contract cc,con_contract_cashflow cf\n" + " from csh_payment_req_ln l,con_contract_cashflow cf\n" +
" where l.payment_req_id = t1.payment_req_id\n" + " where l.payment_req_id = t1.payment_req_id\n" +
" and l.ref_doc_category = 'CONTRACT'\n" +
" and l.ref_doc_id = cc.contract_id\n" +
" and l.ref_doc_line_id = cf.cashflow_id\n" + " and l.ref_doc_line_id = cf.cashflow_id\n" +
" and cf.cf_item in ('40'))" " and cf.cf_item in ('40'))"
......
src/main/webapp/WEB-INF/server-script/layoutconfig/csh_comm_create_entrance_t_csh_req_asset_queryfields.js
View file @ 235bae84
...@@ -6,7 +6,7 @@ var override_queryfields = [ ...@@ -6,7 +6,7 @@ var override_queryfields = [
}, },
{ {
name : 'req_date_to', name : 'req_date_to',
queryexpression : "trunc(T1.req_date)<=to_date(${@req_date_to},'yyyy-mm-dd')" queryexpression : "T1.req_date<to_date(${@req_date_to},'yyyy-mm-dd')+1"
}, },
{ {
name:'payment_req_number', name:'payment_req_number',
...@@ -18,13 +18,16 @@ var override_queryfields = [ ...@@ -18,13 +18,16 @@ var override_queryfields = [
} }
]; ];
var add_datafilters = [ var add_datafilters = [
{
name : 'approval_status',
expression : "(t1.approval_status NOT in ('RETURN','CANCEL'))"
},
{ {
name : '', name : '',
expression : "exists(select 1\n" + expression : "exists(select 1\n" +
" from csh_payment_req_ln l,con_contract cc,con_contract_cashflow cf\n" + " from csh_payment_req_ln l,con_contract_cashflow cf\n" +
" where l.payment_req_id = t1.payment_req_id\n" + " where l.payment_req_id = t1.payment_req_id\n" +
" and l.ref_doc_category = 'CONTRACT'\n" +
" and l.ref_doc_id = cc.contract_id\n" +
" and l.ref_doc_line_id = cf.cashflow_id\n" + " and l.ref_doc_line_id = cf.cashflow_id\n" +
" and cf.cf_item in ('911'))" " and cf.cf_item in ('911'))"
......
src/main/webapp/modules/cont/CON505/con_contract_modify.lview
View file @ 235bae84
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/csh/CSH501R/csh_payment_comm_create_entrance.lview
View file @ 235bae84
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<a:link id="csh_payment_comm_create_link" url="${/request/@context_path}/modules/csh/CSH501R/csh_payment_comm_selected.lview"/> <a:link id="csh_payment_comm_create_link" url="${/request/@context_path}/modules/csh/CSH501R/csh_payment_comm_selected.lview"/>
<a:link id="csh501_csh_comm_req_link_id" <a:link id="csh501_csh_comm_req_link_id"
url="${/request/@context_path}/modules/csh/CSH501R/csh_payment_comm_req.lview"/> url="${/request/@context_path}/modules/csh/CSH501R/csh_payment_comm_req.lview"/>
<a:link id="delete_comm_payment_req_link_id" model="csh.CSH501.delete_payment_req" modelaction="batch_update"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//新增 //新增
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
...@@ -28,6 +29,54 @@ ...@@ -28,6 +29,54 @@
}); });
}; };
//新建状态单据取消
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
var ds_id = '${/parameter/@layout_code}_T_CSH_REQ_ASSET_csh_payment_req_hd_ds';
var records = $(ds_id).getSelected();
var param = {};
var datas = [];
if (!records.length) {
Leaf.showMessage('提示', '请至少选择一条数据!');
return;
}
Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认取消该笔申请？', function okFun() {
for (var i = 0; i < records.length; i++) {
if (records[i].get('payment_req_id')) {
if (records[i].get('approval_status') != 'NEW' ) {
Leaf.showWarningMessage('${l:HLS.PROMPT}', '该付款申请状态不为新建，不能取消!');
return;
}
data = {};
data['payment_req_id'] = records[i].get('payment_req_id');
data['_status'] = 'update';
datas.push(data);
}
}
param['details'] = datas;
var url_l = $('delete_comm_payment_req_link_id').getUrl();
Leaf.request({
url: url_l,
para: datas,
success: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$(ds_id).query();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
});
}, function cancelFun() {
Leaf.SideBar.enable = true;
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
});
};
function detail_link(id, name, query_only) { function detail_link(id, name, query_only) {
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name]; var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
...@@ -36,7 +85,7 @@ ...@@ -36,7 +85,7 @@
param['bp_id'] = record.get('bp_id_agent_level1'); param['bp_id'] = record.get('bp_id_agent_level1');
param['business_type'] = record.get('business_type'); param['business_type'] = record.get('business_type');
param['approval_status'] = record.get('approval_status'); param['approval_status'] = record.get('approval_status');
if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN' || record.get('approval_status') == 'REJECT') { if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN') {
param['function_usage'] = 'UPDATE'; param['function_usage'] = 'UPDATE';
param['function_code'] = 'CSH501D_COMM'; param['function_code'] = 'CSH501D_COMM';
} else{ } else{
......
src/main/webapp/modules/csh/CSH501R/csh_payment_comm_req.lview
View file @ 235bae84
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<a:link id="csh501d_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" <a:link id="csh501d_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
modelaction="update"/> modelaction="update"/>
<a:link id="con_rd_wfl_link" url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/> <a:link id="con_rd_wfl_link" url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<!--<a:link id="update_csh_payment_comm_info_link" model="csh.CSH501.csh_payment_req_get_num" modelaction="execute"/>--> <a:link id="update_csh_payment_comm_info_link" model="csh.CSH501.csh_payment_req_get_num" modelaction="execute"/>
<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/> <link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
<script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/> <script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/> <script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
...@@ -485,6 +485,48 @@ ...@@ -485,6 +485,48 @@
return check_flag || false; return check_flag || false;
}; };
//保存submitsuccess调用
window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res, bp_seq) {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
dirty_flag = 'N';
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var hd_record = $(hdds_id).getCurrentRecord();
var payment_req_id = hd_record.get('payment_req_id');
//获得相应的行信息
var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
if (payment_req_id) {
//更新头信息
Leaf.Masker.mask(Ext.getBody(), '正在保存中。。。');
Leaf.request({
url: $('update_csh_payment_comm_info_link').getUrl(),
para: {
payment_req_id: payment_req_id
},
success: function () {
Leaf.Masker.unmask(Ext.getBody());
$(hdds_id).setQueryParameter('payment_req_id', payment_req_id);
$(hdds_id).query();
},
failure: function () {
Leaf.Masker.unmask(detail_mask);
},
error: function () {
Leaf.Masker.unmask(detail_mask);
},
scope: this
});
$(lnds_id).setQueryParameter('payment_req_id', payment_req_id);
$(lnds_id).query();
} else {
Leaf.showMessage('${l:PROMPT}', '请先保存数据');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
};
//合同编号超链接 //合同编号超链接
function open_con_contract_readonly_win(record_id, ds_id) { function open_con_contract_readonly_win(record_id, ds_id) {
......
src/main/webapp/modules/csh/CSH501R/csh_payment_comm_selected.lview
View file @ 235bae84
...@@ -228,6 +228,8 @@ ...@@ -228,6 +228,8 @@
<a:field name="division_n" displayField="value_name" options="comm_division_name_ds" <a:field name="division_n" displayField="value_name" options="comm_division_name_ds"
returnField="division" valueField="value_code"/> returnField="division" valueField="value_code"/>
<a:field name="overdue_max_days"/> <a:field name="overdue_max_days"/>
<a:field name="lease_start_date_f"/>
<a:field name="lease_start_date_t"/>
</a:fields> </a:fields>
<a:events> <a:events>
<a:event name="update" handler="headUpdateFunction"/> <a:event name="update" handler="headUpdateFunction"/>
...@@ -256,9 +258,12 @@ ...@@ -256,9 +258,12 @@
prompt="最新逾期天数从" allowDecimals="false"/> prompt="最新逾期天数从" allowDecimals="false"/>
<a:numberField name="overdue_max_days_t" allowFormat="true" bindTarget="csh_payment_req_comm_ds" <a:numberField name="overdue_max_days_t" allowFormat="true" bindTarget="csh_payment_req_comm_ds"
prompt="最新逾期天数到" allowDecimals="false"/> prompt="最新逾期天数到" allowDecimals="false"/>
<a:datePicker name="lease_start_date_f" bindTarget="csh_payment_req_comm_ds"
prompt="租赁开始日从" />
<a:datePicker name="lease_start_date_t" bindTarget="csh_payment_req_comm_ds"
prompt="租赁开始日到" />
</a:form> </a:form>
<a:grid id="csh_payment_commi_maintain_grid_ds" bindTarget="csh_payment_comm_selectedDs" marginHeight="200" <a:grid id="csh_payment_commi_maintain_grid_ds" bindTarget="csh_payment_comm_selectedDs" marginHeight="210"
marginWidth="40" navBar="true" rowRenderer="change_background_color"> marginWidth="40" navBar="true" rowRenderer="change_background_color">
<a:columns> <a:columns>
<a:column name="batch_number" prompt="计提单号" renderer="comm_req_detail_renderer" width="120"/> <a:column name="batch_number" prompt="计提单号" renderer="comm_req_detail_renderer" width="120"/>
......
src/main/webapp/modules/prj/PRJ501N/prj501n_wfl_machine_number_detail.lview 0 → 100644
View file @ 235bae84
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wangwei5743
$Date: 2024-5-10 上午09:03:15
$Revision: 1.0
$Purpose: 机号比对展示明细页面
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<a:init-procedure/>
<a:view>
<script type="text/javascript"><![CDATA[
]]></script>
<a:dataSets>
<a:dataSet id="label_ds" autoCreate="true">
<a:fields>
<!--<a:field name="label1" defaultValue="注意："/>-->
<a:field name="label2" defaultValue="1.当前页面仅机号存在重复风险会弹出，二次租赁情况下不弹出"/>
<a:field name="label3" defaultValue="2.如弹出该窗口以为该机号存在重复性风险，请核查机号重复实际情况"/>
<a:field name="label4" defaultValue="3.一但点击确认并正常审批流程代表您已完成风险核对"/>
<a:field name="label5" defaultValue="仔细阅读上述事项，并检查确认无误。请谨慎审批通过该笔单据！"/>
</a:fields>
</a:dataSet>
</a:dataSets>
<a:fieldSet style="margin-left:10px;margin-top:10px;font-weight:bold;" title="机号重复性检验提示" 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:fieldSet>
</a:view>
</a:screen>
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 235bae84
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
model="prj.PRJ505.prj_project_create_contract" modelaction="execute"/> model="prj.PRJ505.prj_project_create_contract" modelaction="execute"/>
<a:link id="prj_approval_link_id" model="prj.PRJ501N.project_approval" modelaction="update"/> <a:link id="prj_approval_link_id" model="prj.PRJ501N.project_approval" modelaction="update"/>
<a:link id="check_machine_number_id" model="prj.PRJ501N.project_approval" modelaction="query"/> <a:link id="check_machine_number_id" model="prj.PRJ501N.project_approval" modelaction="query"/>
<a:link id="prj501n_wfl_machine_number_detail_link_id" url="${/request/@context_path}/modules/prj/PRJ501N/prj501n_wfl_machine_number_detail.lview"/>
<!--<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/> <!--<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
<script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>--> <script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>-->
...@@ -846,6 +847,25 @@ ...@@ -846,6 +847,25 @@
Leaf.onReady(function () { Leaf.onReady(function () {
//机号弹窗校验
debugger;
if('${/parameter/@check_machine_number_flag}'=='Y'){
var url_l = $('prj501n_wfl_machine_number_detail_link_id').getUrl();
var machine_number_win = new Leaf.Window({
id: 'prj501n_wfl_machine_number_detail_win',
url: url_l,
params: {
'winid': 'prj501n_wfl_machine_number_detail_win',
'session_id': '${/session/@session_id}'
},
title: '机号重复性风险提示',
width: 430,
height: 390
});
}
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master'); var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}'; var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}';
$(bp_ds_id).setQueryUrl(url); $(bp_ds_id).setQueryUrl(url);
......
src/main/webapp/modules/wx/WX100/con_ele_agent_content_create.lsc
View file @ 235bae84
...@@ -153,12 +153,16 @@ ...@@ -153,12 +153,16 @@
var userInfoList = []; var userInfoList = [];
for (var k = 0 ; k < ele_signer_data.length;k++){ for (var k = 0 ; k < ele_signer_data.length;k++){
var signer_record_data = ele_signer_data[k]; var signer_record_data = ele_signer_data[k];
if(signer_record_data.signer_category == 'AGENCY_STORE_SEAL' || signer_record_data.signer_category == 'MAN_FACTURER_SEAL'){ if(signer_record_data.signer_category == 'AGENCY_STORE_SEAL' || signer_record_data.signer_category == 'MAN_FACTURER_SEAL'||signer_record_data.signer_category == 'SUPPLIER_SEAL'||signer_record_data.signer_category == 'LEASE_SUPPLIER_SEAL'){
var signer_category; var signer_category;
if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL'){ if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL'){
signer_category = 'AGENCY_STORE_SIGN'; signer_category = 'AGENCY_STORE_SIGN';
}else if (signer_record_data.signer_category == 'MAN_FACTURER_SEAL') { }else if (signer_record_data.signer_category == 'MAN_FACTURER_SEAL') {
signer_category = 'MAN_FACTURER_SIGN'; signer_category = 'MAN_FACTURER_SIGN';
}else if (signer_record_data.signer_category == 'SUPPLIER_SEAL') {
signer_category = 'SUPPLIER_SIGN';
}else if (signer_record_data.signer_category == 'LEASE_SUPPLIER_SEAL') {
signer_category = 'LEASE_SUPPLIER_SIGN';
} }
var ele_org_signer_map = ele_signer_bm.queryAsMap({ var ele_org_signer_map = ele_signer_bm.queryAsMap({
contract_id: $ctx.parameter.contract_id, contract_id: $ctx.parameter.contract_id,
......
src/main/webapp/modules/wx/WX100/con_ele_content_create.lsc
View file @ 235bae84
...@@ -171,12 +171,16 @@ ...@@ -171,12 +171,16 @@
"agentType": "1", "agentType": "1",
"signerCategory":signer_record_data.signer_category "signerCategory":signer_record_data.signer_category
}); });
} else if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL' || signer_record_data.signer_category == 'MAN_FACTURER_SEAL') { } else if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL' || signer_record_data.signer_category == 'MAN_FACTURER_SEAL'|| signer_record_data.signer_category == 'SUPPLIER_SEAL'|| signer_record_data.signer_category == 'LEASE_SUPPLIER_SEAL') {
var signer_category; var signer_category;
if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL'){ if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL'){
signer_category = 'AGENCY_STORE_SIGN'; signer_category = 'AGENCY_STORE_SIGN';
}else if (signer_record_data.signer_category == 'MAN_FACTURER_SEAL') { }else if (signer_record_data.signer_category == 'MAN_FACTURER_SEAL') {
signer_category = 'MAN_FACTURER_SIGN'; signer_category = 'MAN_FACTURER_SIGN';
}else if (signer_record_data.signer_category == 'SUPPLIER_SEAL') {
signer_category = 'SUPPLIER_SIGN';
}else if (signer_record_data.signer_category == 'LEASE_SUPPLIER_SEAL') {
signer_category = 'LEASE_SUPPLIER_SIGN';
} }
var ele_org_signer_map = ele_signer_bm.queryAsMap({ var ele_org_signer_map = ele_signer_bm.queryAsMap({
contract_id: $ctx.parameter.contract_id, contract_id: $ctx.parameter.contract_id,
......
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