Skip to content

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

农行代扣运维I-21120

parent fe217118
Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 24 deletions
src/main/webapp/WEB-INF/classes/csh/CSH1400/csh_import_abc_bank.lwm
View file @ ac0c2df4
......@@ -15,7 +15,8 @@
hc.bank_name,
hc.beneficiary_name,
decode(hc.paid_byother_flag_desc, 'Y', '是', 'N', '否') paid_byother_flag_desc,
decode(hc.collection_classes_desc,
decode(hc.paid_byother_flag_desc, 'Y', 'T', 'N', 'F') paid_byother_flag,
decode(hc.collection_classes_desc,
'DEPOSIT',
'保证金类',
'NON_DEPOSIT',
......@@ -30,7 +31,9 @@
hc.zy,
hc.remark,
hc.extra_nam,
decode(hc.guarantor_name_duty, 'Y', '是', 'N', '否') guarantor_name_duty,
(select hbm.bp_code from hls_bp_master hbm where hbm.extra_nam=hc.extra_nam) bp_code,
decode(hc.guarantor_name_duty, 'Y', '是', 'N', '否') guarantor_name_duty,
decode(hc.guarantor_name_duty, 'Y', '是', 'N', '否') guarantor_name_duty_desc,
hc.create_trx_flag,
hc.creation_date,
hc.created_by,
......@@ -62,6 +65,7 @@
hc.bank_name,
hc.beneficiary_name,
decode(hc.paid_byother_flag_desc, 'Y', '是', 'N', '否') paid_byother_flag_desc,
decode(hc.paid_byother_flag_desc, 'Y', 'T', 'N', 'F') paid_byother_flag,
decode(hc.collection_classes_desc,
'DEPOSIT',
'保证金类',
......@@ -77,7 +81,9 @@
hc.zy,
hc.remark,
hc.extra_nam,
decode(hc.guarantor_name_duty, 'Y', '是', 'N', '否') guarantor_name_duty,
(select hbm.bp_code from hls_bp_master hbm where hbm.extra_nam=hc.extra_nam) bp_code,
decode(hc.guarantor_name_duty, 'Y', '是', 'N', '否') guarantor_name_duty,
decode(hc.guarantor_name_duty, 'Y', '是', 'N', '否') guarantor_name_duty_desc,
hc.create_trx_flag,
hc.creation_date,
hc.created_by,
......
src/main/webapp/modules/csh/CSH1400/csh_agricultural_bank_check.lview
View file @ ac0c2df4
......@@ -16,6 +16,12 @@
url="${/request/@context_path}/modules/csh/CSH1400/csh_abc_import_transaction.lsc"/>
<a:link id="ocr_query_link_id"
url="${/request/@context_path}/modules/efile/EFILE1100/efile_doc_import_new.lsc"/>
<a:link id="extra_nam_csh_transaction_receipt_data_link_id"
model="csh.CSH511.check_extra_nam_count" modelaction="update"/>
<a:link id="get_extra_nam_csh_transaction_receipt_data_link_id"
model="csh.CSH511.query_extra_nam_data" modelaction="update"/>
<a:link id="get_extra_code_csh_transaction_receipt_data_link_id"
model="csh.CSH511.query_extra_nam_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[
Leaf.onReady(function () {
//只开放按钮权限给债权内勤
......@@ -38,11 +44,14 @@
$("OcrQueryDs").query();
$("AbcBankDs").query();
}
function returnBack() {
// 刷新页面
top.refreshFrame();
}
//查询按钮
function agricultural_bank_query() {
$("OcrQueryDs").query();
......@@ -105,7 +114,7 @@
lineOrc['paid_byother_flag_desc'] = orc_save[i].get('paid_byother_flag_desc');
lineOrc['payer_name'] = orc_save[i].get('payer_name');
lineOrc['collection_classes_desc'] = orc_save[i].get('collection_classes_desc');
lineOrc['guarantor_name_duty'] = orc_save[i].get('guarantor_name_duty');
lineOrc['guarantor_name_duty'] = orc_save[i].get('guarantor_name_duty_desc');
lineOrc['bank_receipt_date'] = orc_save[i].get('bank_receipt_date');
lineOrc['bank_num'] = orc_save[i].get('bank_num');
lineOrc['payer_number'] = orc_save[i].get('payer_number');
......@@ -131,7 +140,8 @@
},
scope: this
});
}
}
// 提交按钮
......@@ -166,14 +176,14 @@
lineOrc['extra_nam'] = orc_save[i].get('extra_nam');//代理店简称
lineOrc['bank_account_id'] = orc_save[i].get('bank_account_id');//id
lineOrc['bp_id'] = orc_save[i].get('bp_id');//id
lineOrc['bp_category'] = orc_save[i].get('bp_category');
lineOrc['bp_category'] = orc_save[i].get('bp_category');
saveOrc.push(lineOrc);
recode = orc_save[i];
}
param['AbcOrc'] = saveOrc;
if(recode.get('re_flag')=='N'){
Leaf.showConfirm('特别注意', '日志号, <font color="red">'+recode.get('receipt_no')+'</font>,的单据未匹配到对应回单数据，是否确认提交？', function () {
Leaf.request({
Leaf.request({
url: $('csh_abc_import_transaction_link').getUrl(),
para: {
param: param
......@@ -185,7 +195,7 @@
});
$('AbcBankDs').query();
$("OcrQueryDs").query();
// returnBack();
//returnBack();
},
scope: this
});
......@@ -203,7 +213,7 @@
});
$('AbcBankDs').query();
$("OcrQueryDs").query();
// returnBack();
//returnBack();
},
scope: this
});
......@@ -222,8 +232,8 @@
id: 'agricultural_bank_import_wind',
params: {
winid: 'agricultural_bank_import_wind',
abc_ds:'AbcBankDs',
ocr_ds:'OcrQueryDs',
abc_ds:'AbcBankDs',
ocr_ds:'OcrQueryDs',
},
url: $('agricultural_bank_import_link').getUrl(),
title: '农行回单',
......@@ -257,6 +267,153 @@
});
}
//当也没变动时候,触发事件
function update_import_data(ds, record, name, value, oldvalue) {
if (name =='paid_byother_flag'){
var paid_byother_flag = record.get('paid_byother_flag');
//深圳美鹏
var bp_code = record.get('bp_code');
//dev环境下的深圳美鹏的code bp_code == 'C00010168'
//uat 和生产环境下深圳美鹏的code D00010001 D00000009
if (paid_byother_flag == 'T'){
//判断是否是深圳美鹏code
if (bp_code == 'D00010001' || bp_code == 'D00000009'){
record.set('guarantor_name_duty','Y');
record.set('guarantor_name_duty_desc','是');
record.getField('guarantor_name_duty_desc').setReadOnly(false);
}else if (bp_code == 'C00010168'){
record.set('guarantor_name_duty','Y');
record.set('guarantor_name_duty_desc','是');
record.getField('guarantor_name_duty_desc').setReadOnly(false);
}else {
record.set('guarantor_name_duty_desc',' ');
record.set('guarantor_name_duty','NULL');
record.getField('guarantor_name_duty_desc').setReadOnly(true);
}
}else{
if (bp_code == 'D00010001' || bp_code == 'D00000009' || bp_code == 'C00010168'){
record.set('guarantor_name_duty_desc','否');
record.set('guarantor_name_duty','N');
record.getField('guarantor_name_duty_desc').setReadOnly(true);
}else{
record.set('guarantor_name_duty_desc',' ');
record.set('guarantor_name_duty','NULL');
record.getField('guarantor_name_duty_desc').setReadOnly(true);
}
}
}else if (name == 'bp_name_code'){
var bp_id = record.get('bp_id');
var paid_byother_flag = record.get('paid_byother_flag');
Leaf.request({
url: $('extra_nam_csh_transaction_receipt_data_link_id').getUrl(),
para: {bp_id : bp_id},
scope: this,
success: function (res) {
//先查询数量
var count = res.result.extra_name_count;
if (count == 1){
//根据数量，一个直接查询显示，多个显示空
Leaf.request({
url: $('get_extra_nam_csh_transaction_receipt_data_link_id').getUrl(),
para: {bp_id : bp_id},
scope: this,
success: function (res) {
var extra_name = res.result.extra_name;
record.set('extra_nam',extra_name);
var extra_id = bp_id;
Leaf.request({
url: $('get_extra_code_csh_transaction_receipt_data_link_id').getUrl(),
para: {bp_id : extra_id},
scope: this,
success: function (res) {
var unit_code = res.result.unit_code;
// alert(unit_code);
if (unit_code == 241 || unit_code == 610){
if (paid_byother_flag == null){
//dev环境code --- C00010168(每次部署uat或者生产，需要将下面代码注释)
// record.set('bp_code','C00010168');
//uat和生产有两个深圳美鹏code(每次部署uat或者生产，需求解除下面代码注释)
if (unit_code == 241){
record.set('bp_code','D00010001');
}else if (unit_code == 610){
record.set('bp_code','D00000009');
}
record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc','否');
record.set('guarantor_name_duty','N');
}else if (paid_byother_flag == 'T'){
//dev环境code --- C00010168(每次部署uat或者生产，需要将下面代码注释)
// record.set('bp_code','C00010168');
//uat和生产有两个深圳美鹏code(每次部署uat或者生产，需求解除下面代码注释)
if (unit_code == 241){
record.set('bp_code','D00010001');
}else if (unit_code == 610){
record.set('bp_code','D00000009');
}
record.set('guarantor_name_duty','Y');
record.set('guarantor_name_duty_desc','是');
record.getField('guarantor_name_duty_desc').setReadOnly(false);
}else {
//dev环境code --- C00010168(每次部署uat或者生产，需要将下面代码注释)
// if (unit_code == 241 || unit_code == 610){
// record.set('bp_code','C00010168');
// }else{
// record.set('bp_code','C00000000');
// }
//uat和生产有两个深圳美鹏code(每次部署uat或者生产，需求解除下面代码注释)
if (unit_code == 241){
record.set('bp_code','D00010001');
}else if (unit_code == 610){
record.set('bp_code','D00000009');
}else{
record.set('bp_code','C00000000');
}
record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc','否');
record.set('guarantor_name_duty','N');
}
}else {
record.set('bp_code','C00000000');
record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc',' ');
record.set('guarantor_name_duty','NULL');
}
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
}
});
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
}
});
}
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
}
});
}
}
]]></script>
......@@ -269,6 +426,12 @@
<a:dataSet id="query_time">
</a:dataSet>
<a:dataSet id="paid_byother_flag_ds">
<a:datas>
<a:record code_value="T" code_value_name="是"/>
<a:record code_value="F" code_value_name="否"/>
</a:datas>
</a:dataSet>
<a:dataSet id="OcrQueryDs" autoQuery="true" autoPageSize="true" queryDataSet="query_time"
model="csh.CSH1400.csh_ocr_abc_bank"
queryUrl="${/request/@context_path}/autocrud/csh.CSH1400.csh_ocr_abc_bank/query"
......@@ -281,13 +444,15 @@
selectable="true">
<a:fields>
<!-- 是否代付-->
<a:field name="paid_byother_flag_desc" required="true" options="yes_no_ds"
returnField="paid_byother_flag" displayField="code_value_name" valueField="code_value"/>
<!--<a:field name="paid_byother_flag_desc" required="true" options="yes_no_ds"
returnField="paid_byother_flag" displayField="code_value_name" valueField="code_value"/>-->
<a:field name="paid_byother_flag_desc" required="true" options="paid_byother_flag_ds"
returnField="paid_byother_flag" displayField="code_value_name" valueField="code_value"/>
<a:field name="paid_byother_flag" required="true"/>
<!-- 担保人履行担保义务-->
<a:field name="guarantor_name_duty" options="yes_no_ds"
returnField="paid_byother_flag" displayField="code_value_name" valueField="code_value"/>
<a:field name="paid_byother_flag"/>
<a:field name="guarantor_name_duty_desc" options="yes_no_ds"
returnField="guarantor_name_duty" displayField="code_value_name" valueField="code_value"/>
<a:field name="guarantor_name_duty"/>
<!-- 款项分类-->
<a:field name="collection_classes_desc" required="true" options="collection_classes_ds"
displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
......@@ -298,14 +463,17 @@
<a:mapping>
<a:map from="bp_name" to="beneficiary_name"/>
<a:map from="bp_id" to="bp_id"/>
<a:map from="bp_code" to="bp_name_code"/>
<a:map from="extra_nam" to="extra_nam"/>
<a:map from="bp_category" to="bp_category"/>
<a:map from="bp_category" to="bp_category"/>
</a:mapping>
</a:field>
<a:field name="bp_code"/>
</a:fields>
<a:events>
<a:event name="update" handler="update_import_data"/>
</a:events>
</a:dataSet>
</a:dataSets>
......@@ -326,9 +494,9 @@
<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">
......@@ -343,7 +511,7 @@
<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="payer_bank" prompt="付款方开户行" width="100" align="left"/>
<a:column name="payer_bank" prompt="付款方开户行" width="100" align="left" />
<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"/>
......@@ -368,7 +536,7 @@
<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"/>
<a:column name="bank_name" prompt="对方银行名称" width="100" align="left" />
<a:column name="beneficiary_name" prompt="收款对象" width="100" editor="grid_lov" align="left" required="true"/>
<a:column name="paid_byother_flag_desc" prompt="是否代付" width="70" editor="grid_cb"
required="true"
......@@ -381,7 +549,8 @@
align="center"/>
<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="guarantor_name_duty" prompt="担保人履行担保义务" width="145"
<a:column name="bp_code" prompt="代理店简称code" hidden="true"/>
<a:column name="guarantor_name_duty_desc" prompt="担保人履行担保义务" width="145"
align="center"/>
</a:columns>
<a:editors>
......
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