Skip to content

L
leaf-hlcm
Commit afb79776 authored by 18083's avatar 18083
Browse files
Options

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

parents 2817b3fd e7acb511
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 49 deletions
src/main/webapp/WEB-INF/classes/csh/CSH1400/csh_import_abc_bank.lwm
View file @ afb79776
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
hc.last_updated_by, hc.last_updated_by,
hc.bp_id, hc.bp_id,
hc.bank_account_id, hc.bank_account_id,
hc.bp_category,
'N' re_flag, 'N' re_flag,
NULL AS bank_num_r, NULL AS bank_num_r,
NULL AS bank_receipt_date_r, NULL AS bank_receipt_date_r,
...@@ -80,6 +81,7 @@ ...@@ -80,6 +81,7 @@
hc.last_updated_by, hc.last_updated_by,
hc.bp_id, hc.bp_id,
hc.bank_account_id, hc.bank_account_id,
hc.bp_category,
'Y' re_flag, 'Y' re_flag,
a.bank_num bank_num_r, a.bank_num bank_num_r,
to_char(a.bank_receipt_date, 'yyyy-MM-dd') bank_receipt_date_r, to_char(a.bank_receipt_date, 'yyyy-MM-dd') bank_receipt_date_r,
...@@ -100,11 +102,11 @@ ...@@ -100,11 +102,11 @@
</bm:operations> </bm:operations>
<bm:query-fields> <bm:query-fields>
<!-- <bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= to_date(${@exchange_hour_from},&apos;yyyy-mm-dd&apos;)"/>-->
<!-- <bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= to_date(${@exchange_hour_to},&apos;yyyy-mm-dd&apos;)"/>-->
<bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= ${@exchange_hour_from} "/> <bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= ${@exchange_hour_from} "/>
<bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= ${@exchange_hour_to} "/> <bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= ${@exchange_hour_to} "/>
<bm:query-field name="money_from" queryExpression="t1.total_amount &gt;= ${@money_from} "/>
<bm:query-field name="money_to" queryExpression="t1.total_amount &lt;= ${@money_to} "/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH1400/csh_ocr_abc_bank.lwm
View file @ afb79776
...@@ -148,11 +148,11 @@ ...@@ -148,11 +148,11 @@
</bm:operations> </bm:operations>
<bm:query-fields> <bm:query-fields>
<!-- <bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= to_date(${@exchange_hour_from},&apos;yyyy-mm-dd&apos;)"/>-->
<!-- <bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= to_date(${@exchange_hour_to},&apos;yyyy-mm-dd&apos;)"/>-->
<bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= ${@exchange_hour_from} "/> <bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= ${@exchange_hour_from} "/>
<bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= ${@exchange_hour_to} "/> <bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= ${@exchange_hour_to} "/>
<bm:query-field name="money_from" queryExpression="t1.total_amount &gt;= ${@money_from} "/>
<bm:query-field name="money_to" queryExpression="t1.total_amount &lt;= ${@money_to} "/>
</bm:query-fields> </bm:query-fields>
......
src/main/webapp/modules/csh/CSH1400/csh_abc_excel_import.lview
View file @ afb79776
...@@ -456,7 +456,7 @@ ...@@ -456,7 +456,7 @@
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:form id="success_form" height="400" title="THE_IMPORTED_DATA" width="980"> <a:form id="success_form" height="400" title="收款导入" width="980">
<a:screenTopToolbar> <a:screenTopToolbar>
<a:gridButton click="backBtn" text="退出"/> <a:gridButton click="backBtn" text="退出"/>
<a:gridButton click="import_btn" text="导入"/> <a:gridButton click="import_btn" text="导入"/>
......
src/main/webapp/modules/csh/CSH1400/csh_agricultural_bank_check.lview
View file @ afb79776
...@@ -128,14 +128,14 @@ ...@@ -128,14 +128,14 @@
}); });
} }
} }
function btn001_renderer_button_authority_detail(value, record, name) { // function btn001_renderer_button_authority_detail(value, record, name) {
if (record.isNew==true){ // if (record.isNew==true){
return Leaf.showMessage('提示', '请至少选择一条数据！'); // return Leaf.showMessage('提示', '请至少选择一条数据！');
} // }
} // }
// 提交按钮 // 提交按钮
function agricultural_bank_submit() { function agricultural_bank_submit( ro) {
var orc_save = $('AbcBankDs').getSelected(); var orc_save = $('AbcBankDs').getSelected();
var abc_save = $('OcrQueryDs').getSelected(); var abc_save = $('OcrQueryDs').getSelected();
var param = {}; var param = {};
...@@ -166,10 +166,31 @@ ...@@ -166,10 +166,31 @@
lineOrc['extra_nam'] = orc_save[i].get('extra_nam');//代理店简称 lineOrc['extra_nam'] = orc_save[i].get('extra_nam');//代理店简称
lineOrc['bank_account_id'] = orc_save[i].get('bank_account_id');//id lineOrc['bank_account_id'] = orc_save[i].get('bank_account_id');//id
lineOrc['bp_id'] = orc_save[i].get('bp_id');//id lineOrc['bp_id'] = orc_save[i].get('bp_id');//id
// lineOrc['transaction_type'] = 'DEPOSIT';// lineOrc['bp_category'] = orc_save[i].get('bp_category');
saveOrc.push(lineOrc); saveOrc.push(lineOrc);
recode = orc_save[i];
} }
param['AbcOrc'] = saveOrc; param['AbcOrc'] = saveOrc;
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: {
param: param
},
success: function () {
Leaf.SideBar.show({
msg: '${l:HLS.SUBMIT_SUCCESS}',
duration: 2000
});
$('AbcBankDs').query();
$("OcrQueryDs").query();
returnBack();
},
scope: this
});
});
}else {
Leaf.request({ Leaf.request({
url: $('csh_abc_import_transaction_link').getUrl(), url: $('csh_abc_import_transaction_link').getUrl(),
para: { para: {
...@@ -187,7 +208,7 @@ ...@@ -187,7 +208,7 @@
scope: this scope: this
}); });
} }
}
if (abc_save.length > 0) { if (abc_save.length > 0) {
Leaf.showMessage('提示', '农行回单OCR页面的单据无法提交！'); Leaf.showMessage('提示', '农行回单OCR页面的单据无法提交！');
} }
...@@ -205,12 +226,7 @@ ...@@ -205,12 +226,7 @@
width: 430, width: 430,
height: 390 height: 390
}); });
// win.on('close', function () {
// debugger
// var createWin = $('agricultural_bank_import');
// createWin.close();
// returnAbc();
// });
} }
...@@ -249,6 +265,12 @@ ...@@ -249,6 +265,12 @@
displayField="code_value_name" returnField="collection_classes" valueField="code_value"/> displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<a:field name="collection_classes"/> <a:field name="collection_classes"/>
<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"/>
</a:mapping>
</a:field>
</a:fields> </a:fields>
...@@ -261,15 +283,19 @@ ...@@ -261,15 +283,19 @@
<a:screenTitle/> <a:screenTitle/>
<a:gridButton id="Ocr_Bank_Query" click="agricultural_bank_query" text="HLS.QUERY"/> <a:gridButton id="Ocr_Bank_Query" click="agricultural_bank_query" text="HLS.QUERY"/>
<a:gridButton id="agricultural_bank_save_id" click="agricultural_bank_save" text="保存"/> <a:gridButton id="agricultural_bank_save_id" click="agricultural_bank_save" text="保存"/>
<a:gridButton id="agricultural_bank_import_id" click="agricultural_bank_import" text="明细上传"/> <a:gridButton id="agricultural_bank_import_id" click="agricultural_bank_import" text="收款导入"/>
<a:gridButton id="agricultural_bank_submit_id" click="agricultural_bank_submit" text="提交"/> <a:gridButton id="agricultural_bank_submit_id" click="agricultural_bank_submit" text="提交"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form column="2" title="查询条件"> <a:form column="4" title="查询条件">
<a:datePicker name="exchange_hour_from" bindTarget="query_time" prompt="交易时间从" <a:datePicker name="exchange_hour_from" bindTarget="query_time" prompt="交易时间从"
renderer="Leaf.formatDate"/> renderer="Leaf.formatDate"/>
<a:datePicker name="exchange_hour_to" bindTarget="query_time" prompt="交易时间到" <a:datePicker name="exchange_hour_to" bindTarget="query_time" prompt="交易时间到"
renderer="Leaf.formatDate"/> renderer="Leaf.formatDate"/>
<a:numberField name="money_from" bindTarget="query_time" prompt="交易金额从"
renderer="Leaf.formatMoney"/>
<a:numberField name="money_to" bindTarget="query_time" prompt="交易金额到"
renderer="Leaf.formatMoney"/>
</a:form> </a:form>
<a:tabPanel marginHeight="220" marginWidth="50"> <a:tabPanel marginHeight="220" marginWidth="50">
...@@ -301,30 +327,30 @@ ...@@ -301,30 +327,30 @@
<a:grid id="abc_bank" bindTarget="AbcBankDs" marginHeight="200" marginWidth="80" <a:grid id="abc_bank" bindTarget="AbcBankDs" marginHeight="200" marginWidth="80"
rowRenderer="change_background_color" navBar="true"> rowRenderer="change_background_color" navBar="true">
<a:columns> <a:columns>
<a:column name="bank_num" prompt="账号" width="150" editor="txt" align="center" <a:column name="bank_num" prompt="账号" width="150" align="center"
renderer="checkOcrRender"/> renderer="checkOcrRender"/>
<a:column name="bank_receipt_date" prompt="交易时间" width="100" editor="grid_date" <a:column name="bank_receipt_date" prompt="交易时间" width="100"
renderer="checkOcrRender" align="center"/> renderer="checkOcrRender" align="center"/>
<a:column name="receipt_no" prompt="日志号" width="80" editor="txt" align="left"/> <a:column name="receipt_no" prompt="日志号" width="80" align="left"/>
<a:column name="payer_number" prompt="对方账号" width="100" editor="txt" align="center" renderer="checkOcrRender"/> <a:column name="payer_number" prompt="对方账号" width="100" align="center" renderer="checkOcrRender"/>
<a:column name="payer_name" prompt="对方账号户名" width="100" editor="txt" align="left" <a:column name="payer_name" prompt="对方账号户名" width="100" align="left"
renderer="checkOcrRender" renderer="checkOcrRender"
required="true"/> required="true"/>
<a:column name="bank_name" prompt="对方银行名称" width="100" editor="txt" align="left" <a:column name="bank_name" prompt="对方银行名称" width="100" align="left"
renderer="checkOcrRender"/> renderer="checkOcrRender"/>
<a:column name="beneficiary_name" prompt="收款对象" width="100" editor="txt" 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" <a:column name="paid_byother_flag_desc" prompt="是否代付" width="70" editor="grid_cb"
required="true" required="true"
align="center"/> align="center"/>
<a:column name="total_amount" prompt="收款金额" width="100" editor="txt" align="right" <a:column name="total_amount" prompt="收款金额" width="100" align="right"
renderer="checkOcrRender"/> renderer="checkOcrRender"/>
<a:column name="zy" prompt="摘要" width="80" editor="txt" align="center"/> <a:column name="zy" prompt="摘要" width="80" align="center"/>
<a:column name="collection_classes_desc" prompt="款项分类" width="90" editor="grid_cb" <a:column name="collection_classes_desc" prompt="款项分类" width="90" editor="grid_cb"
required="true" required="true"
align="center"/> align="center"/>
<a:column name="remark" prompt="附言" width="80" align="center" readonly="true"/> <a:column name="remark" prompt="附言" width="80" align="center" readonly="true"/>
<a:column name="extra_nam" prompt="代理店简称" width="100" align="center" readonly="true"/> <a:column name="extra_nam" prompt="代理店简称" width="100" align="center" readonly="true"/>
<a:column name="guarantor_name_duty" prompt="担保人履行担保义务" width="145" editor="grid_cb" <a:column name="guarantor_name_duty" prompt="担保人履行担保义务" width="145"
align="center"/> align="center"/>
</a:columns> </a:columns>
<a:editors> <a:editors>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ afb79776
...@@ -511,7 +511,7 @@ ...@@ -511,7 +511,7 @@
url:$('agricultural_bank_link').getUrl(), url:$('agricultural_bank_link').getUrl(),
title: '农行回单', title: '农行回单',
width: 1500, width: 1500,
height: 590 height: 580
}); });
} }
......
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