Skip to content

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

农行回单修改

parent c7f970c2
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 36 deletions
src/main/webapp/WEB-INF/classes/csh/CSH1400/csh_import_abc_bank.lwm
View file @ 9fbc9711
......@@ -87,7 +87,7 @@
to_char(a.bank_receipt_date, 'yyyy-MM-dd') bank_receipt_date_r,
a.payer_number payer_number_r,
a.payer_name payer_name_r,
a.bank_name bank_name_r,
a.payer_bank bank_name_r,
a.total_amount total_amount_r
FROM hlcm_ele_trx_import_itfc hc, hlcm_ele_abc_bank_slip_trx a
where hc.create_trx_flag = 'Y'
......
src/main/webapp/WEB-INF/classes/csh/CSH1400/csh_ocr_abc_bank.lwm
View file @ 9fbc9711
......@@ -10,7 +10,7 @@
hx.receipt_no,
hx.payer_name,
hx.payer_number,
hx.bank_name,
hx.payer_bank,
(case
when (select count(bp_name)
from hls_bp_master
......@@ -55,7 +55,7 @@
NULL AS bank_receipt_date_r,
NULL AS payer_number_r,
NULL AS payer_name_r,
NULL AS bank_name_r,
NULL AS payer_bank_r,
NULL AS total_amount_r,
COALESCE((SELECT v.code_value_name
FROM sys_code_values_v v,
......@@ -80,7 +80,7 @@
hx.receipt_no,
hx.payer_name,
hx.payer_number,
hx.bank_name,
hx.payer_bank,
(case
when (select count(bp_name)
from hls_bp_master
......@@ -125,7 +125,7 @@
to_char(a.bank_receipt_date, 'yyyy-MM-dd') bank_receipt_date_r,
a.payer_number payer_number_r,
a.payer_name payer_name_r,
a.bank_name bank_name_r,
a.bank_name payer_bank_r,
a.total_amount total_amount_r,
COALESCE((SELECT v.code_value_name
FROM sys_code_values_v v,
......
src/main/webapp/modules/csh/CSH1400/csh_agricultural_bank_check.lview
View file @ 9fbc9711
......@@ -31,7 +31,6 @@
});
function returnAbc() {
// 刷新页面
$("OcrQueryDs").query();
......@@ -48,15 +47,17 @@
$("OcrQueryDs").query();
$("AbcBankDs").query();
}
// 背景渲染农行回单
function change_background_color(record) {
if (record.get('re_flag') == 'Y') {
return 'background-color:#DC143C;'
}
}
// 字段渲染农行回单
function checkOcrRender(value, record, name) {
if (record.get('re_flag') == 'Y') {
if (record.get('re_flag') == 'Y' && !Ext.isEmpty(value)) {
var name_r = name + '_r';
var value_r = record.get(name_r);//OCR数据
if (value != value_r) {
......@@ -77,13 +78,16 @@
}
}
} else {
if (name == 'total_amount') {
return '<font color="black">' + Leaf.formatMoney(value) + '</font>'
} else if (name == 'bank_receipt_date') {
return '<font color="black">' + Leaf.formatDate(value) + '</font>'
} else {
return '<font color="black">' + value + '</font>'
if (!Ext.isEmpty(value)) {
if (name == 'total_amount') {
return '<font color="black">' + Leaf.formatMoney(value) + '</font>'
} else if (name == 'bank_receipt_date') {
return '<font color="black">' + Leaf.formatDate(value) + '</font>'
} else {
return '<font color="black">' + value + '</font>'
}
}
}
}
......@@ -128,6 +132,7 @@
});
}
}
// function btn001_renderer_button_authority_detail(value, record, name) {
// if (record.isNew==true){
// return Leaf.showMessage('提示', '请至少选择一条数据！');
......@@ -135,7 +140,7 @@
// }
// 提交按钮
function agricultural_bank_submit( ro) {
function agricultural_bank_submit(ro) {
var orc_save = $('AbcBankDs').getSelected();
var abc_save = $('OcrQueryDs').getSelected();
var param = {};
......@@ -171,8 +176,8 @@
recode = orc_save[i];
}
param['AbcOrc'] = saveOrc;
if(recode.get('re_flag')=='N'){
Leaf.showConfirm('特别注意','日志号, <font color="red">'+recode.get('receipt_no')+'</font>,的单据未匹配到对应回单数据，是否确认提交？',function (){
if (recode.get('re_flag') == 'N') {
Leaf.showConfirm('特别注意', '日志号, <font color="red">' + recode.get('receipt_no') + '</font>,的单据未匹配到对应回单数据，是否确认提交？', function () {
Leaf.request({
url: $('csh_abc_import_transaction_link').getUrl(),
para: {
......@@ -185,12 +190,12 @@
});
$('AbcBankDs').query();
$("OcrQueryDs").query();
returnBack();
//returnBack();
},
scope: this
});
});
}else {
} else {
Leaf.request({
url: $('csh_abc_import_transaction_link').getUrl(),
para: {
......@@ -203,7 +208,7 @@
});
$('AbcBankDs').query();
$("OcrQueryDs").query();
returnBack();
// returnBack();
},
scope: this
});
......@@ -265,7 +270,7 @@
displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<a:field name="collection_classes"/>
<a:field name="beneficiary_name" lovGridHeight="350" lovHeight="500" lovLabelWidth="90"
<a:field name="beneficiary_name" lovGridHeight="350" lovHeight="500" lovLabelWidth="90"
lovService="basic.hls_bp_master_v_for_agent_lov" lovWidth="550" title="HLS.BP_TITLE">
<a:mapping>
<a:map from="bp_name" to="beneficiary_name"/>
......@@ -293,27 +298,33 @@
<a:datePicker name="exchange_hour_to" bindTarget="query_time" prompt="交易时间到"
renderer="Leaf.formatDate"/>
<a:numberField name="money_from" bindTarget="query_time" prompt="交易金额从"
renderer="Leaf.formatMoney"/>
renderer="Leaf.formatMoney"/>
<a:numberField name="money_to" bindTarget="query_time" prompt="交易金额到"
renderer="Leaf.formatMoney"/>
renderer="Leaf.formatMoney"/>
</a:form>
<a:tabPanel marginHeight="220" marginWidth="50">
<a:tabs>
<a:tab prompt="OCR数据" width="110">
<a:grid id="ocr" bindTarget="OcrQueryDs" marginHeight="200" marginWidth="80" navBar="true" rowRenderer="change_background_color">
<a:grid id="ocr" bindTarget="OcrQueryDs" marginHeight="200" marginWidth="80" navBar="true"
rowRenderer="change_background_color">
<a:columns>
<a:column name="bank_num" prompt="收款账号" width="150" align="center" renderer="checkOcrRender"/>
<a:column name="bank_num" prompt="收款账号" width="150" align="center"
renderer="checkOcrRender"/>
<a:column name="bank_receipt_date" prompt="交易时间" width="100" align="center"
renderer="checkOcrRender"/>
<a:column name="receipt_no" prompt="回单编号" width="80" align="left"/>
<a:column name="payer_number" prompt="付款方账号" width="100" align="center" renderer="checkOcrRender"/>
<a:column name="payer_name" prompt="付款方户名" width="100" align="left" renderer="checkOcrRender"/>
<a:column name="bank_name" prompt="付款方开户行" width="100" align="left" renderer="checkOcrRender"/>
<a:column name="payer_number" prompt="付款方账号" width="100" align="center"
renderer="checkOcrRender"/>
<a:column name="payer_name" prompt="付款方户名" width="100" align="left"
renderer="checkOcrRender"/>
<a:column name="payer_bank" prompt="付款方开户行" width="100" align="left"
renderer="checkOcrRender"/>
<a:column name="bp_name" prompt="收款对象" width="100" align="left"/>
<a:column name="paid_byother_flag_desc" prompt="是否代付" width="70" align="center"/>
<a:column name="total_amount" prompt="金额" width="100" align="right" renderer="checkOcrRender"/>
<a:column name="total_amount" prompt="金额" width="100" align="right"
renderer="checkOcrRender"/>
<a:column name="zy" prompt="摘要" width="80" align="center"/>
<a:column name="collection_classes_desc" prompt="款项分类" width="90" align="center"/>
<a:column name="remark" prompt="附言" width="80" align="center"/>
......@@ -327,24 +338,26 @@
<a:grid id="abc_bank" bindTarget="AbcBankDs" marginHeight="200" marginWidth="80"
rowRenderer="change_background_color" navBar="true">
<a:columns>
<a:column name="bank_num" prompt="账号" width="150" align="center"
<a:column name="bank_num" prompt="账号" width="150" align="center"
renderer="checkOcrRender"/>
<a:column name="bank_receipt_date" prompt="交易时间" width="100"
renderer="checkOcrRender" align="center"/>
<a:column name="receipt_no" prompt="日志号" width="80" align="left"/>
<a:column name="payer_number" prompt="对方账号" width="100" align="center" renderer="checkOcrRender"/>
<a:column name="payer_name" prompt="对方账号户名" width="100" align="left"
<a:column name="receipt_no" prompt="日志号" width="80" align="left"/>
<a:column name="payer_number" prompt="对方账号" width="100" align="center"
renderer="checkOcrRender"/>
<a:column name="payer_name" prompt="对方账号户名" width="100" align="left"
renderer="checkOcrRender"
required="true"/>
<a:column name="bank_name" prompt="对方银行名称" width="100" align="left"
<a:column name="bank_name" prompt="对方银行名称" width="100" align="left"
renderer="checkOcrRender"/>
<a:column name="beneficiary_name" prompt="收款对象" width="100" editor="grid_lov" align="left"/>
<a:column name="beneficiary_name" prompt="收款对象" width="100" editor="grid_lov"
align="left"/>
<a:column name="paid_byother_flag_desc" prompt="是否代付" width="70" editor="grid_cb"
required="true"
align="center"/>
<a:column name="total_amount" prompt="收款金额" width="100" align="right"
<a:column name="total_amount" prompt="收款金额" width="100" align="right"
renderer="checkOcrRender"/>
<a:column name="zy" prompt="摘要" width="80" align="center"/>
<a:column name="zy" prompt="摘要" width="80" align="center"/>
<a:column name="collection_classes_desc" prompt="款项分类" width="90" editor="grid_cb"
required="true"
align="center"/>
......
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