Commit 5c8749e4 authored by lijingjing's avatar lijingjing

Merge branch 'refs/heads/feature/agent' into develop

parents 5d92a8c4 90f33c10
Pipeline #2935 canceled with stages
......@@ -10,6 +10,10 @@
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
hls_bp_master_pkg.check_lease_item_count(
p_agent_division_id =>${@agent_division_id},
p_user_id =>${/session/@user_id}
);
hls_bp_master_pkg.check_lease_item_agent(
p_bp_id =>${@bp_id},
p_division =>${@division},
......
......@@ -12,7 +12,8 @@
begin
con_contract_workflow_pkg.check_con_record(
p_contract_id =>${@contract_id},
p_contract_status =>${@contract_status}
p_contract_status =>${@contract_status},
p_sign_contract_status =>${@sign_contract_status}
);
end;
......
......@@ -799,7 +799,7 @@
},
success: function(res) {
var contract_status = res.result.contract_status;
if(contract_status=='SIGN'){
if(sign_contract_status=='SIGN'||sign_contract_status=='SIGNING'|| contract_status=='NEW' || contract_status=='INCEPT_RETURN'){
for (var i = 0;i < headRecords.length;i++) {
var column_name = headRecords[i].get('column_name')
if(column_name !="lease_start_date"&&column_name !="contract_inception_date"){
......
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