Skip to content

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

Merge branch 'remote_dev' of https://hel.hand-china.com/hlcm/leaf-hlcm into remote_dev

parents 5cd16463 548b70d2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 676 additions and 51 deletions
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm
View file @ f9bedbd2
......@@ -88,6 +88,10 @@
<bm:field name="bank_branch_name" expression="(select bank_branch_name from csh_bank_branch where bank_branch_id = (select bank_branch_id from csh_bank_account where bank_account_id = t1.bank_account_id))" forInsert="false" forUpdate="false"/>
<bm:field name="use_money_amount" expression="(select t1.transaction_amount-t1.returned_amount from dual)" forInsert="false" forUpdate="false"/>
<bm:field name="opposite_band_na"/>
<bm:field name="opposite_band_name" expression="(select a.bank_full_name from hls_bp_master_bank_account a where a.bp_id = t1.bp_id and a.enabled_flag = 'Y' and rownum=1)"/>
<bm:field name="bp_bank_account_number" expression="(select a.Bank_Account_Num from hls_bp_master_bank_account a where a.bp_id = t1.bp_id and a.enabled_flag = 'Y' and rownum=1)"/>
<bm:field name="bp_bank_branch_name" expression="(select a.Bank_Branch_Name from hls_bp_master_bank_account a where a.bp_id = t1.bp_id and a.enabled_flag = 'Y' and rownum=1)"/>
<bm:field name="bank_sum" expression="(select COUNT(*) as bank_sum from hls_bp_master_bank_account a where a.bp_id = t1.bp_id and a.enabled_flag = 'Y')"/>
<bm:field name="applying_amount" expression="(nvl((select sum(cr.return_amount) from csh_transaction_return cr where cr.transaction_id=t1.transaction_id and cr.status='APPROVING'),0))" forInsert="false" forUpdate="false"/>
<bm:field name="return_id" expression="(select cr.return_id from csh_transaction_return cr where cr.transaction_id=t1.transaction_id and cr.status='APPROVING')" forInsert="false" forUpdate="false"/>
<bm:field name="banka"/>
......
src/main/webapp/WEB-INF/classes/prj/PRJ500D/update_prj_credit_code.lwm 0 → 100644
View file @ f9bedbd2
<?xml version="1.0" encoding="UTF-8"?>
<!--
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
Begin
update prj_project_bp pb
set pb.credit_code = ${@credit_code}
where pb.project_id = ${@project_id}
and pb.bp_class = 'ORG'
and pb.bp_category = 'TENANT';
End;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/password_expired_update.lwm 0 → 100644
View file @ f9bedbd2
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="execute">
<bm:parameters>
<bm:parameter name="password_session_id" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@password_session_id"/>
</bm:parameters>
<bm:update-sql><![CDATA[
begin
sys_user_pkg.check_password_by_owner(
p_user_name =>${@user_name},
p_old_password => ${@current_password},
p_new_password => ${@update_password},
p_ip_address => ${/request/@address},
p_password_session_id =>${@password_session_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
sys_user_pkg.change_password_by_owner(
p_user_name =>${@user_name},
p_old_password => ${@current_password},
p_new_password => ${@update_password},
p_ip_address => ${/request/@address}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/sys_user_login_with_userid.lwm 0 → 100644
View file @ f9bedbd2
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="execute">
<bm:parameters>
<bm:parameter name="user_name" dataType="java.lang.String" input="true" output="false"/>
<bm:parameter name="encryted_session_id" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@encryted_session_id"/>
<bm:parameter name="message" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@message"/>
</bm:parameters>
<bm:update-sql><![CDATA[
begin
sys_login_pkg.expired_password(
p_user_name =>${@user_name},
p_encryted_session_id =>${@encryted_session_id},
p_error_message =>${@message}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/wx/WX100/con_ele_file_size_check.lwm
View file @ f9bedbd2
......@@ -27,6 +27,7 @@ select F.ATTACHMENT_ID,
BEGIN
UPDATE fnd_atm_attachment f
set f.if_same = ${@if_same},
f.new_file_size = ${@new_file_size},
f.last_update_date=sysdate,
f.last_updated_by= nvl(${/session/@user_id},1)
where f.attachment_id=${@attachment_id}
......
src/main/webapp/WEB-INF/server-script/layoutconfig/jcredit_entrance_confirm_f_credit_hd_queryfields.js
View file @ f9bedbd2
var add_datafilters = [
{
name: '',
expression: "((t1.credit_status in ('REJECT','APPROVING_OP','APPROVED') and ${/session/@user_id}=11319) or (t1.credit_status in ('REJECT','APPROVING_OP','APPROVED','APPROVING') and ${/session/@user_id}!=11319))"
expression: "((t1.credit_status in ('REJECT','APPROVING_OP','APPROVED') and ${/session/@role_id}=2554) or (t1.credit_status in ('REJECT','APPROVING_OP','APPROVED','APPROVING') and ${/session/@role_id}!=2554))"
},
{
name : "unit_code",
......
src/main/webapp/WEB-INF/server-script/layoutconfig/jcredit_entrance_confirm_f_credit_op_queryfields.js
View file @ f9bedbd2
var add_datafilters = [
{
name: '',
expression: "((t1.credit_status in ('REJECT','APPROVING_OP','APPROVED') and ${/session/@user_id}=11319) or (t1.credit_status in ('REJECT','APPROVING','APPROVED') and ${/session/@user_id}=10399) or (t1.credit_status in ('REJECT','APPROVING_OP','APPROVED','APPROVING') and ${/session/@user_id} not in (11319,10399)))"
expression: "((t1.credit_status in ('REJECT','APPROVING_OP','APPROVED') and ${/session/@role_id}=2554) or (t1.credit_status in ('REJECT','APPROVING_OP','APPROVED','APPROVING') and ${/session/@role_id} != 2554))"
},
{
name : "unit_code",
......
src/main/webapp/WEB-INF/view/login.html
View file @ f9bedbd2
This diff is collapsed.
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return.lview
View file @ f9bedbd2
......@@ -377,18 +377,36 @@
if (res.result.record.v_flag=='Y'){
deposit_record.set('csh_return_bp_name', record.get('bp_name'));
deposit_record.set('csh_return_bp_id', record.get('bp_id'));
if(record.get('bank_sum')==1){
deposit_record.set('opposite_band_na', record.get('opposite_band_name'));
deposit_record.set('bp_bank_account_num', record.get('bp_bank_account_number'));
deposit_record.set('bp_bank_branch_name', record.get('bp_bank_branch_name'));
}else {
deposit_record.set('opposite_band_na','');
deposit_record.set('bp_bank_account_num','');
deposit_record.set('bp_bank_branch_name','');
}
}else{
deposit_record.set('csh_return_bp_name','');
deposit_record.set('csh_return_bp_id','');
deposit_record.set('opposite_band_na','');
deposit_record.set('bp_bank_account_num','');
deposit_record.set('bp_bank_branch_name','');
}
},
failure: function () {
deposit_record.set('csh_return_bp_name','');
deposit_record.set('csh_return_bp_id','');
deposit_record.set('opposite_band_na','');
deposit_record.set('bp_bank_account_num','');
deposit_record.set('bp_bank_branch_name','');
},
error: function () {
deposit_record.set('csh_return_bp_name','');
deposit_record.set('csh_return_bp_id','');
deposit_record.set('opposite_band_na','');
deposit_record.set('bp_bank_account_num','');
deposit_record.set('bp_bank_branch_name','');
},
scope: this
});
......@@ -398,7 +416,7 @@
deposit_record.set('contract_number', record.get('contract_number'));
deposit_record.set('bp_id_telnet_code', record.get('bp_id_telnet_code'));
deposit_record.set('bp_id_telnet_n', record.get('bp_id_telnet_n'));
deposit_record.set('bp_bank_branch_name', record.get('bp_bank_branch_name'));
//deposit_record.set('bp_bank_branch_name', record.get('bp_bank_branch_name'));
deposit_record.set('deposit_trans_type_desc', record.get('deposit_trans_type_desc'));
deposit_record.set('vender_contract_number', record.get('vender_contract_number'));
deposit_record.set('vender_project_number', record.get('vender_project_number'));
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/cus_deposit_write_off_return_maintain.lview
View file @ f9bedbd2
......@@ -143,8 +143,8 @@
params: {
return_id: return_id,
bp_bank_account_name: record.get('bp_bank_account_name'),
opposite_band_na: record.get('opposite_band_na'),
bp_bank_account_num: record.get('bp_bank_account_num'),
opposite_band_na: record.get('opposite_band_name'),
bp_bank_account_num: record.get('bp_bank_account_number'),
left_amount: record.get('left_amount'),
ref_contract_id: record.get('ref_contract_id'),
winId: 'csh_transaction_deposit_link_winid'
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ f9bedbd2
......@@ -195,8 +195,11 @@
//删除角色按钮
window['${/parameter/@layout_code}_G_ROLE_USER_BUTTON1_layout_dynamic_tab_click'] = function () {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var records = $(ds_id).getSelected();
var bp_records = $(bp_ds_id).getCurrentRecord();
if (!records.length) {
Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录');
return false;
......@@ -206,14 +209,27 @@
//}
//alert(records.length);
for (var i = 0; i < records.length; i++) {
var primary_flag = records[i].get('primary_flag');
if (primary_flag == 'Y') {
Leaf.showMessage('${l:PROMPT}', '主角色无法被删除！');
continue;
} else {
if(!Ext.isEmpty(bp_records.get('bp_id'))){
if(!Ext.isEmpty(records[i].get('primary_flag_bak'))){
if(records[i].get('primary_flag_bak') == 'Y'){
$L.showMessage('提示','主角色无法被删除！');
return;
}
}
$(ds_id).remove(records[i]);
}else{
if(records[i].get('primary_flag') == 'Y'){
$L.showMessage('提示','主角色无法被删除！');
return;
}
$(ds_id).remove(records[i]);
}
}
if(!Ext.isEmpty(bp_records.get('bp_id'))){
setTimeout(function () {
$(ds_id).query();
}, 100)
}
};
//法人供应商经办人身份证号非必填 18083 2022/12/1
......@@ -819,6 +835,7 @@
// $(ds_id).query();
//add by zc
var signer_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_signer');
var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
if(head_record.get('bp_id')){
Leaf.request({
url: $('${/parameter/@layout_code}_signer_create_link_id').getUrl(),
......@@ -829,6 +846,9 @@
if($(signer_ds_id)){
$(signer_ds_id).query();
}
if($(role_ds_id)){
$(role_ds_id).query();
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function (res) {
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview
View file @ f9bedbd2
......@@ -232,7 +232,29 @@
};
//商业伙伴角色信息删除
window['${/parameter/@layout_code}_G_ROLE_USER_BUTTON1_layout_dynamic_tab_click'] = function() {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
var records = $(ds_id).getSelected();
Leaf.showConfirm('提示', '是否确认删除', function() {
debugger;
var records = $(ds_id).getSelected();
if(records.length ==0){
$L.showMessage('提示','请至少选择一条数据!');
return;
}
for(var i=0;i<records.length;i++){
if(!Ext.isEmpty(records[i].get('primary_flag_bak'))){
if(records[i].get('primary_flag_bak') == 'Y'){
$L.showMessage('提示','主角色无法被删除！');
return;
}
}
$(ds_id).remove(records[i]);
}
});
};
function CheckSocialCreditCode(Code) {
var patrn = /^[0-9A-Z]+$/;
......@@ -278,6 +300,7 @@
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
var records = $(ds_id);
if (!(records == 'undefined' || records == null)) {
$(ds_id).query();
......@@ -296,6 +319,7 @@
},
success: function (res) {
$(signer_ds_id).query();
$(role_ds_id).query();
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function (res) {
......@@ -1610,6 +1634,7 @@
}
Leaf.onReady(function () {
debugger;
//自然人不展示财报按钮
if('${/parameter/@bp_class}' == 'NP' && document.getElementById('${/parameter/@layout_code}_user_button2') ){
document.getElementById('${/parameter/@layout_code}_user_button2').style.display = 'none';
......
src/main/webapp/modules/hls/HLS361N/credit_credit.lview
View file @ f9bedbd2
......@@ -9,6 +9,7 @@ $Purpose: 商业伙伴授信创建
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<a:model-query fetchAll="true" model="basic.get_sys_default_time" rootPath="sys_default_time"/>-->
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(9070)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/>
</a:init-procedure>
<a:view>
<a:link id="credit_enhance_detail_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
......@@ -16,6 +17,7 @@ $Purpose: 商业伙伴授信创建
<script type="text/javascript"><![CDATA[
//保存前调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function(ds, record) {
debugger;
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var check_flag = true;
......@@ -30,6 +32,16 @@ $Purpose: 商业伙伴授信创建
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
var user_code='${/model/position_code/record/@position_code}';
if(user_code>0){
record.set('credit_status','APPROVING');
}else if(Ext.isEmpty(user_code) && record.get('bp_category_n')=='RENTER'){
record.set('credit_status','APPROVING_OP');
}else if(Ext.isEmpty(user_code) && record.get('bp_category_n')=='AGENT' && record.get('unit_code')=='1011'){
record.set('credit_status','APPROVING_OP');
}else {
record.set('credit_status','APPROVING');
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return check_flag;
......
src/main/webapp/modules/hls/HLS362N/hls_bp_master_credit_confirm.lview
View file @ f9bedbd2
......@@ -8,7 +8,7 @@ $Purpose: 商业伙伴授信维护
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(003,9070)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/>
<a:model-query defaultWhereClause="t1.role_id=${/session/@role_id}" fetchAll="true" model="cont.CON733.query_roles_info" rootPath="position_code"/>
</a:init-procedure>
<a:view>
......@@ -24,8 +24,8 @@ $Purpose: 商业伙伴授信维护
<script type="text/javascript"><![CDATA[
var user_code='';
Leaf.onReady(function(){
user_code='${/model/position_code/record/@position_code}';
if(user_code == 9070){
user_code='${/model/position_code/record/@role_code}';
if(user_code == '0039'){
var ds_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_CREDIT_HD', 'hls_bp_master_credit_hd');
var op_ds_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_CREDIT_OP', 'hls_bp_master_credit_hd');
var record = 'JCREDIT_ENTRANCE_CONFIRM_F_QUERY__ds';
......@@ -61,6 +61,7 @@ $Purpose: 商业伙伴授信维护
//变更确认
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
//授信额度变更
debugger;
var credit_ds=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_CREDIT_HD', 'hls_bp_master_credit_hd');
var op_credit_ds=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_CREDIT_OP', 'hls_bp_master_credit_hd');
var credit_datas = $(credit_ds).selected;
......@@ -79,7 +80,7 @@ $Purpose: 商业伙伴授信维护
//判断角色是否可以操作
//002 营业本部长
for (var i = 0; i < datas.length; i++){
if(user_code==''||user_code==undefined){
if(user_code!='0039' && user_code!='0003'){
$L.showInfoMessage("提示",'只有建设机械部部长/营业副部长（经租）才能操作数据！');
return;
}
......@@ -95,11 +96,15 @@ $Purpose: 商业伙伴授信维护
$L.showInfoMessage("提示",'请选择状态为审批中的数据！',null,null)
return;
}
if(user_code == '0003' && credit_status == 'APPROVING_OP'){
$L.showInfoMessage("提示",'当前单据未到达建机部部长审批节点，请确认！');
return;
}
var data_record;
data_record = datas[i];
data_record.set('_status', 'update');
data_record.set('bp_credit_hd_id', datas[i].data.bp_credit_hd_id);
if(user_code == 9070){
if(user_code == '0039'){
data_record.set('wanted_status', 'APPROVING');
}else {
data_record.set('wanted_status', 'APPROVED');
......@@ -153,7 +158,7 @@ $Purpose: 商业伙伴授信维护
//角色判断
//002 营业本部长
for (var i = 0; i < datas.length; i++){
if(user_code==''||user_code==undefined){
if(user_code!='0039' && user_code!='0003'){
$L.showInfoMessage("提示",'只有建设机械部部长/营业副部长（经租）才能操作数据！');
return;
}
......@@ -170,6 +175,10 @@ $Purpose: 商业伙伴授信维护
$L.showInfoMessage("提示",'请选择状态为审批中的数据！',null,null)
return;
}
if(user_code == '0003' && credit_status == 'APPROVING_OP'){
$L.showInfoMessage("提示",'当前单据未到达建机部部长审批节点，请确认！');
return;
}
var data_record;
data_record = datas[i];
data_record.set('_status', 'update');
......
src/main/webapp/modules/wx/WX100/con_ele_file_file_size_fix_check.lsc
View file @ f9bedbd2
......@@ -20,7 +20,7 @@ var ele_con_file_path = info_query('HL_ELE_FILE_PATH').code_value;
function fileSizeCheck() {
var parameter_map = $bm('wx.WX100.con_ele_file_size_check').queryAsMap({
ele_con_file_path:ele_con_file_path
ele_con_file_path: 'Z:/project/hl_leasing/cmfile/APP'
});
var data = parameter_map.getChildren();
var fixed_size_bm = $bm('wx.WX100.con_ele_file_size_check');
......@@ -31,12 +31,14 @@ function fileSizeCheck() {
if(file_size!=now_file_size){
fixed_size_bm.update({
if_same: 'N',
new_file_size: now_file_size,
attachment_id: data[i].attachment_id,
source_pk_value: data[i].source_pk_value
})
}else {
fixed_size_bm.update({
if_same: 'Y',
new_file_size: now_file_size,
attachment_id: data[i].attachment_id,
source_pk_value: data[i].source_pk_value
})
......
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