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

src/main/webapp/WEB-INF/classes/cont/CON202/con_contract_tmpt_clause_main.lwm

@@ -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="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="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:features>
         <o:sequence-pk sequenceName="con_contract_tmpt_clause_s"/>

src/main/webapp/WEB-INF/classes/cont/CON542/con_contract_for_query.lwm

@@ -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="is_constru_unit"/>
     </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

@@ -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

@@ -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

@@ -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/WEB-INF/classes/prj/PRJ500D/user_agent_description.lwm

@@ -4,7 +4,7 @@
     <bm:operations>
         <bm:operation name="query">
             <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
                 where ee.user_id = ${/session/@user_id}
                 and ee.unit_id = h.unit_id

src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_info_approve_history.lwm

+<?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

+<?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

+<?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

@@ -3,10 +3,13 @@
     <bm:operations>
         <bm:operation name="query">
             <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},
-				                                            ${/session/@user_id}) as service_url
-  				  from zj_wfl_instance_node_rcpt_ht t1
+				                                            ${/session/@user_id}) as service_url,tt.*
+  				  from zj_wfl_instance_node_rcpt_ht tt) t1
   				  #WHERE_CLAUSE#
         	]]></bm:query-sql>
         </bm:operation>

src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_service_wait_to_do.lwm

@@ -3,11 +3,14 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-            	select zj_wfl_core_pkg.get_node_service_url(t1.record_id, 
-            												${/parameter/@url_type}, 
-            												${/session/@user_id}) as service_url
-				  from zj_wfl_instance_node_recipient t1
-				 #WHERE_CLAUSE#
+              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},
+                                    ${/session/@user_id}) as service_url,tt.*
+          from zj_wfl_instance_node_recipient tt) t1
+         #WHERE_CLAUSE#
         	]]></bm:query-sql>
         </bm:operation>
     </bm:operations>

src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_workflow_service_display.lwm

@@ -3,9 +3,12 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-            	select zj_wfl_core_pkg.get_wfl_service_url(t1.instance_id,
-                                           				   ${/session/@user_id}) as service_url
-  				  from zj_wfl_workflow_instance t1
+            	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_wfl_service_url(tt.instance_id,
+                                           				   ${/session/@user_id}) as service_url,tt.*
+  				  from zj_wfl_workflow_instance tt) t1
   				 #WHERE_CLAUSE#
         	]]></bm:query-sql>
         </bm:operation>

src/main/webapp/modules/cont/CON202/con_basic_clause_detail.lview

@@ -19,6 +19,7 @@
             <a:dataSet id="pay_methods_ds" lookupCode="PAY_METHODS"/>
             <a:dataSet id="con202_withway_ds" lookupCode="WITHHOLD_WAYS"/>
             <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="hls_bp_class_ds" lookupCode="HLS211_BP_CLASS"/>
             <a:dataSet id="other_tmpt_clause_ds" lookupCode="CON202_CON_PRINT_OTHER_CONDITON"/>
@@ -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="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="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="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"/>
@@ -127,6 +131,8 @@
                     <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="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="business_type_n" 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

@@ -126,7 +126,11 @@
                 //add by gzj 2022-12-23 北京卡家
                 ||record_data.templet_code =='CON_COLLECTION_PAYMENT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ_1'||record_data.templet_code =='CSH_PAYMENT_REQ_KJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ_SURE'
                 ||record_data.templet_code =='CSH_PAYMENT_REQ_KJ_1'||record_data.templet_code =='CON_CONTRACT_MORTGAGE_KJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ_FR'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_KJ'
