Skip to content

L
leaf-hlcm
Commit 73c4d691 authored by 18083's avatar 18083
Browse files
Options

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

parents 932ad8c2 407de007
Expand all Show whitespace changes
Inline Side-by-side
Showing with 789 additions and 281 deletions
src/main/resources/com/hand/hls/hlcm/cont/mapper/ConExportMapper.xml
View file @ 73c4d691
...@@ -1097,8 +1097,7 @@ ...@@ -1097,8 +1097,7 @@
<select id="selectContractDetailList" parameterType="integer" resultType="java.util.HashMap"> <select id="selectContractDetailList" parameterType="integer" resultType="java.util.HashMap">
Select Select hb.bp_name,
hb.bp_name,
c.contract_number, c.contract_number,
(Select cl.machine_number (Select cl.machine_number
From con_contract_lease_item cl From con_contract_lease_item cl
...@@ -1107,6 +1106,20 @@ ...@@ -1107,6 +1106,20 @@
From con_contract c, hls_bp_master hb From con_contract c, hls_bp_master hb
Where c.bp_id_tenant = hb.bp_id Where c.bp_id_tenant = hb.bp_id
and c.contract_id = #{contractId} and c.contract_id = #{contractId}
and nvl(division, '-1') not IN ('70', '92')
union all
Select hb.bp_name,
c.contract_number,
(Select cl.machine_number_70
From con_contract_lease_item cl
Where cl.contract_id = c.contract_id) As machine_number,
to_char(Sysdate, 'yyyy"年"mm"月"dd"日"') As today
From con_contract c, hls_bp_master hb
Where c.bp_id_tenant = hb.bp_id
and c.contract_id = #{contractId}
and nvl(division, '-1') IN ('70', '92')
</select> </select>
......
src/main/webapp/WEB-INF/classes/basic/sys_code_value_v_lease.lwm
View file @ 73c4d691
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
FROM exp_emp_assign_e_v t FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id} WHERE t.user_id = ${/session/@user_id}
and PARENT_UNIT_ID <> 1544 and PARENT_UNIT_ID <> 1544
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91')) AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60'))
UNION ALL UNION ALL
SELECT v.code_value AS value_code, v.code_value_name AS value_name SELECT v.code_value AS value_code, v.code_value_name AS value_name
FROM sys_code_values_v v FROM sys_code_values_v v
WHERE v.code_enabled_flag = 'Y' WHERE v.code_enabled_flag = 'Y'
AND v.code_value_enabled_flag = 'Y' AND v.code_value_enabled_flag = 'Y'
AND v.code = 'DIVISION' AND v.code = 'DIVISION'
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91') AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60')
AND NOT EXISTS (SELECT 1 AND NOT EXISTS (SELECT 1
FROM exp_emp_assign_e_v t FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id} WHERE t.user_id = ${/session/@user_id}
......
src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_repur_query.lwm
View file @ 73c4d691
...@@ -188,7 +188,181 @@ ...@@ -188,7 +188,181 @@
where hb.bp_id = cc.bp_id_agent_level1 where hb.bp_id = cc.bp_id_agent_level1
And hb.bp_code in And hb.bp_code in
('D00000028', 'D00000035', 'D00000016', 'D00000021', 'D00000039', 'D00000025', 'D00000034', 'D00000017', 'D00000018', 'D00000024', 'D00000032', 'D00000009', 'D00000012', 'D00000014', 'D00000015', 'D00000023'))) ('D00000028', 'D00000035', 'D00000016', 'D00000021', 'D00000039', 'D00000025', 'D00000034', 'D00000017', 'D00000018', 'D00000024', 'D00000032', 'D00000009', 'D00000012', 'D00000014', 'D00000015', 'D00000023')))
or (decode(${/session/@user_id}, 10600, 1, 2) = 2))) t1 or (decode(${/session/@user_id}, 10600, 1, 2) = 2))
and nvl(division,'-1') not IN ('70','92')
union all
SELECT
cc.contract_id,
cc.document_type,
cc.document_category,
--cc.contract_name,
(SELECT pp.project_number
FROM prj_project pp
WHERE pp.project_id = cc.project_id) project_number,
cc.bp_id_tenant,
to_char(cc.inception_of_lease, 'yyyy-mm-dd') inception_of_lease,
(SELECT hb.bp_name
FROM hls_bp_master hb, con_contract_bp ccb
WHERE hb.bp_category = 'AGENT'
AND ccb.bp_category = 'AGENT'
AND hb.bp_id = ccb.bp_id
AND ccb.contract_id = cc.contract_id) agent_id_n,
(SELECT bp_name
FROM hls_bp_master
WHERE bp_id = cc.bp_id_tenant
AND enabled_flag = 'Y') bp_id_tenant_desc,
cc.contract_number,
cc.bp_id_agent_level1,
(SELECT extra_nam
FROM hls_bp_master
WHERE bp_id = cc.bp_id_agent_level1
AND enabled_flag = 'Y') bp_id_agent_desc,
cc.owner_user_id,
(SELECT description
FROM sys_user
WHERE user_id = cc.owner_user_id) owner_user_id_desc,
cc.lease_organization,
(SELECT description
FROM hls_lease_organization
WHERE lease_organization = cc.lease_organization
AND enabled_flag =
'Y') lease_organization_desc,
(SELECT a.description value_name
FROM hls_business_type_v a
WHERE a.enabled_flag = 'Y'
AND a.business_type = cc.business_type) business_type_n,
cc.data_class,
(SELECT hd.description
FROM hls_division hd
WHERE hd.enabled_flag = 'Y'
AND hd.division = cc.division) division_n,
cc.division,
null account_due_times,
null account_due_days,
null account_due_amount,
contract_item_query_pkg.calc_business_overdue_times(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) business_due_times,
contract_item_query_pkg.calc_bussiness_overdue_days(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) business_due_days,
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (250)
AND trunc(ccc.due_date) <= trunc(SYSDATE)) -
nvl((SELECT SUM(nvl(cwo.write_off_due_amount, 0))
FROM csh_write_off cwo
WHERE cwo.reversed_flag = 'N'
AND cwo.contract_id = cc.contract_id
AND cwo.cf_item IN ( 250)
And Exists
(Select 1
From con_contract_cashflow cn
Where cn.cashflow_id = cwo.cashflow_id
And cn.cf_status = 'RELEASE'
And trunc(cn.due_date) <= trunc(Sysdate))),
0) business_due_amount,
--营业逾期总金额
contract_item_query_pkg.calc_repur_penalty(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) over_due_amount,
--营业最早逾期的预定支付日
(SELECT MIN(ccc.due_date)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.due_amount > 0
AND ccc.due_date <= sysdate
and ccc.cf_status='RELEASE'
AND ccc.cf_item in (250)
AND ccc.write_off_flag <> 'FULL') min_overdue_date,
--营业已收租金
(SELECT SUM(nvl(ccc.received_amount, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
and ccc.cf_status='RELEASE'
AND ccc.cf_item IN
(250)) business_received_amount,
--营业未收租金
(SELECT SUM(ccc.due_amount - nvl(ccc.received_amount, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
and ccc.cf_status='RELEASE'
AND ccc.cf_item IN ( 250)
) business_unreceived_amount,
--会计已收租金
null ac_received_amount,
--会计未收租金
null ac_unreceived_amount,
--机型
(SELECT ccli.modelcd
FROM con_contract_lease_item ccli
WHERE ccli.contract_id = cc.contract_id) modelcd,
--机号
(SELECT ccli.machine_number_70
FROM con_contract_lease_item ccli
WHERE ccli.contract_id = cc.contract_id) machine_number,
to_char(cc.repurchase_date, 'yyyy-mm-dd') lease_start_date,
cc.PAYMENT_PERIOD lease_times,
--租金合计
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (250)
) total_due_amount,
cc.contract_status,
cc.BUSINESS_TYPE,
cc.repurchase_types
,(select to_char(max(t.creation_date), 'yyyy-mm-dd')
from cux_rent_dun_msg t
where t.contract_id = cc.contract_id) dun_date,
cc.send_message,
(select v.code_value_name
From sys_code_values_v v
Where v.code = 'SEND_MESSAGE'
And cc.send_message = v.code_value ) send_message_n,
cc.cell_phone
FROM con_contract cc
WHERE
cc.contract_status='REPURING'
and cc.repurchase_types='STAGE_REPURCHASE'
and EXISTS(SELECT 1
FROM con_contract_cashflow ccw
WHERE ccw.contract_id = cc.contract_id
AND TRUNC(ccw.due_date) <= TRUNC(SYSDATE)
AND ccw.due_amount > nvl(ccw.received_amount, 0)
AND ccw.write_off_flag <> 'FULL'
And ccw.cf_item = '250'
AND ccw.cf_status = 'RELEASE'
AND ccw.cf_direction = 'INFLOW')
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 = cc.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))))
And ((decode(${/session/@user_id}, 10600, 1, 2) = 1
And exists(select 1
from hls_bp_master hb
where hb.bp_id = cc.bp_id_agent_level1
And hb.bp_code in
('D00000028', 'D00000035', 'D00000016', 'D00000021', 'D00000039', 'D00000025', 'D00000034', 'D00000017', 'D00000018', 'D00000024', 'D00000032', 'D00000009', 'D00000012', 'D00000014', 'D00000015', 'D00000023')))
or (decode(${/session/@user_id}, 10600, 1, 2) = 2)) and nvl(division,'-1') IN ('70','92')
) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
......
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ 73c4d691
...@@ -782,7 +782,7 @@ ...@@ -782,7 +782,7 @@
var secondary_lease = record.get('secondary_lease') ; var secondary_lease = record.get('secondary_lease') ;
var contract_id = record.get('contract_id'); var contract_id = record.get('contract_id');
var contract_status = record.get('contract_status'); var contract_status = record.get('contract_status');
console.log(contract_record); var contract_status_result = '';
//校验合同状态 //校验合同状态
if(!Leaf.isEmpty(contract_status)){ if(!Leaf.isEmpty(contract_status)){
Leaf.request({ Leaf.request({
...@@ -791,16 +791,18 @@ ...@@ -791,16 +791,18 @@
contract_id: contract_id contract_id: contract_id
}, },
scope: this, scope: this,
sync: true,
success: function (res) { success: function (res) {
if(contract_status != res.result.record.contract_status){ contract_status_result = res.result.record.contract_status;
$L.showErrorMessage('提示', '合同状态已发生改变，需要重新刷新页面！');
return false;
}
}, },
failure: function () { failure: function () {
return false; return false;
}, },
}); });
if (contract_status != contract_status_result) {
$L.showErrorMessage('提示', '合同状态已发生改变，需要重新刷新页面！');
return false;
}
} }
if(!Leaf.isEmpty(secondary_lease) && secondary_lease!='YES') { if(!Leaf.isEmpty(secondary_lease) && secondary_lease!='YES') {
......
src/main/webapp/modules/cont/CON620/con_contract_account_detail.lview
View file @ 73c4d691
...@@ -19,6 +19,20 @@ ...@@ -19,6 +19,20 @@
<a:link id="${/parameter/@layout_code}_con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="${/parameter/@layout_code}_con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
Leaf.onReady(function() {
if (document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER")) {
if ("${/parameter/@division}" == '70' || "${/parameter/@division}" == '92') {
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_prompt").style.display = "none";
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER").style.display = "none";
}
if (document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70")) {
if ("${/parameter/@division}" != '70' && "${/parameter/@division}" != '92') {
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70_prompt").style.display = "none";
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70").style.display = "none";
}
}
}
});
]]></script> ]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/> <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
......
src/main/webapp/modules/cont/CON620/con_contract_rent_detail.lview
View file @ 73c4d691
...@@ -217,8 +217,18 @@ ...@@ -217,8 +217,18 @@
} }
} }
if(document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER")){
if("${/parameter/@division}"=='70' || "${/parameter/@division}"=='92' ){
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_prompt").style.display = "none";
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER").style.display = "none";
}
if (document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70")) {
if ("${/parameter/@division}" !='70' && "${/parameter/@division}" !='92') {
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70_prompt").style.display = "none";
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70").style.display = "none";
}
}
}
}); });
//新增催款函pdf打印（盖章） //新增催款函pdf打印（盖章）
......
src/main/webapp/modules/cont/CON620/con_contract_rent_dun_query.lview
View file @ 73c4d691
...@@ -730,6 +730,10 @@ ...@@ -730,6 +730,10 @@
<a:column name="lease_times" align="center" prompt="期数" width="100"/> <a:column name="lease_times" align="center" prompt="期数" width="100"/>
<a:column name="total_due_amount" align="right" prompt="租金合计" width="100" <a:column name="total_due_amount" align="right" prompt="租金合计" width="100"
renderer="Leaf.formatMoney"/> renderer="Leaf.formatMoney"/>
<a:column name="lease_item_amount" align="right" prompt="设备价格" width="100"
renderer="Leaf.formatMoney"/>
<a:column name="contract_amount" align="right" prompt="合同金额" width="100"
renderer="Leaf.formatMoney"/>
<a:column name="send_message_n" align="center" prompt="发送催收短信" width="60"/> <a:column name="send_message_n" align="center" prompt="发送催收短信" width="60"/>
<a:column name="dun_date" align="center" prompt="催收短信发送日期" width="120"/> <a:column name="dun_date" align="center" prompt="催收短信发送日期" width="120"/>
<!-- <a:column name="contract_status" align="center" prompt="合同状态" width="100"/>--> <!-- <a:column name="contract_status" align="center" prompt="合同状态" width="100"/>-->
......
src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
View file @ 73c4d691
...@@ -892,6 +892,17 @@ ...@@ -892,6 +892,17 @@
$(ds_id).query(); $(ds_id).query();
} }
} }
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item');
if(ds.id == lease_ds_id&&lease_ds_id){
var gridId= ds.bindname+'_layout_grid_id';
if(record.data.division=='70' || record.data.division=='92'){
$(gridId).hideColumn('full_name');
$(gridId).hideColumn('machine_number');
}else {
$(gridId).hideColumn('lease_name');
$(gridId).hideColumn('machine_number_70');
}
};
}; };
//选择事件(grid,attach,gridbox,table) //选择事件(grid,attach,gridbox,table)
/*window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_before_select'] = function(ds, record, bp_seq) { /*window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_before_select'] = function(ds, record, bp_seq) {
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
View file @ 73c4d691
...@@ -89,7 +89,6 @@ ...@@ -89,7 +89,6 @@
var clc_flag = 'N'; var clc_flag = 'N';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
debugger;
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req'); var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
if (ds == $(ds_id)) { if (ds == $(ds_id)) {
if(value!=old_value){ if(value!=old_value){
...@@ -682,9 +681,20 @@ ...@@ -682,9 +681,20 @@
}); });
} }
window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, qpara, bp_seq) { //加载时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item');
if(ds.id == lease_ds_id&&lease_ds_id){
var gridId= ds.bindname+'_layout_grid_id';
if(record.data.division=='70' || record.data.division=='92'){
$(gridId).hideColumn('full_name');
$(gridId).hideColumn('machine_number');
}else {
$(gridId).hideColumn('lease_name');
$(gridId).hideColumn('machine_number_70');
}
}; };
}
//图片渲染 //图片渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function(record, name, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function(record, name, bp_seq) {
...@@ -759,7 +769,6 @@ ...@@ -759,7 +769,6 @@
} }
}; };
window['${/parameter/@layout_code}_user_button5_layout_dynamic_click'] = function () { window['${/parameter/@layout_code}_user_button5_layout_dynamic_click'] = function () {
debugger;
var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req'); var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req');
var req_record = $(req_ds_id).getAt(0); var req_record = $(req_ds_id).getAt(0);
calc_flag = req_record.get('calc_flag')||'N'; calc_flag = req_record.get('calc_flag')||'N';
......
src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview
View file @ 73c4d691
...@@ -519,9 +519,20 @@ ...@@ -519,9 +519,20 @@
}); });
}); });
}; };
window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, qpara, bp_seq) { //加载时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item');
if(ds.id == lease_ds_id&&lease_ds_id){
var gridId= ds.bindname+'_layout_grid_id';
if(record.data.division=='70' || record.data.division=='92'){
$(gridId).hideColumn('full_name');
$(gridId).hideColumn('machine_number');
}else {
$(gridId).hideColumn('lease_name');
$(gridId).hideColumn('machine_number_70');
}
}; };
}
//图片渲染 //图片渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function(record, name, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function(record, name, bp_seq) {
var result = name.match(/(.*)_pic$/); var result = name.match(/(.*)_pic$/);
......
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