Skip to content

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

保证金管理模块uat新增调整

parent 9a0cacd5
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 54 deletions
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_query.lwm
View file @ bbc39f6c
......@@ -141,6 +141,7 @@
from csh_transaction tt
where tt.transaction_type = 'DEPOSIT'
and tt.ref_contract_id is null
and tt.reversed_flag='N'
and tt.confirmed_flag not in
('ACCAUDITING', 'NEW', 'CT_REJECTED')
and (nvl(tt.transaction_amount, 0) - nvl(tt.write_off_amount, 0) -
......
src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview
View file @ bbc39f6c
......@@ -104,53 +104,6 @@
records[i].set('_status', 'update');
saveData.push(records[i].data);
}
}else if(transaction_type == 'DEPOSIT'){
//保证金抵扣时无合同按照收款的校验来判断 18083 2023/8/22
if(Ext.isEmpty('${/parameter/@ref_contract_id}')||'${/parameter/@ref_contract_id}' == 'undefined'){
if (all.length != records.length) {
Leaf.showInfoMessage("提示", "该现金事务不支持部分反冲");
return;
}
for (var i = 0; i < records.length; i++) {
records[i].set('reversed_date', head_record.get('reversed_date'));
records[i].set('description', head_record.get('description'));
records[i].set('_status', 'update');
saveData.push(records[i].data);
}
}else{
var gld_batch_id = records[0].get('gld_batch_id');
for (var i = 0; i < records.length; i++) {
if (records[i].get('gld_batch_id') != gld_batch_id) {
Leaf.showInfoMessage("提示", "请选择同一批次号的记录反冲！");
return;
}
records[i].set('reversed_date', head_record.get('reversed_date'));
records[i].set('description', head_record.get('description'));
records[i].set('_status', 'update');
saveData.push(records[i].data);
}
//同批次未勾选的
var allR = $('csh_transaction_receipt_write_off_reverse_detail_result_ds').getAll();
var unR = [];
for (var i = 0; i < allR.length; i++) {
if (records.indexOf(allR[i]) === -1) {
unR.push(allR[i]);
}
}
for (var i = 0; i < unR.length; i++) {
if (unR[i].get('gld_batch_id') == gld_batch_id) {
Leaf.showInfoMessage("提示", "请选择全部同一批次号的记录反冲！");
return;
}
//校验必须先核销批次较大的 18083 2023/8/23
for (var j = 0; j < records.length; j++) {
if (unR[i].get('gld_batch_id')>records[j].get('gld_batch_id')) {
Leaf.showInfoMessage("提示", "此现金事务下存在核销批次较大的批次，请先反冲！");
return;
}
}
}
}
}else {
var gld_batch_id = records[0].get('gld_batch_id');
for (var i = 0; i < records.length; i++) {
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ bbc39f6c
......@@ -512,6 +512,10 @@
var bank_record = $(bank_ds_id).getAll();
var file_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
var file_record = $(file_ds_id).getAll();
var bank_flag=true;
//校验银行账户必须与商业伙伴名称一致 18083 2023/9/5
var bp_name=head_record.get('bp_name');
var bank_flag1=true;
if(bank_record.length>0){
var flag = true;
for(var i=0;i<bank_record.length;i++){
......@@ -523,10 +527,18 @@
flag = false;
}
}
if(!Leaf.isEmpty(bank_record[i].get('bank_account_name'))&&bank_record[i].get('bank_account_name')!=bp_name){
var bank_flag1 = false;
}
if(flag == false){
Leaf.showErrorMessage('${l:PROMPT}', '请填写支行全称（例如：上海浦东发展银行外高桥保税区支行）');
return false;
}
if(bank_flag1 == false){
Leaf.showErrorMessage('${l:PROMPT}', '银行账户户名必须与商业伙伴名称一致');
return false;
}
}
}
//新增校验，承租人(法人)和担保人(法人)商业伙伴的创建，银行账号信息都是要必填(为电子签约做准备)
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview
View file @ bbc39f6c
......@@ -89,6 +89,21 @@
var address_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_address');
var records_addr = $(address_ds_id).getAll();
//校验银行账户名必须与商业伙伴名称一致 18083 2023/9/5
var bp_name=bp_record.get('bp_name');
var bank_flag =true;
if(bank_record.length>0){
for(var i=0;i<bank_record.length;i++){
if(!Leaf.isEmpty(bank_record[i].get('bank_account_name'))&&bank_record[i].get('bank_account_name')!=bp_name){
bank_flag = false;
}
}
}
if(bank_flag == false){
Leaf.showErrorMessage('${l:PROMPT}', '银行账户户名必须与商业伙伴名称一致');
return false;
}
//新增校验，承租人(法人)和担保人(法人)商业伙伴的创建，银行账号信息都是要必填(为电子签约做准备)
if(bp_record.get('bp_class') == 'ORG'){
if(bp_record.get('bp_type')=='TENANT' || bp_record.get('bp_type')=='GUTA_ORG'){
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_req_modify.lview
View file @ bbc39f6c
......@@ -81,7 +81,8 @@
var bank_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_bank_acc_req');
var bank_record = $(bank_ds_id).getAll();
var flag = true;
var bp_name=bp_record.get('bp_name');
var bank_flag =true;
//新增校验，承租人(法人)和担保人(法人)商业伙伴的创建，银行账号信息都是要必填(为电子签约做准备)
if(bp_record.get('bp_class') == 'ORG'){
if(bp_record.get('bp_type')=='TENANT' || bp_record.get('bp_type')=='GUTA_ORG'){
......@@ -121,13 +122,19 @@
flag = false;
}
}
if(!Leaf.isEmpty(bank_record[i].get('bank_account_name'))&&bank_record[i].get('bank_account_name')!=bp_name){
var bank_flag = false;
}
}
}
if(flag == false){
Leaf.showErrorMessage('${l:PROMPT}', '请填写支行全称（例如：上海浦东发展银行外高桥保税区支行）');
return false;
}
if(bank_flag == false){
Leaf.showErrorMessage('${l:PROMPT}', '银行账户户名必须与商业伙伴名称一致');
return false;
}
if(bp_record.get('bp_type')=='THIRD_PARTY'){
var flag = true;
if (bank_record.length <=0){
......
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