-                ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ'||record_data.templet_code =='PERSONAL_CREDIT_KJ'||record_data.templet_code =='ENTERPRISE_CREDIT_KJ') {
+                ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ'||record_data.templet_code =='PERSONAL_CREDIT_KJ'||record_data.templet_code =='ENTERPRISE_CREDIT_KJ'
+		//add by 18938
+                ||record_data.templet_code == 'BUSINESS_CONTRACT_XN' || record_data.templet_code == 'LEASE_CONTRACT_PAR_XN2'  || record_data.templet_code == 'LEASE_CONTRACT_PAR_XN' || record_data.templet_code == 'DOWN_PAYMENT_OFFSET'
+                ||record_data.templet_code == 'FINANCE_LEASEBACK_CONTRACT_XN' || record_data.templet_code == 'LEASE_ORDER_XN'  || record_data.templet_code == 'LEASE_ORDER_XN2' || record_data.templet_code == 'FINANCE_LEASE_CONTRACT_XN'
+                ||record_data.templet_code == 'CON_CONTRACT_MORTGAGE_XN') {
 
             // word转pdf
             var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id;

src/main/webapp/modules/csh/CSH501/csh_payment_create_entrance.lview

@@ -230,7 +230,9 @@
             param['division'] = record.get('division');
             param['approval_status'] = record.get('approval_status');
             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') {
                 param['function_code'] = 'CSH501D';
             } else if (record.get('business_type') == 'PREPAYMENT') {

src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview

@@ -129,6 +129,9 @@
                             param['product_type_n'] = record.get('product_type_n');
                             param['product_name_write'] = record.get('product_name_write');
                         }
+                        //add by 18938
+                        param['is_constru_unit'] = record.get('is_constru_unit');
+                        param['is_buyout'] = record.get('is_buyout');
                         param['winid'] = 'csh501_csh_payment_req_link_winid';
                         param['url_title'] = '付款申请';
                         hls_doc_get_layout_code('csh501_get_layout_code_link_id', param, 'csh501_csh_payment_req_link_id', 'csh_payment_req_selectedDs');

src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview

