Skip to content

L
leaf-hlcm
Commit 1e5379b8 authored by stone's avatar stone
Browse files
Options

Merge branch 'feature/shouxin' into develop 

# Conflicts:
#	src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
[fix] 完善导入的功能，改变退款单据的显示条件
parent 50859ce8
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 93 deletions
src/main/database/Register_function/REGISTER_CSH509.sql
View file @ 1e5379b8
......@@ -21,6 +21,9 @@ sys_function_assign_pkg.func_service_load('CSH509','modules/csh/CSH509/csh_trans
--分配菜单 p_function_group_code=>'DEMO1' 为功能EXERCISES001的菜单
sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CSH_MANAGE',p_function_code=>'CSH509',p_enabled_flag=>'Y',P_USER_ID=>-1);
sys_function_assign_pkg.func_bm_load('CSH509','csh.CSH509.query_roles_info');
end;
/
......
src/main/database/Register_function/REGISTER_CSH510.sql
View file @ 1e5379b8
......@@ -12,7 +12,6 @@ begin
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510N.csh_transaction_list_tmp');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_for_lov');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update');
sys_function_assign_pkg.func_bm_load('CSH509','csh.CSH509.query_roles_info');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update_bp_info');
......
src/main/webapp/WEB-INF/classes/csh/CSH515/csh_transaction_receipt_return_query.lwm
View file @ 1e5379b8
......@@ -107,7 +107,7 @@
<bm:pk-field name="transaction_id"/>
</bm:primary-key>
<bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} and t1.posted_flag=&apos;Y&apos; and t1.reversed_flag=&apos;N&apos; and write_off_flag&lt;&gt; &apos;FULL&apos; and returned_flag &lt;&gt; &apos;FULL&apos; and t1.transaction_type in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;) and (nvl(t1.returned_amount, 0)+nvl(t1.write_off_amount, 0)&lt;t1.transaction_amount)) "/>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} and t1.posted_flag=&apos;Y&apos; and t1.reversed_flag=&apos;N&apos; and write_off_flag&lt;&gt; &apos;FULL&apos; and returned_flag not in ( &apos;FULL&apos;,&apos;RETURN&apos;) and t1.transaction_type in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;) and (nvl(t1.returned_amount, 0)+nvl(t1.write_off_amount, 0)&lt;t1.transaction_amount)) "/>
<bm:data-filter name="query" expression="(t1.confirmed_flag=&apos;APPROVED&apos; and t1.write_off_flag in(&apos;NOT&apos;,&apos;PARTIAL&apos;))"/>
</bm:data-filters>
<bm:query-fields>
......
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
View file @ 1e5379b8
......@@ -29,43 +29,12 @@
if(import_flag==0){
for (var i = 0;i < records.length;i++) {
var record=records[i];
if( record.get('status') == 'ERROR'){
//不将这条数据传递到数组中
continue;
/*if (record.get('status') == 'ERROR') {
//错误的行不导入，其他行正常导入，这里不再判断cuo，在插入数据的时候
Leaf.showMessage('${l:PROMPT}', '导入的数据存在错误，请查看错误信息！');
//将该条数据从导入的ds中
//return;
}*/
//获得周期时间
/* var r_date = record.get('attribute_3');
r_date = Leaf.formatDate(r_date);
Leaf.request({
url: $('get_period_name_id').getUrl(),
para: {
p_date: r_date,
date : new Date().getMilliseconds()
},
success: function(res){
var period_name = res.result.record.period_name,
internal_period_num = res.result.record.internal_period_num;
record.set('period_name', period_name);
record.set('internal_period_num', internal_period_num);
if (period_name) {
record.set('period_name', period_name);
record.set('internal_period_num', internal_period_num);
} else {
record.set('period_name', '');
record.set('internal_period_num', '');
if (record.get('transaction_date')) {
record.set('transaction_date', '');
Leaf.showMessage('${l:PROMPT}', '${l:CSH511.PERIOD_ERROR}');
}
}
},
scope: this
});*/
//否则的话添加必要的字段
record.set('receipt_type','IMPORT');
record.set('bank_account_num',record.get('attribute_1'));
......@@ -82,36 +51,6 @@
record.set('write_off_flag','DISABLED');
//根据银行卡号设置我方的银行账号
/*Leaf.request({
url: $('import_csh_transaction_receipt_data_link_id').getUrl(),
para: {
bank_account_num:record.get('attribute_1'),
bp_bank_account_num:record.get('attribute_8')
},
success: function(res){
record.set('bank_account_id',res.result.bank_account_id);
//根据对方的银行卡号获取商业伙伴信息
record.set('bp_category',res.result.bp_category);
record.set('csh_bp_name',res.result.csh_bp_name);
//i. 若能找到唯一值且该商业伙伴类型为承租人，则代付字段为“否”、商业伙伴字段为匹配到的商业伙伴；
// ii. 若能找到唯一值且该商业伙伴类型为代理店，则代付字段为“是”、商业伙伴字段为匹配到的商业伙伴；
//iii. 若无法找到匹配项或匹配到多项，则代付字段为“是”、商业伙伴字段为空；
if(res.result.bp_id!=-1&&res.result.bp_category=='TENANT'){
record.set('paid_byother_flag','F');
record.set('bp_id',res.result.bp_id);
}else if(res.result.bp_id!=-1&&res.result.bp_category=='AGENCY'){
record.set('paid_byother_flag','T');
record.set('bp_id',res.result.bp_id);
}else{
record.set('paid_byother_flag','T');
record.set('bp_id',null);
}
},
scope: this
});*/
record.set('_status','insert');
saveData.push(record.data);
......@@ -131,8 +70,8 @@
msg: '操作成功',
duration: 2000
});
// backBtn();
//关闭该导入的界面
backBtn();
}
});
});
......
src/main/webapp/modules/csh/CSH515/csh_amount_return.lview
View file @ 1e5379b8
......@@ -54,6 +54,8 @@
// Leaf.showMessage('提示','退还后保证金不足融资余额10%！');
// return;
// }
$L.showConfirm("提示",'确认提交审批？',function(){
var detail_mask = $('${/parameter/@winid}').wrap;
Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
Leaf.request({
......@@ -78,6 +80,9 @@
},
scope: this
});
})
};
//上传按钮
......
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