Skip to content

L
leaf-hlcm
Commit 4465f884 authored by stone's avatar stone
Browse files
Options

[fix] 修复bug

parents dc7b674e 57b6e89b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 223 additions and 78 deletions
src/main/webapp/WEB-INF/classes/csh/CSH515/csh_transaction_receipt_return_query.lwm
View file @ 4465f884
......@@ -90,6 +90,7 @@
<bm:field name="banka"/>
<bm:field name="purpose"/>
<bm:field name="can_returned_amount" expression="(select transaction_amount-nvl(returned_amount,0) from dual)"/>
<bm:field name="this_return_amount" expression="nvl((sELECT r.this_return_amount from csh_transaction_return r WHERE status='APPROVING' AND r.transaction_id=t1.transaction_id),0)"/>
<bm:field name="gsber"/>
<bm:field name="sus_belnr"/>
<bm:field name="bp_virtual_bank_account"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH515/csh_transaction_returned_list.lwm
View file @ 4465f884
......@@ -10,77 +10,77 @@
<bm:operation name="query">
<bm:query-sql><![CDATA[select r.return_id,
r.this_return_amount,
t1.transaction_num,
t1.transaction_date,
t1.currency_code,
b.bank_account_num,
b.bank_branch_name,
bank_slip_num,
t1.period_name,
(select gc.currency_name
from gld_currency_vl gc
where gc.currency_code = t1.currency_code) as currency_name,
t1.transaction_amount,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select d.bp_name from hls_bp_master_v d where d.bp_id = t1.bp_id) as bp_name,
(select b.description
from hls_bp_category b
where b.bp_category = t1.bp_category) as bp_category_display,
t1.transaction_num,
t1.transaction_date,
t1.currency_code,
b.bank_account_num,
b.bank_branch_name,
bank_slip_num,
t1.period_name,
(select gc.currency_name
from gld_currency_vl gc
where gc.currency_code = t1.currency_code) as currency_name,
t1.transaction_amount,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select d.bp_name from hls_bp_master_v d where d.bp_id = t1.bp_id) as bp_name,
(select b.description
from hls_bp_category b
where b.bp_category = t1.bp_category) as bp_category_display,
(select cp.description
from csh_payment_method cp
where cp.payment_method_id = t1.payment_method_id) as payment_method_display,
t1.exchange_rate,
(select tv.type_name
from gld_exchangerate_types_vl tv
where tv.type_code = t1.exchange_rate_type) as exchange_rate_type_display,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select cp.description
from csh_payment_method cp
where cp.payment_method_id = t1.payment_method_id) as payment_method_display,
t1.exchange_rate,
(select tv.type_name
from gld_exchangerate_types_vl tv
where tv.type_code = t1.exchange_rate_type) as exchange_rate_type_display,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select a.bank_account_code
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_code,
(select a.bank_account_name
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_name,
(select u.employee_name
from sys_user_v u
where u.user_id = t1.created_by) user_desc,
r.notes,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_tenant
from con_contract c
where contract_id = r.ref_contract_id)) bp_name_t,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_agent_level1
from con_contract c
where contract_id = r.ref_contract_id)) agent_name_t,
(select c.contract_number
from con_contract c
where contract_id = r.ref_contract_id) contract_number_t
from csh_transaction t1,
csh_transaction_return r,
hls_bp_master_bank_account b
where
t1.transaction_id = r.transaction_id
and r.bp_id = b.bp_id
and r.status = 'APPROVED'
and t1.transaction_id = ${@return_from_csh_trx_id}
(select a.bank_account_code
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_code,
(select a.bank_account_name
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_name,
(select u.employee_name
from sys_user_v u
where u.user_id = t1.created_by) user_desc,
r.notes,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_tenant
from con_contract c
where contract_id = r.ref_contract_id)) bp_name_t,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_agent_level1
from con_contract c
where contract_id = r.ref_contract_id)) agent_name_t,
(select c.contract_number
from con_contract c
where contract_id = r.ref_contract_id) contract_number_t
from csh_transaction t1,
csh_transaction_return r,
hls_bp_master_bank_account b
where
t1.transaction_id(+)= r.transaction_id
and r.bp_id = b.bp_id
and r.status = 'APPROVED'
and t1.transaction_id = ${@return_from_csh_trx_id}
]]></bm:query-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/hls/HLS303/hls_bp_master_asgent_modify.lwm
View file @ 4465f884
......@@ -7,6 +7,7 @@
FROM (SELECT bp.bp_id,
bp.bp_code,
bp.bp_name,
bp.english_name,
bp.bp_class,
(SELECT v.code_value_name
FROM sys_code_values_v v
......@@ -75,6 +76,7 @@
<bm:field name="bp_class"/>
<bm:field name="bp_category_n"/>
<bm:field name="bp_class_n"/>
<bm:field name="english_name"/>
<bm:field name="agent_type"/>
<bm:field name="agent_type_n"/>
<bm:field name="agent_instance_status"/>
......
src/main/webapp/modules/cont/CON350/con350_insurance_import.lview
View file @ 4465f884
......@@ -107,11 +107,15 @@
<a:screenTopToolbar>
<a:screenTitle/>
<a:toolbarButton click="quit" text="HLS.EXIT"/>
<a:toolbarButton click="loadData" text="PROMPT.LOADDATA" width="80"/>
<a:toolbarButton click="checkData" text="PROMPT.CHECK"/>
<!-- <a:toolbarButton click="loadData" text="PROMPT.LOADDATA" width="80"/>-->
<!-- <a:toolbarButton click="checkData" text="PROMPT.CHECK"/>-->
<a:toolbarButton id="submitData_btn_id" click="submitData" text="PROMPT.SUBMIT" width="80"/>
</a:screenTopToolbar>
<a:grid bindTarget="con_contract_insurance_ds" marginHeight="200" marginWidth="30" navBar="true">
<a:toolBar>
<a:button type="add"/>
<a:button type="delete"/>
</a:toolBar>
<a:columns>
<a:column name="contract_number" prompt="合同编号" width="120"/>
<a:column name="insurance_number" prompt="保单号" width="120"/>
......@@ -121,7 +125,7 @@
<a:column name="real_insurance_date" renderer="Leaf.formatDate" prompt="保险起始日" width="120"/>
<a:column name="insurance_end_date" renderer="Leaf.formatDate" prompt="保单到期日" width="120"/>
<a:column name="ins_company" prompt="保险公司" width="120"/>
<a:column name="err_message" prompt="错误信息" width="230"/>
<!-- <a:column name="err_message" prompt="错误信息" width="230"/>-->
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/cont/CON350/con350_insurance_manual_import.lview 0 → 100644
View file @ 4465f884
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: zhuxianfei
$Date: 2018-07-17 下午2:20:47
$Revision: 1.0
$Purpose:
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application">
<a:init-procedure>
<a:model-query model="cont.CON350.con_insurance_import_batch_id" rootPath="batch_id"/>
<a:model-delete model="cont.CON350.con350_update_interface"/>
</a:init-procedure>
<a:view>
<a:link id="import_upload_link"
url="${/request/@context_path}/modules/cont/CON350/con_insurance_import_upload.lview"/>
<a:link id="con350_import_check_link" model="cont.CON350.check_data" modelaction="update"/>
<a:link id="import_save_link" model="cont.CON350.contract_insurance_temp" modelaction="update"/>
<a:link id="con_contract_return_link"
url="${/request/@context_path}/modules/cont/CON350/con350_insurance_entrance.lview"/>
<script type="text/javascript"><![CDATA[
var flag;
var check_flag = 'N';
//导入数据
function loadData() {
new Leaf.Window({
id: 'upload_window',
url: $('import_upload_link').getUrl() + '?batch_id=${/model/batch_id/record/@batch_id}',
title: '导入实例',
width: 420,
height: 300
});
}
//校验数据
function checkData() {
var allData = $('con_contract_insurance_ds').getAll();
if (allData.length == 0) {
Leaf.showMessage('${l:PROMPT}', '请导入数据!');
} else {
var param = {};
param['batch_id'] = '${/model/batch_id/record/@batch_id}';
Leaf.request({
url: $('con350_import_check_link').getUrl(),
para: param,
success: function (res) {
check_flag = 'Y';
flag = res.result.return_id;
if (res.result.return_id == 0) {
Leaf.showMessage('${l:PROMPT}', '数据有错误,请核对！');
$('con_contract_insurance_ds').query();
} else {
Leaf.SideBar.show({
msg: '核对操作成功！',
duration: 2000
});
$('con_contract_insurance_ds').query();
}
},
scope: this
});
}
}
//提交数据
function submitData() {
//
if (check_flag == 'N') {
Leaf.showMessage('${l:PROMPT}', '请先核对通过再提交，谢谢！');
return;
} else {
if (flag == 0) {
Leaf.showMessage('${l:PROMPT}', '导入的数据有错误，请重新导入，谢谢！');
return;
} else {
$('submitData_btn_id').disable(); //让按钮失效
var param = {};
param['batch_id'] = '${/model/batch_id/record/@batch_id}';
Leaf.request({
url: $('import_save_link').getUrl(),
para: param,
success: function () {
Leaf.SideBar.show({
msg: '提交操作成功！',
duration: 2000
});
quit();
},
scope: this
});
}
}
}
function quit() {
window.location.href = $('con_contract_return_link').getUrl() + '?layout_code=CONTRACT_INSURANCE&function_code=CON350';
}
]]></script>
<a:dataSets>
<a:dataSet id="con_contract_insurance_ds" autoQuery="true" model="cont.CON350.contract_insurance_temp"
queryUrl="${/request/@context_path}/autocrud/cont.CON350.contract_insurance_temp/query?batch_id=${/model/batch_id/record/@batch_id}"/>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
<a:screenTitle/>
<a:toolbarButton click="quit" text="HLS.EXIT"/>
<!-- <a:toolbarButton click="loadData" text="PROMPT.LOADDATA" width="80"/>-->
<!-- <a:toolbarButton click="checkData" text="PROMPT.CHECK"/>-->
<a:toolbarButton id="submitData_btn_id" click="submitData" text="PROMPT.SUBMIT" width="80"/>
</a:screenTopToolbar>
<a:grid bindTarget="con_contract_insurance_ds" marginHeight="200" marginWidth="30" navBar="true">
<a:toolBar>
<a:button type="add"/>
<a:button type="delete"/>
</a:toolBar>
<a:columns>
<a:column name="contract_number" prompt="合同编号" width="120"/>
<a:column name="insurance_number" prompt="保单号" width="120"/>
<!--<a:column name="pattern" prompt="机型" width="120"/>-->
<!-- <a:column name="model_number" prompt="机号" width="120"/>
<a:column name="engine_number" prompt="发动机号" width="120"/>-->
<a:column name="real_insurance_date" renderer="Leaf.formatDate" prompt="保险起始日" width="120"/>
<a:column name="insurance_end_date" renderer="Leaf.formatDate" prompt="保单到期日" width="120"/>
<a:column name="ins_company" prompt="保险公司" width="120"/>
<!-- <a:column name="err_message" prompt="错误信息" width="230"/>-->
</a:columns>
</a:grid>
</a:screenBody>
</a:view>
</a:screen>
src/main/webapp/modules/cont/CON_REPO001/con_contract_repo_create_entrance.lview
View file @ 4465f884
......@@ -16,7 +16,7 @@
param['function_code'] = 'CON301';
param['function_usage'] = 'QUERY';
param['download'] = 'Y';
param['maintain_type'] = 'UPDATE';
param['maintain_type'] = 'QUERY';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('con_contract_repo_get_layout_code_link_id', param, 'con_contract_modify_link', ds_id);
}
......
src/main/webapp/modules/csh/CSH515/csh_transaction_receipt_return_maintain.lview
View file @ 4465f884
......@@ -381,7 +381,7 @@
<a:field name="currency_name_to_display" displayField="currency_name" options="currency_ds" returnField="currency_code_to" valueField="currency_code"/>
<a:field name="currency_code_to"/>
<a:field name="transaction_category" defaultValue="BUSINESS"/>
<a:field name="write_off_flag" defaultValue="NOT"/>
<a:field name="write_off_flag"/>
</a:fields>
<a:events>
<a:event name="update" handler="csh510_receipt_maintain_update"/>
......@@ -461,6 +461,7 @@
<a:column name="can_returned_amount" prompt="可退款金额" renderer="Leaf.formatMoney" align="right"/>
<a:column name="bp_name" prompt="HLS.BP_NAME" align="center"/>
<a:column name="bank_slip_num" prompt="银行流水号" align="center"/>
<a:column name="this_return_amount" prompt="退款中金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="returned_amount" renderer="Leaf.formatMoney" align="right"/>
<!-- <a:column name="posted_flag" prompt="HLS.POST"/> -->
<!-- <a:column name="bank_account_code" prompt="CSH511.BANK_ACCOUNT_CODE"/>
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ 4465f884
......@@ -305,7 +305,7 @@
var regax = /^[A-Z]+$/;
//alert('${/parameter/@unbrand}');
if (bp_class == 'NP') {
debugger
if (card_identity_flag == 'N' || sp_identity_flag == 'N') {
//if (regax.test(extra_nam) && extra_nam.length == 3) {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
......
src/main/webapp/modules/hls/HLS303/bp_agent_entrance.lview
View file @ 4465f884
......@@ -217,6 +217,7 @@
navBar="true">
<a:columns>
<a:column name="bp_code" align="center" prompt="代理商编码" renderer="bp_agent_render" width="120"/>
<a:column name="english_name" align="center" prompt="代理商代码" width="120"/>
<a:column name="bp_name" align="center" prompt="代理商名称" width="280"/>
<a:column name="extra_nam" align="center" prompt="代理商简称" width="130"/>
<!--<a:column name="large_area" align="center" prompt="大区" width="90"/>
......@@ -224,17 +225,20 @@
<a:column name="liv_city_n" align="center" prompt="所在城市" width="90"/>-->
<a:column name="enabled_flag" align="center" prompt="代理商状态" width="100"/>
<!--<a:column name="large_area" align="center" prompt="额度管理" width="120"/>-->
<a:column name="agent_info" align="center" prompt="代理商信息补充" renderer="bp_agent_render" width="100"/>
<!-- <a:column name="agent_info" align="center" prompt="代理商信息补充" renderer="bp_agent_render" width="100"/>
<a:column name="agent_renew" align="center" prompt="代理商续约" renderer="bp_agent_render" width="90"/>
<a:column name="financial_statements_import" align="center" prompt="财务报表导入"
renderer="bp_agent_render" width="90"/>
<a:column name="financial_statements" align="center" prompt="财务报表" renderer="bp_agent_render"
width="80"/>
<!-- <a:column name="enterprise_certification" align="center" prompt="企业认证"-->
<a:column name="enterprise_certification" align="center" prompt="企业认证"-->
<!-- renderer="enterprise_certification_render" width="80"/>-->
<!-- <a:column name="certification_status" align="center" prompt="认证状态" width="80"/>-->
<!-- <a:column name="re_kunnr" align="center" prompt="SAP客户编码" width="100"/>-->
<!-- <a:column name="re_lifnr" align="center" prompt="SAP供应商编码" width="100"/>-->
<!-- <a:column name="certification_status" align="center" prompt="认证状态" width="80"/>&ndash;&gt;-->
<!-- <a:column name="re_kunnr" align="center" prompt="SAP客户编码" width="100"/>-->
<!-- <a:column name="re_lifnr" align="center" prompt="SAP供应商编码" width="100"/>&ndash;&gt;&ndash;&gt;-->
<!--<a:column name="bp_class_n" align="center" prompt="商业伙伴类型" width="120"/>
<a:column name="bp_category_n" align="center" prompt="商业伙伴类别" width="150"/>
<a:column name="agent_type_n" align="center" prompt="代理商类型" width="150"/>
......
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