@@ -115,6 +115,7 @@
         function hls_hls500_save(nextStep, source_procedure) {
             debugger;
             var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
+            var is_constru_unit = '${/parameter/@is_constru_unit}' || 'N';
             var  H1,H54;
             for (var i = 0; i < temp_head_records.length; i++) {
                 if (temp_head_records[i].get('column_code') == 'H1') {
@@ -177,9 +178,9 @@
                             //    Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%');
                             //    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({
                                         // msg:'首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%</br>租赁期为一年及以内的，利率为6.75%，大于一年的7.3%</br>利率最低值不能低于4.75%',
                                         msg:'首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%',
@@ -370,7 +371,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 +1562,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 +1626,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) {
@@ -1682,7 +1685,7 @@
                             //    Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%');
                             //    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) {
                                             Leaf.SideBar.show({
                                                // 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

@@ -20,6 +20,8 @@
     <a:view>
         <a:link id="prj_chance_create_link"
                 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"
                 modelaction="update"/>
         <a:link id="prj500n_create_project_interface_link" model="prj.PRJ500N.ds_project_interface_query" modelaction="execute" />
@@ -39,15 +41,22 @@
                 return false;
             }
             if ($(ds_id).validate()) {
-                record.set('function_code', 'PRJ500D');
+                 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');
+                    url = "prj_chance_create_link";
+                }
+                record.data['url_title'] = '报价申请创建';
                 record.set('function_usage', 'CREATE');
                 record.set('document_category', 'PROJECT');
                 record.set('default_value_dsid', ds_id);
-                record.data['url_title'] = '报价申请创建';
                 var param = record.data;
                 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_modify_entrance.lview

@@ -16,6 +16,7 @@
         <a:link id="prj_project_modify_link"
                 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_constru_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain_constru.lview"/>
         <a:link id="car_modify_dff_link"
                 url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/>
         <a:link id="car_modify_mananger_link"
@@ -32,6 +33,7 @@
         function open_project_modify_win(record_id, ds_id) {
             var record = $(ds_id).findById(record_id);
             var project_status = record.get('project_status');
+            var url;
             //项目类layout_code
             if (record.get('document_type') == 'PRJ') {
                 var maintain_type = 'UPDATE';
@@ -52,18 +54,23 @@
                     param = record.data;
                     param['bp_id_tenant'] = record.get('bp_id_tenant');
                     param['document_id'] = record.get('project_id');
-                    param['function_code'] = 'PRJ501_WFL';
                     param['function_usage'] = 'QUERY';
                     param['bp_class'] = 'NP';
                     param['maintain_type'] = maintain_type;
                     param['prj_bp_id'] = record.get('prj_bp_id');
                     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 {
                     maintain_type = 'UPDATE';
                     param = record.data;
                     param['document_id'] = record.get('project_id');
-                    param['function_code'] = 'PRJ501D';
                     param['function_usage'] = 'MODIFY';
                     param['bp_class'] = 'NP';
                     param['maintain_type'] = maintain_type;
@@ -71,7 +78,14 @@
                     param['prj_bp_id'] = record.get('prj_bp_id');
                     param['bp_id_tenant'] = record.get('bp_id_tenant');
                     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

@@ -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

@@ -3,6 +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_service_record"/>
     </a:init-procedure>
     <a:view>
         <script type="text/javascript"><![CDATA[
@@ -16,7 +17,21 @@
                     <div style="color:red;"><![CDATA[自定义页面获取失败]]></div>
                 </a:case>
                 <a:case value="*">
-                    <a:screen-include screen="${/model/workflow_service_record/record/@service_url}"/>
+                <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:screen-include screen="${/model/workflow_service_record/record/@service_url}"/>
+                            </a:case>
+                        </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"/>

src/main/webapp/modules/zjwfl/ZJWFL3010/zj_wfl_approve_history_for_submitter.lview

@@ -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.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_node_info_display" rootPath="node_service_info"/>
     </a:init-procedure>
     <a:view>
         <script type="text/javascript"><![CDATA[
@@ -16,7 +17,21 @@
                 <div style="color:red;"><![CDATA[自定义页面获取失败]]></div>
             </a:case>
             <a:case value="*">
-                <a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url}"/>
+                <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:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url}"/>
+                    </a:case>
+                 </a:switch>
             </a:case>
         </a:switch>
         <a:switch test="/model/submiter_ht_workflow/record/@show_approve_history_flag">

src/main/webapp/modules/zjwfl/ZJWFL3040/zj_wfl_my_approved_application_history.lview

@@ -4,31 +4,32 @@
         <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.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:view>
         <script type="text/javascript"><![CDATA[
           (function() {
                 var checker_list = {};
-            
+
                 zjwfl5110_ApproveChecker_add = function(name, fun) {
                     checker_list[name] = fun;
                 };
-            
+
                 zjwfl5110_ApproveChecker_remove = function(name) {
                     delete checker_list[name];
                 };
-            
+
                 zjwfl5110_ApproveChecker_check = function(type) {
                     for (var key in checker_list) {
                         if (checker_list[key](type) == true) {
-            
+
                            } else {
                             return false;
                         }
                     }
                     return true;
                 };
-            
+
             })();
         ]]></script>
         <a:switch test="/model/approver_ht_node_service/record/@service_url">
@@ -39,7 +40,21 @@
                 <div style="color:red;"><![CDATA[自定义页面获取失败]]></div>
             </a:case>
             <a:case value="*">
-                <a:screen-include screen="${/model/approver_ht_node_service/record/@service_url}"/>
+                <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:screen-include screen="${/model/approver_ht_node_service/record/@service_url}"/>
+                    </a:case>
+                 </a:switch>
             </a:case>
         </a:switch>
         <a:switch test="/model/approver_ht_node/record/@show_approve_history_flag">

src/main/webapp/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview

@@ -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" 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_info_query" rootPath="node_info_record" trace="true"/>
         <s:server-script import="zjwfl_user_define.js"/>
     </a:init-procedure>
     <a:view>
@@ -28,39 +29,39 @@
          .buttongroup .item-btn-tl,.buttongroup .item-btn-tc,.buttongroup .item-btn-tr,.buttongroup .item-btn-bl,.buttongroup .item-btn-bc,.buttongroup .item-btn-br,.buttongroup .item-btn-mr{
             display:none;
          }
-         
+
          .buttongroup .item-btn{
             height:30px;
             border:none;
          }
-         
+
          .buttongroup .item-btn-ml{
             background:url(${/request/@context_path}/images/button2.gif)
          }
-         
+
          .buttongroup .item-btn-mc{
              background:url(${/request/@context_path}/images/button2.gif) right 0;
              padding:9px 8px 5px 0;
          }
-         
+
          .buttongroup .item-btn-mc button div{
              color:#ffffff;
          }
-         
+
          .buttongroup .item-btn-over .item-btn-mc{
              background:url(${/request/@context_path}/images/button2.gif) right -30px;
          }
-         
+
          .buttongroup .item-btn-over .item-btn-ml{
              background:url(${/request/@context_path}/images/button2.gif) left -30px;
          }
-         
+
          .buttongroup .item-btn-over button div{
              color:#000000;
          }
-         
+
          .fixed {
-             position:fixed; 
+             position:fixed;
              left:10px;
              bottom:10px;
              height:100px;
@@ -98,9 +99,9 @@
         	function zjwfl_before_approve_procedure(out_type){
         	    var params ={out_object:'out_object',
                     		out_type:'no_win'};
-                return  params; 		
+                return  params;
         	}
-        
+
             function zjwfl5110_approveCheck_type(type) {
                 if (type == 'agree') {
                     return true;
@@ -123,31 +124,31 @@
                     return false;
                 }
             }
-            
+
             (function() {
                 var checker_list = {};
-            
+
                 zjwfl5110_ApproveChecker_add = function(name, fun) {
                     checker_list[name] = fun;
                 };
-            
+
                 zjwfl5110_ApproveChecker_remove = function(name) {
                     delete checker_list[name];
                 };
-            
+
                 zjwfl5110_ApproveChecker_check = function(type) {
                     for (var key in checker_list) {
                         if (checker_list[key](type) == true) {
-            
+
                            } else {
                             return false;
                         }
                     }
                     return true;
                 };
-            
+
             })();
-            
+
             function zjwfl5110_approveCheckNew(type) {
                 if (zjwfl5110_approveCheck_type(type) && zjwfl5110_ApproveChecker_check(type)) {
                     return true;
@@ -155,7 +156,7 @@
                     return false;
                 }
             }
-            
+
             function zjwfl5110_uploadAttach() {
                 debugger;
                 var rcpt_record_id = '${/parameter/@record_id}';
@@ -185,12 +186,12 @@
 
 
             }
-            
+
             function zjwfl5110_approvePage_close() {
                // wflCmp('zj_wfl_approve_win').close();
                 window.parent.location.reload();
             }
-            
+
             function zjwfl5110_approvePage_mask() {
                 if(parent.$jq("iframe[id='wfl_common_iframe']").length > 0) {
                     Leaf.Masker.mask(document.documentElement, '正在提交');
@@ -198,7 +199,7 @@
                     Leaf.Masker.mask($('zj_wfl_approve_win').wrap);
                 }
             }
-            
+
             function zjwfl5110_approvePage_noMask() {
                 if(parent.$jq("iframe[id='wfl_common_iframe']").length > 0) {
                     Leaf.Masker.unmask(document.documentElement);
@@ -206,8 +207,8 @@
                     Leaf.Masker.unmask($('zj_wfl_approve_win').wrap);
                 }
             }
-            
-            
+
+
             function zjwfl5110_actionTypeRenderer(value, record, name) {
                 var action_type = record.get('action_type');
                 var action_type_desc = record.get('action_type_desc');
@@ -221,7 +222,7 @@
                     return "";
                 }
             }
-            
+
             function zjwfl5110_viewGraphics() {
                 new Leaf.Window({
                     id: 'zj_wfl_graphics',
@@ -234,9 +235,9 @@
                     fullScreen: true
                 });
             }
-            
+
             //初始化意见框内容
-            
+
             function comment_text_ds_add(ds,record,index) {
                 // var comment_text = '';
                 // var position_code = '${/model/instance_one/record/@position_code}';
@@ -334,7 +335,21 @@
                 <div style="color:red;"><![CDATA[自定义页面获取失败]]></div>
             </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: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: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:switch>
         <a:switch test="/model/node_record/record/@show_approve_history_flag">

src/main/webapp/modules/zjwfl/zj_wfl_approve_history.lview

@@ -36,7 +36,9 @@
     	]]></style>
         <a:screen-include screen="modules/zjwfl/zj_wfl_common_javascript.lview"/>
         <script type="text/javascript"><![CDATA[
-        document.getElementById('zj_wfl_approve_history_table_id_tb').style.display = 'none';
+            if(document.getElementById('zj_wfl_approve_history_table_id_tb')){
+                document.getElementById('zj_wfl_approve_history_table_id_tb').style.display = 'none';
+            }
             function render_action_type_desc(value, record, name) {
                 return f_zjwfl.getApproveImg(record.get('record_type'), value);
             }