Skip to content

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

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

# Conflicts:
#	src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
#	src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview
parents 7173cd92 6e7bcea1
Hide whitespace changes
Inline Side-by-side
Showing with 273 additions and 73 deletions
src/main/webapp/WEB-INF/classes/cont/CON542/con_contract_for_query.lwm
View file @ c0b76866
......@@ -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 @ c0b76866
......@@ -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 @ c0b76866
......@@ -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 @ c0b76866
......@@ -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/CON3200/con_re_incept_modify.lview
View file @ c0b76866
......@@ -607,9 +607,9 @@
Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
return;
}
debugger;
if ($(ds_id).validate()) {
debugger;
if('${/model/wfl_status/record/@mar_status}' == 'Y'){
if('${/model/wfl_status/record/@mar_status}' == 'Y' || Ext.isEmpty('${/model/wfl_status/record/@mar_status}')){
if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin')){
Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租');
return;
......
src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
View file @ c0b76866
......@@ -115,6 +115,9 @@
};
if(record.data.lease_name92=='Y'){//add by gzj
record.data.division=record.data.division+',92';
};
if(record.data.lease_name99=='Y'){//add by gzj
record.data.division=record.data.division+',99';
};
record.data.division=record.data.division.substr(1,record.data.division.length);
$('contract_sales_result_ds').query();
......@@ -208,7 +211,8 @@
<a:checkBox name="lease_name40" bindTarget="contract_sales_report_ds" prompt="其它"/>
<a:checkBox name="lease_name91" bindTarget="contract_sales_report_ds" prompt="神钢建机"/>//addby xsh35973 20221011 I-12357新增产品线
<a:checkBox name="lease_name92" bindTarget="contract_sales_report_ds" prompt="北京心诚"/>
</a:form>
<a:checkBox name="lease_name99" bindTarget="contract_sales_report_ds" prompt="工程机械"/>
</a:form>
<a:grid id="contract_sales_result_ds_grid" bindTarget="contract_sales_result_ds" marginHeight="150" navBar="true" marginWidth="40">
<a:columns>
......
src/main/webapp/modules/cont/CON3500/contract_ifrs9_report.lview
View file @ c0b76866
......@@ -35,6 +35,7 @@
record.data.division9='';
record.data.division10='';
record.data.division11='';
record.data.division12='';
if(record.data.lease_name10=='Y'){
record.data.division1='10';
}
......@@ -68,9 +69,12 @@
if(record.data.lease_name92=='Y'){
record.data.division11='92';
};
if(record.data.lease_name99=='Y'){
record.data.divisio12='99';
};
// record.data.division=record.data.division.substr(1,record.data.division.length);
if(record.data.division1 == ''&&record.data.division2 == ''&&record.data.division3 == ''&&record.data.division4 == ''
&&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''&&record.data.division10 == ''&&record.data.division11 == ''){
&&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''&&record.data.division10 == ''&&record.data.division11 == ''&&record.data.division12 == ''){
// record.data.division1='10,20,30,40,50,60,70,80';
record.data.division1='10';
record.data.division2='20';
......@@ -83,6 +87,8 @@
record.data.division9='90';
record.data.division10='91';
record.data.division11='92';
record.data.division12='99';
};
param['division1']= record.data.division1;
param['division2']= record.data.division2;
......@@ -95,6 +101,7 @@
param['division9']= record.data.division9;
param['division10']= record.data.division10;
param['division11']= record.data.division11;
param['division12']= record.data.division12;
param['period_name']=period_name;
param['function_code'] = 'CON3400N';
param['function_usage'] = 'MODIFY';
......
src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
View file @ c0b76866
......@@ -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/cont/CON505/con_contract_modify.lview
View file @ c0b76866
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview
View file @ c0b76866
......@@ -51,6 +51,9 @@
if(record.data.lease_name92=='Y'){//add by gzj 2022-12-19 10:17:53
record.data.division=record.data.division+',92';
};
if(record.data.lease_name99=='Y'){//add by gzj 2022-12-19 10:17:53
record.data.division=record.data.division+',99';
};
record.data.division=record.data.division.substr(1,record.data.division.length);
Leaf.Masker.mask(Ext.getBody(), '正在统计并查询，请稍等...');
Leaf.request({
......@@ -157,6 +160,7 @@
<a:field checkedValue="Y" name="lease_name80" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name90" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name92" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name99" uncheckedValue="N" defaultValue="N"/>
<a:field name="division" />
<a:field name="overdue_day1" required="true" prompt="已到期1个月界定天数" defaultValue="30"/>
<a:field name="overdue_day2" required="true" prompt="已到期2个月界定天数" defaultValue="60"/>
......@@ -206,6 +210,7 @@
<a:checkBox name="lease_name40" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="其它"/>
<a:checkBox name="lease_name91" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="神钢建机"/>//addby xsh35973 20221011 I-12357新增产品线
<a:checkBox name="lease_name92" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="北京心诚"/>
<a:checkBox name="lease_name99" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="工程机械"/>
......
src/main/webapp/modules/csh/CSH501/csh_payment_create_entrance.lview
View file @ c0b76866
......@@ -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 @ c0b76866
......@@ -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 @ c0b76866
......@@ -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/csh/CSH531F/csh_bank_recoi_margin_check.lview
View file @ c0b76866
......@@ -47,18 +47,20 @@
//自定义提交审批保存
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
debugger;
window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
var ds_id = 'MARGIN_CHECK_F_QUERY_csh_margin_check_ds';
var ds_result_id = 'MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
var record=$(ds_id).getCurrentRecord();
var params = record.data;
var marAfterStatus= params.mar_after_status;
var beforStatus=params.mar_before_status;
if(Ext.isEmpty(marAfterStatus)){
Leaf.showErrorMessage('提示', '修改后茂甲保证金校验状态不能为空!');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
if (marAfterStatus == '${/model/wfl_status/record/@mar_status}') {
if (marAfterStatus == '${/model/wfl_status/record/@mar_status}' || marAfterStatus == beforStatus) {
Leaf.showErrorMessage('提示', '请选择与修改前茂甲保证金校验不同的状态');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
......@@ -80,9 +82,6 @@
url: $('${/parameter/@layout_code}_csh531_margin_check_save_link_id').getUrl(),
para: params,
success: function(res) {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
debugger;
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var marginCheckId=res.result.margin_check_id;
Leaf.request({
url: $('${/parameter/@layout_code}_csh531_margin_check_submit_link_id').getUrl(),
......
src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview
View file @ c0b76866
......@@ -48,6 +48,8 @@ $Purpose: 商业伙伴授信维护
link_function = 'on_business_tenant_detail_window';
}else if ( record.get('bp_category')=='AGENT'){
link_function = 'on_business_agent_detail_window';
}else if(record.get('bp_category')=='VENDER'){
link_function = 'on_business_tenant_detail_window';
}
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + value + '</a>';
}
......@@ -198,6 +200,17 @@ $Purpose: 商业伙伴授信维护
param['url_title'] = '商业伙伴授信详细';
hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_agent_detail_link', null);
}
// //--供应商的详细信息
// function on_business_agent_detail_window(id, name) {
// //获得该条record的所有数据
// var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
// var param = record.data;
// param['function_code'] = 'HLS36103';
// param['function_usage'] = 'MODIFY';
// param['maintain_type'] = 'UPDATE';
// param['url_title'] = '商业伙伴授信详细';
// hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_agent_detail_link', null);
// }
// //变更履历按钮
window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
......
src/main/webapp/modules/hls/HLS362N/hls_bp_master_credit_confirm.lview
View file @ c0b76866
......@@ -39,6 +39,8 @@ $Purpose: 商业伙伴授信维护
link_function = 'on_business_tenant_detail_window';
}else if ( record.get('bp_category')=='AGENT'){
link_function = 'on_business_agent_detail_window';
}else if(record.get('bp_category')=='VENDER'){
link_function = 'on_business_tenant_detail_window';
}
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + value + '</a>';
......
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @ c0b76866
......@@ -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.lview
View file @ c0b76866
......@@ -66,7 +66,7 @@
// alert('${/parameter/@division}')
//add by zhuxianfei
Leaf.onReady(function() {
if(division!='30' && division!='50'){
if(division!='30' && division!='50'&& division!='99'){
var gridId= 'PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id';
$(gridId).hideColumn('machine_number_n');
}
......@@ -112,7 +112,7 @@
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
if(division=='30' || division=='50'|| division=='99'){
var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){
......@@ -185,7 +185,7 @@
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
if(division=='30' || division=='50'|| division=='99'){
var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){
......@@ -903,7 +903,7 @@
var bp_code='${/model/user_agent_description/record/@bp_code}';
var invoice_agent_id=record.get('invoice_agent_id');
if((division=='80'||division=='30'||division=='50') && invoice_agent_id !== "25321"){
if((division=='80'||division=='30'||division=='50'|| division=='99') && invoice_agent_id !== "25321"){
record.set('credit_line','TENANT');
record.set('credit_line_n','承租人');
}
......@@ -975,7 +975,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) {
if(division=='30'||division=='50'||division=='80'){
if(division=='30'||division=='50'||division=='80'|| division=='99'){
record.getField('set_number').setRequired(true);
}else{
record.getField('set_number').setReadOnly(true);
......@@ -1282,7 +1282,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'){
if(division!='30' && division!='50'&& division!='99'){
$(gridId).hideColumn('machine_number_n');
}
if(division=='70'|| division=='92'){
......@@ -1489,7 +1489,7 @@
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(division=='30'||division=='50'){
if(division=='30'||division=='50'|| division=='99'){
var record=$(lease_ds_id).getCurrentRecord();
var records=$(ds_id).getCurrentRecord();
var set_number=records.get('set_number');
......@@ -1548,7 +1548,7 @@
Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () {
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(division=='30'||division=='50'){
if(division=='30'||division=='50'|| division=='99'){
var record=$(lease_ds_id).getCurrentRecord();
var records=$(ds_id).getCurrentRecord();
var set_number=records.get('set_number');
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_constru.lview
View file @ c0b76866
......@@ -62,7 +62,7 @@
<script type="text/javascript"><![CDATA[
//add by zhuxianfei
Leaf.onReady(function() {
if(division!='30' && division!='50'){
if(division!='30' && division!='50'&& division!='99'){
var gridId= 'PROJECT_CONSTRU_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id';
$(gridId).hideColumn('machine_number_n');
}
......@@ -101,7 +101,7 @@
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
if(division=='30' || division=='50'||division=='99'){
var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){
......@@ -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,
......@@ -174,7 +175,7 @@
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
if(division=='30' || division=='50'||division=='99'){
var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){
......@@ -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,
......@@ -909,7 +912,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) {
if(division=='30'||division=='50'||division=='80'){
if(division=='30'||division=='50'||division=='80'||division=='99'){
record.getField('set_number').setRequired(true);
}else{
record.getField('set_number').setReadOnly(true);
......@@ -1167,7 +1170,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'){
if(division!='30' && division!='50'&& division!='99'){
$(gridId).hideColumn('machine_number_n');
}
if(division=='70'|| division=='92'){
......@@ -1375,7 +1378,7 @@
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(division=='30'||division=='50'){
if(division=='30'||division=='50'||division=='99'){
var record=$(lease_ds_id).getCurrentRecord();
var records=$(ds_id).getCurrentRecord();
var set_number=records.get('set_number');
......@@ -1434,7 +1437,7 @@
Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () {
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(division=='30'||division=='50'){
if(division=='30'||division=='50'||division=='99'){
var record=$(lease_ds_id).getCurrentRecord();
var records=$(ds_id).getCurrentRecord();
var set_number=records.get('set_number');
......
src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import_details.lview
View file @ c0b76866
......@@ -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.lview
View file @ c0b76866
......@@ -172,7 +172,7 @@
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
if(division=='30' || division=='50'|| division=='99'){
var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){
......@@ -248,7 +248,7 @@
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
if(division=='30' || division=='50'|| division=='99'){
var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){
......@@ -1023,7 +1023,7 @@
$(bp_ds_ids).query();*/
if(lease_item_ds_id == ds.id &&lease_item_ds_id){
var gridId= ds.bindname+'_layout_grid_id';
if(division!='30' && division!='50'){
if(division!='30' && division!='50'&& division!='99'){
$(gridId).hideColumn('machine_number_n');
}
if((division=='70'||division=='92')&&division!=''){
......@@ -1063,7 +1063,7 @@
$(gridId).hideColumn('created_by_n');
}
if (lease_item_ds_id == ds.id && lease_item_ds_id) {
if(division=='30'||division=='50'||division=='80'){
if(division=='30'||division=='50'||division=='80'||division=='99'){
record.getField('set_number').setRequired(true);
}else{
record.getField('set_number').setReadOnly(true);
......@@ -1257,7 +1257,7 @@
var credit_record = $(ds_id).getCurrentRecord();
var invoice_agent_id=record.get('invoice_agent_id');
if((division=='80'||division=='30'||division=='50') && invoice_agent_id !== 25321){
if((division=='80'||division=='30'||division=='50'||division=='99') && invoice_agent_id !== 25321){
credit_record.set('credit_line','TENANT');
credit_record.set('credit_line_n','承租人');
}
......@@ -1725,7 +1725,7 @@
Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () {
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(division=='30'||division=='50'){
if(division=='30'||division=='50'|| division=='99'){
var record=$(lease_ds_id).getCurrentRecord();
var records=$(ds_id).getCurrentRecord();
var set_number=records.get('set_number');
......@@ -1785,7 +1785,7 @@
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(division=='30'||division=='50'){
if(division=='30'||division=='50'|| division=='99'){
var record=$(lease_ds_id).getCurrentRecord();
var records=$(ds_id).getCurrentRecord();
var set_number=records.get('set_number');
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_constru.lview
View file @ c0b76866
......@@ -164,7 +164,7 @@
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
if(division=='30' || division=='50'||division=='99'){
var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){
......@@ -240,7 +240,7 @@
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
if(division=='30' || division=='50'||division=='99'){
var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){
......@@ -928,7 +928,7 @@
if(lease_item_ds_id == ds.id &&lease_item_ds_id){
var gridId= ds.bindname+'_layout_grid_id';
if(division!='30' && division!='50'){
if(division!='30' && division!='50'&&division!='99'){
$(gridId).hideColumn('machine_number_n');
}
if((division=='70'||division=='92')&&division!=''){
......@@ -967,7 +967,7 @@
$(gridId).hideColumn('created_by_n');
}
if (lease_item_ds_id == ds.id && lease_item_ds_id) {
if(division=='30'||division=='50'||division=='80'){
if(division=='30'||division=='50'||division=='80'||division=='99'){
record.getField('set_number').setRequired(true);
}else{
record.getField('set_number').setReadOnly(true);
......@@ -1127,7 +1127,7 @@
var description = '${/model/description/record/@employee_type_code}';
var bp_code='${/model/user_agent_description/record/@bp_code}';
var credit_record = $(ds_id).getCurrentRecord();
if(division=='80'||division=='30'||division=='50'){
if(division=='80'||division=='30'||division=='50'||division=='99'){
credit_record.set('credit_line','TENANT');
credit_record.set('credit_line_n','承租人');
}else if(!Ext.isEmpty(description) && description == 'AGENT'){
......@@ -1578,7 +1578,7 @@
Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () {
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(division=='30'||division=='50'){
if(division=='30'||division=='50'||division=='99'){
var record=$(lease_ds_id).getCurrentRecord();
var records=$(ds_id).getCurrentRecord();
var set_number=records.get('set_number');
......@@ -1638,7 +1638,7 @@
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(division=='30'||division=='50'){
if(division=='30'||division=='50'||division=='99'){
var record=$(lease_ds_id).getCurrentRecord();
var records=$(ds_id).getCurrentRecord();
var set_number=records.get('set_number');
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview
View file @ c0b76866
......@@ -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,
......
src/main/webapp/modules/prj/PRJ502N/prj_project_modify_entrance.lview
View file @ c0b76866
......@@ -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 @ c0b76866
......@@ -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