Skip to content

L
leaf-hlcm
Commit 894bb4b2 authored by xy's avatar xy
Browse files
Options

[建机]-虚拟代理店需求

parent 85e97b4b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5339 additions and 262 deletions
src/main/webapp/WEB-INF/classes/cont/CON202/con_contract_tmpt_clause_main.lwm
View file @ 894bb4b2
...@@ -70,6 +70,11 @@ ...@@ -70,6 +70,11 @@
<bm:field name="finance_type_n" expression="(select code_value_name from sys_code_values_v scv where scv.code=&apos;FINANCE_TYPE&apos; and scv.code_value = t1.finance_type)" forInsert="false" forUpdate="false"/> <bm:field name="finance_type_n" expression="(select code_value_name from sys_code_values_v scv where scv.code=&apos;FINANCE_TYPE&apos; and scv.code_value = t1.finance_type)" forInsert="false" forUpdate="false"/>
<bm:field name="pay_method"/> <bm:field name="pay_method"/>
<bm:field name="pay_method_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = &apos;PAY_METHODS&apos; and v.code_value=t1.pay_method)" forInsert="false" forUpdate="false"/> <bm:field name="pay_method_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = &apos;PAY_METHODS&apos; and v.code_value=t1.pay_method)" forInsert="false" forUpdate="false"/>
<bm:field name="is_buyout"/>
<bm:field name="is_buyout_n" expression="(Select v.code_value_name From sys_code_values_v v Where v.code = &apos;YES_OR_NO&apos; And v.code_enabled_flag = &apos;Y&apos; And v.code_value_enabled_flag = &apos;Y&apos; And v.code_value = t1.is_buyout)" forInsert="false" forUpdate="false"/>
<bm:field name="is_constru_unit"/>
<bm:field name="is_constru_unit_n" expression="(Select v.code_value_name From sys_code_values_v v Where v.code = &apos;YES_OR_NO&apos; And v.code_enabled_flag = &apos;Y&apos; And v.code_value_enabled_flag = &apos;Y&apos; And v.code_value = t1.is_constru_unit)" forInsert="false" forUpdate="false"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<o:sequence-pk sequenceName="con_contract_tmpt_clause_s"/> <o:sequence-pk sequenceName="con_contract_tmpt_clause_s"/>
......
src/main/webapp/WEB-INF/classes/cont/CON542/con_contract_for_query.lwm
View file @ 894bb4b2
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<bm:field name="sign_contract_status_n"/> <bm:field name="sign_contract_status_n"/>
<bm:field name="bp_id_tenant_n"/> <bm:field name="bp_id_tenant_n"/>
<bm:field name="bp_id_agent_level1_n"/> <bm:field name="bp_id_agent_level1_n"/>
<bm:field name="is_constru_unit"/>
</bm:fields> </bm:fields>
<bm:primary-key> <bm:primary-key>
<bm:pk-field name="contract_id"/> <bm:pk-field name="contract_id"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ 894bb4b2
...@@ -88,7 +88,9 @@ ...@@ -88,7 +88,9 @@
v.write_off_date, v.write_off_date,
v.write_off_amount, v.write_off_amount,
v.division, v.division,
v.finance_amount v.finance_amount,
v.lease_item_amount,
v.is_buyout
FROM (SELECT t.contract_id, FROM (SELECT t.contract_id,
(SELECT hbbc.bank_account_id (SELECT hbbc.bank_account_id
FROM hls_bp_master_bank_account hbbc FROM hls_bp_master_bank_account hbbc
...@@ -220,7 +222,9 @@ ...@@ -220,7 +222,9 @@
from csh_write_off cwo from csh_write_off cwo
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount, where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount,
t.division, t.division,
t.finance_amount t.finance_amount,
t.lease_item_amount,
nvl(t.is_buyout,'N') is_buyout
FROM con_contract_cashflow f FROM con_contract_cashflow f
join con_contract t join con_contract t
on t.contract_id = f.contract_id 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 @ 894bb4b2
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
cpr.bp_bank_account_name BP_BANK_ACCOUNT_NAME, cpr.bp_bank_account_name BP_BANK_ACCOUNT_NAME,
--应付我司金额 --应付我司金额
cpr.amount_agent, nvl(cpr.amount_agent,0) amount_agent,
cpr.amount_vender, cpr.amount_vender,
to_char(cpr.amount_agent,'FM999,999,999,990.00') amount_agent_print, 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, to_char(cpr.amount_vender,'FM999,999,999,990.00') amount_vender_print,
...@@ -131,7 +131,8 @@ ...@@ -131,7 +131,8 @@
nvl((select sum(cwo.write_off_due_amount) write_off_amount nvl((select sum(cwo.write_off_due_amount) write_off_amount
from csh_write_off cwo from csh_write_off cwo
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=c.contract_id),0) write_off_amount, 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, from csh_payment_req_ln cpr,
con_contract c, con_contract c,
hls_bp_master hbm, hls_bp_master hbm,
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
View file @ 894bb4b2
...@@ -158,6 +158,11 @@ ...@@ -158,6 +158,11 @@
(select bp_name (select bp_name
from hls_bp_master from hls_bp_master
where hls_bp_master.bp_id = t.bp_id_agent_level1) bp_id_agent_n, 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, (SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n,
hli.vender_name, hli.vender_name,
...@@ -255,6 +260,8 @@ ...@@ -255,6 +260,8 @@
<bm:field name="con_business_type_n"/> <bm:field name="con_business_type_n"/>
<bm:field name="cdd_list_id"/> <bm:field name="cdd_list_id"/>
<bm:field name="bp_id_agent_n"/> <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="bp_id_tenant"/>
<!-- <bm:field name="vender_name"/>--> <!-- <bm:field name="vender_name"/>-->
<bm:field name="vender_name_n"/> <bm:field name="vender_name_n"/>
......
src/main/webapp/WEB-INF/classes/prj/PRJ500D/user_agent_description.lwm
View file @ 894bb4b2
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select h.bp_name, h.bp_code, h.bp_id select h.bp_name, h.bp_code, h.bp_id,nvl(h.is_constru_unit,'N') as is_constru_unit
from exp_emp_assign_e_v ee, hls_bp_master h from exp_emp_assign_e_v ee, hls_bp_master h
where ee.user_id = ${/session/@user_id} where ee.user_id = ${/session/@user_id}
and ee.unit_id = h.unit_id and ee.unit_id = h.unit_id
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_info_approve_history.lwm 0 → 100644
View file @ 894bb4b2
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
Select nvl((Select distinct zw.workflow_code
From zj_wfl_workflow zw, zj_wfl_workflow_instance zi
Where zw.workflow_id = zi.workflow_id
And zi.instance_id = t1.instance_id),'N') as workflow_code,
nvl((Select hm.is_constru_unit
From prj_project pp, hls_bp_master hm
Where pp.invoice_agent_id = hm.bp_id
And pp.wfl_instance_id = t1.instance_id),
'N') as is_constru_unit
From zj_wfl_instance_node_rcpt_ht t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_info_display.lwm 0 → 100644
View file @ 894bb4b2
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
Select nvl((Select distinct zw.workflow_code
From zj_wfl_workflow zw
Where zw.workflow_id = t1.workflow_id),'N') as workflow_code,
nvl((Select hm.is_constru_unit
From prj_project pp, hls_bp_master hm
Where pp.invoice_agent_id = hm.bp_id
And pp.wfl_instance_id = t1.instance_id),
'N') as is_constru_unit
From zj_wfl_workflow_instance t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_info_query.lwm 0 → 100644
View file @ 894bb4b2
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
Select nvl((Select distinct zw.workflow_code
From zj_wfl_workflow zw, zj_wfl_workflow_instance zi
Where zw.workflow_id = zi.workflow_id
And zi.instance_id = t1.instance_id),'N') as workflow_code,
nvl((Select hm.is_constru_unit
From prj_project pp, hls_bp_master hm
Where pp.invoice_agent_id = hm.bp_id
And pp.wfl_instance_id = t1.instance_id),
'N') as is_constru_unit
From zj_wfl_instance_node_recipient t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_service_approve_history.lwm
View file @ 894bb4b2
...@@ -3,10 +3,13 @@ ...@@ -3,10 +3,13 @@
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select zj_wfl_core_pkg.get_node_service_url(t1.record_id, Select t1.*,replace(t1.service_url,
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru
From (select zj_wfl_core_pkg.get_node_service_url(tt.record_id,
${/parameter/@url_type}, ${/parameter/@url_type},
${/session/@user_id}) as service_url ${/session/@user_id}) as service_url,tt.*
from zj_wfl_instance_node_rcpt_ht t1 from zj_wfl_instance_node_rcpt_ht tt) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_service_wait_to_do.lwm
View file @ 894bb4b2
...@@ -3,10 +3,13 @@ ...@@ -3,10 +3,13 @@
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select zj_wfl_core_pkg.get_node_service_url(t1.record_id, Select t1.*,replace(t1.service_url,
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru
From (select zj_wfl_core_pkg.get_node_service_url(tt.record_id,
${/parameter/@url_type}, ${/parameter/@url_type},
${/session/@user_id}) as service_url ${/session/@user_id}) as service_url,tt.*
from zj_wfl_instance_node_recipient t1 from zj_wfl_instance_node_recipient tt) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_workflow_service_display.lwm
View file @ 894bb4b2
...@@ -3,9 +3,12 @@ ...@@ -3,9 +3,12 @@
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select zj_wfl_core_pkg.get_wfl_service_url(t1.instance_id, Select t1.*,replace(t1.service_url,
${/session/@user_id}) as service_url 'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
from zj_wfl_workflow_instance t1 'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru
From (select zj_wfl_core_pkg.get_wfl_service_url(tt.instance_id,
${/session/@user_id}) as service_url,tt.*
from zj_wfl_workflow_instance tt) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
......
src/main/webapp/modules/cont/CON202/con_basic_clause_detail.lview
View file @ 894bb4b2
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<a:dataSet id="pay_methods_ds" lookupCode="PAY_METHODS"/> <a:dataSet id="pay_methods_ds" lookupCode="PAY_METHODS"/>
<a:dataSet id="con202_withway_ds" lookupCode="WITHHOLD_WAYS"/> <a:dataSet id="con202_withway_ds" lookupCode="WITHHOLD_WAYS"/>
<a:dataSet id="secondary_lease_ds" lookupCode="SECONDARY_LEASE"/> <a:dataSet id="secondary_lease_ds" lookupCode="SECONDARY_LEASE"/>
<a:dataSet id="is_buyout_ds" lookupCode="YES_OR_NO"/>
<a:dataSet id="con202_finance_type" lookupCode="FINANCE_TYPE"/> <a:dataSet id="con202_finance_type" lookupCode="FINANCE_TYPE"/>
<a:dataSet id="hls_bp_class_ds" lookupCode="HLS211_BP_CLASS"/> <a:dataSet id="hls_bp_class_ds" lookupCode="HLS211_BP_CLASS"/>
<a:dataSet id="other_tmpt_clause_ds" lookupCode="CON202_CON_PRINT_OTHER_CONDITON"/> <a:dataSet id="other_tmpt_clause_ds" lookupCode="CON202_CON_PRINT_OTHER_CONDITON"/>
...@@ -36,6 +37,9 @@ ...@@ -36,6 +37,9 @@
<a:field name="withhold_way_n" displayField="code_value_name" options="con202_withway_ds" returnField="withhold_way" valueField="code_value"/> <a:field name="withhold_way_n" displayField="code_value_name" options="con202_withway_ds" returnField="withhold_way" valueField="code_value"/>
<a:field name="pay_method_n" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/> <a:field name="pay_method_n" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/>
<a:field name="secondary_lease_n" displayField="code_value_name" options="secondary_lease_ds" returnField="secondary_lease" valueField="code_value"/> <a:field name="secondary_lease_n" displayField="code_value_name" options="secondary_lease_ds" returnField="secondary_lease" valueField="code_value"/>
<a:field name="is_buyout_n" displayField="code_value_name" options="is_buyout_ds" returnField="is_buyout" valueField="code_value"/>
<a:field name="is_constru_unit_n" displayField="code_value_name" options="is_buyout_ds" returnField="is_constru_unit" valueField="code_value"/>
<a:field name="marital_status_flag_n" displayField="code_value_name" options="marital_status_flag_ds" returnField="marital_status_flag" valueField="code_value"/> <a:field name="marital_status_flag_n" displayField="code_value_name" options="marital_status_flag_ds" returnField="marital_status_flag" valueField="code_value"/>
<a:field name="sp_sign_flag_n" displayField="code_value_name" options="sp_sign_flag_ds" returnField="sp_sign_flag" valueField="code_value"/> <a:field name="sp_sign_flag_n" displayField="code_value_name" options="sp_sign_flag_ds" returnField="sp_sign_flag" valueField="code_value"/>
<a:field name="finance_type"/> <a:field name="finance_type"/>
...@@ -127,6 +131,8 @@ ...@@ -127,6 +131,8 @@
<a:column name="bp_category_n" editor="lov" prompt="商业伙伴类型" width="100"/> <a:column name="bp_category_n" editor="lov" prompt="商业伙伴类型" width="100"/>
<a:column name="vender_id_n" editor="lov" prompt="厂商" width="100"/> <a:column name="vender_id_n" editor="lov" prompt="厂商" width="100"/>
<a:column name="secondary_lease_n" editor="cb" prompt="二次租赁" width="100"/> <a:column name="secondary_lease_n" editor="cb" prompt="二次租赁" width="100"/>
<a:column name="is_buyout_n" editor="cb" prompt="是否买断机" width="100"/>
<a:column name="is_constru_unit_n" editor="cb" prompt="宏菱建机部" width="100"/>
<a:column name="bp_class_n" editor="cb" prompt="商业伙伴分类" width="100"/> <a:column name="bp_class_n" editor="cb" prompt="商业伙伴分类" width="100"/>
<a:column name="business_type_n" editor="lov" prompt="业务类型" width="80"/> <a:column name="business_type_n" editor="lov" prompt="业务类型" width="80"/>
<a:column name="business_type" editor="lov" prompt="业务类型" width="80"/> <a:column name="business_type" editor="lov" prompt="业务类型" width="80"/>
......
src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
View file @ 894bb4b2
...@@ -126,7 +126,11 @@ ...@@ -126,7 +126,11 @@
//add by gzj 2022-12-23 北京卡家 //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 =='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 =='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 // word转pdf
var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id; 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 @ 894bb4b2
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/> <a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="csh_payment_req_create_link" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_selected.lview"/> <a:link id="csh_payment_req_create_link"
<a:link id="csh_payment_req_history_print_link_id" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_history_pdf_print.lsc"/> url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_selected.lview"/>
<a:link id="csh_payment_req_history_word_link_id" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_history_word_print.lsc"/> <a:link id="csh_payment_req_history_print_link_id"
url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_history_pdf_print.lsc"/>
<a:link id="get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="tre_loan_contact_cancel_change_link_id" model="lon.LON120.tre_loan_change_cancel" <a:link id="tre_loan_contact_cancel_change_link_id" model="lon.LON120.tre_loan_change_cancel"
modelaction="update"/> modelaction="update"/>
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
Leaf.onReady(function () { Leaf.onReady(function () {
//付款打印按钮只有会计担当和会计部长可见 //付款打印按钮只有会计担当和会计部长可见
if ("${/model/role_info/record/@role_code}" != "0013" && "${/model/role_info/record/@role_code}" != "0014" && "${/model/role_info/record/@role_code}" != "0010"&& "${/model/role_info/record/@role_code}" != "0006") { if ("${/model/role_info/record/@role_code}" != "0013" && "${/model/role_info/record/@role_code}" != "0014" && "${/model/role_info/record/@role_code}" != "0010") {
//$('${/parameter/@layout_code}_user_button5').style.display='none'; //$('${/parameter/@layout_code}_user_button5').style.display='none';
Ext.fly('${/parameter/@layout_code}_user_button5').dom.style.display = "none"; Ext.fly('${/parameter/@layout_code}_user_button5').dom.style.display = "none";
} else { } else {
...@@ -36,22 +37,11 @@ ...@@ -36,22 +37,11 @@
//获取该付款申请的头id //获取该付款申请的头id
var payment_req_id = records[0].get('payment_req_id'); var payment_req_id = records[0].get('payment_req_id');
var payment_status = records[0].get('approval_status'); var payment_status = records[0].get('approval_status');
var division = records[0].get('con_division');
if (payment_status != "APPROVED") { if (payment_status != "APPROVED") {
$L.showInfoMessage("提示", '只有审批通过的付款申请才能打印,且一次只能打印一个付款申请!'); $L.showInfoMessage("提示", '只有审批通过的付款申请才能打印,且一次只能打印一个付款申请!');
return; return;
} }
// var url_l = $('csh_payment_req_history_print_link_id').getUrl() + '?document_id=' + payment_req_id + '&document_table=CSH_PAYMENT_APPROVE&file_path=${/parameter/@file_path}&batch_flag=Y&source_type=COMMON';
// window.open(href = url_l, target = "_self");
if(division == '30' || division == '50'){
var url_l = $('csh_payment_req_history_word_link_id').getUrl() + '?document_id=' + payment_req_id + '&document_table=CSH_PAYMENT_APPROVE&file_path=${/parameter/@file_path}&batch_flag=Y&source_type=COMMON';
}else{
var url_l = $('csh_payment_req_history_print_link_id').getUrl() + '?document_id=' + payment_req_id + '&document_table=CSH_PAYMENT_APPROVE&file_path=${/parameter/@file_path}&batch_flag=Y&source_type=COMMON'; var url_l = $('csh_payment_req_history_print_link_id').getUrl() + '?document_id=' + payment_req_id + '&document_table=CSH_PAYMENT_APPROVE&file_path=${/parameter/@file_path}&batch_flag=Y&source_type=COMMON';
}
window.open(href = url_l, target = "_self"); window.open(href = url_l, target = "_self");
}; };
...@@ -227,6 +217,8 @@ ...@@ -227,6 +217,8 @@
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name]; var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var ds_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_hd');
var param = {}; var param = {};
param['payment_req_id'] = record.get('payment_req_id'); param['payment_req_id'] = record.get('payment_req_id');
param['document_category'] = record.get('document_category'); param['document_category'] = record.get('document_category');
...@@ -239,12 +231,13 @@ ...@@ -239,12 +231,13 @@
param['approval_status'] = record.get('approval_status'); param['approval_status'] = record.get('approval_status');
param['con_business_type'] = record.get('con_business_type'); param['con_business_type'] = record.get('con_business_type');
param['division'] = record.get('division'); param['division'] = record.get('division');
//add by 18938
param['is_constru_unit'] = record.get('is_constru_unit');
if (record.get('business_type') == 'PAYMENT') { if (record.get('business_type') == 'PAYMENT') {
param['function_code'] = 'CSH501D'; param['function_code'] = 'CSH501D';
} else if (record.get('business_type') == 'PREPAYMENT') { } else if (record.get('business_type') == 'PREPAYMENT') {
param['function_code'] = 'CSH501_PRE_D'; param['function_code'] = 'CSH501_PRE_D';
} }
if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN' || record.get('approval_status') == 'REJECT') { if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN' || record.get('approval_status') == 'REJECT') {
param['function_usage'] = 'UPDATE'; param['function_usage'] = 'UPDATE';
param['function_code'] = 'CSH501D'; param['function_code'] = 'CSH501D';
......
src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview
View file @ 894bb4b2
...@@ -129,6 +129,9 @@ ...@@ -129,6 +129,9 @@
param['product_type_n'] = record.get('product_type_n'); param['product_type_n'] = record.get('product_type_n');
param['product_name_write'] = record.get('product_name_write'); 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['winid'] = 'csh501_csh_payment_req_link_winid';
param['url_title'] = '付款申请'; 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'); 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 @ 894bb4b2
...@@ -115,6 +115,7 @@ ...@@ -115,6 +115,7 @@
function hls_hls500_save(nextStep, source_procedure) { function hls_hls500_save(nextStep, source_procedure) {
debugger; debugger;
var temp_head_records = $('hls_fin_calculator_hd_ds').getAll(); var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
var is_constru_unit = '${/parameter/@is_constru_unit}' || 'N';
var H1,H54; var H1,H54;
for (var i = 0; i < temp_head_records.length; i++) { for (var i = 0; i < temp_head_records.length; i++) {
if (temp_head_records[i].get('column_code') == 'H1') { if (temp_head_records[i].get('column_code') == 'H1') {
...@@ -177,7 +178,7 @@ ...@@ -177,7 +178,7 @@
// Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%'); // Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%');
// return false; // return false;
//} //}
if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new) { if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new && is_constru_unit != 'Y') {
if ('${/parameter/@division}'==91){ if ('${/parameter/@division}'==91){
Leaf.SideBar.show({ Leaf.SideBar.show({
...@@ -370,7 +371,8 @@ ...@@ -370,7 +371,8 @@
id_num: id_num, id_num: id_num,
recreate_H_formula: recreate_H_formula, recreate_H_formula: recreate_H_formula,
recreate_L_formula: recreate_L_formula, recreate_L_formula: recreate_L_formula,
division:'${/parameter/@division}' division:'${/parameter/@division}',
is_constru_unit: '${/parameter/@is_constru_unit}'
}, },
url: url, url: url,
title: '${l:HLS.FIN_CALCULATOR}', title: '${l:HLS.FIN_CALCULATOR}',
...@@ -1560,6 +1562,7 @@ ...@@ -1560,6 +1562,7 @@
debugger; debugger;
var temp_head_records = $('hls_fin_calculator_hd_ds').getAll(); var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
var H1, H54, H159, H16, H12,H99,H102,H15,H44; 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++) { for (var i = 0; i < temp_head_records.length; i++) {
if (temp_head_records[i].get('column_code') == 'H1') { if (temp_head_records[i].get('column_code') == 'H1') {
H1 = temp_head_records[i].get('column_value') || 0; H1 = temp_head_records[i].get('column_value') || 0;
...@@ -1599,7 +1602,7 @@ ...@@ -1599,7 +1602,7 @@
// unlock_calc_current_window(); // unlock_calc_current_window();
// return false; // return false;
//} //}
if (H54 < 0) { if (H54 < 0&&'${/parameter/@division}'!=91) {
Leaf.showMessage('${l:PROMPT}', '利率最低值不能低于4.75'); Leaf.showMessage('${l:PROMPT}', '利率最低值不能低于4.75');
unlock_calc_current_window(); unlock_calc_current_window();
return false; return false;
...@@ -1612,7 +1615,6 @@ ...@@ -1612,7 +1615,6 @@
return false; return false;
} }
if(H44!=100){ if(H44!=100){
Leaf.showMessage('${l:PROMPT}', '留购金需要为100元'); Leaf.showMessage('${l:PROMPT}', '留购金需要为100元');
unlock_calc_current_window(); unlock_calc_current_window();
return false; return false;
...@@ -1624,7 +1626,7 @@ ...@@ -1624,7 +1626,7 @@
unlock_calc_current_window(); unlock_calc_current_window();
return false; 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; var dowm_payment = div(H16, plus(H99,H102)).toFixed(2) * 100;
if (dowm_payment < 15) { if (dowm_payment < 15) {
if ('${/parameter/@division}'!=91) { if ('${/parameter/@division}'!=91) {
...@@ -1683,7 +1685,7 @@ ...@@ -1683,7 +1685,7 @@
// Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%'); // Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%');
// return false; // return false;
//} //}
if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new) { if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new && is_constru_unit != 'Y') {
if ('${/parameter/@division}'==91) { if ('${/parameter/@division}'==91) {
Leaf.SideBar.show({ Leaf.SideBar.show({
// msg:'首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%</br>租赁期为一年及以内的，利率为6.75%，大于一年的7.3%</br>利率最低值不能低于4.75%', // msg:'首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%</br>租赁期为一年及以内的，利率为6.75%，大于一年的7.3%</br>利率最低值不能低于4.75%',
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
View file @ 894bb4b2
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
<a:view> <a:view>
<a:link id="prj_chance_create_link" <a:link id="prj_chance_create_link"
url="${/request/@context_path}/modules/prj/PRJ500N/prj_project_create.lview"/> url="${/request/@context_path}/modules/prj/PRJ500N/prj_project_create.lview"/>
<a:link id="prj_chance_constru_create_link"
url="${/request/@context_path}/modules/prj/PRJ500N/prj_project_create_constru.lview"/>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
modelaction="update"/> modelaction="update"/>
<a:link id="prj500n_create_project_interface_link" model="prj.PRJ500N.ds_project_interface_query" modelaction="execute" /> <a:link id="prj500n_create_project_interface_link" model="prj.PRJ500N.ds_project_interface_query" modelaction="execute" />
...@@ -39,15 +41,22 @@ ...@@ -39,15 +41,22 @@
return false; return false;
} }
if ($(ds_id).validate()) { if ($(ds_id).validate()) {
var url;
if(record.data.is_constru_unit == 'Y' || '${/model/user_agent_description/record/@is_constru_unit}' == 'Y'){
record.set('function_code', 'PRJ500D_CONSTRU');
url = "prj_chance_constru_create_link";
}else{
record.set('function_code', 'PRJ500D'); record.set('function_code', 'PRJ500D');
url = "prj_chance_create_link";
}
record.data['url_title'] = '报价申请创建';
record.set('function_usage', 'CREATE'); record.set('function_usage', 'CREATE');
record.set('document_category', 'PROJECT'); record.set('document_category', 'PROJECT');
record.set('default_value_dsid', ds_id); record.set('default_value_dsid', ds_id);
record.data['url_title'] = '报价申请创建';
var param = record.data; var param = record.data;
record.set('winid', 'prj_porject_create_win_id'); record.set('winid', 'prj_porject_create_win_id');
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'prj_chance_create_link'); hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, url);
} }
}; };
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_constru.lview 0 → 100644
View file @ 894bb4b2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/prj/PRJ501N/prj_project_modify_entrance.lview
View file @ 894bb4b2
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<a:link id="prj_project_modify_link" <a:link id="prj_project_modify_link"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_create_tree_n.lview"/> url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_create_tree_n.lview"/>
<a:link id="car_modify_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/> <a:link id="car_modify_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/>
<a:link id="car_modify_constru_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain_constru.lview"/>
<a:link id="car_modify_dff_link" <a:link id="car_modify_dff_link"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/> url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/>
<a:link id="car_modify_mananger_link" <a:link id="car_modify_mananger_link"
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
function open_project_modify_win(record_id, ds_id) { function open_project_modify_win(record_id, ds_id) {
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
var project_status = record.get('project_status'); var project_status = record.get('project_status');
var url;
//项目类layout_code //项目类layout_code
if (record.get('document_type') == 'PRJ') { if (record.get('document_type') == 'PRJ') {
var maintain_type = 'UPDATE'; var maintain_type = 'UPDATE';
...@@ -52,18 +54,23 @@ ...@@ -52,18 +54,23 @@
param = record.data; param = record.data;
param['bp_id_tenant'] = record.get('bp_id_tenant'); param['bp_id_tenant'] = record.get('bp_id_tenant');
param['document_id'] = record.get('project_id'); param['document_id'] = record.get('project_id');
param['function_code'] = 'PRJ501_WFL';
param['function_usage'] = 'QUERY'; param['function_usage'] = 'QUERY';
param['bp_class'] = 'NP'; param['bp_class'] = 'NP';
param['maintain_type'] = maintain_type; param['maintain_type'] = maintain_type;
param['prj_bp_id'] = record.get('prj_bp_id'); param['prj_bp_id'] = record.get('prj_bp_id');
param['url_title'] = '报价申请维护'; param['url_title'] = '报价申请维护';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id); if(record.get('is_constru_unit') == 'Y'){
param['function_code'] = 'PRJ501_CONSTRU_WFL';
url = 'car_modify_constru_link';
}else{
param['function_code'] = 'PRJ501_WFL';
url = 'car_modify_link';
}
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, url, ds_id);
} else { } else {
maintain_type = 'UPDATE'; maintain_type = 'UPDATE';
param = record.data; param = record.data;
param['document_id'] = record.get('project_id'); param['document_id'] = record.get('project_id');
param['function_code'] = 'PRJ501D';
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'MODIFY';
param['bp_class'] = 'NP'; param['bp_class'] = 'NP';
param['maintain_type'] = maintain_type; param['maintain_type'] = maintain_type;
...@@ -71,7 +78,14 @@ ...@@ -71,7 +78,14 @@
param['prj_bp_id'] = record.get('prj_bp_id'); param['prj_bp_id'] = record.get('prj_bp_id');
param['bp_id_tenant'] = record.get('bp_id_tenant'); param['bp_id_tenant'] = record.get('bp_id_tenant');
param['url_title'] = '报价申请维护'; param['url_title'] = '报价申请维护';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id); if(record.get('is_constru_unit') == 'Y'){
param['function_code'] = 'PRJ500D_CONSTRU';
url = 'car_modify_constru_link';
}else{
param['function_code'] = 'PRJ501D';
url = 'car_modify_link';
}
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, url, ds_id);
} }
} }
} }
......
src/main/webapp/modules/prj/PRJ502N/prj_project_modify_entrance.lview
View file @ 894bb4b2
...@@ -17,6 +17,7 @@ ...@@ -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="prj_project_bp_parameter_link" url="${/request/@context_path}/modules/prj/PRJ501/prj_project_bp_parameter.lview"/>
<!-- <a:link id="car_modify_link_readonly" 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_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" 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="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="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"/> <a:link id="car_modify_special_link" url="${/request/@context_path}/modules/prj/PRJ500N/prj_project_create_special.lview"/>
...@@ -27,17 +28,27 @@ ...@@ -27,17 +28,27 @@
function open_project_modify_win(record_id, ds_id) { function open_project_modify_win(record_id, ds_id) {
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
var url;
//项目类layout_code //项目类layout_code
maintain_type = 'QUERY'; maintain_type = 'QUERY';
param = record.data; param = record.data;
param['document_id'] = record.get('project_id'); param['document_id'] = record.get('project_id');
param['function_code'] = 'PRJ501Q';
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'MODIFY';
param['bp_class'] = 'NP'; param['bp_class'] = 'NP';
param['maintain_type'] = maintain_type; param['maintain_type'] = maintain_type;
param['url_title'] = '${l:HLS.PROJECT_MAITAIN}'; 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 @ 894bb4b2
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<a:init-procedure> <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_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_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_service_record"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
...@@ -15,10 +16,24 @@ ...@@ -15,10 +16,24 @@
<a:case value="ERROR"> <a:case value="ERROR">
<div style="color:red;"><![CDATA[自定义页面获取失败]]></div> <div style="color:red;"><![CDATA[自定义页面获取失败]]></div>
</a:case> </a:case>
<a:case value="*">
<a:switch test="/model/node_service_record/record/@workflow_code">
<a:case value="PROJECT_WFL">
<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>
<a:case value="*"> <a:case value="*">
<a:screen-include screen="${/model/workflow_service_record/record/@service_url}"/> <a:screen-include screen="${/model/workflow_service_record/record/@service_url}"/>
</a:case> </a:case>
</a:switch> </a:switch>
</a:case>
<a:case value="*">
<a:screen-include screen="${/model/workflow_service_record/record/@service_url}"/>
</a:case>
</a:switch>
</a:case>
</a:switch>
<a:screen-include screen="modules/zjwfl/zj_wfl_approve_history.lview?instance_id=${/parameter/@instance_id}&amp;reader_type=ADMIN"/> <a:screen-include screen="modules/zjwfl/zj_wfl_approve_history.lview?instance_id=${/parameter/@instance_id}&amp;reader_type=ADMIN"/>
</a:screenBody> </a:screenBody>
</a:view> </a:view>
......
src/main/webapp/modules/zjwfl/ZJWFL3010/zj_wfl_approve_history_for_submitter.lview
View file @ 894bb4b2
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_workflow_instance" rootPath="submiter_ht_instance"/> <a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_workflow_instance" rootPath="submiter_ht_instance"/>
<a:model-query defaultWhereClause="t1.workflow_id = ${/model/submiter_ht_instance/record/@workflow_id}" model="zjwfl.zj_wfl_workflow" rootPath="submiter_ht_workflow"/> <a:model-query defaultWhereClause="t1.workflow_id = ${/model/submiter_ht_instance/record/@workflow_id}" model="zjwfl.zj_wfl_workflow" rootPath="submiter_ht_workflow"/>
<a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_workflow_service_display" rootPath="submiter_ht_wfl_service"/> <a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_workflow_service_display" rootPath="submiter_ht_wfl_service"/>
<a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_node_info_display" rootPath="node_service_info"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
...@@ -15,10 +16,24 @@ ...@@ -15,10 +16,24 @@
<a:case value="ERROR"> <a:case value="ERROR">
<div style="color:red;"><![CDATA[自定义页面获取失败]]></div> <div style="color:red;"><![CDATA[自定义页面获取失败]]></div>
</a:case> </a:case>
<a:case value="*">
<a:switch test="/model/node_service_info/record/@workflow_code">
<a:case value="PROJECT_WFL">
<a:switch test="/model/node_service_info/record/@is_constru_unit">
<a:case value="Y">
<a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url_constru}"/>
</a:case>
<a:case value="*">
<a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url}"/>
</a:case>
</a:switch>
</a:case>
<a:case value="*"> <a:case value="*">
<a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url}"/> <a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url}"/>
</a:case> </a:case>
</a:switch> </a:switch>
</a:case>
</a:switch>
<a:switch test="/model/submiter_ht_workflow/record/@show_approve_history_flag"> <a:switch test="/model/submiter_ht_workflow/record/@show_approve_history_flag">
<a:case value="Y"> <a:case value="Y">
<a:screen-include screen="modules/zjwfl/zj_wfl_approve_history.lview?instance_id=${/model/submiter_ht_instance/record/@instance_id}&amp;reader_type=SUBMITTER&amp;workflow_id=${/model/submiter_ht_instance/record/@workflow_id}"/> <a:screen-include screen="modules/zjwfl/zj_wfl_approve_history.lview?instance_id=${/model/submiter_ht_instance/record/@instance_id}&amp;reader_type=SUBMITTER&amp;workflow_id=${/model/submiter_ht_instance/record/@workflow_id}"/>
......
src/main/webapp/modules/zjwfl/ZJWFL3040/zj_wfl_my_approved_application_history.lview
View file @ 894bb4b2
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<a:model-query defaultWhereClause="t1.record_id = ${/parameter/@rcpt_record_id} " model="zjwfl.zj_wfl_node_service_approve_history" rootPath="approver_ht_node_service"/> <a:model-query defaultWhereClause="t1.record_id = ${/parameter/@rcpt_record_id} " model="zjwfl.zj_wfl_node_service_approve_history" rootPath="approver_ht_node_service"/>
<a:model-query defaultWhereClause="t1.record_id = ${/parameter/@approve_record_id}" model="zjwfl.zj_wfl_approve_record" rootPath="approver_ht_approve"/> <a:model-query defaultWhereClause="t1.record_id = ${/parameter/@approve_record_id}" model="zjwfl.zj_wfl_approve_record" rootPath="approver_ht_approve"/>
<a:model-query defaultWhereClause="t1.node_id = ${/model/approver_ht_approve/record/@node_id}" model="zjwfl.zj_wfl_workflow_node_filter_node_id" rootPath="approver_ht_node"/> <a:model-query defaultWhereClause="t1.node_id = ${/model/approver_ht_approve/record/@node_id}" model="zjwfl.zj_wfl_workflow_node_filter_node_id" rootPath="approver_ht_node"/>
<a:model-query defaultWhereClause="t1.record_id = ${/parameter/@rcpt_record_id} " model="zjwfl.zj_wfl_node_info_approve_history" rootPath="node_service_info"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
...@@ -38,10 +39,24 @@ ...@@ -38,10 +39,24 @@
<a:case value="ERROR"> <a:case value="ERROR">
<div style="color:red;"><![CDATA[自定义页面获取失败]]></div> <div style="color:red;"><![CDATA[自定义页面获取失败]]></div>
</a:case> </a:case>
<a:case value="*">
<a:switch test="/model/node_service_info/record/@workflow_code">
<a:case value="PROJECT_WFL">
<a:switch test="/model/node_service_info/record/@is_constru_unit">
<a:case value="Y">
<a:screen-include screen="${/model/approver_ht_node_service/record/@service_url_constru}"/>
</a:case>
<a:case value="*">
<a:screen-include screen="${/model/approver_ht_node_service/record/@service_url}"/>
</a:case>
</a:switch>
</a:case>
<a:case value="*"> <a:case value="*">
<a:screen-include screen="${/model/approver_ht_node_service/record/@service_url}"/> <a:screen-include screen="${/model/approver_ht_node_service/record/@service_url}"/>
</a:case> </a:case>
</a:switch> </a:switch>
</a:case>
</a:switch>
<a:switch test="/model/approver_ht_node/record/@show_approve_history_flag"> <a:switch test="/model/approver_ht_node/record/@show_approve_history_flag">
<a:case value="Y"> <a:case value="Y">
<a:screen-include screen="modules/zjwfl/zj_wfl_approve_history.lview?instance_id=${/model/approver_ht_approve/record/@instance_id}&amp;reader_type=APPROVER&amp;node_id=${/model/approver_ht_approve/record/@node_id}"/> <a:screen-include screen="modules/zjwfl/zj_wfl_approve_history.lview?instance_id=${/model/approver_ht_approve/record/@instance_id}&amp;reader_type=APPROVER&amp;node_id=${/model/approver_ht_approve/record/@node_id}"/>
......
src/main/webapp/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview
View file @ 894bb4b2
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<a:model-query autocount="true" fetchall="true" model="zjwfl.zj_wfl_workflow_node_action_group" rootpath="node_action_group"/> <a:model-query autocount="true" fetchall="true" model="zjwfl.zj_wfl_workflow_node_action_group" rootpath="node_action_group"/>
<a:model-query autoCount="true" defaultWhereClause="t1.record_id = ${/parameter/@record_id}" fetchAll="true" model="zjwfl.ZJWFL5110.cus_zj_wfl_instance_node_recipient" rootPath="instance_one"/> <a:model-query autoCount="true" defaultWhereClause="t1.record_id = ${/parameter/@record_id}" fetchAll="true" model="zjwfl.ZJWFL5110.cus_zj_wfl_instance_node_recipient" rootPath="instance_one"/>
<a:model-query defaultWhereClause="t1.record_id = ${/parameter/@record_id}" model="zjwfl.zj_wfl_node_service_wait_to_do" rootPath="node_service_record" trace="true"/> <a:model-query defaultWhereClause="t1.record_id = ${/parameter/@record_id}" model="zjwfl.zj_wfl_node_service_wait_to_do" rootPath="node_service_record" trace="true"/>
<a:model-query defaultWhereClause="t1.record_id = ${/parameter/@record_id}" model="zjwfl.zj_wfl_node_info_query" rootPath="node_info_record" trace="true"/>
<s:server-script import="zjwfl_user_define.js"/> <s:server-script import="zjwfl_user_define.js"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
...@@ -333,10 +334,24 @@ ...@@ -333,10 +334,24 @@
<a:case value="ERROR"> <a:case value="ERROR">
<div style="color:red;"><![CDATA[自定义页面获取失败]]></div> <div style="color:red;"><![CDATA[自定义页面获取失败]]></div>
</a:case> </a:case>
<a:case value="*">
<a:switch test="/model/node_info_record/record/@workflow_code">
<a:case value="PROJECT_WFL">
<a:switch test="/model/node_info_record/record/@is_constru_unit">
<a:case value="Y">
<a:screen-include screen="${/model/node_service_record/record/@service_url_constru}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/>
</a:case>
<a:case value="*">
<a:screen-include screen="${/model/node_service_record/record/@service_url}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/>
</a:case>
</a:switch>
</a:case>
<a:case value="*"> <a:case value="*">
<a:screen-include screen="${/model/node_service_record/record/@service_url}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/> <a:screen-include screen="${/model/node_service_record/record/@service_url}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/>
</a:case> </a:case>
</a:switch> </a:switch>
</a:case>
</a:switch>
<a:switch test="/model/node_record/record/@show_approve_history_flag"> <a:switch test="/model/node_record/record/@show_approve_history_flag">
<a:case value="Y"> <a:case value="Y">
<a:screen-include screen="modules/zjwfl/zj_wfl_approve_history.lview?instance_id=${/parameter/@instance_id}&amp;reader_type=APPROVER&amp;node_id=${/parameter/@node_id}"/> <a:screen-include screen="modules/zjwfl/zj_wfl_approve_history.lview?instance_id=${/parameter/@instance_id}&amp;reader_type=APPROVER&amp;node_id=${/parameter/@node_id}"/>
......
src/main/webapp/modules/zjwfl/zj_wfl_approve_history.lview
View file @ 894bb4b2
...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
]]></style> ]]></style>
<a:screen-include screen="modules/zjwfl/zj_wfl_common_javascript.lview"/> <a:screen-include screen="modules/zjwfl/zj_wfl_common_javascript.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
if(document.getElementById('zj_wfl_approve_history_table_id_tb')){
document.getElementById('zj_wfl_approve_history_table_id_tb').style.display = 'none'; document.getElementById('zj_wfl_approve_history_table_id_tb').style.display = 'none';
}
function render_action_type_desc(value, record, name) { function render_action_type_desc(value, record, name) {
return f_zjwfl.getApproveImg(record.get('record_type'), value); return f_zjwfl.getApproveImg(record.get('record_type'), value);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment