Skip to content

L
leaf-hlcm
Commit 934213d2 authored by niminmin's avatar niminmin
Browse files
Options

Merge branch 'feature/回租/二次租赁开发' into develop 

# Conflicts:
#	src/main/webapp/modules/csh/CSH501/csh_payment_create_entrance.lview
parents 1ce3db97 39372c51
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 717 additions and 1527 deletions
src/main/webapp/WEB-INF/classes/acp/ACP522/acp_import_contract_lov.lwm
View file @ 934213d2
......@@ -15,6 +15,7 @@
from con_contract c
where c.data_class = 'NORMAL'
and c.contract_status IN ('REPURING','ETING','INCEPT','PENDING')
and c.business_type <>'LEASEBACK'
and not exists (select 1 from acp_invoice_ln an where an.contract_id=c.contract_id and an.confirmation_status in('APPROVING','APPROVED'))
) V
#WHERE_CLAUSE#
......
src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_finish_for_query.lwm
View file @ 934213d2
......@@ -78,10 +78,12 @@
<bm:query-field field="bp_id_agent_desc" queryExpression="bp_id_agent_desc like upper(&apos;%&apos;||${@bp_id_agent_desc}||&apos;%&apos;)"/>
</bm:query-fields>
<bm:data-filters>
<bm:field name="is_terminate" expression="(SELECT ccc.write_off_flag from con_contract_cashflow ccc WHERE ccc.contract_id=t1.contract_id AND ccc.cf_item=8 AND ccc.cf_status=&apos;RELEASE&apos;)=&apos;FULL&apos;"/>
<bm:field name="is_terminate" expression="((t1.contract_status not in('REPURING') and (SELECT ccc.write_off_flag from con_contract_cashflow ccc WHERE ccc.contract_id=t1.contract_id AND ccc.cf_item=8 AND ccc.cf_status=&apos;RELEASE&apos;)=&apos;FULL&apos;)or(t1.contract_status='REPURING'))"/>
<bm:data-filter enforceOperations="query" expression="t1.contract_status in (&apos;INCEPT&apos;,&apos;ETING&apos;,&apos;REPURING&apos;,&apos;TERMINATING&apos;) "/>
<!-- <bm:data-filter enforceOperations="query" expression="t1.lease_end_date &lt;= sysdate"/> -->
<bm:data-filter enforceOperations="query" expression="t1.data_class = &apos;NORMAL&apos;"/>
<!-- <bm:data-filter enforceOperations="query" expression=" not exists (select 1 from con_contract_cashflow ccw where ccw.contract_id = t1.contract_id and ccw.cf_item=1 and ccw.cf_status=&apos;RELEASE&apos; and nvl(ccw.output_tax_create_je_flag,'N')='N')"/>-->
<bm:data-filter enforceOperations="query" expression=" not exists (select 1 from con_contract_cashflow ccw , con_unearned_finance_income cf where ccw.contract_id = t1.contract_id and ccw.cf_item=1 and cf.cashflow_id(+)=ccw.cashflow_id and ccw.cf_status=&apos;RELEASE&apos; and nvl(cf.create_je_flag,'N')='N' and nvl(ccw.output_tax_create_je_flag,'N')='N')"/>
<!-- <bm:data-filter enforceOperations="query" expression="t1.contract_id = ${@contract_id}"/>-->
<!--<bm:data-filter enforceOperations="query" expression=" NOT EXISTS (SELECT 1 FROM con_contract_cashflow WHERE contract_id = t1.contract_id AND cf_item IN (1,8,52) AND (write_off_flag IN (&apos;PARTIAL&apos;, &apos;NOT&apos;) OR received_amount != due_amount))"/>-->
<!--<bm:data-filter enforceOperations="query" expression="exists (select 1 from con_contract where contract_id = t1.contract_id and created_by = ${/session/@user_id})"/>-->
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ 934213d2
......@@ -26,6 +26,7 @@
v.contract_name,
v.project_name,
v.tenant_bp_id,
v.tenant_bp_id bp_id_tenant,
v.bp_id_tenant_n,
v.cf_description,
v.due_amount,
......@@ -46,8 +47,6 @@
v.search_term_1,
'' bank_full_name, --宏菱需要置为空 bank_key
v.irr,
v.application_type_n,
v.application_result_n,
v.price,
v.factory_price,
--代理店账户
......@@ -83,7 +82,9 @@
v.pattern,
v.machine_number,
v.repur_con_amt,
v.repur_con_ddct_amt
v.repur_con_ddct_amt,
v.entrusted_amount,
v.amount_tenant
FROM (SELECT t.contract_id,
(SELECT hbbc.bank_account_id
FROM hls_bp_master_bank_account hbbc
......@@ -100,14 +101,6 @@
(SELECT DECODE(COUNT(1), 0, 'N', 'Y')
FROM acp_invoice_ln ai
WHERE ai.contract_id = t.contract_id)) invoice_uploaded_flag_n,
(SELECT TO_CHAR(SUBSTR(wm_concat(cccr.interface_name), 1, 1000))
FROM con_contract_case_record cccr
WHERE cccr.document_id = t.contract_id
AND cccr.document_table = 'CON_CONTRACT') application_type_n,
(SELECT TO_CHAR(SUBSTR(wm_concat(cccr.status_n), 1, 1000))
FROM con_contract_case_record_lv cccr
WHERE cccr.document_id = t.contract_id
AND cccr.document_table = 'CON_CONTRACT') application_result_n,
f.times,
f.cashflow_id,
t.contract_number,
......@@ -120,35 +113,7 @@
h.description cf_description,
f.due_amount,
t.currency currency_code,
(CASE
WHEN f.cf_item IN (5, 6, 993, 998) THEN
(SELECT t.bank_account_name
FROM hls_bp_master_bank_account_v t
WHERE t.bp_id =
NVL(${@payment_bp_id},
csh_payment_req_pkg.get_bp_id(t.contract_id))
AND t.enabled_flag = 'Y'
AND t.sap_bvtyp = DECODE(t.division,
'10',
'CNYA',
'00',
'CNYA',
'01',
'CNYB')
AND rownum = 1)
WHEN f.cf_item IN (992, 994, 995, 997) THEN
(SELECT t.bank_account_name
FROM hls_bp_master_bank_account_v t
WHERE t.bp_id =
NVL(${@payment_bp_id},
csh_payment_req_pkg.get_bp_id(t.contract_id))
AND t.enabled_flag = 'Y'
AND t.sap_bvtyp = 'CNYC'
AND rownum = 1)
ELSE
NULL
END) bp_bank_account_id_n,
'' bp_bank_account_id_n,
(SELECT t.bank_branch_name
FROM hls_bp_master_bank_account_v t
WHERE t.bp_id =
......@@ -217,20 +182,6 @@
AND h.approval_status = 'APPROVING'),
0)) applied_pay_amount,
t.irr,
-- (SELECT
-- vl.price
-- FROM
-- hls_lease_products_vl vl
-- WHERE
-- vl.lease_products_code =
-- (SELECT
-- l.item_frame_number
-- FROM
-- con_contract_lease_item l
-- WHERE
-- l.contract_id= t.contract_id
-- )
-- )price
i.price,
i.factory_price,
--获得厂商的相关信息
......@@ -250,24 +201,12 @@
from con_contract cc
where cc.contract_id =f.contract_id)
and pq.document_category = 'PROJECT')) other_payment2,
DECODE(t.division, '10', 'CNYA', '00', 'CNYA', '01', 'CNYB') sap_bvtyp,
(SELECT v.code_value_name
FROM sys_code_values_v v
WHERE v.code = 'HLS_SAP_BVTYP'
AND v.code_enabled_flag = 'Y'
AND v.code_value_enabled_flag = 'Y'
AND v.code_value = DECODE(t.division,
'10',
'CNYA',
'00',
'CNYA',
'01',
'CNYB')) sap_bvtyp_n,
i.pattern,
i.machine_number,
nvl((select due_amount from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_amt,
nvl((select due_amount from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_ddct_amt
nvl((select due_amount-nvl(received_amount,0) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_amt,
nvl((select due_amount-nvl(received_amount,0) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_ddct_amt,
nvl(t.entrusted_amount,0) entrusted_amount,
decode(t.business_type,'LEASEBACK',(f.due_amount-nvl(t.down_payment,0)-nvl(t.entrusted_amount,0)),'LEASE',0) amount_tenant
FROM con_contract_cashflow f
join con_contract t
on t.contract_id = f.contract_id
......@@ -278,24 +217,7 @@
on t.project_id = p.project_id
left outer join con_contract_lease_item i
on i.contract_id = t.contract_id
and i.equipment_type = decode(f.cf_item,
5,
'MAIN',
6,
'MAIN',
992,
'MAIN',
997,
'MAIN',
993,
'ACCESSORY',
998,
'ACCESSORY',
994,
'ACCESSORY',
995,
'ACCESSORY',
'')
and i.equipment_type ='MAIN'
where EXISTS (SELECT 1
FROM CSH_PAYMENT_CASHFLOW_ID_TEMP tmp
WHERE tmp.session_id = ${/session/@session_id}
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm
View file @ 934213d2
......@@ -14,6 +14,7 @@
c.contract_name,
c.contract_id,
c.bp_id_agent_level1,
c.bp_id_tenant,
ccli.pattern pattern,
ccli.machine_number machine_number,
ccli.modelcd,
......@@ -118,7 +119,12 @@
cpr.ref_doc_line_id,
cpr.ref_doc_category,
nvl(cpr.repur_con_amt,0)repur_con_amt,
nvl(cpr.repur_con_ddct_amt,0)repur_con_ddct_amt
nvl(cpr.repur_con_ddct_amt,0)repur_con_ddct_amt,
nvl(cpr.amount_tenant,0)amount_tenant,
cpr.tenant_bank_account_name,
cpr.tenant_bank_account_number,
cpr.tenant_bank_account_number tenant_bank_account_number_n,
nvl(c.entrusted_amount,0) entrusted_amount
from csh_payment_req_ln cpr,
con_contract c,
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
View file @ 934213d2
......@@ -160,7 +160,12 @@
where hls_bp_master.bp_id = t.bp_id_agent_level1) bp_id_agent_n,
--查找厂商
(SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n,
hli.vender_name
hli.vender_name,
t.business_type,
(SELECT h.description
FROM hls_business_type h
WHERE h.business_type = t.business_type) AS business_type_n,
f.due_amount-nvl(t.down_payment,0)-nvl(t.entrusted_amount,0) amount_tenant
FROM con_contract_cashflow f,
hls_cashflow_item h,
con_contract_lease_item i,
......@@ -180,9 +185,11 @@
AND f.cf_direction = 'OUTFLOW'
AND NOT EXISTS (
SELECT 1
FROM csh_payment_req_ln l
FROM csh_payment_req_ln l,csh_payment_req_hd hd
WHERE l.ref_doc_line_id=f.cashflow_id
AND l.ref_doc_category='CONTRACT'
and l.payment_req_id=hd.payment_req_id
and hd.approval_status in ('NEW','REJECT','APPROVED','APPROVING','RETURN')
)
AND t.data_class = 'NORMAL'
AND ('Y' = 'Y' AND EXISTS
......@@ -248,10 +255,13 @@
<bm:field name="con_business_type_n"/>
<bm:field name="cdd_list_id"/>
<bm:field name="bp_id_agent_n"/>
<bm:field name="bp_id_tenant"/>
<!-- <bm:field name="vender_name"/>-->
<bm:field name="vender_name_n"/>
<bm:field name="division"/>
<bm:field name="division_n"/>
<bm:field name="business_type"/>
<bm:field name="business_type_n"/>
<bm:field name="first_contract_day"/>
<bm:field name="invoice_uploaded_flag_n"/>
<bm:field name="pattern"/>
......@@ -269,6 +279,7 @@
<bm:field name="cf_61_write_off_flag_n"/>
<bm:field name="billing_status_n"/>
<bm:field name="invoice_status_n"/>
<bm:field name="amount_tenant"/>
<!-- <bm:field name="bp_bank_account_id"/>-->
<!-- <bm:field name="vender_bank_account_id"/>-->
<!-- <bm:field name="vender_name"/>-->
......@@ -336,5 +347,6 @@
<bm:query-field name="cf_61_write_off_flag" queryExpression="t1.cf_61_write_off_flag = ${@cf_61_write_off_flag}"/>
<bm:query-field name="vender_name" queryExpression="t1.vender_name=${@vender_name}"/>
<bm:query-field name="vender_name_n" queryExpression="t1.vender_name_n=${@vender_name_n}"/>
<bm:query-field name="business_type" queryExpression="t1.business_type=${@business_type}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH501/delete_payment_req.lwm
View file @ 934213d2
......@@ -10,9 +10,12 @@
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
DELETE FROM csh_payment_req_hd t where t.payment_req_id = ${@payment_req_id};
DELETE FROM csh_payment_req_ln l where l.payment_req_id = ${@payment_req_id};
update csh_payment_req_hd t
set t.approval_status='CANCEL',
t.closed_flag='Y',
t.last_updated_by=${/session/@user_id},
t.last_update_date=sysdate
where t.payment_req_id = ${@payment_req_id};
end;
]]></bm:update-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/csh/CSH501/get_loan_flag.lwm
View file @ 934213d2
......@@ -9,20 +9,15 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT
'Y' loan_flag
FROM
dual
WHERE
EXISTS
(SELECT
1
FROM
csh_payment_req_debt_ln_lv t
WHERE
t.payment_req_id =${/parameter/@payment_req_id} AND
t.cf_item = 5
)
Select cc.business_type
From csh_payment_req_ln t, con_contract cc
Where t.payment_req_id = ${/parameter/@payment_req_id}
And t.ref_doc_category = 'CONTRACT'
and t.ref_doc_id = cc.contract_id
and rownum = 1
]]></bm:query-sql>
</bm:operation>
</bm:operations>
......
src/main/webapp/WEB-INF/server-script/layoutconfig/csh_create_entrance_g_csh_req_2_queryfields.js
View file @ 934213d2
......@@ -23,7 +23,7 @@ var override_queryfields = [
var add_datafilters = [
{
name : 'approval_status',
expression : "(t1.approval_status NOT in ('NEW','RETURN','REJECT'))"
expression : "(t1.approval_status NOT in ('NEW','RETURN','REJECT','CANCEL'))"
} ];
add_datafilter();
......
src/main/webapp/modules/aut/AUT105/aut_owner_user_authorize.lview
View file @ 934213d2
......@@ -12,90 +12,90 @@
<a:view>
<a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/>
<script type="text/javascript"><![CDATA[
function aut_105_query() {
$('aut_owner_user_authorize_result_ds').query();
function aut_105_query() {
$('aut_owner_user_authorize_result_ds').query();
}
function aut_105_reset() {
$('aut_owner_user_authorize_query_ds').reset();
}
function aut_105_back() {
history.go(-1);
}
function aut_105_next() {
history.go(1);
}
function aut_105_quit() {
location.href = $('sys_service_welcome_link').getUrl();
parent.shMenu('show');
}
function aut_105_grid_add() {
var record = $('aut_owner_user_authorize_result_ds').getCurrentRecord();
if (!record) {
index = 0;
} else {
index = $('aut_owner_user_authorize_result_ds').indexOf(record);
}
function aut_105_reset() {
$('aut_owner_user_authorize_query_ds').reset();
var grid = $('aut_owner_user_authorize_result_ds_grid');
$('aut_owner_user_authorize_result_ds_grid').showEditorByRecord($('aut_owner_user_authorize_result_ds').create(index));
}
function aut_105_grid_clear() {
$('aut_owner_user_authorize_result_ds_grid').clear();
}
function aut_105_grid_delete() {
$('aut_owner_user_authorize_result_ds_grid').remove();
}
function aut_105_grid_submit() {
$('aut_owner_user_authorize_result_ds').submit();
}
function compareDate(start, end) {
if (start > end) {
return false;
}
function aut_105_back() {
history.go(-1);
}
function aut_105_next() {
history.go(1);
}
function aut_105_quit() {
location.href = $('sys_service_welcome_link').getUrl();
parent.shMenu('show');
}
function aut_105_grid_add() {
var record = $('aut_owner_user_authorize_result_ds').getCurrentRecord();
if (!record) {
index = 0;
} else {
index = $('aut_owner_user_authorize_result_ds').indexOf(record);
}
var grid = $('aut_owner_user_authorize_result_ds_grid');
$('aut_owner_user_authorize_result_ds_grid').showEditorByRecord($('aut_owner_user_authorize_result_ds').create(index));
}
function aut_105_grid_clear() {
$('aut_owner_user_authorize_result_ds_grid').clear();
}
function aut_105_grid_delete() {
$('aut_owner_user_authorize_result_ds_grid').remove();
}
function aut_105_grid_submit() {
$('aut_owner_user_authorize_result_ds').submit();
}
function compareDate(start, end) {
if (start > end) {
return false;
}
return true;
}
function dateValidator(record, name, value) {
if (name == 'start_date' || name == 'end_date') {
var start_date = record.get('start_date');
var end_date = record.get('end_date');
if (typeof(end_date) != 'undefined' && !Ext.isEmpty(end_date)) {
if (!compareDate(start_date, end_date)) {
return '${l:START_GREATER_THAN_END}';
}
return true;
}
function dateValidator(record, name, value) {
if (name == 'start_date' || name == 'end_date') {
var start_date = record.get('start_date');
var end_date = record.get('end_date');
if (typeof(end_date) != 'undefined' && !Ext.isEmpty(end_date)) {
if (!compareDate(start_date, end_date)) {
return '${l:START_GREATER_THAN_END}';
}
return true;
}
}
function aut105trxCategoryFunction(record, name) {
if (record.isNew) {
return 'aut105_grid_comb';
} else {
return '';
}
return true;
}
function aut105lovFunction(record, name) {
if (record.isNew) {
return 'aut105_grid_lov';
} else {
return '';
}
}
function aut105trxCategoryFunction(record, name) {
if (record.isNew) {
return 'aut105_grid_comb';
} else {
return '';
}
function aut_105_submitsuccess() {
$('aut_owner_user_authorize_result_ds').query();
}
function aut105lovFunction(record, name) {
if (record.isNew) {
return 'aut105_grid_lov';
} else {
return '';
}
}
function aut_105_submitsuccess() {
$('aut_owner_user_authorize_result_ds').query();
}
]]></script>
<a:dataSets>
<a:dataSet id="document_category_ds" loadData="true" model="aut.AUT103.aut_trx_category_v"/>
......@@ -153,7 +153,7 @@
<a:gridButton click="aut_105_query" text="HLS.QUERY"/>
<a:gridButton click="aut_105_reset" text="HLS.RESET"/>
<a:gridButton click="aut_105_grid_add" text="HLS.NEW"/>
<!-- <a:gridButton click="aut_105_grid_delete" text="HLS.REMOVE"/> -->
<a:gridButton click="aut_105_grid_delete" text="HLS.REMOVE"/>
<a:gridButton click="aut_105_grid_clear" text="HLS.CLEAR"/>
<a:gridButton click="aut_105_grid_submit" text="HLS.SAVE"/>
</a:screenTopToolbar>
......
src/main/webapp/modules/cont/CON302N/con_cashflow_wirte_off_detail.lview
View file @ 934213d2
......@@ -30,7 +30,7 @@ $Purpose:
<a:columns>
<a:column name="write_off_type_desc" prompt="核销类型" width="120"/>
<!-- <a:column name="write_off_classification_desc" prompt="核销分类" width="120"/>-->
<a:column name="journal_date" prompt="核销日期" renderer="Leaf.formatDate" width="120"/>
<a:column name="write_off_date" prompt="核销日期" renderer="Leaf.formatDate" width="120"/>
<a:column name="write_off_due_amount" prompt="核销金额" renderer="Leaf.formatMoney" width="120"/>
<a:column name="transaction_num" prompt="收款编号" width="120"/>
<a:column name="transaction_type" prompt="收款类型" align="center" width="120"/>
......
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ 934213d2
......@@ -66,12 +66,22 @@
if (ds_id == ds.id && ds_id) {
if (record.get('business_type') == 'LEASEBACK'&&'${/parameter/@function_usage}'=='MODIFY') {
record.set('submit_date',null);
record.set('guarantee_letter_f','NO');
record.set('guarantee_letter_f','N');
record.set('guarantee_letter_f_n','否');
record.getField('submit_date').setReadOnly(true);
record.getField('guarantee_letter_f').setReadOnly(true);
record.getField('guarantee_letter_f_n').setReadOnly(true);
}else if(record.get('business_type') == 'LEASE'){
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_ENTRUSTED_AMOUNT_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_ENTRUSTED_AMOUNT').style.display = 'none';
}
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_REPUR_CONTRACT_ID').style.display = 'block';
} else if (record.get('secondary_lease') == 'NO') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
};
......
src/main/webapp/modules/csh/CSH501/csh_payment_req_cashflow_id.lsc
View file @ 934213d2
......@@ -6,7 +6,7 @@
<a:model-insert model="csh.CSH501.csh_payment_req_cashflow_id" trace="true"/>
<a:model-execute model="csh.CSH501.del_csh_pay_cashflow_id_temp"/>
</batch-apply>
<a:model-update model="csh.CSH501.check_cf_0_total_amt" trace="true"/>
<!-- <a:model-update model="csh.CSH501.check_cf_0_total_amt" trace="true"/>-->
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
src/main/webapp/modules/gld/GLD107/gld_je_template_header.lview
View file @ 934213d2
......@@ -189,7 +189,7 @@
<a:gridButton click="para_headDs_reset" text="HLS.RESET"/>
<a:gridButton click="headDs_grid_add" text="HLS.NEW"/>
<a:gridButton click="headDs_grid_clear" text="HLS.CLEAR"/>
<!-- <a:gridButton click="headDs_grid_remove" text="HLS.REMOVE"/> -->
<a:gridButton click="headDs_grid_remove" text="HLS.REMOVE"/>
<a:gridButton click="headDs_grid_save" text="HLS.SAVE"/>
</a:screenTopToolbar>
<a:form column="4" labelWidth="120" title="HAP_QUERY_TITLE">
......
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @ 934213d2
......@@ -969,6 +969,12 @@
headRecords[i].set('column_value', detention);
headRecords[i].set('column_value_c', detention);
}
if (column_name =='business_type') {
headRecords[i].set('input_mode', 'READONLY');
headRecords[i].set('readonly_input_mode', 'TRUE');
headRecords[i].getField('column_value').setReadOnly(true);
headRecords[i].getField('column_value_c').setReadOnly(true);
}
}
......@@ -1663,6 +1669,14 @@
if (!$('temp_hd_attribute_ds').find('column_code', temp_head_records[i].get('column_code'))) {
$('temp_hd_attribute_ds').create(temp_head_records[i].data);
}
var H16;
if (temp_head_records[i].get('column_code') == 'H16') {
H16 = temp_head_records[i].get('column_value');
}
if (temp_head_records[i].get('column_code') == 'H109') {
temp_head_records[i].set('column_value', H16);
// temp_head_records[i].set('column_value_c',0);
}
}
var all_records = $('temp_hd_attribute_ds').getAll();
var headRecord = $('hls_fin_cal_save_hd_ds').getAt(0);
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 934213d2
......@@ -814,8 +814,8 @@
strJs = strJs.substr(0, strJs.length - 1) + '})';
return eval(strJs);
}
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
if (ds_id == ds.id && ds_id) {
if (record.get('pay_method') == 'WIRE_TRANSFER') {
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 934213d2
......@@ -707,25 +707,34 @@
record.getField('bank_branch_name_n').setRequired(false);
}
if('${/parameter/@function_usage}'!='QUERY'){
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
if('${/parameter/@function_usage}'!='QUERY') {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
} else {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
} else if (record.get('secondary_lease') == 'NO') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}
//业务类型回租时，默认只读“首付款抵扣”选项
if (record.get('business_type') == 'LEASEBACK') {
record.set('payment_deduction', 'DOWN_PAYMENT_DEDUCTION');
......
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