Skip to content

L
leaf-hlcm
Commit b9d2f7a8 authored by liyuan.chen's avatar liyuan.chen
Browse files
Options

[fix]修改

parent 2bb7faa5
Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 13 deletions
src/main/webapp/WEB-INF/classes/acr/ACR510/hls_cashflow_item_v_lov.lwm
View file @ b9d2f7a8
...@@ -25,6 +25,6 @@ ...@@ -25,6 +25,6 @@
</ns1:query-fields> </ns1:query-fields>
<ns1:data-filters> <ns1:data-filters>
<ns1:data-filter name="enabled_flag" enforceOperations="query" expression="t1.enabled_flag=&apos;Y&apos;"/> <ns1:data-filter name="enabled_flag" enforceOperations="query" expression="t1.enabled_flag=&apos;Y&apos;"/>
<ns1:data-filter name="cf_item" enforceOperations="query" expression="t1.cf_item in(&apos;2&apos;,&apos;1&apos;,&apos;9&apos;,&apos;8&apos;,&apos;200&apos;,&apos;250&apos;)"/> <ns1:data-filter name="cf_item" enforceOperations="query" expression="t1.cf_item in(&apos;2&apos;,&apos;1&apos;,&apos;9&apos;,&apos;8&apos;,&apos;200&apos;,&apos;250&apos;,&apos;11&apos;)"/>
</ns1:data-filters> </ns1:data-filters>
</ns1:model> </ns1:model>
src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm
View file @ b9d2f7a8
...@@ -56,8 +56,79 @@ select t.parent_company_id company_id ...@@ -56,8 +56,79 @@ select t.parent_company_id company_id
queryExpression="due_date &lt;= to_date(${@due_date_to},&apos;yyyy-mm-dd&apos;)"/> queryExpression="due_date &lt;= to_date(${@due_date_to},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field field="dd_bank_account_num" queryOperator="="/> <bm:query-field field="dd_bank_account_num" queryOperator="="/>
<bm:query-field field="dd_bank_account_name" queryOperator="="/> <bm:query-field field="dd_bank_account_name" queryOperator="="/>
<!--<bm:query-field name="bp_id"
queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id} or ((select bp_category from hls_bp_master where bp_id = ${@bp_id}) = 'VENDER'))"/>-->
<bm:query-field name="bp_id" <bm:query-field name="bp_id"
queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id} or ((select bp_category from hls_bp_master where bp_id = ${@bp_id}) = 'VENDER'))"/> queryExpression="( (t.bp_id_tenant In
decode((Select h.bp_category
From hls_bp_master h
Where h.bp_id = ${@bp_id}),
'TENANT',
decode(decode((Select h.bp_class
From hls_bp_master h
Where h.bp_id = ${@bp_id}),
'NP',
(Select Count(1)
From hls_bp_master hb
Where Trim(hb.bp_name) =
(Select Trim(hbm.bp_name)
From hls_bp_master hbm
Where hbm.bp_id = ${@bp_id})
Group By Trim(hb.bp_name), Trim(hb.id_card_no)),
'ORG',
(Select Count(1)
From hls_bp_master hb
Where Trim(hb.bp_name) =
(Select Trim(hbm.bp_name)
From hls_bp_master hbm
Where hbm.bp_id = ${@bp_id})
Group By Trim(hb.bp_name),
Trim(nvl(hb.social_code, 'N')))),
1,
${@bp_id},
(Select hbm.bp_id
From hls_bp_master hbm
Where hbm.bp_name =
(Select hbm.bp_name
From hls_bp_master hbm
Where hbm.bp_id = ${@bp_id})))))
Or (t.bp_id_agent_level1 In
decode((Select h.bp_category
From hls_bp_master h
Where h.bp_id = ${@bp_id}),
'AGENT',
decode(decode((Select h.bp_class
From hls_bp_master h
Where h.bp_id = ${@bp_id}),
'NP',
(Select Count(1)
From hls_bp_master hb
Where Trim(hb.bp_name) =
(Select Trim(hbm.bp_name)
From hls_bp_master hbm
Where hbm.bp_id = ${@bp_id})
Group By Trim(hb.bp_name), Trim(hb.id_card_no)),
'ORG',
(Select Count(1)
From hls_bp_master hb
Where Trim(hb.bp_name) =
(Select Trim(hbm.bp_name)
From hls_bp_master hbm
Where hbm.bp_id = ${@bp_id})
Group By Trim(hb.bp_name),
Trim(nvl(hb.social_code, 'N')))),
1,
${@bp_id},
(Select hbm.bp_id
From hls_bp_master hbm
Where hbm.bp_name =
(Select hbm.bp_name
From hls_bp_master hbm
Where hbm.bp_id = ${@bp_id})))))
Or ((Select bp_category From hls_bp_master Where bp_id = ${@bp_id}) =
'VENDER') )"/>
<bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/> <bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/con_contract_v.lwm
View file @ b9d2f7a8
...@@ -244,7 +244,10 @@ ...@@ -244,7 +244,10 @@
</bm:features> </bm:features>
<bm:query-fields> <bm:query-fields>
<bm:query-field field="contract_number" queryOperator="like"/> <bm:query-field field="contract_number" queryOperator="like"/>
<bm:query-field name="bp_id_agent_level1" queryExpression="t1.bp_id_agent_level1=${@bp_id_agent_level1}"/> <bm:query-field name="bp_id_agent_level1" queryExpression="((t1.bp_id_agent_level1=${@bp_id_agent_level1}) or exists (select 1 from con_contract_lease_item ccli,hls_lease_item hli where ccli.lease_item_id=hli.lease_item_id and hli.vender_id=${@bp_id_agent_level1} and t1.contract_id=ccli.contract_id))"/>
<bm:query-field name="contract_name" queryExpression="t1.contract_name like &apos;%&apos;||${@contract_name}||&apos;%&apos;"/> <bm:query-field name="contract_name" queryExpression="t1.contract_name like &apos;%&apos;||${@contract_name}||&apos;%&apos;"/>
</bm:query-fields> </bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.contract_status not in (&apos;TERMINATE&apos;, &apos;CANCEL&apos;, &apos;REPUR&apos;, &apos;ET&apos;, &apos;INCEPT_RETURN&apos;)"/>
</bm:data-filters>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_query.lwm
View file @ b9d2f7a8
...@@ -44,18 +44,20 @@ ...@@ -44,18 +44,20 @@
from sys_code_values_v v from sys_code_values_v v
where v.code = 'DEPOSIT_TRANS_TYPE' where v.code = 'DEPOSIT_TRANS_TYPE'
and v.code_value = v1.deposit_trans_type) deposit_trans_type_n, and v.code_value = v1.deposit_trans_type) deposit_trans_type_n,
nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id=>v1.contract_id,p_user_id=>1) ),'正常')approve_status nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id=>v1.contract_id,p_user_id=>1) ),'正常')approve_status,
v1.bp_id
from (select tt.ref_contract_id contract_id, from (select tt.ref_contract_id contract_id,
tt.deposit_trans_type, tt.deposit_trans_type,
sum((nvl(tt.transaction_amount, 0) - sum((nvl(tt.transaction_amount, 0) -
nvl(tt.write_off_amount, 0) - nvl(tt.returned_amount, 0))) unwrite_off_amount nvl(tt.write_off_amount, 0) - nvl(tt.returned_amount, 0))) unwrite_off_amount,
tt.bp_id
from csh_transaction tt from csh_transaction tt
where tt.transaction_type = 'DEPOSIT' where tt.transaction_type = 'DEPOSIT'
and tt.ref_contract_id is not null and tt.ref_contract_id is not null
and tt.transaction_amount > 0 and tt.transaction_amount > 0
and tt.deposit_trans_type is not null and tt.deposit_trans_type is not null
group by tt.ref_contract_id, tt.deposit_trans_type) v1 group by tt.ref_contract_id, tt.deposit_trans_type, tt.bp_id) v1
where v1.unwrite_off_amount>0)v where v1.unwrite_off_amount>0)v
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
......
src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
View file @ b9d2f7a8
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
url="${/request/@context_path}/uploadFile.lview"/> url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id" <a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id"
url="${/request/@context_path}/downloadFile.lview"/> url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="con731_hls_bp_master_query_link" url="${/request/@context_path}/modules/cont/CON505/hls_bp_master_query.lview"/>
<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[
Ext.ux.Lightbox.register('a[ref=img]', true); Ext.ux.Lightbox.register('a[ref=img]', true);
Leaf.onReady(function () { Leaf.onReady(function () {
...@@ -452,7 +454,10 @@ ...@@ -452,7 +454,10 @@
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) { window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
var link_function = ''; var link_function = '';
window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record; window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'attachment') { if (name == 'bp_link' && record.get('bp_id') && record.get('record_id')) {
link_function = '${/parameter/@layout_code}_open_bp_detail_window';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + config_record.get('prompt') + '</a>';
} else if (name == 'attachment') {
link_function = 'con_repo001_upload_file'; link_function = 'con_repo001_upload_file';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>'; return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
} else if (name == 'attach_file_name') { } else if (name == 'attach_file_name') {
...@@ -494,6 +499,49 @@ ...@@ -494,6 +499,49 @@
} }
} }
}; };
window['${/parameter/@layout_code}_open_bp_detail_window'] = function (id, name) {
debugger;
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var param = {};//record.data;
param['bp_id'] = record.get('bp_id');
param['cdd_list_id'] = record.get('cdd_list_id');
param['company_id'] = '${/session/company_id}';
param['document_id'] = record.get('bp_id');
param['document_category'] = 'BP';
param['bp_class'] = record.get('bp_class');
param['bp_category'] = record.get('bp_category');
if( record.get('bp_category')=='AGENT'){
param['function_code'] = 'HLS303_Q';
param['function_usage'] = 'QUERY';
}else{
param['function_code'] = 'CON505H';
param['function_usage'] = 'QUERY';
}
param['bp_type'] = record.get('bp_type');
param['download'] = 'Y';
param['url_title'] = '${l:HLS212.BP_MASTER_QUERY}';
hls_doc_get_layout_code('${/parameter/@layout_code}_con_contract_get_layout_code_link_id', param, 'con731_hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}');
};
//加载时调用(grid,table,gridBox)
/*window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, record, config_records, bp_seq) {
if(record.get('bp_category') == 'TENANT' || record.get('bp_category') == 'AGENT'){
record.getField('bp_id').setReadOnly(true);
record.getField('bp_id_n').setReadOnly(true);
}
};*/
//选择事件(grid,attach,gridbox,table)
/*window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_before_select'] = function(ds, record, bp_seq) {
if((record.get('bp_category') == 'TENANT' || record.get('bp_category') == 'AGENT') && record.isSelected){
setTimeout(function() {
$(ds.id).unSelect(record);
}, 0);
}
};*/
]]></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"/>
</a:view> </a:view>
......
src/main/webapp/modules/cont/CON732/hls_ccr_query_entrance.lview
View file @ b9d2f7a8
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
winid: 'open_print_detail_win' winid: 'open_print_detail_win'
}, },
url: $('hls_crr_query_print_link_id').getUrl(), url: $('hls_crr_query_print_link_id').getUrl(),
title: '合同变更附件', title: '合同文本打印',
width: 1000, width: 1000,
height: 450 height: 450
}); });
......
src/main/webapp/modules/cont/CON_ET003/con_early_termination_modify_query.lview
View file @ b9d2f7a8
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
winid: 'open_print_detail_win' winid: 'open_print_detail_win'
}, },
url: $('con_grant_deduct_print_link').getUrl(), url: $('con_grant_deduct_print_link').getUrl(),
title: '提前结清附件', title: '合同文本打印',
width: 1000, width: 1000,
height: 450 height: 450
}); });
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<a:screenTitle/> <a:screenTitle/>
<a:gridButton click="contractQueryScreen_query" text="HLS.QUERY"/> <a:gridButton click="contractQueryScreen_query" text="HLS.QUERY"/>
<a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/> <a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/>
<a:gridButton click="con_gur_np_pint" text="提前结清附件" id="con_gur_np_pint_id"/> <a:gridButton click="con_gur_np_pint" text="合同文本打印" id="con_gur_np_pint_id"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE"> <a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
<a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="变更申请编号"/> <a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="变更申请编号"/>
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT100/cus_deposit_entry_maintain.lview
View file @ b9d2f7a8
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
</a:toolBar>--> </a:toolBar>-->
<a:columns> <a:columns>
<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110" align="center"/> <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110" align="center"/>
<a:column name="bp_name" prompt="代理店" align="center"/> <a:column name="bp_name" prompt="代理店/厂商" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/> <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/> <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/> <a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/cus_deposit_transfer_maintain.lview
View file @ b9d2f7a8
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
params: { params: {
winId: 'csh_transaction_deposit_transfer_link_winid', winId: 'csh_transaction_deposit_transfer_link_winid',
contract_id:record.get('contract_id'), contract_id:record.get('contract_id'),
bp_id_agent_level1:record.get('bp_id_agent_level1') bp_id_agent_level1:record.get('bp_id')
}, },
url: url, url: url,
title: '保证金划转', title: '保证金划转',
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT104/cus_deposit_write_off_maintain.lview
View file @ b9d2f7a8
...@@ -521,7 +521,7 @@ ...@@ -521,7 +521,7 @@
<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" width="110" <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" width="110"
align="center"/> align="center"/>
<!--<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="csh531n_detail_renderer" width="110" align="center"/>--> <!--<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="csh531n_detail_renderer" width="110" align="center"/>-->
<a:column name="bp_name" prompt="代理店" align="center"/> <a:column name="bp_name" prompt="代理店/厂商" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/> <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/> <a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT"
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return.lview
View file @ b9d2f7a8
...@@ -157,6 +157,9 @@ var csh_return_atm_id = '${/model/csh_return_list_id/record/@return_list_id}'; ...@@ -157,6 +157,9 @@ var csh_return_atm_id = '${/model/csh_return_list_id/record/@return_list_id}';
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="csh_return_bp_id"/> <a:field name="csh_return_bp_id"/>
<a:field name="bp_bank_account_name" defaultValue="${/parameter/@bp_bank_account_name}"/>
<a:field name="opposite_band_na" defaultValue="${/parameter/@opposite_band_na}"/>
<a:field name="bp_bank_account_num" defaultValue="${/parameter/@bp_bank_account_num}"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/cus_deposit_write_off_return_maintain.lview
View file @ b9d2f7a8
...@@ -139,6 +139,9 @@ ...@@ -139,6 +139,9 @@
new Leaf.Window({ new Leaf.Window({
id: 'csh_transaction_deposit_link_winid', id: 'csh_transaction_deposit_link_winid',
params: { params: {
bp_bank_account_name: record.get('bp_bank_account_name'),
opposite_band_na: record.get('opposite_band_na'),
bp_bank_account_num: record.get('bp_bank_account_num'),
winId: 'csh_transaction_deposit_link_winid' winId: 'csh_transaction_deposit_link_winid'
}, },
url: url, url: url,
......
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