Skip to content

L
leaf-hlcm
Commit 6e7bcea1 authored by 陆正友's avatar 陆正友
Browse files
Options

Merge remote-tracking branch 'origin/remote_dev' into remote_dev 

# Conflicts:
#	src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_constru.lview
#	src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview
parents a2de45f9 06b1176b
Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 37 deletions
src/main/webapp/WEB-INF/classes/cont/CON542/con_contract_for_query.lwm
View file @ 6e7bcea1
......@@ -53,6 +53,7 @@
<bm:field name="sign_contract_status_n"/>
<bm:field name="bp_id_tenant_n"/>
<bm:field name="bp_id_agent_level1_n"/>
<bm:field name="project_status"/>
</bm:fields>
<bm:primary-key>
<bm:pk-field name="contract_id"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ 6e7bcea1
......@@ -88,7 +88,9 @@
v.write_off_date,
v.write_off_amount,
v.division,
v.finance_amount
v.finance_amount,
v.lease_item_amount,
v.is_buyout
FROM (SELECT t.contract_id,
(SELECT hbbc.bank_account_id
FROM hls_bp_master_bank_account hbbc
......@@ -220,7 +222,9 @@
from csh_write_off cwo
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount,
t.division,
t.finance_amount
t.finance_amount,
t.lease_item_amount,
nvl(t.is_buyout,'N') is_buyout
FROM con_contract_cashflow f
join con_contract t
on t.contract_id = f.contract_id
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm
View file @ 6e7bcea1
......@@ -60,7 +60,7 @@
cpr.bp_bank_account_name BP_BANK_ACCOUNT_NAME,
--应付我司金额
cpr.amount_agent,
nvl(cpr.amount_agent,0) amount_agent,
cpr.amount_vender,
to_char(cpr.amount_agent,'FM999,999,999,990.00') amount_agent_print,
to_char(cpr.amount_vender,'FM999,999,999,990.00') amount_vender_print,
......@@ -131,7 +131,8 @@
nvl((select sum(cwo.write_off_due_amount) write_off_amount
from csh_write_off cwo
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=c.contract_id),0) write_off_amount,
c.division
c.division,
nvl(c.is_buyout,'N') is_buyout
from csh_payment_req_ln cpr,
con_contract c,
hls_bp_master hbm,
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
View file @ 6e7bcea1
......@@ -158,6 +158,11 @@
(select bp_name
from hls_bp_master
where hls_bp_master.bp_id = t.bp_id_agent_level1) bp_id_agent_n,
--add by 18938
(select nvl(is_constru_unit,'N')
from hls_bp_master
where hls_bp_master.bp_id = t.bp_id_agent_level1) is_constru_unit,
nvl(t.is_buyout,'N') is_buyout,
--查找厂商
(SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n,
hli.vender_name,
......@@ -255,6 +260,8 @@
<bm:field name="con_business_type_n"/>
<bm:field name="cdd_list_id"/>
<bm:field name="bp_id_agent_n"/>
<bm:field name="is_constru_unit"/>
<bm:field name="is_buyout"/>
<bm:field name="bp_id_tenant"/>
<!-- <bm:field name="vender_name"/>-->
<bm:field name="vender_name_n"/>
......
src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
View file @ 6e7bcea1
......@@ -126,7 +126,11 @@
//add by gzj 2022-12-23 北京卡家
||record_data.templet_code =='CON_COLLECTION_PAYMENT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ_1'||record_data.templet_code =='CSH_PAYMENT_REQ_KJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ_SURE'
||record_data.templet_code =='CSH_PAYMENT_REQ_KJ_1'||record_data.templet_code =='CON_CONTRACT_MORTGAGE_KJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ_FR'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_KJ'
||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ'||record_data.templet_code =='PERSONAL_CREDIT_KJ'||record_data.templet_code =='ENTERPRISE_CREDIT_KJ') {
||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ'||record_data.templet_code =='PERSONAL_CREDIT_KJ'||record_data.templet_code =='ENTERPRISE_CREDIT_KJ'
//add by 18938
||record_data.templet_code == 'BUSINESS_CONTRACT_XN' || record_data.templet_code == 'LEASE_CONTRACT_PAR_XN2' || record_data.templet_code == 'LEASE_CONTRACT_PAR_XN' || record_data.templet_code == 'DOWN_PAYMENT_OFFSET'
||record_data.templet_code == 'FINANCE_LEASEBACK_CONTRACT_XN' || record_data.templet_code == 'LEASE_ORDER_XN' || record_data.templet_code == 'LEASE_ORDER_XN2' || record_data.templet_code == 'FINANCE_LEASE_CONTRACT_XN'
||record_data.templet_code == 'CON_CONTRACT_MORTGAGE_XN') {
// word转pdf
var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id;
......
src/main/webapp/modules/csh/CSH501/csh_payment_create_entrance.lview
View file @ 6e7bcea1
......@@ -240,6 +240,8 @@
param['approval_status'] = record.get('approval_status');
param['con_business_type'] = record.get('con_business_type');
param['division'] = record.get('division');
//add by 18938
param['is_constru_unit'] = record.get('is_constru_unit');
if (record.get('business_type') == 'PAYMENT') {
param['function_code'] = 'CSH501D';
} else if (record.get('business_type') == 'PREPAYMENT') {
......
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
View file @ 6e7bcea1
......@@ -39,6 +39,8 @@
<script type="text/javascript"><![CDATA[
jQuery.noConflict();
var con_business_type='${/parameter/@con_business_type}'||'${/model/loan_flag_path/record/@business_type}'||'LEASE';
var is_constru_unit='${/parameter/@is_constru_unit}' || 'N';
var is_buyout='${/parameter/@is_buyout}' || 'N';
//工作流审批界面校验发票状态
if ('${/parameter/@source_type}' == 'WFL_Y') {
zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function (type) {
......@@ -175,6 +177,7 @@
};
window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
debugger;
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var hd_ds, lineRecords, currency_code;
......@@ -232,6 +235,38 @@
records[i].getField('tenant_bank_account_name').setRequired(false);
}
}
//add by 18938
if(is_constru_unit == 'Y'){
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var records = $(ds_id).getAll();
for (i = 0; i < records.length; i++) {
if(records[i].get('is_buyout') == 'Y'){
//买断机 应付承租人金额为必填项 应付我司金额为只读项且默认为0
records[i].getField('amount_tenant').setRequired(true);
records[i].getField('amount_agent').setReadOnly(true);
records[i].getField('tenant_bank_account_number').setRequired(true);
records[i].getField('tenant_bank_account_number_n').setRequired(true);
}else{
//非买断机 应付承租人金额为只读项，默认为0,承租人账号为非必填 应付我司金额为只读项且默认为0 委托付款金额为必填项(界面已配置)
records[i].getField('amount_tenant').setReadOnly(true);
records[i].getField('amount_agent').setReadOnly(true);
}
}
}
}
//非虚拟店 应付承租人金额非必填且未只读
if(is_constru_unit != 'Y'){
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var records = $(ds_id).getAll();
for (i = 0; i < records.length; i++) {
records[i].getField('amount_tenant').setRequired(false);
records[i].getField('amount_tenant').setReadOnly(true);
if(con_business_type == 'LEASEBACK'){
records[i].getField('tenant_bank_account_number').setRequired(true);
records[i].getField('tenant_bank_account_number_n').setRequired(true);
}
}
}
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
};
......@@ -239,6 +274,7 @@
var first_load_flag = 'N';
function on_csh_payment_req_temp_ln_ds_load(ds) {
debugger;
var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var records = ds.getAll();
if (!'${/parameter/@payment_req_id}' && lnds_id && '${/parameter/@business_type}' == 'PAYMENT') {
......@@ -285,6 +321,39 @@
};
}
}
//add by 18938
if(is_constru_unit == 'Y'){
if(con_business_type == 'LEASEBACK'){
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var records = $(ds_id).getAll();
for (i = 0; i < records.length; i++) {
if(is_buyout == 'Y'){
//买断机 应付承租人金额为必填项 应付我司金额为只读项且默认为0 承租人账号必填
records[i].getField('amount_tenant').setRequired(true);
records[i].getField('amount_agent').setReadOnly(true);
records[i].getField('tenant_bank_account_number').setRequired(true);
records[i].getField('tenant_bank_account_number_n').setRequired(true);
}else{
//非买断机 应付承租人金额为只读项，默认为0,承租人账号为非必填 应付我司金额为只读项且默认为0 委托付款金额为必填项(界面已配置)
records[i].getField('amount_tenant').setReadOnly(true);
records[i].getField('amount_agent').setReadOnly(true);
}
}
}
}else{
//非虚拟店 应付承租人金额非必填且未只读
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var records = $(ds_id).getAll();
for (i = 0; i < records.length; i++) {
records[i].getField('amount_tenant').setRequired(false);
records[i].getField('amount_tenant').setReadOnly(true);
if(con_business_type == 'LEASEBACK'){
records[i].getField('tenant_bank_account_number').setRequired(true);
records[i].getField('tenant_bank_account_number_n').setRequired(true);
}
}
}
//end
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
......@@ -400,6 +469,8 @@
var repur_con_ddct_amt = get_current_amount(line_data.get('repur_con_ddct_amt'));
//应付承租人金额
var amount_tenant = get_current_amount(line_data.get('amount_tenant'));
//设备款 add by 18938
var lease_item_amount = get_current_amount(line_data.get('lease_item_amount'));
if (amount_agent < 0 || amount_vender < 0) {
$L.showErrorMessage("提示", '应付我司金额和首付款抵冲金额不能为负数！');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
......@@ -428,18 +499,31 @@
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
//add by 18938
if(is_constru_unit == 'Y'){
if(plus(plus(other_payment2, amount_vender), repur_con_ddct_amt) != lease_item_amount){
$L.showErrorMessage("提示", '首付款抵扣金额,委托付款金额,回购租金抵冲金额之和应等于设备款！',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
}
} else if (con_business_type == 'LEASEBACK') {
var entrusted_amount = get_current_amount(line_data.get('entrusted_amount'));
if (plus(plus(amount_agent, amount_vender),repur_con_ddct_amt) != entrusted_amount) {
$L.showErrorMessage("提示", '应付代理店金额、应付厂商金额、回购租金抵冲金额合计不等于合同签约时承租人所填写委托付款金额，请重新填写！',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
if (plus(plus(plus(plus(amount_agent, amount_vender), other_payment2), repur_con_ddct_amt), amount_tenant) != due_amount) {
$L.showErrorMessage("提示", '应付我司金额,委托付款金额,应付承租人金额,首付款抵冲金额和回购租金抵冲金额之和应等于应付金额！',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
//add by 18938
if(is_constru_unit == 'Y'){
if(plus(plus(plus(other_payment2, amount_tenant), amount_vender), repur_con_ddct_amt) != lease_item_amount){
$L.showErrorMessage("提示", '首付款抵扣金额,应付承租人金额,委托付款金额,回购租金抵冲金额之和应等于设备款！',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
}
//end
}
//本次申请金额等于委托加我司加应付承租人金额
......@@ -454,6 +538,23 @@
$L.showErrorMessage("提示", '买断机合同（即厂商的付款金额为0）不可与其他正常合同同时进行付款申请支付');
return false;
}
//add by 18938
if(is_constru_unit == 'Y'){
if(con_business_type == 'LEASEBACK'){
if(plus(plus(total_amount_agent, total_amount_vender), total_amount_tenant) != total_apply_amount){
$L.showErrorMessage("提示", '应付代理店总金额,应付厂商总金额,应付承租人总金额之和应等于申请总金额！',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
}else{
if(plus(total_amount_agent, total_amount_vender) != total_apply_amount){
$L.showErrorMessage("提示", '应付代理店总金额,应付厂商总金额之和应等于申请总金额！',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
}
}
//end
//给头表赋值
$(ds_id).getAt(0).set('amount_agent_total', total_amount_agent);
$(ds_id).getAt(0).set('amount_vender_total', total_amount_vender);
......@@ -503,6 +604,7 @@
};
window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
debugger;
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
if (hdds_id == ds.id && record.isNew) {
if ('${/parameter/@business_type}' == 'PAYMENT') {
......@@ -541,19 +643,47 @@
//record.getField('t_bank_account_name_n').setRequired(true);
}else{
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID_prompt').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME_prompt').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM_prompt').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME_prompt').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_BRANCH_NAME_prompt').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_BRANCH_NAME').style.display = 'none';
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID_prompt').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID').style.display = 'none';
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME_prompt').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME').style.display = 'none';
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM_prompt').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM').style.display = 'none';
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME_prompt').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME').style.display = 'none';
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_BRANCH_NAME')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_BRANCH_NAME_prompt').style.display = 'none';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_BRANCH_NAME').style.display = 'none';
}
}
//add by 18938
if(is_constru_unit == 'Y'){
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID_prompt').style.display = 'block';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID').style.display = 'block';
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME_prompt').style.display = 'block';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME').style.display = 'block';
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM_prompt').style.display = 'block';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM').style.display = 'block';
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME_prompt').style.display = 'block';
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME').style.display = 'block';
}
}
//end
}
};
//保存submitsuccess调用
......
src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview
View file @ 6e7bcea1
......@@ -129,6 +129,9 @@
param['product_type_n'] = record.get('product_type_n');
param['product_name_write'] = record.get('product_name_write');
}
//add by 18938
param['is_constru_unit'] = record.get('is_constru_unit');
param['is_buyout'] = record.get('is_buyout');
param['winid'] = 'csh501_csh_payment_req_link_winid';
param['url_title'] = '付款申请';
hls_doc_get_layout_code('csh501_get_layout_code_link_id', param, 'csh501_csh_payment_req_link_id', 'csh_payment_req_selectedDs');
......
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @ 6e7bcea1
......@@ -370,7 +370,8 @@
id_num: id_num,
recreate_H_formula: recreate_H_formula,
recreate_L_formula: recreate_L_formula,
division:'${/parameter/@division}'
division:'${/parameter/@division}',
is_constru_unit: '${/parameter/@is_constru_unit}'
},
url: url,
title: '${l:HLS.FIN_CALCULATOR}',
......@@ -1560,6 +1561,7 @@
debugger;
var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
var H1, H54, H159, H16, H12,H99,H102,H15,H44;
var is_constru_unit = '${/parameter/@is_constru_unit}' || 'N';
for (var i = 0; i < temp_head_records.length; i++) {
if (temp_head_records[i].get('column_code') == 'H1') {
H1 = temp_head_records[i].get('column_value') || 0;
......@@ -1623,7 +1625,7 @@
unlock_calc_current_window();
return false;
}
if ('${/parameter/@document_category}' == 'PROJECT' && '${/parameter/@business_type}'=='LEASEBACK') {
if ('${/parameter/@document_category}' == 'PROJECT' && '${/parameter/@business_type}'=='LEASEBACK' && is_constru_unit != 'Y') {
var dowm_payment = div(H16, plus(H99,H102)).toFixed(2) * 100;
if (dowm_payment < 15) {
if ('${/parameter/@division}'!=91) {
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_constru.lview
View file @ 6e7bcea1
......@@ -149,7 +149,8 @@
id_num: 0,
calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
recreate_L_formula: calc_recreate_L_formula,
division:'${/parameter/@division}'
division:'${/parameter/@division}',
is_constru_unit: 'Y'
},
url: url,
fullScreen: true,
......@@ -205,7 +206,8 @@
id_num: 0,
calc_type: '${/parameter/@calc_type}',
recreate_L_formula: 'N',
division:'${/parameter/@division}'
division:'${/parameter/@division}',
is_constru_unit: 'Y'
},
url: url,
fullScreen: true,
......@@ -253,7 +255,8 @@
id_num: 0,
calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
recreate_L_formula: calc_recreate_L_formula,
division:'${/parameter/@division}'
division:'${/parameter/@division}',
is_constru_unit: 'Y'
},
url: url,
fullScreen: true,
......
src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import_details.lview
View file @ 6e7bcea1
......@@ -19,7 +19,7 @@
Leaf.onReady(function() {
var status='${/parameter/@project_status}';
if (('${/parameter/@hide_flag}' == 'Y' || status=='APPROVING' || status=='CLOSED' || status=='CONTRACT_CREATED') && ("${/model/role_info/record/@role_code}"!="0019")) {
if (('${/parameter/@hide_flag}' == 'Y' || status=='APPROVING' || status=='CLOSED' || status=='CONTRACT_CREATED')) {
$('PROJECT_LEASE_IMPORT_user_button1').hide();
$('PROJECT_LEASE_IMPORT_user_button2').hide();
$('PROJECT_LEASE_IMPORT_user_button4').hide();
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview
View file @ 6e7bcea1
......@@ -187,7 +187,8 @@
id_num: 1,
calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
recreate_L_formula: calc_recreate_L_formula,
division:division
division:division,
is_constru_unit: 'Y'
},
url: url,
fullScreen: true,
......@@ -230,7 +231,8 @@
id_num: 1,
calc_type: '${/parameter/@calc_type}',
recreate_L_formula: 'N',
division:division
division:division,
is_constru_unit: 'Y'
},
url: url,
fullScreen: true,
......@@ -591,7 +593,7 @@
var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(lease_item_ds_id == ds.id &&lease_item_ds_id){
var gridId= ds.bindname+'_layout_grid_id';
if(division!='30' && division!='50'&& division!='99'){
if(division!='30' && division!='50'){
$(gridId).hideColumn('machine_number_n');
}
if((division=='70'||division=='92')&&division!=''){
......@@ -1181,7 +1183,7 @@
record.getField('modelcd').setReadOnly(true);
}
if(division=='30'||division=='50'||division=='80'||division=='99'){
if(division=='30'||division=='50'||division=='80'){
record.getField('set_number').setRequired(true);
}else{
record.getField('set_number').setReadOnly(true);
......
src/main/webapp/modules/prj/PRJ502N/prj_project_modify_entrance.lview
View file @ 6e7bcea1
......@@ -17,6 +17,7 @@
<a:link id="prj_project_bp_parameter_link" url="${/request/@context_path}/modules/prj/PRJ501/prj_project_bp_parameter.lview"/>
<!-- <a:link id="car_modify_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain_readonly.lview"/>-->
<a:link id="car_modify_link_readonly" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/>
<a:link id="car_modify_link_readonly_c" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain_constru.lview"/>
<a:link id="car_modify_mananger_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain_manager.lview"/>
<a:link id="prj_project_close_link_id" model="prj.PRJ501.prj_project_close" modelaction="update"/>
<a:link id="car_modify_special_link" url="${/request/@context_path}/modules/prj/PRJ500N/prj_project_create_special.lview"/>
......@@ -27,17 +28,27 @@
function open_project_modify_win(record_id, ds_id) {
var record = $(ds_id).findById(record_id);
var url;
//项目类layout_code
maintain_type = 'QUERY';
param = record.data;
param['document_id'] = record.get('project_id');
param['function_code'] = 'PRJ501Q';
param['function_usage'] = 'MODIFY';
param['bp_class'] = 'NP';
param['maintain_type'] = maintain_type;
param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link_readonly', ds_id);
//add by 18938
if(record.get('is_constru_unit') == 'Y'){
param['function_code'] = 'PRJ501Q_CONSTRU';
url = 'car_modify_link_readonly_c';
}else{
param['function_code'] = 'PRJ501Q';
url = 'car_modify_link_readonly';
}
//end
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, url, ds_id);
}
......
src/main/webapp/modules/zjwfl/ZJWFL1060/zj_wfl_monitoring_node_approve_history.lview
View file @ 6e7bcea1
......@@ -3,7 +3,7 @@
<a:init-procedure>
<a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_workflow_service_display" rootPath="workflow_service_record"/>
<a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_workflow_instance" rootPath="instance_simple_record"/>
<a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_node_info_display" rootPath="node_info_record"/>
<a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_node_info_display" rootPath="node_service_record"/>
</a:init-procedure>
<a:view>
<script type="text/javascript"><![CDATA[
......@@ -17,9 +17,9 @@
<div style="color:red;"><![CDATA[自定义页面获取失败]]></div>
</a:case>
<a:case value="*">
<a:switch test="/model/node_service_info/record/@workflow_code">
<a:switch test="/model/node_service_record/record/@workflow_code">
<a:case value="PROJECT_WFL">
<a:switch test="/model/node_service_info/record/@is_constru_unit">
<a:switch test="/model/node_service_record/record/@is_constru_unit">
<a:case value="Y">
<a:screen-include screen="${/model/workflow_service_record/record/@service_url_constru}"/>
</a:case>
......
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