Skip to content

L
leaf-hlcm
Commit ae118e6b authored by 38823's avatar 38823
Browse files
Options

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

parents 79eadde1 ec3ba9d5
Show whitespace changes
Inline Side-by-side
Showing with 522 additions and 20 deletions
src/main/webapp/WEB-INF/classes/basic/hls_division_detail_for_lov.lwm 0 → 100644
View file @ ae118e6b
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2024-05-20 下午2:57:45
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" extend="hls.HLS103.hls_division_detail" extendMode="reference">
<bm:fields>
<bm:field name="division_detail_code" forDisplay="true" forQuery="true"/>
<bm:field name="division_detail_name" forDisplay="true" forQuery="true"/>
</bm:fields>
<bm:data-filters>
<bm:data-filter expression="t1.division = &apos;70&apos;"/>
</bm:data-filters>
<bm:query-fields>
<bm:query-field field="division_detail_code" queryOperator="like"/>
<bm:query-field field="division_detail_name" queryOperator="like"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON202/con_contract_tmpt_clause_main.lwm
View file @ ae118e6b
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
<bm:field name="business_type_n" expression="(select v.description from HLS_BUSINESS_TYPE_V v where v.business_type = t1.business_type)" forInsert="false" forUpdate="false"/> <bm:field name="business_type_n" expression="(select v.description from HLS_BUSINESS_TYPE_V v where v.business_type = t1.business_type)" forInsert="false" forUpdate="false"/>
<bm:field name="document_type_n" expression="(select v.document_type_desc from hls_document_type_v v where v.document_type = t1.document_type)" forInsert="false" forUpdate="false"/> <bm:field name="document_type_n" expression="(select v.document_type_desc from hls_document_type_v v where v.document_type = t1.document_type)" forInsert="false" forUpdate="false"/>
<bm:field name="division_n" expression="(select v.description from HLS_DIVISION v where v.division = t1.division)" forInsert="false" forUpdate="false"/> <bm:field name="division_n" expression="(select v.description from HLS_DIVISION v where v.division = t1.division)" forInsert="false" forUpdate="false"/>
<bm:field name="division_detail" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DIVISION_DETAIL" prompt="CON_CONTRACT_TMPT_CLAUSE.DIVISION_DETAIL"/>
<bm:field name="division_detail_n" expression="(select v.division_detail_name from hls_division_detail v where v.division_detail_code = t1.division_detail and v.enable_flag='Y')" forInsert="false" forUpdate="false"/>
<bm:field name="lease_channel_n" expression="(select v.description from HLS_LEASE_CHANNEL v where v.lease_channel = t1.lease_channel)" forInsert="false" forUpdate="false"/> <bm:field name="lease_channel_n" expression="(select v.description from HLS_LEASE_CHANNEL v where v.lease_channel = t1.lease_channel)" forInsert="false" forUpdate="false"/>
<bm:field name="lease_organization_n" expression="(select v.description from hls_lease_organization v where v.lease_organization = t1.lease_organization)" forInsert="false" forUpdate="false"/> <bm:field name="lease_organization_n" expression="(select v.description from hls_lease_organization v where v.lease_organization = t1.lease_organization)" forInsert="false" forUpdate="false"/>
<bm:field name="price_list_n" expression="(select v.description from HLS_PRICE_LIST v where v.price_list = t1.price_list)" forInsert="false" forUpdate="false"/> <bm:field name="price_list_n" expression="(select v.description from HLS_PRICE_LIST v where v.price_list = t1.price_list)" forInsert="false" forUpdate="false"/>
......
src/main/webapp/WEB-INF/classes/cont/CON505/con505_contract_content.lwm
View file @ ae118e6b
...@@ -26,5 +26,12 @@ ...@@ -26,5 +26,12 @@
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select con_contract_workflow_pkg.get_rsc_upload_flag(p_contract_id =>${@contract_id}) as is_rsc_upload_flag
from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations> </bm:operations>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS103/hls_agent_division_detail.lwm 0 → 100644
View file @ ae118e6b
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:e="leaf.service.exception" xmlns:o="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_AGENT_DIVISION">
<bm:fields>
<bm:field name="agent_division_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="AGENT_DIVISION_ID" prompt="HLS_AGENT_DIVISION.AGENT_DIVISION_ID"/>
<bm:field name="division_detail_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DIVISION_DETAIL_ID" prompt="HLS_AGENT_DIVISION.DIVISION_DETAIL_ID"/>
<bm:field name="division_detail_code" forInsert="false" forUpdate="false" prompt="产品线细分编码"/>
<bm:field name="agent_bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="AGENT_BP_ID" prompt="HLS_AGENT_DIVISION.AGENT_BP_ID"/>
<bm:field name="agent_bp_code" databaseType="VARCHAR" datatype="java.lang.String" physicalName="AGENT_BP_CODE" prompt="HLS_AGENT_DIVISION.AGENT_BP_CODE"/>
<bm:field name="agent_bp_name" databaseType="VARCHAR" datatype="java.lang.String" physicalName="AGENT_BP_NAME" prompt="HLS_AGENT_DIVISION.AGENT_BP_NAME"/>
<bm:field name="enable_flag" databaseType="VARCHAR" datatype="java.lang.String" physicalName="ENABLE_FLAG" prompt="启用"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT t1.agent_division_id,
t1.division_detail_id,
(SELECT d.division_detail_code
FROM hls_division_detail d
WHERE d.division_detail_id = t1.division_detail_id) division_detail_code,
t1.agent_bp_id,
t1.agent_bp_code,
t1.agent_bp_name,
t1.enable_flag,
t1.creation_date,
t1.created_by,
t1.last_update_date,
t1.last_updated_by
FROM HLS_AGENT_DIVISION t1 #WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
<bm:operation name="insert">
<bm:parameters>
<bm:parameter name="agent_division_id" input="false" output="true" outputPath="@agent_division_id"/>
</bm:parameters>
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_agent_division_manage(p_sql_type => 'INSERT',
p_agent_division_id => ${@agent_division_id},
p_division_detail_id => ${@division_detail_id},
p_agent_bp_id => ${@agent_bp_id},
p_agent_bp_code => ${@agent_bp_code},
p_agent_bp_name => ${@agent_bp_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_agent_division_manage(p_sql_type => 'UPDATE',
p_agent_division_id => ${@agent_division_id},
p_division_detail_id => ${@division_detail_id},
p_agent_bp_id => ${@agent_bp_id},
p_agent_bp_code => ${@agent_bp_code},
p_agent_bp_name => ${@agent_bp_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="delete">
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_agent_division_manage(p_sql_type => 'DELETE',
p_agent_division_id => ${@agent_division_id},
p_division_detail_id => ${@division_detail_id},
p_agent_bp_id => ${@agent_bp_id},
p_agent_bp_code => ${@agent_bp_code},
p_agent_bp_name => ${@agent_bp_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.division_detail_id=${@division_detail_id}"/>
</bm:data-filters>
<bm:features>
<f:standard-who/>
<!--<o:sequence-pk sequenceName="HLS_AGENT_DIVISION_S"/>-->
<o:sequence-pk/>
</bm:features>
<bm:primary-key>
<bm:pk-field name="agent_division_id"/>
</bm:primary-key>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS103/hls_division_detail.lwm 0 → 100644
View file @ ae118e6b
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:e="leaf.service.exception" xmlns:o="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_DIVISION_DETAIL">
<bm:fields>
<bm:field name="division_detail_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DIVISION_DETAIL_ID" prompt="HLS_DIVISION_DETAIL.DIVISION_DETAIL_ID"/>
<bm:field name="division" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DIVISION" prompt="产品线"/>
<bm:field name="description" databaseType="VARCHAR2" datatype="java.lang.String" expression="(select hls.description from hls_division hls where hls.division= t1.division)" prompt="产品线" forInsert="false" forUpdate="false"/>
<bm:field name="division_detail_code" databaseType="VARCHAR" datatype="java.lang.String" physicalName="DIVISION_DETAIL_CODE" prompt="产品线细分编码"/>
<bm:field name="division_detail_name" databaseType="VARCHAR" datatype="java.lang.String" physicalName="DIVISION_DETAIL_NAME" prompt="产品线细分名称"/>
<bm:field name="enable_flag" databaseType="VARCHAR" datatype="java.lang.String" physicalName="ENABLE_FLAG" prompt="启用"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select t1.division_detail_id,
t1.division,
(select hd.description
from hls_division hd
where hd.division = t1.division) description,
t1.division_detail_code,
t1.division_detail_name,
t1.enable_flag
from hls_division_detail t1
#WHERE_CLAUSE#
order by t1.division_detail_id
]]></bm:query-sql>
</bm:operation>
<bm:operation name="insert">
<bm:parameters>
<bm:parameter name="division_detail_id" input="false" output="true" outputPath="@division_detail_id"/>
</bm:parameters>
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_division_detail_manage(p_sql_type => 'INSERT',
p_division_detail_id => ${@division_detail_id},
p_division => ${@division},
p_division_detail_code => ${@division_detail_code},
p_division_detail_name => ${@division_detail_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_division_detail_manage(p_sql_type => 'UPDATE',
p_division_detail_id => ${@division_detail_id},
p_division => ${@division},
p_division_detail_code => ${@division_detail_code},
p_division_detail_name => ${@division_detail_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="delete">
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_division_detail_manage(p_sql_type => 'DELETE',
p_division_detail_id => ${@division_detail_id},
p_division => ${@division},
p_division_detail_code => ${@division_detail_code},
p_division_detail_name => ${@division_detail_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:features>
<f:standard-who/>
<!--<o:sequence-pk sequenceName="HLS_DIVISION_DETAIL_S"/>-->
<o:sequence-pk/>
</bm:features>
<bm:primary-key>
<bm:pk-field name="division_detail_id"/>
</bm:primary-key>
</bm:model>
src/main/webapp/WEB-INF/classes/wx/WX100/con_file_download.lwm
View file @ ae118e6b
...@@ -104,7 +104,21 @@ select fa.file_name,fa.file_path,fa.attachment_id ...@@ -104,7 +104,21 @@ select fa.file_name,fa.file_path,fa.attachment_id
'CON_CONTRACT_MORTGAGE_BLD_E', 'CON_CONTRACT_MORTGAGE_BLD_E',
'MORT_CONTRACT', 'MORT_CONTRACT',
'CON_CONTRACT_LEASEBACK_BLD_E', 'CON_CONTRACT_LEASEBACK_BLD_E',
'CONTRACT' 'CONTRACT',
--云南铁拳合同文本匹配关系 18083 2024/5/22
'CON_CONTRACT_LEASEBACK_YNTQ','FINANCE_LEASE_CONTRACT_TJ_E',
'CON_CONTRACT_MORTGAGE_YNTQ','CON_CONTRACT_MORTGAGE_TJ_E',
'CON_COLLECTION_PAYMENT_YNTQ','CON_COLLECTION_PAYMENT_TJ_E',
'CSH_LEASEBACK_YNTQ','CSH_PAYMENT_REQ_TJ_E',
'PAR_TENANT_YNTQ','SPOUSE_COMMITMENT',
'PAR_GUTA_YNTQ','GUARANTEE_COMMITMENT',
'SURE_LEASEBACK_GR_YNTQ','FINANCE_LEASE_CONTRACT_TJ_S_E',
'SURE_LEASEBACK_FR_YNTQ','FINANCE_LEASE_CONTRACT_FR_TJ_E',
'SURE_LEASEBACK_FR_HLJ_YNTQ','FINANCE_LEASE_CONTRACT_TJ_FR_E',
'PERSONAL_CREDIT_YNTQ','PERSONAL_CREDIT',
'ENTERPRISE_CREDIT_YNTQ','ENTERPRISE_CREDIT',
'PERSONAL_CREDIT_GUTA_YNTQ','PERSONAL_CREDIT',
'ENTERPRISE_CREDIT_GUTA_YNTQ','ENTERPRISE_CREDIT'
) )
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
......
src/main/webapp/modules/cont/CON202/con_basic_clause_detail.lview
View file @ ae118e6b
...@@ -81,6 +81,12 @@ ...@@ -81,6 +81,12 @@
<a:map from="description" to="division_n"/> <a:map from="description" to="division_n"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="division_detail_n" lovGridHeight="300" lovHeight="480" lovService="basic.hls_division_detail_for_lov" lovWidth="500">
<a:mapping>
<a:map from="division_detail_name" to="division_detail_n"/>
<a:map from="division_detail_code" to="division_detail"/>
</a:mapping>
</a:field>
<a:field name="lease_channel_n" lovGridHeight="260" lovHeight="480" lovService="basic.hls_lease_channel_for_lov" lovWidth="500"> <a:field name="lease_channel_n" lovGridHeight="260" lovHeight="480" lovService="basic.hls_lease_channel_for_lov" lovWidth="500">
<a:mapping> <a:mapping>
<a:map from="lease_channel" to="lease_channel"/> <a:map from="lease_channel" to="lease_channel"/>
...@@ -140,6 +146,7 @@ ...@@ -140,6 +146,7 @@
<a:column name="document_type_n" editor="lov" prompt="单据类型" width="80"/> <a:column name="document_type_n" editor="lov" prompt="单据类型" width="80"/>
<a:column name="finance_type_n" editor="cb" prompt="融资业务类型" width="80"/> <a:column name="finance_type_n" editor="cb" prompt="融资业务类型" width="80"/>
<a:column name="division_n" editor="lov" prompt="产品线" width="100"/> <a:column name="division_n" editor="lov" prompt="产品线" width="100"/>
<a:column name="division_detail_n" editor="lov" prompt="产品线细分" width="100"/>
<a:column name="lease_channel_n" editor="lov" prompt="商业模式" width="100"/> <a:column name="lease_channel_n" editor="lov" prompt="商业模式" width="100"/>
<a:column name="lease_organization_n" editor="lov" prompt="事业部" width="100"/> <a:column name="lease_organization_n" editor="lov" prompt="事业部" width="100"/>
<a:column name="district_n" editor="cb" prompt="区域" width="120"/> <a:column name="district_n" editor="cb" prompt="区域" width="120"/>
......
src/main/webapp/modules/cont/CON311/con_re_print_entrance.lview
View file @ ae118e6b
...@@ -202,6 +202,7 @@ ...@@ -202,6 +202,7 @@
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var records = $(ds_id).getSelected(); var records = $(ds_id).getSelected();
var division=records[0].data.division; var division=records[0].data.division;
var division_detail = records[0].data.division_detail;
if(division == '95'){ if(division == '95'){
Leaf.showErrorMessage('提示','经营性租赁暂不支持线上生成合同文本！'); Leaf.showErrorMessage('提示','经营性租赁暂不支持线上生成合同文本！');
return; return;
...@@ -210,6 +211,12 @@ ...@@ -210,6 +211,12 @@
Leaf.showMessage('${l:PROMPT}','${l:HLS.SELECT_RECORD}'); Leaf.showMessage('${l:PROMPT}','${l:HLS.SELECT_RECORD}');
return; return;
} }
if(division == '70'){
if(division_detail=='03'){
Leaf.showErrorMessage('提示','当前合同不支持打印纸质合同文本！');
return;
}
}
var record=records[0]; var record=records[0];
new Leaf.Window({ new Leaf.Window({
id: 'con_contract_update_print_detail_winid', id: 'con_contract_update_print_detail_winid',
......
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ ae118e6b
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
<a:link id="prj2000_pur_order_deteail_link_id" url="${/request/@context_path}/modules/prj/PRJ2000/purchase_order_deteail.lview"></a:link> <a:link id="prj2000_pur_order_deteail_link_id" url="${/request/@context_path}/modules/prj/PRJ2000/purchase_order_deteail.lview"></a:link>
<script src="${/request/@context_path}/modules/viewerjs/viewer.js"/> <script src="${/request/@context_path}/modules/viewerjs/viewer.js"/>
<script src="${/request/@context_path}/modules/viewerjs/viewer_tool.js"/> <script src="${/request/@context_path}/modules/viewerjs/viewer_tool.js"/>
<a:link id="con_get_rsc_upload" model="cont.CON505.con505_contract_content" modelaction="query"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function lock_current_window() { function lock_current_window() {
...@@ -89,11 +90,33 @@ ...@@ -89,11 +90,33 @@
}); });
}; };
//查看财报
window['${/parameter/@layout_code}_user_button9_layout_dynamic_click'] = function () {
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var record = $(bp_ds_id).getAt(0)
new Leaf.Window({
id: 'rsc303_fin_statement_query',
url: $('rsc303_fin_statement_link').getUrl(),
title: '查看财报',
fullScreen: true,
params: {
bp_id: record.get('bp_id_tenant')
}
});
}
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
debugger; debugger;
if('${/parameter/@cond_para2}'=='N' || '${/parameter/@cond_para2}'==''){ if('${/parameter/@cond_para2}'=='N' || '${/parameter/@cond_para2}'==''){
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
if (ds_id == ds.id && ds_id) { if (ds_id == ds.id && ds_id) {
//自然人不展示财报按钮
if((record.get('bp_class') == 'NP' &&
document.getElementById('${/parameter/@layout_code}_user_button9')
|| record.get('contract_status') == 'INCEPT')){
document.getElementById('${/parameter/@layout_code}_user_button9').style.display = 'none';
}
// if (record.get('business_type') == 'LEASEBACK'&&'${/parameter/@function_usage}'=='MODIFY') { // if (record.get('business_type') == 'LEASEBACK'&&'${/parameter/@function_usage}'=='MODIFY') {
// record.set('submit_date',null); // record.set('submit_date',null);
// record.set('guarantee_letter_f','N'); // record.set('guarantee_letter_f','N');
...@@ -643,7 +666,7 @@ ...@@ -643,7 +666,7 @@
debugger; debugger;
if ($(ds_id).validate()) { if ($(ds_id).validate()) {
if('${/model/wfl_status/record/@mar_status}' == 'Y' || Ext.isEmpty('${/model/wfl_status/record/@mar_status}')){ if('${/model/wfl_status/record/@mar_status}' == 'Y' || Ext.isEmpty('${/model/wfl_status/record/@mar_status}')){
if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin')){ if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin') &&record.get('division_detail')=='01'){
// Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租'); // Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租');
Leaf.showMessage('${l:PROMPT}', '二手机业务需要保证金入账后才能起租'); Leaf.showMessage('${l:PROMPT}', '二手机业务需要保证金入账后才能起租');
return; return;
...@@ -657,6 +680,44 @@ ...@@ -657,6 +680,44 @@
// Leaf.showMessage('${l:PROMPT}', '北京卡家业务需要保证金入账后才能起租'); // Leaf.showMessage('${l:PROMPT}', '北京卡家业务需要保证金入账后才能起租');
// return; // return;
// } // }
//为法人且不为95时，财报是否上传提示
var is_rsc_flag = '';
if (record.get('division') != '95' && record.get('bp_class') == 'ORG'){
Leaf.request({
url: $('con_get_rsc_upload').getUrl(),
para: {
contract_id: contract_id
},
scope: this,
sync: true,
success: function (res) {
is_rsc_flag = res.result.record.is_rsc_upload_flag;
}
});
}
if (is_rsc_flag == 'N'){
Leaf.showConfirm('${HLS.PROMPT}', '当前承租人未上传财报，是否提交工作流？', function () {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('con_approval_link_id').getUrl(),
para: {
contract_id: contract_id
},
scope: this,
success: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close();
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
});
});
}else{
Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () { Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () {
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({ Leaf.request({
...@@ -665,6 +726,7 @@ ...@@ -665,6 +726,7 @@
contract_id: contract_id contract_id: contract_id
}, },
scope: this, scope: this,
sync: true,
success: function () { success: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close(); $('${/parameter/@winid}').close();
...@@ -677,6 +739,8 @@ ...@@ -677,6 +739,8 @@
} }
}); });
}); });
}
} }
......
src/main/webapp/modules/cont/CON505/con_contract_modify.lview
View file @ ae118e6b
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/hls/HLS103/hls_detail.lsc 0 → 100644
View file @ ae118e6b
<?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:batch-apply sourcepath="/parameter">
<p:switch test="@current_parameter/@_status">
<p:case value="insert">
<a:model-insert model="hls.HLS103.hls_division_detail"/>
</p:case>
<p:case value="update">
<a:model-update model="hls.HLS103.hls_division_detail"/>
</p:case>
<p:case value="delete">
<a:model-delete model="hls.HLS103.hls_division_detail"/>
</p:case>
</p:switch>
<a:model-batch-update model="hls.HLS103.hls_agent_division_detail" sourcePath="@current_parameter/agent_info"/>
</a:batch-apply>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
src/main/webapp/modules/hls/HLS103/hls_division.lview
View file @ ae118e6b
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<a:init-procedure/> <a:init-procedure/>
<a:view> <a:view>
<a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/> <a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/>
<a:link id="query_division_detail_link" url="${/request/@context_path}/modules/hls/HLS103/hls_division_detail.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function hls_103_queryDivision() { function hls_103_queryDivision() {
$('hls_division_result_ds').query(); $('hls_division_result_ds').query();
...@@ -52,6 +53,28 @@ ...@@ -52,6 +53,28 @@
return ''; return '';
} }
} }
function division_detail_renderer(value, record, name) {
if(record.get('division')=='70'){
return '<a href="javascript:open_division_detail_window(\'' + record.get('division') + '\',\'' + record.get('description') + '\')">' + '明细' + '</a>';
}
}
function open_division_detail_window(division,description) {
var win = new Leaf.Window({
id: 'query_division_detail_link_winId',
url: $('query_division_detail_link').getUrl(),
params: {
division: division,
description: description,
winid: 'query_division_detail_link_winId'
},
title: '产品线细分',
draggable: true,
width: 700,
height: 500
});
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="full_elec_sign_ds" lookupCode="YES_OR_NO"/> <a:dataSet id="full_elec_sign_ds" lookupCode="YES_OR_NO"/>
...@@ -81,6 +104,7 @@ ...@@ -81,6 +104,7 @@
<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="division_detail" align="center" prompt="产品线明细" renderer="division_detail_renderer" width="100"/>
<a:column name="full_elec_sign_desc" prompt="是否为全电子签约" align="center" editor="grid_id_comboBox_id" width="100"/> <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>
......
src/main/webapp/modules/hls/HLS103/hls_division_detail.lview 0 → 100644
View file @ ae118e6b
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2024-5-11 下午4:03:43
$Revision: 1.0
$Purpose: 二手机产品线细分
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application">
<a:init-procedure/>
<a:view>
<script type="text/javascript"><![CDATA[
function division_detail_add() {
$('hls_division_detail_grid').showEditorByRecord($('hls_division_detail_result_ds').create());
}
function division_detail_grid_clear() {
$('hls_division_detail_grid').clear();
}
function division_detail_grid_query() {
$('hls_division_detail_result_ds').query();
}
/*function division_detail_delete() {
$('hls_division_detail_grid').remove();
}*/
function agent_detail_add() {
var bankDs=$('hls_division_detail_result_ds');
var record=bankDs.getCurrentRecord();
if(Ext.isEmpty(record))
{
return ;
}
else if(record.isNew)
{
Leaf.showMessage('${l:HLS.PROMPT}','请先保存产品明细，才能新增代理店');
return ;
}
$('hls_agent_division_detail_grid').showEditorByRecord($('hls_agent_division_detail_result_ds').create({
division_detail_id:record.get('division_detail_id'),
division_detail_code:record.get('division_detail_code')
}));
}
function agent_detail_grid_clear() {
$('hls_agent_division_detail_grid').clear();
}
function division_detail_submit() {
var result_ds = $('hls_division_detail_result_ds');
if (result_ds.validate()) {
result_ds.submit();
}
}
function divisionCodeFunction(record, name) {
if (record.isNew) {
return 'division_detail_tf';
} else {
return '';
}
}
function agentCodeFunction(record, name) {
if (record.isNew) {
return 'agent_bp_code_lv';
} else {
return '';
}
}
]]></script>
<a:dataSets>
<a:dataSet id="hls_division_detail_result_ds" autoQuery="true" fetchAll="true" model="hls.HLS103.hls_division_detail" selectionModel="single" selectable="true" submitUrl="hls_detail.lsc">
<a:fields>
<a:field name="division" defaultValue="${/parameter/@division}" readOnly="true"/>
<a:field name="description" defaultValue="${/parameter/@description}" readOnly="true"/>
<a:field name="division_detail_code" required="true"/>
<a:field name="division_detail_name" required="true"/>
<a:field name="enable_flag" checkedValue="Y" defaultValue="Y" uncheckedValue="N"/>
</a:fields>
</a:dataSet>
<a:dataSet id="hls_agent_division_detail_result_ds" bindName="agent_info" bindTarget="hls_division_detail_result_ds" autoQuery="true" fetchAll="false" model="hls.HLS103.hls_agent_division_detail" queryUrl="${/request/@context_path}/autocrud/hls.HLS103.hls_agent_division_detail/query?division_detail_code=${/parameter/@division_detail_code}" selectable="true">
<a:fields>
<a:field name="division_detail_code" readOnly="true"/>
<a:field name="agent_bp_code" lovGridHeight="300" lovHeight="450" lovLabelWidth="120"
lovService="basic.hls_bp_master_v_for_lov?bp_category=AGENT" lovWidth="600" title="代理店">
<a:mapping>
<a:map from="bp_id" to="agent_bp_id"/>
<a:map from="bp_code" to="agent_bp_code"/>
<a:map from="bp_name" to="agent_bp_name"/>
</a:mapping>
</a:field>
<a:field name="enable_flag" checkedValue="Y" defaultValue="Y" uncheckedValue="N"/>
</a:fields>
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
<a:screenTitle/>
<a:gridButton click="division_detail_add" text="新增产品线细分"/>
<a:gridButton click="division_detail_grid_clear" text="移除产品线细分"/>
<a:gridButton click="division_detail_grid_query" text="HLS.QUERY"/>
<a:gridButton click="agent_detail_add" text="新增代理店"/>
<a:gridButton click="agent_detail_grid_clear" text="移除代理店"/>
<a:gridButton click="division_detail_submit" text="HLS.SAVE"/>
<!--<a:gridButton click="division_detail_delete" text="HLS.DELETE"/>-->
</a:screenTopToolbar>
<a:grid id="hls_division_detail_grid" bindTarget="hls_division_detail_result_ds" marginHeight="400" marginWidth="300">
<a:columns>
<a:column name="description" align="left" sortable="true" width="100"/>
<a:column name="division_detail_code" align="center" prompt="产品线细分编码" editorFunction="divisionCodeFunction" width="100"/>
<a:column name="division_detail_name" align="center" prompt="产品线细分名称" editorFunction="divisionCodeFunction" width="200"/>
<a:column name="enable_flag" align="center" prompt="启用" editor="division_detail_grid_editor_check" width="60"/>
</a:columns>
<a:editors>
<a:textField id="division_detail_tf"/>
<a:checkBox id="division_detail_grid_editor_check"/>
</a:editors>
</a:grid>
<a:grid id="hls_agent_division_detail_grid" bindTarget="hls_agent_division_detail_result_ds" marginHeight="200" marginWidth="300">
<a:columns>
<a:column name="division_detail_code" prompt="产品线细分编码" align="left" sortable="true" width="100"/>
<a:column name="agent_bp_code" align="center" prompt="代理店编码" editorFunction="agentCodeFunction" width="100"/>
<a:column name="agent_bp_name" align="center" prompt="代理店名称" width="250"/>
<a:column name="enable_flag" align="center" prompt="启用" editor="agent_division_grid_editor_check" width="60"/>
</a:columns>
<a:editors>
<a:lov id="agent_bp_code_lv"/>
<a:checkBox id="agent_division_grid_editor_check"/>
</a:editors>
</a:grid>
</a:screenBody>
</a:view>
</a:screen>
src/main/webapp/modules/hls/HLS303/bp_agent_modify.lview
View file @ ae118e6b
...@@ -130,6 +130,19 @@ ...@@ -130,6 +130,19 @@
// record.getField('invoice_bp_bank_account_id').setRequired(false); // record.getField('invoice_bp_bank_account_id').setRequired(false);
// } // }
// } // }
var agent_division_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
if (agent_division_ds_id == ds.id &&agent_division_ds_id) {
var division = record.get('division');
if(division!='70'){
record.getField('division_detail').setReadOnly(true);
record.getField('division_detail_n').setReadOnly(true);
record.set('division_detail','');
record.set('division_detail_n','');
}else{
record.getField('division_detail').setReadOnly(false);
record.getField('division_detail_n').setReadOnly(false);
}
}
var role_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role'); var role_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
if (role_ds == ds.id) { if (role_ds == ds.id) {
...@@ -336,7 +349,6 @@ ...@@ -336,7 +349,6 @@
//资产管理费 //资产管理费
function open_asset_management(record_id, ds_id) { function open_asset_management(record_id, ds_id) {
debugger;
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
if(record.get('bp_id') == undefined || record.get('agent_division_id')==undefined){ if(record.get('bp_id') == undefined || record.get('agent_division_id')==undefined){
$L.showMessage('提示','请先保存！'); $L.showMessage('提示','请先保存！');
...@@ -358,7 +370,6 @@ ...@@ -358,7 +370,6 @@
//佣金政策 //佣金政策
window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var record = $(ds_id).getAll(); var record = $(ds_id).getAll();
...@@ -448,6 +459,17 @@ ...@@ -448,6 +459,17 @@
}; };
//加载时调用(grid,table,gridBox) //加载时调用(grid,table,gridBox)
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 agent_division_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
if (agent_division_ds_id == ds.id && agent_division_ds_id) {
var records = $(agent_division_ds_id).getAll();
for (i = 0;i < records.length;i++) {
if(records[i].get('division')!='70'){
records[i].getField('division_detail').setReadOnly(true);
records[i].getField('division_detail_n').setReadOnly(true);
}
}
}
var ds_renew_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_agent_renew'); var ds_renew_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_agent_renew');
if (ds_renew_id) { if (ds_renew_id) {
if (ds_renew_id == ds.id) { if (ds_renew_id == ds.id) {
...@@ -455,6 +477,7 @@ ...@@ -455,6 +477,7 @@
ds.getField('valid_date_from').setPropertity('validator', 'hls303d_record_field_validator'); ds.getField('valid_date_from').setPropertity('validator', 'hls303d_record_field_validator');
} }
} }
}; };
......
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