Skip to content

L
leaf-hlcm
Commit 6c181754 authored by 陆正友's avatar 陆正友
Browse files
Options

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

parents 17026d2c 2bb76c46
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 245 additions and 38 deletions
src/main/webapp/WEB-INF/classes/cont/CON505/contract_sign_check.lwm 0 → 100644
View file @ 6c181754
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2023-07_26 上午11:00:06
$Revision: 3.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
con_contract_workflow_pkg.contract_sign_check(
p_sign_type => ${@sign_type},
p_contract_id =>${@contract_id},
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON733/query_user_info.lwm 0 → 100644
View file @ 6c181754
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2019-01-14 16:29:48
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select *
from SYS_USER t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="user_id" queryOperator="="/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS103/hls_division.lwm
View file @ 6c181754
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<bm:field name="division" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DIVISION" prompt="HLS.DIVISION_CODE"/> <bm:field name="division" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DIVISION" prompt="HLS.DIVISION_CODE"/>
<bm:field name="description" databaseType="VARCHAR" datatype="java.lang.String" physicalName="DESCRIPTION" prompt="HLS.DIVISION_NAME"/> <bm:field name="description" databaseType="VARCHAR" datatype="java.lang.String" physicalName="DESCRIPTION" prompt="HLS.DIVISION_NAME"/>
<bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG" prompt="HLS.ENABLED_FLAG"/> <bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG" prompt="HLS.ENABLED_FLAG"/>
</bm:fields> <bm:field name="full_elec_sign" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="full_elec_sign_desc" expression="(select sv.code_value_name from sys_code_values_v sv where sv.code = 'YES_OR_NO' and sv.code_value = t1.full_elec_sign)" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
</bm:features> </bm:features>
......
src/main/webapp/WEB-INF/classes/hls/HLS500N/check_con_record_date.lwm 0 → 100644
View file @ 6c181754
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
con_contract_workflow_pkg.check_lease_start_date(
p_contract_id =>${@contract_id},
p_lease_start_date =>to_date(${@lease_start_date},'yyyy/mm/dd'),
p_error_count =>${@error_count},
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="error_count" dataType="java.lang.Long" input="false" output="true"/>
</bm:parameters>
</bm:operation>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select
cc.sign_type sign_type,
hd.full_elec_sign full_elec_sign
from con_contract cc, hls_division hd
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ 6c181754
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<a:model-query model="csh.CSH531F.csh_transaction_recoi_check_wfl" rootPath="wfl_status"/> <a:model-query model="csh.CSH531F.csh_transaction_recoi_check_wfl" rootPath="wfl_status"/>
<a:model-query model="cont.CON3200.get_user_employee_type" rootPath="employee_info"/> <a:model-query model="cont.CON3200.get_user_employee_type" rootPath="employee_info"/>
<a:model-query fetchAll="true" model="cont.CON500.con_contract_get_guid_file_name" rootPath="file_name_path"/> <a:model-query fetchAll="true" model="cont.CON500.con_contract_get_guid_file_name" rootPath="file_name_path"/>
<!--<a:model-query model="cont.CON3200.receipt_detail_insert_atm" rootPath="get_contract_ccr"/>-->
<s:server-script import="contract_print_path.js"><![CDATA[ <s:server-script import="contract_print_path.js"><![CDATA[
$ctx.parameter.file_path = con_print_path['con_print_path']; $ctx.parameter.file_path = con_print_path['con_print_path'];
$ctx.parameter.tomcat_source = con_print_path['tomcat_source']; $ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
...@@ -771,6 +772,7 @@ ...@@ -771,6 +772,7 @@
}; };
var count = 0; var count = 0;
window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) { window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
debugger;
var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'con_contract_lease_item'); var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'con_contract_lease_item');
var lease_item_record = $(lease_item_ds_id).getCurrentRecord(); var lease_item_record = $(lease_item_ds_id).getCurrentRecord();
var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract'); var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
...@@ -847,6 +849,9 @@ ...@@ -847,6 +849,9 @@
if("${/model/employee_info/record/@employee_type_code}" != 'STAFF'){ if("${/model/employee_info/record/@employee_type_code}" != 'STAFF'){
document.getElementById('${/parameter/@layout_code}_C_ATTCH_2_con_contract_grid_id_wrap').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_C_ATTCH_2_con_contract_grid_id_wrap').style.display = 'none';
} }
//if('${/parameter/@paper_sign_ccr}' == 'Y' && "${/model/get_contract_ccr/record/@crr_count}" == 'Y'){
// Leaf.showInfoMessage('${l:PROMPT}','此合同进行过签约前变更，请注意租赁开始日和对应的租金还款计划',null,250,100);
//}
} }
]]></script> ]]></script>
</a:view> </a:view>
......
src/main/webapp/modules/cont/CON505/con_contract_modify.lview
View file @ 6c181754
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/cont/CON620/con_contract_rent_dun_query.lview
View file @ 6c181754
...@@ -301,6 +301,8 @@ ...@@ -301,6 +301,8 @@
Leaf.onReady(function () { Leaf.onReady(function () {
if ("${/model/role_info/record/@role_code}" == "0018" || "${/model/role_info/record/@role_code}" == "0019") { if ("${/model/role_info/record/@role_code}" == "0018" || "${/model/role_info/record/@role_code}" == "0019") {
document.getElementById('msg_money_id').style.display = "none";
document.getElementById('msg_no_money_id').style.display = "none";
$('CON601_con_contract_grid_ds').hideColumn('account_due_times'); $('CON601_con_contract_grid_ds').hideColumn('account_due_times');
$('CON601_con_contract_grid_ds').hideColumn('account_due_days'); $('CON601_con_contract_grid_ds').hideColumn('account_due_days');
$('CON601_con_contract_grid_ds').hideColumn('account_due_amount'); $('CON601_con_contract_grid_ds').hideColumn('account_due_amount');
...@@ -587,8 +589,8 @@ ...@@ -587,8 +589,8 @@
<a:screenTitle/> <a:screenTitle/>
<a:gridButton click="CON601_con_contract_reset" text="HLS.RESET"/> <a:gridButton click="CON601_con_contract_reset" text="HLS.RESET"/>
<a:gridButton click="CON601_con_contract_query" text="HLS.QUERY"/> <a:gridButton click="CON601_con_contract_query" text="HLS.QUERY"/>
<a:gridButton click="CON601_dun_msg_money" text="催收短信发送（含金额）"/> <a:gridButton id="msg_money_id" click="CON601_dun_msg_money" text="催收短信发送（含金额）"/>
<a:gridButton click="CON601_dun_msg_no_money" text="催收短信发送（无金额）"/> <a:gridButton id="msg_no_money_id" click="CON601_dun_msg_no_money" text="催收短信发送（无金额）"/>
<!--<a:gridButton id="CON601_con_contract_print_btn" click="CON601_con_contract_print" text="打印催收函"/>--> <!--<a:gridButton id="CON601_con_contract_print_btn" click="CON601_con_contract_print" text="打印催收函"/>-->
</a:screenTopToolbar> </a:screenTopToolbar>
......
src/main/webapp/modules/cont/CON731/hls_before_sign_change_detail.lview
View file @ 6c181754
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<a:init-procedure> <a:init-procedure>
<a:model-query defaultWhereClause="t1.change_req_id = ${/parameter/@change_req_id}" <a:model-query defaultWhereClause="t1.change_req_id = ${/parameter/@change_req_id}"
model="cus_deposit.CUS_DEPOSIT106.get_contract_wfl_status" rootPath="default_value_path"/> model="cus_deposit.CUS_DEPOSIT106.get_contract_wfl_status" rootPath="default_value_path"/>
<a:model-query defaultWhereClause="cc.division = hd.division and cc.contract_id=${/parameter/@change_req_id}" model="hls.HLS500N.check_con_record_date" rootPath="full_elec_sign"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
...@@ -230,6 +231,71 @@ ...@@ -230,6 +231,71 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'con_contract_lease_item'); var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'con_contract_lease_item');
if(ds.id == lease_item_ds_id&&lease_item_ds_id){ if(ds.id == lease_item_ds_id&&lease_item_ds_id){
//加载时根据是否全电签约及电子合同判断，非全电签约及电子合同租赁物信息只读
if('${/model/full_elec_sign/record/@full_elec_sign}'!='Y' && '${/model/full_elec_sign/record/@sign_type}'=='ELE_SIGN'){
var gridId= ds.bindname+'_layout_grid_id';
if(record.data.division=='70'|| record.data.division=='92'){
$(gridId).hideColumn('full_name');
$(gridId).hideColumn('full_name_n');
$(gridId).hideColumn('division_n');
$(gridId).hideColumn('equipments');
$(gridId).hideColumn('machine_model_class_n');
$(gridId).hideColumn('item_type_n');
$(gridId).hideColumn('equipment_type_n');
$(gridId).hideColumn('machine_number');
//取消设置必填
//record.getField('machine_number').setRequired(false);
}else {
$(gridId).hideColumn('machine_number_70');
$(gridId).hideColumn('lease_name_n');
$(gridId).hideColumn('brand_value');
$(gridId).hideColumn('type_name');
$(gridId).hideColumn('produce_date');
$(gridId).hideColumn('using_hour');
$(gridId).hideColumn('detention_amount');
$(gridId).hideColumn('residual_value_amount');
$(gridId).hideColumn('ownership_flag_n');
$(gridId).hideColumn('created_by_n');
}
if(record.data.division=='30'||record.data.division=='50'||record.data.division=='80'){
//record.getField('set_number').setRequired(true);
record.getField('set_number').setReadOnly(true);
}else{
record.getField('set_number').setReadOnly(true);
if(Ext.isEmpty(record.get('set_number'))){
record.set('set_number',1);
}
}
//非全电签约电子合同取消设置必填
/*if (record.data.division == '70' || record.data.division=='92') {
record.getField('lease_name_n').setRequired(true);
record.getField('brand_value').setRequired(true);
record.getField('modelcd').setReadOnly(false);
record.getField('modelcd').setRequired(true);
record.getField('machine_number_70').setRequired(true);
}*/
//设置为非必填
record.getField('machine_number').setRequired(false);
//新增逻辑，将布局中未设置为只读的字段设置为只读
record.getField('lease_item_seq').setReadOnly(true);
record.getField('lease_name').setReadOnly(true);
record.getField('lease_name_n').setReadOnly(true);
record.getField('brand_value').setReadOnly(true);
record.getField('modelcd').setReadOnly(true);
record.getField('pattern').setReadOnly(true);
//机号
record.getField('machine_number').setReadOnly(true);
record.getField('machine_number_70').setReadOnly(true);
record.getField('produce_date').setReadOnly(true);
record.getField('using_hour').setReadOnly(true);
record.getField('residual_value_amount').setReadOnly(true);
record.getField('ownership_flag').setReadOnly(true);
record.getField('ownership_flag_n').setReadOnly(true);
record.getField('full_name').setReadOnly(true);
record.getField('full_name_n').setReadOnly(true);
}else{
var gridId= ds.bindname+'_layout_grid_id'; var gridId= ds.bindname+'_layout_grid_id';
if(record.data.division=='70'|| record.data.division=='92'){ if(record.data.division=='70'|| record.data.division=='92'){
$(gridId).hideColumn('full_name'); $(gridId).hideColumn('full_name');
...@@ -272,7 +338,7 @@ ...@@ -272,7 +338,7 @@
record.getField('machine_numbe\r_70').setRequired(true); record.getField('machine_numbe\r_70').setRequired(true);
} }
}
} }
var lease_old_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_OLD_CAR', 'con_contract_lease_item'); var lease_old_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_OLD_CAR', 'con_contract_lease_item');
if(ds.id == lease_old_ds_id&&lease_old_ds_id){ if(ds.id == lease_old_ds_id&&lease_old_ds_id){
......
src/main/webapp/modules/cont/CON733/hls_con_contract_et_create_entrance.lview
View file @ 6c181754
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
//合同变更创建：营业内勤只能选到回款账户变更， //合同变更创建：营业内勤只能选到回款账户变更，
// 债权担当只能选到承租人变更， // 债权担当只能选到承租人变更，
// 代理店下级只能选到租金计划变更； // 代理店下级只能选到租金计划变更；
//代理店下级茂甲,铁甲,卡家放开合同签约前变更
Leaf.onReady(function () { Leaf.onReady(function () {
var role_code = '${/model/role_code/record/@role_code}'; var role_code = '${/model/role_code/record/@role_code}';
var user_name = '${/model/user_info/record/@user_name}'; var user_name = '${/model/user_info/record/@user_name}';
...@@ -43,14 +44,16 @@ ...@@ -43,14 +44,16 @@
head_record.getField('ccr_document_type_n').setReadOnly(true); head_record.getField('ccr_document_type_n').setReadOnly(true);
/*$(ds_id_n).setQueryParameter('contract_status', ''); /*$(ds_id_n).setQueryParameter('contract_status', '');
$(ds_id_n).query();*/ $(ds_id_n).query();*/
} else if (role_code == '0019' && (user_name != 'MJ002' && user_name != 'BJK002' && user_name != 'TJ002')) { }
head_record.set('ccr_document_type', 'LEASE_CHAG'); // else if (role_code == '0019' && (user_name != 'MJ002' && user_name != 'BJK002' && user_name != 'TJ002')) {
head_record.set('ccr_document_type_n', '承租人变更'); // head_record.set('ccr_document_type', 'LEASE_CHAG');
head_record.getField('ccr_document_type').setReadOnly(true); // head_record.set('ccr_document_type_n', '承租人变更');
head_record.getField('ccr_document_type_n').setReadOnly(true); // head_record.getField('ccr_document_type').setReadOnly(true);
/*$(ds_id_n).setQueryParameter('contract_status', 'INCEPT'); // head_record.getField('ccr_document_type_n').setReadOnly(true);
$(ds_id_n).query();*/ // /*$(ds_id_n).setQueryParameter('contract_status', 'INCEPT');
} else if (role_code == '0008') { // $(ds_id_n).query();*/
// }
else if (role_code == '0008') {
head_record.set('ccr_document_type', 'CUT_CHAG'); head_record.set('ccr_document_type', 'CUT_CHAG');
head_record.set('ccr_document_type_n', '租金计划变更'); head_record.set('ccr_document_type_n', '租金计划变更');
head_record.getField('ccr_document_type').setReadOnly(true); head_record.getField('ccr_document_type').setReadOnly(true);
...@@ -120,10 +123,10 @@ ...@@ -120,10 +123,10 @@
Leaf.showErrorMessage('${l:PROMPT}', '铁甲业务无法操作此项变更!'); Leaf.showErrorMessage('${l:PROMPT}', '铁甲业务无法操作此项变更!');
return; return;
} }
if((record.get('division') != '70' && record.get('division') != '92') && ccr_document_type == 'CCR_BEFORE_SIGN'){ //if((record.get('division') != '70' && record.get('division') != '92') && ccr_document_type == 'CCR_BEFORE_SIGN'){
Leaf.showErrorMessage('${l:PROMPT}', '当前合同暂不能进行此项变更!'); // Leaf.showErrorMessage('${l:PROMPT}', '当前合同暂不能进行此项变更!');
return; // return;
} //}
Leaf.showConfirm('特别注意', '<span style="color: #ff0000; ">该操作将导致合同在变更期间无法进行后续操作，请谨慎操作！！！如果需要取消变更，请一定点击取消变更按钮！！！</span>', function () { Leaf.showConfirm('特别注意', '<span style="color: #ff0000; ">该操作将导致合同在变更期间无法进行后续操作，请谨慎操作！！！如果需要取消变更，请一定点击取消变更按钮！！！</span>', function () {
var contract = record.get('contract_id'); var contract = record.get('contract_id');
......
src/main/webapp/modules/hls/HLS103/hls_division.lview
View file @ 6c181754
...@@ -54,11 +54,15 @@ ...@@ -54,11 +54,15 @@
} }
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="full_elec_sign_ds" lookupCode="YES_OR_NO"/>
<a:dataSet id="hls_division_result_ds" autoQuery="true" fetchAll="false" model="hls.HLS103.hls_division" selectable="true"> <a:dataSet id="hls_division_result_ds" autoQuery="true" fetchAll="false" model="hls.HLS103.hls_division" selectable="true">
<a:fields> <a:fields>
<a:field name="division" required="true"/> <a:field name="division" required="true"/>
<a:field name="description" required="true"/> <a:field name="description" required="true"/>
<a:field name="enabled_flag" checkedValue="Y" defaultValue="Y" uncheckedValue="N"/> <a:field name="enabled_flag" checkedValue="Y" defaultValue="Y" uncheckedValue="N"/>
<a:field name="full_elec_sign" required="true"/>
<a:field name="full_elec_sign_desc" required="true" displayField="code_value_name" options="full_elec_sign_ds" returnField="full_elec_sign" valueField="code_value"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
...@@ -77,12 +81,14 @@ ...@@ -77,12 +81,14 @@
<a:columns> <a:columns>
<a:column name="division" align="left" editorFunction="hls103divisionCodeFunction" sortable="true" width="250"/> <a:column name="division" align="left" editorFunction="hls103divisionCodeFunction" sortable="true" width="250"/>
<a:column name="description" align="left" editor="hls103_division_description_tf" width="300"/> <a:column name="description" align="left" editor="hls103_division_description_tf" width="300"/>
<a:column name="full_elec_sign_desc" prompt="是否为全电子签约" align="center" editor="grid_id_comboBox_id" width="100"/>
<a:column name="enabled_flag" align="center" editor="hls103_division_result_grid_cb" width="100"/> <a:column name="enabled_flag" align="center" editor="hls103_division_result_grid_cb" width="100"/>
</a:columns> </a:columns>
<a:editors> <a:editors>
<a:textField id="hls103_division_code_tf" maxLength="2"/> <a:textField id="hls103_division_code_tf" maxLength="2"/>
<a:textField id="hls103_division_description_tf"/> <a:textField id="hls103_division_description_tf"/>
<a:checkBox id="hls103_division_result_grid_cb"/> <a:checkBox id="hls103_division_result_grid_cb"/>
<a:comboBox id="grid_id_comboBox_id"/>
</a:editors> </a:editors>
</a:grid> </a:grid>
</a:screenBody> </a:screenBody>
......
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