Commit f9bedbd2 authored by 18083's avatar 18083

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

parents 5cd16463 548b70d2
......@@ -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"/>
......
<?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>
<?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>
<?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>
......@@ -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}
......
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",
......
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",
......
......@@ -19,13 +19,56 @@
<link href="${base.contextPath}/lib/assets/global/css/plugins.css" rel="stylesheet" type="text/css"/>
<link href="${base.contextPath}/lib/assets/pages/css/login-5.css" rel="stylesheet" type="text/css"/>
<script src="${base.contextPath}/lib/assets/global/plugins/jquery.min.js" type="text/javascript"></script>
<link href="${base.contextPath}/resources/upload/favicon.png" rel="shortcut icon"/>
<script src="${base.contextPath}/javascripts/aes.js" type="text/javascript"></script>
<script type="text/javascript">var _baseContext = '${base.contextPath}'</script>
<script src="${base.contextPath}/javascripts/aes.js" type="text/javascript"></script>
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' */lib;">
<meta content="text/html; charset=UTF-8; X-Content-Type-Options=nosniff" http-equiv="Content-Type" />
</head>
<body class=" login">
<style>
/* 弹窗的样式 */
.modal {
display: none;
position: fixed;
z-index: 1;
left: 0;
top: 0;
margin-left: auto;
margin-right: auto;
width: 50%;
height: 50%;
overflow: auto;
padding-top: 60px;
}
/* 弹窗内容的样式 */
.modal-content {
background-color: #fefefe;
margin: 5% auto;
padding: 20px;
border: 1px solid #888;
width: 80%;
}
/* 关闭按钮的样式 */
.close {
color: #aaa;
float: right;
font-size: 28px;
font-weight: bold;
}
.close:hover,
.close:focus {
color: black;
text-decoration: none;
cursor: pointer;
}
</style>
<script type="text/javascript">
function changeCaptchaCode() {
$("#imgObj").attr("src", '${base.contextPath}/verifiCode?_r=' + Math.random());
......@@ -45,6 +88,118 @@
var encrypted = CryptoJS.AES.encrypt(srcs, key, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7});
//document.getElementById('password').value= encrypted;
}
function checkLogin(){
var check = true;
$.ajax({
type: 'POST',
url: '${base.contextPath}/autocrud/sys.sys_user_login_with_userid/execute',
async: false, //设为同步
dataType: 'json',
data: {
user_name : document.getElementById('username').value
},
success: function (res) {
debugger;
if (res.result['encryted_session_id'] == 'ERROR') {
check = false;
} else {
check = true;
}
},
error: function() {
check = true;
}
});
return check;
}
window.onload = function()
{
// Listen to the double click event.
if (window.addEventListener) {
document.getElementById('loginForm').addEventListener('submit', function(event) {
// 阻止默认提交行为
event.preventDefault();
// 自定义处理逻辑
if (checkLogin()) {
// 如果验证通过,手动提交表单
this.submit();
} else {
alert('您的密码已经过期,请修改密码!');
//打开修改密码的弹窗
document.getElementById("user_name").value = document.getElementById('username').value.toUpperCase();
document.getElementById("user_name").readOnly = true;
var modal = document.getElementById("passwordModal");
modal.style.display = "block";
}
});
document.getElementById('passwordForm').addEventListener('submit', function(event) {
// 阻止默认提交行为
event.preventDefault();
// 自定义处理逻辑
if (checkUpdatePassword()) {
alert('修改成功');
// 如果验证通过,手动提交表单
window.top.location="${base.contextPath}/login";
}
});
};
};
//关闭弹窗
function closeModal(){
var modal = document.getElementById("passwordModal");
modal.style.display = "none";
document.getElementById("current_password").value = "";
document.getElementById("update_password").value = "";
document.getElementById("confirm_password").value = "";
}
//修改密码
function checkUpdatePassword(){
var username = document.getElementById('username').value;
var current_password = document.getElementById('current_password').value;
var update_password = document.getElementById('update_password').value;
var confirm_password = document.getElementById('confirm_password').value;
var check = true;
if (update_password != confirm_password){
alert('新密码和确认密码不一致');
check = false;
return check;
}
$.ajax({
type: 'POST',
url: '${base.contextPath}/autocrud/sys.password_expired_update/execute',
async: false, //设为同步
dataType: 'json',
data: {
user_name : username,
current_password : document.getElementById('current_password').value,
update_password : document.getElementById('update_password').value
},
success: function (res) {
debugger;
if (res.result['password_session_id'] == '校验成功') {
check = true;
} else {
alert(res.result['password_session_id']);
check = false;
}
},
error: function() {
check = false;
}
});
return check;
}
</script>
<style>
.user-login-5 input:-webkit-autofill {
......@@ -75,7 +230,7 @@
<div class="login-icon">
<!-- <img src="${base.contextPath}/lib/assets/pages/img/login/icon@2x.png" style="height: 28px">-->
</div>
<form id="loginForm" class="login-form" action="login" method="post" autocomplete="off">
<form id="loginForm" name="loginForm" class="login-form" action="login" method="post" autocomplete="off">
<div class="form-title">
<img src="${base.contextPath}/lib/assets/pages/img/login/icon@2x.png" style="height: 24px">
<p style="font-size: 18px;font-weight: bold;">宏菱建机融资租赁管理平台</p>
......@@ -95,7 +250,7 @@
</#if>
<div class="form-input">
<input class="form-control form-control-solid placeholder-no-fix" type="text"
autocomplete="off" placeholder="请输入用户名" name="username"/>
autocomplete="off" placeholder="请输入用户名" name="username" id="username"/>
</div>
<div class="form-input">
<input class="form-control form-control-solid placeholder-no-fix " placeholder="密码"
......@@ -131,14 +286,52 @@
</form>
</div>
<!-- <table width="340" cellspacing="0" cellpadding="0" style="margin-top: 30px">-->
<!-- <tr>-->
<!-- <td> 该网站的使用仅限于宏菱建机员工以及得到许可的用户。-->
<!-- 系统正在监督及保存所有系统内用户登录记录。-->
<!-- <strong>非法使用者</strong>根据相关法律需要承担民刑事的责任。-->
<!-- </td>-->
<!-- </tr>-->
<!-- </table>-->
<div id="passwordModal" class="modal" style="width: 500px; height: 530px">
<div class="modal-content">
<span class="close" onclick="closeModal()">&times;</span>
<form id="passwordForm" name="passwordForm" action="" method="post" >
<label>账号:</label>
<input class="form-control form-control-solid placeholder-no-fix" type="text"
autocomplete="off" name="user_name" id="user_name" />
<br/>
<label>原密码:</label>
<input class="form-control form-control-solid placeholder-no-fix" type="text"
autocomplete="off" name="current_password" id="current_password" required />
<br/>
<label >新密码:</label>
<input class="form-control form-control-solid placeholder-no-fix" type="text"
autocomplete="off" name="update_password" id="update_password" required/>
<br/>
<label >确认密码:</label>
<input class="form-control form-control-solid placeholder-no-fix" type="text"
autocomplete="off" name="confirm_password" id="confirm_password" required/>
<br/>
<div class="button-login">
<button class="btn blue" type="submit" style="min-width:100%;width: 100%;">确认</button>
</div>
</form>
</div>
</div>
<script type="text/javascript">
$('#current_password').on('focus', function () {
$(this).attr('type', 'password');
})
$('#update_password').on('focus', function () {
$(this).attr('type', 'password');
})
$('#confirm_password').on('focus', function () {
$(this).attr('type', 'password');
})
</script>
<!-- <table width="340" cellspacing="0" cellpadding="0" style="margin-top: 30px">-->
<!-- <tr>-->
<!-- <td> 该网站的使用仅限于宏菱建机员工以及得到许可的用户。-->
<!-- 系统正在监督及保存所有系统内用户登录记录。-->
<!-- <strong>非法使用者</strong>根据相关法律需要承担民刑事的责任。-->
<!-- </td>-->
<!-- </tr>-->
<!-- </table>-->
<div class="login-footer" style="position: fixed;bottom: 10px;right: 10px;">
<div class="row bs-reset">
......
......@@ -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'));
......
......@@ -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'
......
......@@ -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) {
......
......@@ -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';
......
......@@ -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;
......
......@@ -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');
......
......@@ -57,6 +57,7 @@
<a:link id="${/parameter/@layout_code}_prj_project_update_status_link_id"
model="prj.PRJ505.prj_project_create_contract" modelaction="execute"/>
<a:link id="prj501n_prj_approval_link_id" model="prj.PRJ501N.project_approval" modelaction="update"/>
<a:link id="prj_update_credit_code_link_id" model="prj.PRJ500D.update_prj_credit_code" modelaction="update"/>
<a:link id="prj501n_check_machine_number_id" model="prj.PRJ501N.project_approval" modelaction="query"/>
<a:link id="prj501n_check_machine_number_repeat_id" model="prj.PRJ501N.check_machine_number_repeat" modelaction="execute"/>
<a:link id="prj501n_wfl_machine_number_detail_link_id" url="${/request/@context_path}/modules/prj/PRJ501N/prj501n_wfl_machine_number_detail.lview"/>
......@@ -66,6 +67,8 @@
<link href="${/request/@context_path}/modules/viewerjs/viewer.css" rel="stylesheet"/>
<script src="${/request/@context_path}/modules/viewerjs/viewer.js"/>
<script src="${/request/@context_path}/modules/viewerjs/viewer_tool.js"/>
<script src="${/request/@context_path}/modules/prj/PRJ500N/javascripts/input_validator.js"
type="text/javascript"/>
<script type="text/javascript"><![CDATA[
window['${/parameter/@layout_code}_user_button5_layout_dynamic_click'] = function () {
Leaf.showConfirm('提示', '是否确认生成合同?', function () {
......@@ -538,6 +541,37 @@
$(tenant_ds_id).query();
}
var creditCode;
var projectId;
if('${/parameter/@credit_flag}'=='N'){
if(bp_ds_id){
var record = $(bp_ds_id).getAll();
for(var i = 0;i<record.length;i++){
if(record[i].get('bp_class')=='ORG'&&record[i].get('bp_category')=='TENANT'){
creditCode = record[i].get('credit_code');
projectId = record[i].get('project_id');
}
}
Leaf.request({
url: $('prj_update_credit_code_link_id').getUrl(),
para: {
project_id:projectId,
credit_code:creditCode
},
success: function(res) {
Leaf.Masker.unmask(Ext.getBody());
},
failure: function() {
Leaf.Masker.unmask(Ext.getBody());
},
error: function() {
bp_rate_flag = false;
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
}
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
};
......@@ -630,6 +664,18 @@
record.getField('bp_category_n').setReadOnly(true);
record.getField('bp_id_n').setReadOnly(true);
}
if('${/parameter/@credit_flag}'=='N'){
if(record.get('bp_category') == 'TENANT'&&record.get('bp_class') == 'ORG'){
record.getField('credit_code').setReadOnly(false);
record.getField('credit_code').setRequired(true);
}if(record.get('bp_category') == 'TENANT'&&record.get('bp_class') == 'NP'){
var ds_gridBpId= ds.bindname+'_layout_grid_id';
$(ds_gridBpId).hideColumn('credit_code');
}
}else {
var ds_gridBpId= ds.bindname+'_layout_grid_id';
$(ds_gridBpId).hideColumn('credit_code');
}
}
......@@ -999,25 +1045,49 @@
credit_record.getField('credit_line_n').setRequired(true);
record.set('editable_flag','Y');
}else {
if('${/parameter/@credit_flag}'!='N'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}else{
if(credit_record.get('bp_class')=='NP'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
}
}
}else if(create_bp_code =='X00010005' || create_bp_code =='J00010006') {
credit_record.getField('credit_line').setReadOnly(true);
credit_record.getField('credit_line_n').setReadOnly(true);
credit_record.getField('credit_line').setRequired(false);
credit_record.getField('credit_line_n').setRequired(false);
if('${/parameter/@editable_flag}' != 'YE'){
if('${/parameter/@credit_flag}'!='N'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}else{
if(credit_record.get('bp_class')=='NP'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
}
}
}else if('${/parameter/@editable_flag}' != 'YE'){
if('${/parameter/@credit_flag}'!='N'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}else{
if(credit_record.get('bp_class')=='NP'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
}
}else {
}
}
......@@ -1134,12 +1204,21 @@
}
if('${/parameter/@function_usage}' == 'QUERY' && '${/parameter/@editable_flag}' != 'YE' && '${/parameter/@editable_flag}' != 'Y' ){
if('${/parameter/@credit_flag}'!='N'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}else{
if(credit_record.get('bp_class')=='NP'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
}
}
};
if('${/parameter/@editable_flag}' == 'Y' || '${/parameter/@editable_flag}' == 'YE'){
debugger;
zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function (type) {
var prj_project_ds = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_INFO_1', 'prj_project');
if (type == 'agree') {
......@@ -1160,6 +1239,7 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_INFO_1', 'prj_project');
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BP', 'prj_project_bp');
if(tenant_ds_id == ds.id&&tenant_ds_id){
......@@ -1172,6 +1252,59 @@
}
}
if(bp_ds_id == ds.id&&bp_ds_id){
if(name == 'credit_code'){
var credit_code;
if (!Leaf.isEmpty(value)) {
//去除空格
credit_code = value.trim();
credit_code = credit_code.replace(/[\t\r\f\n\s]*/g,"");
if (credit_code.length == '16'){
// if(!(/^[A-Z][A-z0-9]*$/).test(credit_code)){
// Leaf.showMessage('提示', '中征码首字母需要大写');
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// setTimeout(function () {
// record.set('credit_code', '');
// }, 20);
// return false;
//
// }else {
// return true;
// }
let financeCode = new Array(16);
for (let i = 0; i < credit_code.length && i < 16; i++) {
financeCode[i] = credit_code.charCodeAt(i);
}
if(!checkDKK(financeCode)){
Leaf.showMessage('提示', '中征码错误');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
setTimeout(function () {
record.set('credit_code', '');
}, 20);
return false;
}else {
if(old_value != value){
Leaf.showConfirm('${l:HLS.PROMPT}', '本次中征码维护值与基本信息维护值不一致,是否继续?', function() {
debugger;
record.set('credit_code', value);
}, function() {
debugger;
$(bp_ds_id).query();
});
}
}
}else {
Leaf.showMessage('提示', '请输入16位中征码');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
setTimeout(function () {
record.set('credit_code', '');
}, 20);
return false;
}
}
}
}
//选择承租人带出开票信息
var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
......
......@@ -63,6 +63,7 @@
<a:link id="${/parameter/@layout_code}_prj_project_update_status_link_id"
model="prj.PRJ505.prj_project_create_contract" modelaction="execute"/>
<a:link id="prj501n_prj_approval_link_id" model="prj.PRJ501N.project_approval" modelaction="update"/>
<a:link id="prj_update_credit_code_link_id" model="prj.PRJ500D.update_prj_credit_code" modelaction="update"/>
<a:link id="prj501n_check_machine_number_id" model="prj.PRJ501N.project_approval" modelaction="query"/>
<a:link id="prj501n_wfl_machine_number_detail_link_id" url="${/request/@context_path}/modules/prj/PRJ501N/prj501n_wfl_machine_number_detail.lview"/>
<a:link id="prj501n_check_machine_number_repeat_id" model="prj.PRJ501N.check_machine_number_repeat" modelaction="execute"/>
......@@ -72,6 +73,8 @@
<link href="${/request/@context_path}/modules/viewerjs/viewer.css" rel="stylesheet"/>
<script src="${/request/@context_path}/modules/viewerjs/viewer.js"/>
<script src="${/request/@context_path}/modules/viewerjs/viewer_tool.js"/>
<script src="${/request/@context_path}/modules/prj/PRJ500N/javascripts/input_validator.js"
type="text/javascript"/>
<script type="text/javascript"><![CDATA[
window['${/parameter/@layout_code}_user_button5_layout_dynamic_click'] = function () {
Leaf.showConfirm('提示', '是否确认生成合同?', function () {
......@@ -596,7 +599,6 @@
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var bp_ds_ids = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_INFO_1', 'prj_project');
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BP', 'prj_project_bp');
var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
var cdd_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
......@@ -607,6 +609,37 @@
$(tenant_ds_id).query();
}
var creditCode;
var projectId;
if('${/parameter/@credit_flag}'=='M'){
if(bp_ds_id){
var record = $(bp_ds_id).getAll();
for(var i = 0;i<record.length;i++){
if(record[i].get('bp_class')=='ORG'&&record[i].get('bp_category')=='TENANT'){
creditCode = record[i].get('credit_code');
projectId = record[i].get('project_id');
}
}
Leaf.request({
url: $('prj_update_credit_code_link_id').getUrl(),
para: {
project_id:projectId,
credit_code:creditCode
},
success: function(res) {
Leaf.Masker.unmask(Ext.getBody());
},
failure: function() {
Leaf.Masker.unmask(Ext.getBody());
},
error: function() {
bp_rate_flag = false;
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
}
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
};
......@@ -647,6 +680,7 @@
//加载时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
debugger;
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BP', 'prj_project_bp');
var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
//控制资管费现金流隐藏
......@@ -737,6 +771,18 @@
record.getField('vender_bank_account_num').setRequired(false);
}
}
if('${/parameter/@credit_flag}'=='M'){
if(record.get('bp_category') == 'TENANT'&&record.get('bp_class') == 'ORG'){
record.getField('credit_code').setReadOnly(false);
record.getField('credit_code').setRequired(true);
}if(record.get('bp_category') == 'TENANT'&&record.get('bp_class') == 'NP'){
var ds_gridBpId= ds.bindname+'_layout_grid_id';
$(ds_gridBpId).hideColumn('credit_code');
}
}else {
var ds_gridBpId= ds.bindname+'_layout_grid_id';
$(ds_gridBpId).hideColumn('credit_code');
}
}
//现金流列表加载时隐藏资管费 18083
if(cashflow_ds_id == ds.id &&cashflow_ds_id){
......@@ -1189,19 +1235,35 @@
credit_record.getField('credit_line_n').setRequired(true);
record.set('editable_flag','Y');
}else {
if('${/parameter/@credit_flag}' !='M'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}else{
if(credit_record.get('bp_class')=='NP'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
}
}
}else if(create_bp_code =='X00010005' || create_bp_code =='J00010006') {
credit_record.getField('credit_line').setReadOnly(true);
credit_record.getField('credit_line_n').setReadOnly(true);
credit_record.getField('credit_line').setRequired(false);
credit_record.getField('credit_line_n').setRequired(false);
if('${/parameter/@editable_flag}' != 'YE'){
if('${/parameter/@credit_flag}' !='M'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}else{
if(credit_record.get('bp_class')=='NP'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
}
}
}else if('${/parameter/@editable_flag}' != 'YE' && division != '93'){
if(document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_CREDIT_LINE')){
......@@ -1209,10 +1271,17 @@
'prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_CREDIT_LINE').style.display = 'none';
}
if('${/parameter/@credit_flag}' !='M'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}else{
if(credit_record.get('bp_class')=='NP'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
}
}else if(division !='93') {
if(document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_CREDIT_LINE')){
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_CREDIT_LINE_prompt').style.display = 'none';
......@@ -1224,12 +1293,20 @@
credit_record.getField('credit_line').setRequired(true);
credit_record.getField('credit_line_n').setRequired(true);
}else if(division=='93' && '${/parameter/@editable_flag}' != 'YE'){
if('${/parameter/@credit_flag}' !='M'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}else{
if(credit_record.get('bp_class')=='NP'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
}
}
}
}
if (prj_quotation_ds_id == ds.id && prj_quotation_ds_id){
//产品线维护了组合利率的调整加载事件显示
if('${/parameter/@asset_fee_flag}'=='N'||'${/parameter/@asset_fee_flag}'==''){
......@@ -1384,13 +1461,22 @@
}
if('${/parameter/@function_usage}' == 'QUERY' && '${/parameter/@editable_flag}' != 'YE' && '${/parameter/@editable_flag}' != 'Y' ){
if('${/parameter/@credit_flag}' !='M'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}else{
if(credit_record.get('bp_class')=='NP'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
}
}
};
if('${/parameter/@editable_flag}' == 'Y' || '${/parameter/@editable_flag}' == 'YE'){
debugger;
zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function (type) {
var prj_project_ds = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_INFO_1', 'prj_project');
if (type == 'agree') {
......@@ -1409,7 +1495,6 @@
}
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_INFO_1', 'prj_project');
var prj_quotation_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BP', 'prj_project_bp');
......@@ -1429,6 +1514,57 @@
}
}
}
if(name == 'credit_code'){
var credit_code;
if (!Leaf.isEmpty(value)) {
//去除空格
credit_code = value.trim();
credit_code = credit_code.replace(/[\t\r\f\n\s]*/g,"");
if (credit_code.length == '16'){
// if(!(/^[A-Z][A-z0-9]*$/).test(credit_code)){
// Leaf.showMessage('提示', '中征码首字母需要大写');
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// setTimeout(function () {
// record.set('credit_code', '');
// }, 20);
// return false;
//
// }else {
// return true;
// }
let financeCode = new Array(16);
for (let i = 0; i < credit_code.length && i < 16; i++) {
financeCode[i] = credit_code.charCodeAt(i);
}
if(!checkDKK(financeCode)){
Leaf.showMessage('提示', '中征码错误');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
setTimeout(function () {
record.set('credit_code', '');
}, 20);
return false;
}else {
if(old_value != value){
Leaf.showConfirm('${l:HLS.PROMPT}', '本次中征码维护值与基本信息维护值不一致,是否继续?', function() {
debugger;
record.set('credit_code', value);
}, function() {
debugger;
$(bp_ds_id).query();
});
}
}
}else {
Leaf.showMessage('提示', '请输入16位中征码');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
setTimeout(function () {
record.set('credit_code', '');
}, 20);
return false;
}
}
}
}
if(tenant_ds_id == ds.id&&tenant_ds_id){
......
......@@ -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