Commit d661e303 authored by Darming's avatar Darming

Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into develop

parents 4e116d6c 110f7258
package com.hand.hls.hlcm.util;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.channels.FileChannel;
public class Test4 {
public void fileChannelCopy(File s, File t) {
FileInputStream fi = null;
FileOutputStream fo = null;
FileChannel in = null;
FileChannel out = null;
try {
fi = new FileInputStream(s);
fo = new FileOutputStream(t);
in = fi.getChannel();//得到对应的文件通道
out = fo.getChannel();//得到对应的文件通道
in.transferTo(0, in.size(), out);//连接两个通道,并且从in通道读取,然后写入out通道
} catch (IOException e) {
e.printStackTrace();
} finally {
try {
fi.close();
in.close();
fo.close();
out.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
public static void main(String[] args) {
Test4 test4=new Test4();
File s=new File("D:\\ttt\\tt3.docx");
File t=new File("D:\\ttt\\ttt4.docx");
long start,end;
start =System.currentTimeMillis();
test4.fileChannelCopy(s,t);
end =System.currentTimeMillis();
System.out.println("用时"+(end-start)+"ms");
}
}
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_BP_MASTER_BANK_ACCOUNT_V"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_BP_MASTER_BANK_ACCOUNT_V">
<bm:fields> <bm:fields>
<bm:field name="bank_account_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BANK_ACCOUNT_ID" prompt="HLS_BP_MASTER_BANK_ACCOUNT_V.BANK_ACCOUNT_ID"/> <bm:field name="bank_account_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BANK_ACCOUNT_ID" prompt="HLS_BP_MASTER_BANK_ACCOUNT_V.BANK_ACCOUNT_ID" />
<bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_BANK_ACCOUNT_V.BP_ID"/> <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_BANK_ACCOUNT_V.BP_ID"/>
<bm:field name="bank_account_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_ACCOUNT_NUM" prompt="HLS.BANK_ACCOUNT_NUM"/> <bm:field name="bank_account_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_ACCOUNT_NUM" prompt="HLS.BANK_ACCOUNT_NUM" forQuery="true" forDisplay="true"/>
<bm:field name="bank_account_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_ACCOUNT_CODE" prompt="HLS.BANK_ACCOUNT_CODE"/> <bm:field name="bank_account_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_ACCOUNT_CODE" prompt="HLS.BANK_ACCOUNT_CODE"/>
<bm:field name="bank_account_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_ACCOUNT_NAME" prompt="HLS.BANK_ACCOUNT_NAME"/> <bm:field name="bank_account_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_ACCOUNT_NAME" prompt="HLS.BANK_ACCOUNT_NAME" forDisplay="true" forQuery="true"/>
<bm:field name="bank_branch_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BANK_BRANCH_ID" prompt="HLS_BP_MASTER_BANK_ACCOUNT_V.BANK_BRANCH_ID"/> <bm:field name="bank_branch_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BANK_BRANCH_ID" prompt="HLS_BP_MASTER_BANK_ACCOUNT_V.BANK_BRANCH_ID"/>
<bm:field name="bank_branch_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_BRANCH_NAME" prompt="HLS.BANK_BRANCH_NAME"/> <bm:field name="bank_branch_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_BRANCH_NAME" prompt="HLS.BANK_BRANCH_NAME"/>
<bm:field name="bank_full_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_FULL_NAME" prompt="HLS.BANK_FULL_NAME"/> <bm:field name="bank_full_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_FULL_NAME" prompt="HLS.BANK_FULL_NAME"/>
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
<bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG" prompt="HLS.ENABLED_FLAG"/> <bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG" prompt="HLS.ENABLED_FLAG"/>
<bm:field name="currency_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_NAME" prompt="HLS.CURRENCY"/> <bm:field name="currency_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_NAME" prompt="HLS.CURRENCY"/>
</bm:fields> </bm:fields>
<bm:query-fields>
<bm:query-field name="bank_account_name" queryExpression="t1.bank_account_name like &apos;%&apos;||${@bank_account_name}||&apos;%&apos;"/>
<bm:query-field name="bank_account_num" queryExpression="t1.bank_account_num like &apos;%&apos;||${@bank_account_num}||&apos;%&apos;"/>
</bm:query-fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
</bm:features> </bm:features>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: feng
$Date: 2013-9-11 下午15:13:20
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql>
<![CDATA[
select tt.bp_name,tt.bp_id ,tt.bp_code from (
select t.bp_id,
t.bp_name,
t.bp_code,
t.bp_type
from hls_bp_master t
where t.bp_category = 'TENANT'
and t.enabled_flag = 'Y'
union
select t.bp_id ,
t.bp_name ,
t.bp_code,
t.bp_type
from hls_bp_master_role d, hls_bp_master t
where d.bp_id = t.bp_id
and d.bp_category = 'TENANT'
and d.enabled_flag = 'Y')tt #WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="bp_name" fordisplay="true" forQuery="true" prompt="承租人名称"/>
<bm:field name="bp_code" fordisplay="true" forQuery="true" prompt="承租人代码"/>
<bm:field name="bp_id"/>
</bm:fields>
<bm:query-fields>
<bm:query-field field="bp_code" queryOperator="like"/>
<bm:query-field field="bp_name" queryOperator="like"/>
</bm:query-fields>
</bm:model>
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
<s:bm-script><![CDATA[ <!--<s:bm-script><![CDATA[-->
var cx = Packages.leaf.javascript.Context.getCurrentContext(); <!--var cx = Packages.leaf.javascript.Context.getCurrentContext();-->
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js"); <!--Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");-->
]]></s:bm-script> <!--]]></s:bm-script>-->
</bm:features> </bm:features>
<bm:primary-key> <bm:primary-key>
<bm:pk-field name="contract_id"/> <bm:pk-field name="contract_id"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: feng
$Date: 2013-9-11 下午15:13:20
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql>
<![CDATA[
select v.code_value, v.code_value_name
from sys_code_values_v v
where v.code = 'CON500_CONTRACT_STATUS'
and v.code_value in ('ETING', 'INCEPT', 'TERMINATING','REPUR')
and v.code_enabled_flag = 'Y'
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -9,29 +9,35 @@ ...@@ -9,29 +9,35 @@
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
SELECT SELECT
--应付我司开户名 --应付我司开户名
(SELECT BP_NAME (SELECT hbbc.bank_branch_name
FROM HLS_BP_MASTER HBM, HLS_BP_MASTER_BANK_ACCOUNT HBBC FROM hls_bp_master_bank_account hbbc
WHERE HBBC.BANK_ACCOUNT_ID = V.BP_BANK_ACCOUNT_ID WHERE hbbc.bank_account_id=V.bp_bank_account_id
AND HBBC.BP_ID = HBM.BP_ID) AGENT_NAME, ) agent_bank_name,
--应付我司开户行 --应付我司开户行
(SELECT HBBC.BANK_BRANCH_NAME (SELECT HBBc.bank_account_name
FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC
WHERE HBBC.BANK_ACCOUNT_ID = V.BP_BANK_ACCOUNT_ID) AGENT_BANK_NAME, WHERE HBBC.BANK_ACCOUNT_ID = V.BP_BANK_ACCOUNT_ID) agent_account_name,
--应付我司开户账号 --应付我司开户账号
(SELECT HBBC.BANK_ACCOUNT_NUM (SELECT HBBC.BANK_ACCOUNT_NUM
FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC
WHERE HBBC.BANK_ACCOUNT_ID = V.BP_BANK_ACCOUNT_ID) AGENT_BANK_NUM, WHERE HBBC.BANK_ACCOUNT_ID = V.BP_BANK_ACCOUNT_ID) AGENT_BANK_NUM,
--应付我司开户名 --厂商开户名
(SELECT BP_NAME (SELECT hbbc.bank_account_name
FROM HLS_BP_MASTER HBM, HLS_BP_MASTER_BANK_ACCOUNT HBBC FROM hls_bp_master_bank_account hbbc
WHERE HBBC.BANK_ACCOUNT_ID = V.VENDER_BANK_ACCOUNT_ID WHERE hbbc.bank_account_id=v.vender_bank_account_id
AND HBBC.BP_ID = HBM.BP_ID) VENDER_NAME, ) vender_account_name,
--应付我司开户行 --厂商开户行
(SELECT HBBC.BANK_BRANCH_NAME (SELECT hbbc.bank_branch_name
FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC FROM hls_bp_master_bank_account hbbc
WHERE HBBC.BANK_ACCOUNT_ID = V.VENDER_BANK_ACCOUNT_ID) VENDER_BANK_NAME, WHERE hbbc.bank_account_id=v.vender_bank_account_id
) vender_bank_name,
--厂商名称
(SELECT bp_name
FROM hls_bp_master hbm,hls_bp_master_bank_account hbbc
WHERE hbm.bp_id=hbbc.bp_id
AND hbbc.bank_account_id=V.vender_bank_account_id) vender_name,
--应付我司开户账号 --应付我司开户账号
(SELECT HBBC.BANK_ACCOUNT_NUM (SELECT HBBC.BANK_ACCOUNT_NUM
FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
from con_contract_lease_item ccli, hls_lease_item hli from con_contract_lease_item ccli, hls_lease_item hli
where ccli.lease_item_id = hli.lease_item_id where ccli.lease_item_id = hli.lease_item_id
and ccli.contract_id = c.contract_id) pattern, and ccli.contract_id = c.contract_id) pattern,
(select hli.machine_number (select ccli.machine_number
from con_contract_lease_item ccli, hls_lease_item hli from con_contract_lease_item ccli, hls_lease_item hli
where ccli.lease_item_id = hli.lease_item_id where ccli.lease_item_id = hli.lease_item_id
and ccli.contract_id = c.contract_id) machine_number, and ccli.contract_id = c.contract_id) machine_number,
...@@ -87,6 +87,9 @@ ...@@ -87,6 +87,9 @@
(select hbm.bank_account_num (select hbm.bank_account_num
from hls_bp_master_bank_account hbm from hls_bp_master_bank_account hbm
where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_number_n, where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_number_n,
(select hbm.bank_account_name
from hls_bp_master_bank_account hbm
where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_name,
cpr.amount, cpr.amount,
--首付款抵充金额 --首付款抵充金额
(select nvl(hd.other_payment2, 0) (select nvl(hd.other_payment2, 0)
......
...@@ -293,12 +293,12 @@ ...@@ -293,12 +293,12 @@
<!-- <bm:field name="bp_bank_account_name"/>--> <!-- <bm:field name="bp_bank_account_name"/>-->
<!-- <bm:field name="bp_bank_account_num"/>--> <!-- <bm:field name="bp_bank_account_num"/>-->
</bm:fields> </bm:fields>
<bm:features> <!-- <bm:features>-->
<s:bm-script><![CDATA[ <!-- <s:bm-script><![CDATA[-->
var cx = Packages.leaf.javascript.Context.getCurrentContext(); <!-- var cx = Packages.leaf.javascript.Context.getCurrentContext();-->
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js"); <!-- Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");-->
]]></s:bm-script> <!-- ]]></s:bm-script>-->
</bm:features> <!-- </bm:features>-->
<!--只查找该代理店--> <!--只查找该代理店-->
<bm:data-filters> <bm:data-filters>
<!-- <bm:data-filter name="enabled_flag" enforceOperations="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/>--> <!-- <bm:data-filter name="enabled_flag" enforceOperations="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/>-->
......
...@@ -5,11 +5,13 @@ ...@@ -5,11 +5,13 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" baseTable="csh_payment_req_hd"> <bm:model xmlns:s="leaf.plugin.script" xmlns:bm="http://www.leaf-framework.org/schema/bm" baseTable="csh_payment_req_hd">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
SELECT *
SELECT v.*
FROM( SELECT t.*
FROM (SELECT h.payment_req_number, FROM (SELECT h.payment_req_number,
h.document_type, h.document_type,
--应付金额 --应付金额
...@@ -159,7 +161,17 @@ ...@@ -159,7 +161,17 @@
(SELECT company_id (SELECT company_id
FROM fnd_companies FROM fnd_companies
START WITH company_id = 1 START WITH company_id = 1
CONNECT BY prior company_id = parent_biz_company_id)) v CONNECT BY prior company_id = parent_biz_company_id)
) t
WHERE t.bp_id_agent_n IN (
select h.bp_name
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
and h.bp_category = 'AGENT'
)
)v
#WHERE_CLAUSE#
ORDER BY v.req_date DESC, v.payment_req_number DESC ORDER BY v.req_date DESC, v.payment_req_number DESC
]]></bm:query-sql> ]]></bm:query-sql>
...@@ -175,6 +187,7 @@ ...@@ -175,6 +187,7 @@
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="payment_req_number" queryExpression="v.payment_req_number like &apos;%&apos; || ${@payment_req_number} || &apos;%&apos;"/>
<bm:query-field name="bp_id_tenant_n" queryExpression="v.bp_id_tenant_n like ${@bp_id_tenant_n}"/> <bm:query-field name="bp_id_tenant_n" queryExpression="v.bp_id_tenant_n like ${@bp_id_tenant_n}"/>
<bm:query-field name="print_flag" queryExpression="nvl(v.print_flag,&apos;N&apos;) = ${@print_flag}"/> <bm:query-field name="print_flag" queryExpression="nvl(v.print_flag,&apos;N&apos;) = ${@print_flag}"/>
<bm:query-field name="employee_name" queryExpression="v.user_name like &apos;%&apos; || ${@employee_name} || &apos;%&apos;"/> <bm:query-field name="employee_name" queryExpression="v.user_name like &apos;%&apos; || ${@employee_name} || &apos;%&apos;"/>
...@@ -197,4 +210,10 @@ ...@@ -197,4 +210,10 @@
<bm:query-field name="payment_req_number" queryExpression="v.payment_req_number like &apos;%&apos;||upper(${@payment_req_number})||&apos;%&apos;"/> <bm:query-field name="payment_req_number" queryExpression="v.payment_req_number like &apos;%&apos;||upper(${@payment_req_number})||&apos;%&apos;"/>
<bm:query-field name="user_name" queryExpression="v.user_name like ${@user_name}"/> <bm:query-field name="user_name" queryExpression="v.user_name like ${@user_name}"/>
</bm:query-fields> </bm:query-fields>
<bm:features>
<s:bm-script><![CDATA[
var cx = Packages.leaf.javascript.Context.getCurrentContext();
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
]]></s:bm-script>
</bm:features>
</bm:model> </bm:model>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:s="leaf.plugin.script">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
...@@ -58,11 +58,17 @@ ...@@ -58,11 +58,17 @@
--AND --AND
--cc.cf_item = '52' --cc.cf_item = '52'
)) v #WHERE_CLAUSE# )) v #WHERE_CLAUSE#
ORDER BY transaction_date DESC, transaction_num ORDER BY transaction_date DESC, transaction_num
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
<bm:features>
<s:bm-script><![CDATA[
var cx = Packages.leaf.javascript.Context.getCurrentContext();
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
]]></s:bm-script>
</bm:features>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="payment_req_number_from" datatype="java.lang.String" queryExpression="v.payment_req_number&gt;=${@payment_req_number_from}"/> <bm:query-field name="payment_req_number_from" datatype="java.lang.String" queryExpression="v.payment_req_number&gt;=${@payment_req_number_from}"/>
<bm:query-field name="payment_req_number_to" datatype="java.lang.String" queryExpression="v.payment_req_number&lt;=${@payment_req_number_to}"/> <bm:query-field name="payment_req_number_to" datatype="java.lang.String" queryExpression="v.payment_req_number&lt;=${@payment_req_number_to}"/>
...@@ -73,8 +79,10 @@ ...@@ -73,8 +79,10 @@
<bm:query-field name="transaction_amount_from" datatype="java.lang.String" queryExpression="v.transaction_amount&gt;=${@transaction_amount_from}"/> <bm:query-field name="transaction_amount_from" datatype="java.lang.String" queryExpression="v.transaction_amount&gt;=${@transaction_amount_from}"/>
<bm:query-field name="transaction_amount_to" datatype="java.lang.String" queryExpression="v.transaction_amount&lt;=${@transaction_amount_to}"/> <bm:query-field name="transaction_amount_to" datatype="java.lang.String" queryExpression="v.transaction_amount&lt;=${@transaction_amount_to}"/>
<bm:query-field name="bank_account_code_from" datatype="java.lang.String" queryexpression="v.bank_account_code &gt;= ${@bank_account_code_from}"/> <bm:query-field name="bank_account_code_from" datatype="java.lang.String" queryexpression="v.bank_account_code &gt;= ${@bank_account_code_from}"/>
<bm:query-field name="bank_account_num" queryexpression="v.bank_account_num like &apos;%&apos; || ${@bank_account_num} || &apos;%&apos;"/>
<bm:query-field name="bank_account_code_to" datatype="java.lang.String" queryexpression="v.bank_account_code &lt;= ${@bank_account_code_to}"/> <bm:query-field name="bank_account_code_to" datatype="java.lang.String" queryexpression="v.bank_account_code &lt;= ${@bank_account_code_to}"/>
<bm:query-field name="currency_code" datatype="java.lang.String" queryexpression="v.currency_code = ${@currency_code}"/> <bm:query-field name="currency_code" datatype="java.lang.String" queryexpression="v.currency_code = ${@currency_code}"/>
<bm:query-field name="bp_id" datatype="java.lang.String" queryexpression="v.bp_id = ${@bp_id}"/> <bm:query-field name="bp_id" datatype="java.lang.String" queryexpression="v.bp_id = ${@bp_id}"/>
<bm:query-field name="bp_name" datatype="java.lang.String" queryexpression="v.bp_name = ${@bp_name}"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
bp.enabled_flag, bp.enabled_flag,
decode(nvl(bp.certification_status,'N'),'N','未认证','认证完成')certification_status, decode(nvl(bp.certification_status,'N'),'N','未认证','认证完成')certification_status,
bp.re_kunnr, bp.re_kunnr,
bp.re_lifnr bp.re_lifnr,
bp.sbo_bp_message
FROM hls_bp_master bp FROM hls_bp_master bp
WHERE bp.bp_category = 'AGENT' WHERE bp.bp_category = 'AGENT'
AND NVL(bp.agent_instance_status, 'NEW') IN AND NVL(bp.agent_instance_status, 'NEW') IN
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
<bm:field name="certification_status"/> <bm:field name="certification_status"/>
<bm:field name="re_kunnr"/> <bm:field name="re_kunnr"/>
<bm:field name="re_lifnr"/> <bm:field name="re_lifnr"/>
<bm:field name="sbo_bp_message"/>
</bm:fields> </bm:fields>
<bm:query-fields> <bm:query-fields>
<bm:query-field field="bp_code" queryExpression="t1.bp_code like upper(&apos;%&apos;||${@bp_code}||&apos;%&apos;)"/> <bm:query-field field="bp_code" queryExpression="t1.bp_code like upper(&apos;%&apos;||${@bp_code}||&apos;%&apos;)"/>
......
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
and fm.table_name = 'PRJ_CDD_ITEM_CHECK' and fm.table_name = 'PRJ_CDD_ITEM_CHECK'
and fm.table_pk_value = pp.check_id) as last_file_upload_time, and fm.table_pk_value = pp.check_id) as last_file_upload_time,
hls_sys_upload_pkg.get_atm_file_href(p_table_pk_value => pp.check_id,p_source_type => 'PRJ_CDD_ITEM_CHECK',p_user_id => ${/session/@user_id}) AS attach_file_name, hls_sys_upload_pkg.get_atm_file_href(p_table_pk_value => pp.check_id,p_source_type => 'PRJ_CDD_ITEM_CHECK',p_user_id => ${/session/@user_id}) AS attach_file_name,
hls_sys_upload_pkg.get_atm_file_href(p_table_pk_value => pp.check_id,p_source_type => 'CON_CONTRACT',p_user_id => ${/session/@user_id}) AS attachment_new,
(Select tab_group From prj_cdd_item_tab_group Where tab_group_id = tg.tab_group_id) AS attach_file_type, -- add by zhuxianfei (Select tab_group From prj_cdd_item_tab_group Where tab_group_id = tg.tab_group_id) AS attach_file_type, -- add by zhuxianfei
(Select tab_group_name From prj_cdd_item_tab_group Where tab_group_id = tg.tab_group_id) AS attach_file_type_n (Select tab_group_name From prj_cdd_item_tab_group Where tab_group_id = tg.tab_group_id) AS attach_file_type_n
FROM FROM
...@@ -299,6 +300,7 @@ ...@@ -299,6 +300,7 @@
<bm:field name="tab_group_id" databaseType="NUMBER" datatype="java.lang.Long"/> <bm:field name="tab_group_id" databaseType="NUMBER" datatype="java.lang.Long"/>
<bm:field name="important_flag" databaseType="VARCHAR2" datatype="java.lang.String"/> <bm:field name="important_flag" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="attach_file_name" databaseType="VARCHAR2" datatype="java.lang.String"/> <bm:field name="attach_file_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="attachment_new" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="last_file_upload_time" databaseType="VARCHAR2" datatype="java.lang.String"/> <bm:field name="last_file_upload_time" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="attach_file_type" databaseType="VARCHAR2" datatype="java.lang.String"/> <bm:field name="attach_file_type" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="attach_file_type_n" databaseType="VARCHAR2" datatype="java.lang.String"/> <bm:field name="attach_file_type_n" databaseType="VARCHAR2" datatype="java.lang.String"/>
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
t1.bp_id, t1.bp_id,
t1.description, t1.description,
t1.project_id, t1.project_id,
t1.contract_id t1.contract_id,
t1.bp_category
FROM prj_project_history_lv t1 FROM prj_project_history_lv t1
WHERE t1.bp_id = ${@bp_id} WHERE t1.bp_id = ${@bp_id}
and t1.project_id <> ${@project_id}) tt and t1.project_id <> ${@project_id}) tt
......
...@@ -201,31 +201,33 @@ ...@@ -201,31 +201,33 @@
</tbl> </tbl>
<p line="400" > <p line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >备注:以上款项如核对无误,烦请贵司向我司付款${model.getObject('/model/static_data/record/@sum_amount_agent')!''}元,向日立建机付款${model.getObject('/model/static_data/record/@sum_amount_vender')!''}元。特此申请! </t> <t fontFamily="宋体" fontSize="20" fontColor="000000" >备注:以上款项如核对无误,烦请贵司向我司付款${model.getObject('/model/static_data/record/@sum_amount_agent')!''}元,向${model.getObject('/model/bank_info/record/@vender_name')!''}付款${model.getObject('/model/static_data/record/@sum_amount_vender')!''}元。特此申请! </t>
</p> </p>
<p indFirstLine="1" line="400" > <p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >本公司和日立建机(上海)有限公司的一切债权债务关系由本公司和日立建机(上海)有限公司自行解决和宏菱融资租赁(上海)有限公司无关。</t> <t fontFamily="宋体" fontSize="20" fontColor="000000" >本公司和${model.getObject('/model/bank_info/record/@vender_name')!''}的一切债权债务关系由本公司和${model.getObject('/model/bank_info/record/@vender_name')!''}自行解决和宏菱融资租赁(上海)有限公司无关。</t>
</p> </p>
<p line="400" > <p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >烦请贵司将款项汇至以下账号:</t> <t fontFamily="宋体" fontSize="20" fontColor="000000" >烦请贵司将款项汇至以下账号:</t>
</p> </p>
<p line="400" > <p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >开户名:${model.getObject('/model/bank_info/record/@agent_name')!''} 开户名:${model.getObject('/model/bank_info/record/@vender_name')!''} </t> <t fontFamily="宋体" fontSize="20" fontColor="000000" >开户名:${model.getObject('/model/bank_info/record/@agent_account_name')!''} 开户名:${model.getObject('/model/bank_info/record/@vender_account_name')!''} </t>
</p>
<p line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >开户行:${model.getObject('/model/bank_info/record/@agent_bank_name')!''} 开户行:${model.getObject('/model/bank_info/record/@vender_bank_name')!''} </t>
</p> </p>
<p line="400" > <p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >账号:${model.getObject('/model/bank_info/record/@agent_bank_num')!''} 账号:${model.getObject('/model/bank_info/record/@vender_bank_num')!''}</t> <t fontFamily="宋体" fontSize="20" fontColor="000000" >开户行:${model.getObject('/model/bank_info/record/@agent_bank_name')!''} 开户行:${model.getObject('/model/bank_info/record/@vender_bank_name')!''} </t>
</p> </p>
<p line="400" > <p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >委托收款人确认金额无误 委托公司名称:重庆日和东浦工程机械有限公司 </t> <t fontFamily="宋体" fontSize="20" fontColor="000000" >账号:${model.getObject('/model/bank_info/record/@agent_bank_num')!''} 账号:${model.getObject('/model/bank_info/record/@vender_bank_num')!''}</t>
</p> </p>
<p indFirstLine="1" line="400" > <p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >收款人:日立建机(上海)有限公司(盖章) 申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t> <t fontFamily="宋体" fontSize="20" fontColor="000000" >委托收款人确认金额无误 委托公司名称:${model.getObject('/model/bank_info/record/@vender_name')!''}</t>
</p>
<p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >收款人:日立建机(上海)有限公司(盖章) 申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t>
</p>
<p indFirstLine="9" line="400">
<t fontFamily="宋体" fontSize="20" fontColor="000000"> 确认日期:</t>
</p> </p>
<p indFirstLine="8" line="400" orientation="landscape"> <p orientation="landscape">
<t fontFamily="宋体" fontSize="20" fontColor="000000" > 确认日期:</t>
</p> </p>
</body> </body>
</doc> </doc>
\ No newline at end of file
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<a:link id="con_contract_modify_link" url="${/request/@context_path}/modules/cont/CON311/con_re_print_modify.lview"/> <a:link id="con_contract_modify_link" url="${/request/@context_path}/modules/cont/CON311/con_re_print_modify.lview"/>
<a:link id="${/parameter/@layout_code}con_contract_query_link" <a:link id="${/parameter/@layout_code}con_contract_query_link"
url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/> url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<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/PRJ501N/prj_project_maintain.lview"/>
<a:link id="con_contract_update_print_detail_link_id" url="${/request/@context_path}/modules/cont/CON311/con_contract_update_print_word_detail.lview"/> <a:link id="con_contract_update_print_detail_link_id" url="${/request/@context_path}/modules/cont/CON311/con_contract_update_print_word_detail.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function open_contract_win(ds_id, record_id) { function open_contract_win(ds_id, record_id) {
......
...@@ -257,7 +257,12 @@ ...@@ -257,7 +257,12 @@
var record = $(ds_id).findById(id); var record = $(ds_id).findById(id);
if (record.get('check_id')) { if (record.get('check_id')) {
var url; var url;
if (query_only == 'Y') { if(record.get('attachment_tab_group')=='SIGN' && '${/parameter/@con_query_only}'=='N'){
url = $('${/parameter/@layout_code}_prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
}else if(record.get('attachment_tab_group')=='SIGN' && '${/parameter/@con_query_only}'=='Y'){
url = $('${/parameter/@layout_code}_prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
}
else if (query_only == 'Y') {
url = $('${/parameter/@layout_code}_prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id'); url = $('${/parameter/@layout_code}_prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
} else { } else {
url = $('${/parameter/@layout_code}_prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id'); url = $('${/parameter/@layout_code}_prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
]]> ]]>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="${/parameter/@layout_code}con_contract_query_link"
url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<a:link id="con_contract_terminate_link_id" model="cont.CON560.con_contract_terminate" <a:link id="con_contract_terminate_link_id" model="cont.CON560.con_contract_terminate"
modelaction="batch_update"/> modelaction="batch_update"/>
<a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/> <a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/>
...@@ -47,9 +49,19 @@ ...@@ -47,9 +49,19 @@
}, null, null); }, null, null);
} }
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
param['function_code'] = 'CON301';
param['function_usage'] = 'QUERY';
param['winid'] = 'con_contract_modify_win_id';
param['download'] = 'Y';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id);
}
function con560_render_contractMaintainDs_grid(value, record, name) { function con560_render_contractMaintainDs_grid(value, record, name) {
if (name == 'contract_number') { if (name == 'contract_number') {
return '<a href="javascript:con560_contractMaintainDs_grid_update(' + record.id + ');">' + value + '</a>'; return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
} }
} }
...@@ -123,19 +135,22 @@ ...@@ -123,19 +135,22 @@
<a:dataSets> <a:dataSets>
<a:dataSet id="receivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_received_amount"/> <a:dataSet id="receivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_received_amount"/>
<a:dataSet id="unreceivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_unreceived_amount"/> <a:dataSet id="unreceivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_unreceived_amount"/>
<a:dataSet id="con560_contract_status_ds" lookupCode="CON500_CONTRACT_STATUS"/> <a:dataSet id="con560_contract_status_ds" autoQuery="true" model="cont.CON560.con_contract_status"/>
<a:dataSet id="con560_lease_organization_name_ds" loadData="true" <a:dataSet id="con560_lease_organization_name_ds" loadData="true"
model="basic.hls_lease_organization_for_lov"/> model="basic.hls_lease_organization_for_lov"/>
<a:dataSet id="con560_contract_status_grid_ds" lookupCode="CON500_CONTRACT_STATUS"/>
<a:dataSet id="con560_contract_query_ds" autoCreate="true"> <a:dataSet id="con560_contract_query_ds" autoCreate="true">
<a:fields> <a:fields>
<a:field name="bp_name" autoComplete="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="100" <a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovLabelWidth="100"
lovService="cont.CON541.hls_bp_master_v_for_lov?bp_category=TENANT" lovWidth="520" lovService="cont.CON541.hls_bp_masster_for_lov" lovWidth="520"
title="HLS.BP_TITLE"> title="HLS.BP_TITLE">
<a:mapping> <a:mapping>
<a:map from="bp_name" to="bp_name"/> <a:map from="bp_name" to="bp_name"/>
<a:map from="bp_code" to="bp_code"/>
<a:map from="bp_id" to="bp_id_tenant"/> <a:map from="bp_id" to="bp_id_tenant"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="bp_id_tenant"/>
<!-- <a:field name="contract_number" autoComplete="true" lovGridHeight="300" lovHeight="450" lovService="cont.CON531.con_contract_lov" lovWidth="500" title="HLS.CONTRACT_NUMBER"> <!-- <a:field name="contract_number" autoComplete="true" lovGridHeight="300" lovHeight="450" lovService="cont.CON531.con_contract_lov" lovWidth="500" title="HLS.CONTRACT_NUMBER">
<a:mapping> <a:mapping>
<a:map from="contract_number" to="contract_number"/> <a:map from="contract_number" to="contract_number"/>
...@@ -164,7 +179,7 @@ ...@@ -164,7 +179,7 @@
selectable="true" selectionModel="single"> selectable="true" selectionModel="single">
<a:fields> <a:fields>
<a:field name="contract_status_n" displayField="code_value_name" <a:field name="contract_status_n" displayField="code_value_name"
options="con560_contract_status_ds" returnField="contract_status" options="con560_contract_status_grid_ds" returnField="contract_status"
valueField="code_value"/> valueField="code_value"/>
</a:fields> </a:fields>
<a:events> <a:events>
...@@ -194,7 +209,7 @@ ...@@ -194,7 +209,7 @@
renderer="con560_render_contractMaintainDs_grid" width="150"/> renderer="con560_render_contractMaintainDs_grid" width="150"/>
<a:column name="bp_name" prompt="HLS.TENANT_NAME" width="240"/> <a:column name="bp_name" prompt="HLS.TENANT_NAME" width="240"/>
<a:column name="inception_of_lease" prompt="起租日期" renderer="Leaf.formatDate" width="100"/> <a:column name="inception_of_lease" prompt="起租日期" renderer="Leaf.formatDate" width="100"/>
<a:column name="lease_end_date" prompt="合同预计结束日期" renderer="Leaf.formatDate" width="140"/> <!-- <a:column name="lease_end_date" prompt="合同预计结束日期" renderer="Leaf.formatDate" width="140"/>-->
<a:column name="is_terminate" prompt="租金是否结清" width="100"/> <a:column name="is_terminate" prompt="租金是否结清" width="100"/>
<a:column name="residual_value" align="right" prompt="留购价" renderer="Leaf.formatMoney" width="50"/> <a:column name="residual_value" align="right" prompt="留购价" renderer="Leaf.formatMoney" width="50"/>
<!--<a:column name="signing_user_id_n" prompt="签约人" width="100"/>--> <!--<a:column name="signing_user_id_n" prompt="签约人" width="100"/>-->
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
]]> ]]>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="${/parameter/@layout_code}con_contract_query_link"
url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<a:link id="con_contract_terminate_link_id" model="cont.CON560.con_contract_terminate" <a:link id="con_contract_terminate_link_id" model="cont.CON560.con_contract_terminate"
modelaction="batch_update"/> modelaction="batch_update"/>
<a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/> <a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/>
...@@ -46,10 +48,20 @@ ...@@ -46,10 +48,20 @@
// return; // return;
// }, null, null); // }, null, null);
} }
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
param['function_code'] = 'CON301';
param['function_usage'] = 'QUERY';
param['winid'] = 'con_contract_modify_win_id';
param['download'] = 'Y';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id);
}
function con560_render_contractMaintainDs_grid(value, record, name) { function con560_render_contractMaintainDs_grid(value, record, name) {
if (name == 'contract_number') { if (name == 'contract_number') {
return '<a href="javascript:con560_contractMaintainDs_grid_update(' + record.id + ');">' + value + '</a>'; return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
} }
} }
...@@ -123,9 +135,10 @@ ...@@ -123,9 +135,10 @@
<a:dataSets> <a:dataSets>
<a:dataSet id="receivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_received_amount"/> <a:dataSet id="receivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_received_amount"/>
<a:dataSet id="unreceivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_unreceived_amount"/> <a:dataSet id="unreceivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_unreceived_amount"/>
<a:dataSet id="con560_contract_status_ds" lookupCode="CON500_CONTRACT_STATUS"/> <a:dataSet id="con560_contract_status_ds" autoQuery="true" model="cont.CON560.con_contract_status"/>
<a:dataSet id="con560_lease_organization_name_ds" loadData="true" <a:dataSet id="con560_lease_organization_name_ds" loadData="true"
model="basic.hls_lease_organization_for_lov"/> model="basic.hls_lease_organization_for_lov"/>
<a:dataSet id="con560_contract_status_grid_ds" lookupCode="CON500_CONTRACT_STATUS"/>
<a:dataSet id="con560_contract_query_ds" autoCreate="true"> <a:dataSet id="con560_contract_query_ds" autoCreate="true">
<a:fields> <a:fields>
<a:field name="bp_name" autoComplete="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="100" <a:field name="bp_name" autoComplete="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="100"
...@@ -161,7 +174,7 @@ ...@@ -161,7 +174,7 @@
selectable="true" selectionModel="single"> selectable="true" selectionModel="single">
<a:fields> <a:fields>
<a:field name="contract_status_n" displayField="code_value_name" <a:field name="contract_status_n" displayField="code_value_name"
options="con560_contract_status_ds" returnField="contract_status" options="con560_contract_status_grid_ds" returnField="contract_status"
valueField="code_value"/> valueField="code_value"/>
</a:fields> </a:fields>
<a:events> <a:events>
...@@ -190,12 +203,12 @@ ...@@ -190,12 +203,12 @@
renderer="con560_render_contractMaintainDs_grid" width="150"/> renderer="con560_render_contractMaintainDs_grid" width="150"/>
<a:column name="bp_name" prompt="HLS.TENANT_NAME" width="100"/> <a:column name="bp_name" prompt="HLS.TENANT_NAME" width="100"/>
<a:column name="inception_of_lease" prompt="起租日期" renderer="Leaf.formatDate" width="100"/> <a:column name="inception_of_lease" prompt="起租日期" renderer="Leaf.formatDate" width="100"/>
<a:column name="lease_end_date" prompt="合同预计结束日期" renderer="Leaf.formatDate" width="100"/> <!-- <a:column name="lease_end_date" prompt="合同预计结束日期" renderer="Leaf.formatDate" width="100"/>-->
<a:column name="is_terminate" prompt="租金是否结清" width="100"/> <a:column name="is_terminate" prompt="租金是否结清" width="100"/>
<a:column name="residual_value" align="right" prompt="留购价" renderer="Leaf.formatMoney" width="50"/> <a:column name="residual_value" align="right" prompt="留购价" renderer="Leaf.formatMoney" width="50"/>
<!--<a:column name="signing_user_id_n" prompt="签约人" width="100"/>--> <!--<a:column name="signing_user_id_n" prompt="签约人" width="100"/>-->
<a:column name="signing_date" prompt="签约时间" renderer="Leaf.formatDate" width="100"/> <!-- <a:column name="signing_date" prompt="签约时间" renderer="Leaf.formatDate" width="100"/>-->
<a:column name="signing_location" prompt="签约地点" width="100"/> <!-- <a:column name="signing_location" prompt="签约地点" width="100"/>-->
<!--<a:column name="bp_vender" align="center" footerRenderer="summaryRenderer" prompt="主供应商名称" width="200"/>--> <!--<a:column name="bp_vender" align="center" footerRenderer="summaryRenderer" prompt="主供应商名称" width="200"/>-->
<a:column name="lease_item_amount" align="right" footerRenderer="summaryRenderer" prompt="租赁物总价" <a:column name="lease_item_amount" align="right" footerRenderer="summaryRenderer" prompt="租赁物总价"
renderer="Leaf.formatMoney" width="120"/> renderer="Leaf.formatMoney" width="120"/>
......
...@@ -223,7 +223,21 @@ ...@@ -223,7 +223,21 @@
} }
} }
}; };
window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
// var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
// var ds_id = '${/parameter/@layout_code}_G_CSH_REQ_1_csh_payment_req_hd_ds';
// var ds_id_2= '${/parameter/@layout_code}_G_CSH_REQ_2_csh_payment_req_hd_ds';
//
// if (ds.id == ds_id) {
aut_authority_list_validate_query(ds, qpara);
// }
// if (ds.id == ds_id_2) {
// aut_authority_list_validate_query(ds, qpara);
// }
};
]]></script> ]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/> <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=PAYMENT_REQ&amp;function_code=CSH501"/>
</a:view> </a:view>
</a:screen> </a:screen>
...@@ -635,7 +635,7 @@ ...@@ -635,7 +635,7 @@
} }
if(line_records.length>1){ if(line_records.length>1){
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('${l:PROMPT}', '一次只能选择一条数据进行操作!'); Leaf.showMessage('${l:PROMPT}', '一次支付只支持同一合同!');
return; return;
} }
......
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
]]></script> ]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/> <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CSH501"/> <!-- <a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CSH501"/>-->
<a:dataSets> <a:dataSets>
<a:dataSet id="vender_name_ds" lookupCode="VENDER_NAME"/> <a:dataSet id="vender_name_ds" lookupCode="VENDER_NAME"/>
<a:dataSet id="yes_no_ds" lookupCode="YES_NO"/> <a:dataSet id="yes_no_ds" lookupCode="YES_NO"/>
......
...@@ -111,7 +111,6 @@ ...@@ -111,7 +111,6 @@
param['merge_flag'] = 'N'; param['merge_flag'] = 'N';
param['bp_category'] =identify_category; param['bp_category'] =identify_category;
param['details'] = saveData; param['details'] = saveData;
Leaf.showConfirm('${l:PROMPT_MESSAGE}', '确定提交?', function okFun() { Leaf.showConfirm('${l:PROMPT_MESSAGE}', '确定提交?', function okFun() {
Leaf.request({ Leaf.request({
url: $('csh_payment_req_pay_link_id').getUrl(), url: $('csh_payment_req_pay_link_id').getUrl(),
...@@ -688,7 +687,7 @@ ...@@ -688,7 +687,7 @@
<a:field name="zero_amounts_allowed" defaultValue="N"/> <a:field name="zero_amounts_allowed" defaultValue="N"/>
<a:field name="currency_code" defaultValue="CNY"/> <a:field name="currency_code" defaultValue="CNY"/>
<a:field name="currency_name" defaultValue="人民币"/> <a:field name="currency_name" defaultValue="人民币"/>
<a:field name="bank_account_id" defaultValue="1531"/> <a:field name="bank_account_id"/>
<a:field name="bank_account_name"/> <a:field name="bank_account_name"/>
<a:field name="bank_account_num" autoComplete="true" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" required="true" title="CSH511.BANK_ACCOUNT_CODE"> <a:field name="bank_account_num" autoComplete="true" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" required="true" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping> <a:mapping>
...@@ -696,6 +695,7 @@ ...@@ -696,6 +695,7 @@
<a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/> <a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
<a:map from="bank_account_id" to="bank_account_id"/> <a:map from="bank_account_id" to="bank_account_id"/>
<a:map from="bank_account_num" to="bank_account_num"/> <a:map from="bank_account_num" to="bank_account_num"/>
<a:map from="bank_account_id" to="bank_account_id"/>
<a:map from="bank_account_name" to="bank_account_name"/> <a:map from="bank_account_name" to="bank_account_name"/>
<a:map from="bank_account_code" to="bank_account_code"/> <a:map from="bank_account_code" to="bank_account_code"/>
<a:map from="currency_code" to="currency_code"/> <a:map from="currency_code" to="currency_code"/>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application"> <a:screen xmlns:a="http://www.leaf-framework.org/application">
<a:init-procedure/> <a:init-procedure/>
<a:view> <a:view>
<a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CSH502"/>
<a:link id="payment_req_post_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_insert_tmp.lsc"/> <a:link id="payment_req_post_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_insert_tmp.lsc"/>
<a:link id="payment_req_excel_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_excel_sheets.lsc"/> <a:link id="payment_req_excel_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_excel_sheets.lsc"/>
<a:link id="payment_req_excel_cib_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_excel_sheets_cib.lsc"/> <a:link id="payment_req_excel_cib_link" url="${/request/@context_path}/modules/csh/CSH502/payment_seq_excel_sheets_cib.lsc"/>
...@@ -46,7 +47,19 @@ ...@@ -46,7 +47,19 @@
// return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>'; // return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>';
// } // }
} }
function construct_from_to() {
var config = ['amount', 'bank_slip_num', 'transaction_amount', 'currency_code', 'bank_account_code'];
var pattern = ['_from', '_to'];
var obj = {};
for (var i = 0,
j = config.length; i < j; i++) {
for (var m = 0,
n = pattern.length; m < n; m++) {
obj[config[i] + pattern[m]] = config[i] + pattern[n - 1 - m];
}
}
return obj;
}
// function openWindow(url) { // function openWindow(url) {
// new Leaf.Window({ // new Leaf.Window({
...@@ -77,6 +90,18 @@ ...@@ -77,6 +90,18 @@
} }
function onUpdate_payment_req(ds, record, name, value, oldvalue) { function onUpdate_payment_req(ds, record, name, value, oldvalue) {
/*
var from_to = construct_from_to();
var opposite_name = from_to[name];
if (!Ext.isEmpty(opposite_name)) {
var opposite_value = record.get(opposite_name);
if (!Ext.isEmpty(value) && Ext.isEmpty(opposite_value)) {
record.set(opposite_name, value);
}
}
*/
if (name == 'payment_req_number_from') { if (name == 'payment_req_number_from') {
if (record.get('payment_req_number_to') == 'undefined' || record.get('payment_req_number_to') == null || record.get('payment_req_number_to') == '') { if (record.get('payment_req_number_to') == 'undefined' || record.get('payment_req_number_to') == null || record.get('payment_req_number_to') == '') {
record.set('payment_req_number_to', value); record.set('payment_req_number_to', value);
...@@ -94,13 +119,21 @@ ...@@ -94,13 +119,21 @@
record.set('approval_date_from', value); record.set('approval_date_from', value);
} }
} else if (name == 'amount_from') { } else if (name == 'amount_from') {
var formatMoney=value.replace(/\,/g, "");
if (record.get('amount_to') == 'undefined' || record.get('amount_to') == null || record.get('amount_to') == '') { if (record.get('amount_to') == 'undefined' || record.get('amount_to') == null || record.get('amount_to') == '') {
record.set('amount_to', value);
record.set('amount_to', formatMoney);
} }
ds.getAt(0).set('amount_from', formatMoney)
record.set('amount_from', formatMoney);
} else if (name == 'amount_to') { } else if (name == 'amount_to') {
var formatMoney=value.replace(/\,/g, "");
if (record.get('amount_from') == 'undefined' || record.get('amount_from') == null || record.get('amount_from') == '') { if (record.get('amount_from') == 'undefined' || record.get('amount_from') == null || record.get('amount_from') == '') {
record.set('amount_from', value); record.set('amount_from', formatMoney);
} }
record.set('amount_to', formatMoney);
} else if (name == 'req_date_from') { } else if (name == 'req_date_from') {
if (record.get('req_date_to') == 'undefined' || record.get('req_date_to') == null || record.get('req_date_to') == '') { if (record.get('req_date_to') == 'undefined' || record.get('req_date_to') == null || record.get('req_date_to') == '') {
record.set('req_date_to', value); record.set('req_date_to', value);
...@@ -377,13 +410,13 @@ ...@@ -377,13 +410,13 @@
<!-- <a:column name="status_n" align="center" prompt="BPM状态" width="80"/> --> <!-- <a:column name="status_n" align="center" prompt="BPM状态" width="80"/> -->
<!-- <a:column name="user_name" prompt="CSH502.CSH_PROPOSER" width="120"/>--> <!-- <a:column name="user_name" prompt="CSH502.CSH_PROPOSER" width="120"/>-->
<a:column name="req_date" align="center" prompt="CSH502.CSH_REQ_DATE" width="120"/> <a:column name="req_date" align="center" prompt="CSH502.CSH_REQ_DATE" width="120"/>
<a:column name="amount" align="center" prompt="应付金额" width="120" renderer="Leaf.formatMoney"/> <a:column name="amount" align="right" prompt="应付金额" width="120" renderer="Leaf.formatMoney"/>
<a:column name="bp_id_agent_n" align="center" prompt="代理店" width="120"/> <a:column name="bp_id_agent_n" align="center" prompt="代理店" width="120"/>
<a:column name="amount_agent_total" align="center" prompt="应付代理店金额" width="120" renderer="Leaf.formatMoney"/> <a:column name="amount_agent_total" align="right" prompt="应付代理店金额" width="120" renderer="Leaf.formatMoney"/>
<a:column name="residual_agent_amount" align="center" prompt="未付代理店金额" width="120" renderer="Leaf.formatMoney"/> <a:column name="residual_agent_amount" align="right" prompt="未付代理店金额" width="120" renderer="Leaf.formatMoney"/>
<a:column name="vender_name" align="center" prompt="厂商" width="120"/> <a:column name="vender_name" align="center" prompt="厂商" width="120"/>
<a:column name="amount_vender_total" align="center" prompt="应付厂商金额" width="120" renderer="Leaf.formatMoney"/> <a:column name="amount_vender_total" align="right" prompt="应付厂商金额" width="120" renderer="Leaf.formatMoney"/>
<a:column name="residual_vender_amount" align="center" prompt="未付厂商金额" width="120" renderer="Leaf.formatMoney"/> <a:column name="residual_vender_amount" align="right" prompt="未付厂商金额" width="120" renderer="Leaf.formatMoney"/>
<!-- <a:column name="bp_id_tenant_n" align="center" prompt="承租人"/>--> <!-- <a:column name="bp_id_tenant_n" align="center" prompt="承租人"/>-->
<!-- <a:column name="apply_amount" align="right" prompt="CSH501.CSH_APPLIED_TOTAL_AMOUNT" renderer="Leaf.formatMoney"/>--> <!-- <a:column name="apply_amount" align="right" prompt="CSH501.CSH_APPLIED_TOTAL_AMOUNT" renderer="Leaf.formatMoney"/>-->
......
...@@ -173,18 +173,19 @@ ...@@ -173,18 +173,19 @@
</a:dataSet> </a:dataSet>
<a:dataSet id="csh_payment_reverse_query_ds"> <a:dataSet id="csh_payment_reverse_query_ds">
<a:fields> <a:fields>
<a:field name="bp_code" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov" lovWidth="500"> <a:field name="bp_name" lovGridHeight="350" lovHeight="550" lovService="basic.hls_bp_master_bank_account_v" lovWidth="580">
<a:mapping> <a:mapping>
<a:map from="bp_code" to="bp_code"/> <!-- <a:map from="bp_code" to="bp_code"/>-->
<a:map from="bp_name" to="bp_name"/> <a:map from="bank_account_name" to="bp_name"/>
<a:map from="bp_id" to="bp_id"/> <!-- <a:map from="bp_id" to="bp_id"/>-->
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="transaction_date_from" validator="dateValidator"/> <a:field name="transaction_date_from" validator="dateValidator"/>
<a:field name="transaction_date_to" validator="dateValidator"/> <a:field name="transaction_date_to" validator="dateValidator"/>
<a:field name="bank_account_code_from" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE"> <a:field name="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping> <a:mapping>
<a:map from="bank_account_code" to="bank_account_code_from"/> <a:map from="bank_account_name" to="bank_account_name"/>
<a:map from="bank_account_num" to="bank_account_num"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="bank_account_from_id"/> <a:field name="bank_account_from_id"/>
...@@ -230,9 +231,9 @@ ...@@ -230,9 +231,9 @@
<a:textField name="payment_req_number_to" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_REQ_HD.PAYMENT_REQ_NUMBER_TO" width="150"/> <a:textField name="payment_req_number_to" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_REQ_HD.PAYMENT_REQ_NUMBER_TO" width="150"/>
<a:numberField name="transaction_amount_from" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_AMOUNT_FROM" width="150"/> <a:numberField name="transaction_amount_from" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_AMOUNT_FROM" width="150"/>
<a:numberField name="transaction_amount_to" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_AMOUNT_TO" width="150"/> <a:numberField name="transaction_amount_to" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_AMOUNT_TO" width="150"/>
<a:lov name="bank_account_code_from" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.BANK_ACCOUNT_CODE_FROM" width="150"/> <a:lov name="bank_account_num" bindTarget="csh_payment_reverse_query_ds" prompt="付款账号" width="150"/>
<a:lov name="bank_account_code_to" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.BANK_ACCOUNT_CODE_TO" width="150"/> <!-- <a:lov name="bank_account_code_to" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.BANK_ACCOUNT_CODE_TO" width="150"/>-->
<a:lov name="bp_code" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_OBJ" width="150"><![CDATA[ <a:lov name="bp_name" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_PAYMENT_OBJ" width="150"><![CDATA[
]]></a:lov> ]]></a:lov>
<a:comboBox name="currency_name_display" bindTarget="csh_payment_reverse_query_ds" prompt="HLS.CURRENCY"/> <a:comboBox name="currency_name_display" bindTarget="csh_payment_reverse_query_ds" prompt="HLS.CURRENCY"/>
</a:form> </a:form>
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<!-- <a:column name="bank_account_num" prompt="CSH511.BANK_ACCOUNT_NUM"/> --> <!-- <a:column name="bank_account_num" prompt="CSH511.BANK_ACCOUNT_NUM"/> -->
<a:column name="bp_name" prompt="HLS.BP_NAME" align="center"/> <a:column name="bp_name" prompt="HLS.BP_NAME" align="center"/>
<a:column name="bp_category_display" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY" align="center"/> <a:column name="bp_category_display" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY" align="center"/>
<a:column name="bank_slip_num" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM" align="center"/> <a:column name="bank_slip_num" prompt="银行流水号" align="center"/>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/> <a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/>
<a:column align="center" prompt="附件查看" renderer="csh515_attachment_download" width="80"/> <a:column align="center" prompt="附件查看" renderer="csh515_attachment_download" width="80"/>
</a:columns> </a:columns>
......
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
bp_record.set('owner_user_id','${/session/@user_id}'); bp_record.set('owner_user_id','${/session/@user_id}');
bp_record.set('agent_name', agent_name); bp_record.set('agent_name', agent_name);
bp_record.set('agent_name_n', agent_name_n); bp_record.set('agent_name_n', agent_name_n);
if(agent_name && agent_name_n){
bp_record.getField('agent_name_n').setReadOnly(true);
}else{
bp_record.getField('agent_name_n').setReadOnly(false);
bp_record.getField('agent_name_n').setRequired(true);
// bp_record.getField('agent_type_n').setRequired(true);
}
if ('${/parameter/@bp_type}' == 'AGENT') { if ('${/parameter/@bp_type}' == 'AGENT') {
bp_record.getField('agent_type_n').setReadOnly(false); bp_record.getField('agent_type_n').setReadOnly(false);
// bp_record.getField('agent_type_n').setRequired(true); // bp_record.getField('agent_type_n').setRequired(true);
...@@ -84,6 +90,7 @@ ...@@ -84,6 +90,7 @@
current_record.getField('enabled_flag').setReadOnly(true); current_record.getField('enabled_flag').setReadOnly(true);
}else if(head_record.get('bp_category') == 'VENDER'){ }else if(head_record.get('bp_category') == 'VENDER'){
bp_record.getField('agent_name_n').setReadOnly(true); bp_record.getField('agent_name_n').setReadOnly(true);
bp_record.getField('agent_name_n').setRequired(false);
}else { }else {
current_record.getField('bp_type_n').setReadOnly(true); current_record.getField('bp_type_n').setReadOnly(true);
current_record.getField('enabled_flag').setReadOnly(true); current_record.getField('enabled_flag').setReadOnly(true);
...@@ -328,6 +335,8 @@ ...@@ -328,6 +335,8 @@
// } // }
// }); // });
var social_credit_code_flag;
function CheckSocialCreditCode(Code) { function CheckSocialCreditCode(Code) {
var patrn = /^[0-9A-Z]+$/; var patrn = /^[0-9A-Z]+$/;
//18位校验及大写校验 //18位校验及大写校验
...@@ -426,44 +435,51 @@ ...@@ -426,44 +435,51 @@
// } // }
} else { } else {
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var check_flag = false;
if (head_record.get('bp_code')) {
return true;
}
Leaf.request({ if (social_credit_code_flag != 'N'){
url: $('get_special_fields_link_id').getUrl(),
para: { var check_flag = false;
document_category: 'BP', if (head_record.get('bp_code')) {
document_type: head_record.get('bp_type'), return true;
// document_type: 'TENANT', }
bp_class: head_record.get('bp_class'), Leaf.request({
id_type: head_record.get('id_type'), url: $('get_special_fields_link_id').getUrl(),
id_card_no: head_record.get('id_card_no'), para: {
bp_info: head_record.get('bp_info'), document_category: 'BP',
province_id: head_record.get('province_id'), document_type: head_record.get('bp_type'),
organization_code: head_record.get('organization_code'), // document_type: 'TENANT',
function_code: '${/parameter/@function_code}', bp_class: head_record.get('bp_class'),
function_usage: '${/parameter/@function_usage}' id_type: head_record.get('id_type'),
}, id_card_no: head_record.get('id_card_no'),
success: function (res) { bp_info: head_record.get('bp_info'),
var document_number = res.result.document_number; province_id: head_record.get('province_id'),
head_record.set('bp_code', document_number); organization_code: head_record.get('organization_code'),
head_record.set('company_id', '${/session/@company_id}'); function_code: '${/parameter/@function_code}',
head_record.set('unbrand', '${/parameter/@unbrand}'); function_usage: '${/parameter/@function_usage}'
check_flag = true; },
}, success: function (res) {
error: function () { var document_number = res.result.document_number;
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); head_record.set('bp_code', document_number);
}, head_record.set('company_id', '${/session/@company_id}');
failure: function () { head_record.set('unbrand', '${/parameter/@unbrand}');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); check_flag = true;
}, },
sync: true, error: function () {
scope: this window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}); },
} failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
sync: true,
scope: this
});
}else {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('提示', '统一社会信用代码有误,请重新输入!');
return false;
}
}
return check_flag; return check_flag;
}; };
...@@ -587,7 +603,19 @@ ...@@ -587,7 +603,19 @@
//自动带出籍贯 //自动带出籍贯
record.set('resident_addres', get_native_place(value)) record.set('resident_addres', get_native_place(value))
} }
if (name == 'id_no_sp') {
if (!value) {
record.set('ccx_resmsg1', '');
}
if(record.get('card_type_sp') == 'ID_CARD'){
if (!checkCard(value)) {
Leaf.showMessage('${l:HLS.PROMPT}','配偶身份证号错误!');
return false;
}
}
// ds.fields.id_no_sp.pro.validator = id_card_no_validate;
record.set('resident_addres_sp', get_native_place(value))
}
} }
var hls_bp_master_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); var hls_bp_master_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
...@@ -605,27 +633,28 @@ ...@@ -605,27 +633,28 @@
if(name == 'social_code') { if(name == 'social_code') {
if (!CheckSocialCreditCode(value)) { if (!CheckSocialCreditCode(value)) {
Leaf.showMessage('提示', '统一社会信用代码有误,请重新输入!'); Leaf.showMessage('提示', '统一社会信用代码有误,请重新输入!');
social_credit_code_flag ='N';
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false; return false;
} }
} }
} }
if (ds.id == gird_ds_id4 || ds.id == gird_ds_id5) { // if (ds.id == gird_ds_id4 || ds.id == gird_ds_id5) {
if (name == 'id_no_sp') { // if (name == 'id_no_sp') {
if (!value) { // if (!value) {
record.set('ccx_resmsg1', ''); // record.set('ccx_resmsg1', '');
} // }
if(record.get('card_type_sp') == 'ID_CARD'){ // if(record.get('card_type_sp') == 'ID_CARD'){
if (!checkCard(value)) { // if (!checkCard(value)) {
Leaf.showMessage('${l:HLS.PROMPT}','配偶身份证号错误!'); // Leaf.showMessage('${l:HLS.PROMPT}','配偶身份证号错误!');
return false; // return false;
} // }
} // }
// ds.fields.id_no_sp.pro.validator = id_card_no_validate; // // ds.fields.id_no_sp.pro.validator = id_card_no_validate;
record.set('resident_addres_sp', get_native_place(value)) // record.set('resident_addres_sp', get_native_place(value))
} // }
} // }
if(name=='marital_status'){ if(name=='marital_status'){
if(value=='30'){ if(value=='30'){
record.getField('bp_name_sp').setRequired(true); record.getField('bp_name_sp').setRequired(true);
......
...@@ -78,6 +78,9 @@ ...@@ -78,6 +78,9 @@
return url; return url;
} }
}else if(name =='atm_attachment'){
link_function = 'hls215n_upload_file';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
} }
}; };
......
...@@ -417,24 +417,23 @@ ...@@ -417,24 +417,23 @@
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var bp_record = $(ds_id).getCurrentRecord(); var bp_record = $(ds_id).getCurrentRecord();
if (ds_id == ds.id) { if (ds_id == ds.id) {
// record.set('taxpayer_type','Y'); record.set('taxpayer_type','GENERAL_TAXPAYER');
// record.set('taxpayer_type_n','否'); record.set('taxpayer_type_n','一般纳税人');
if (record.get('taxpayer_type') == 'Y') { // if (record.get('taxpayer_type') == 'Y') {
record.getField('tax_registry_num').setRequired(true); // record.getField('tax_registry_num').setRequired(true);
record.getField('invoice_bp_address').setRequired(true); // record.getField('invoice_bp_address').setRequired(true);
record.getField('invoice_title').setRequired(true); // record.getField('invoice_title').setRequired(true);
record.getField('invoice_bp_phone_num').setRequired(true); // record.getField('invoice_bp_phone_num').setRequired(true);
record.getField('invoice_bp_bank').setRequired(true); // record.getField('invoice_bp_bank').setRequired(true);
record.getField('invoice_bp_bank_account_id').setRequired(true); // record.getField('invoice_bp_bank_account_id').setRequired(true);
} else { // } else {
record.getField('tax_registry_num').setRequired(false); // record.getField('tax_registry_num').setRequired(false);
record.getField('invoice_bp_address').setRequired(false); // record.getField('invoice_bp_address').setRequired(false);
record.getField('invoice_title').setRequired(false); // record.getField('invoice_title').setRequired(false);
record.getField('invoice_bp_phone_num').setRequired(false); // record.getField('invoice_bp_phone_num').setRequired(false);
record.getField('invoice_bp_bank').setRequired(false); // record.getField('invoice_bp_bank').setRequired(false);
record.getField('invoice_bp_bank_account_id').setRequired(false); // record.getField('invoice_bp_bank_account_id').setRequired(false);
} // }
bp_record.set('employee_id', '${/model/employee_id_path/record/@employee_id}'); bp_record.set('employee_id', '${/model/employee_id_path/record/@employee_id}');
bp_record.set('employee_id_n', '${/model/employee_id_path/record/@employee_name}'); bp_record.set('employee_id_n', '${/model/employee_id_path/record/@employee_name}');
......
...@@ -192,6 +192,7 @@ ...@@ -192,6 +192,7 @@
selectionModel="single"> selectionModel="single">
<a:fields> <a:fields>
<a:field name="enabled_flag" checkedValue="Y" uncheckedValue="N"/> <a:field name="enabled_flag" checkedValue="Y" uncheckedValue="N"/>
<a:field name="sbo_bp_message" readOnly="true"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
...@@ -215,7 +216,7 @@ ...@@ -215,7 +216,7 @@
<a:column name="bp_name" align="center" prompt="代理店名称" width="280"/> <a:column name="bp_name" align="center" prompt="代理店名称" width="280"/>
<a:column name="extra_nam" align="center" prompt="代理店简称" width="130"/> <a:column name="extra_nam" align="center" prompt="代理店简称" width="130"/>
<a:column name="enabled_flag" align="center" prompt="代理店状态" width="100"/> <a:column name="enabled_flag" align="center" prompt="代理店状态" width="100"/>
<a:column name="sbo_bp_message" align="left" prompt="SBO反馈信息" width="350"/>
<!-- <a:column name="agent_instance_status_n" align="center" prompt="工作流状态" width="150"/>--> <!-- <a:column name="agent_instance_status_n" align="center" prompt="工作流状态" width="150"/>-->
</a:columns> </a:columns>
</a:grid> </a:grid>
......
...@@ -44,7 +44,8 @@ ...@@ -44,7 +44,8 @@
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_history_display.lview"/> url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_history_display.lview"/>
<a:model-query fetchAll="true" model="prj.PRJ500D.prj_occu_object_display" rootPath="occu_object"/> <a:model-query fetchAll="true" model="prj.PRJ500D.prj_occu_object_display" rootPath="occu_object"/>
<a:link id="prj_two_secondary_lease_link_id" model="prj.PRJ501N.insert_two_secondary_lease" modelaction="update"/> <a:link id="prj_two_secondary_lease_link_id" model="prj.PRJ501N.insert_two_secondary_lease" modelaction="update"/>
<a:link id="${/parameter/@layout_code}contract_number_query_link"
url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
// alert('${/parameter/@division}') // alert('${/parameter/@division}')
//add by zhuxianfei //add by zhuxianfei
...@@ -126,6 +127,7 @@ ...@@ -126,6 +127,7 @@
draggable: true draggable: true
}); });
win.on('close', function () { win.on('close', function () {
$(quotation_ds_id).query(); $(quotation_ds_id).query();
$(history_ds_id).query(); $(history_ds_id).query();
...@@ -166,6 +168,7 @@ ...@@ -166,6 +168,7 @@
draggable: true draggable: true
}); });
win.on('close', function () { win.on('close', function () {
$(quotation_ds_id).query(); $(quotation_ds_id).query();
$(history_ds_id).query(); $(history_ds_id).query();
}); });
...@@ -272,7 +275,30 @@ ...@@ -272,7 +275,30 @@
hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}'); hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}');
} }
function prj501n_project_number_renderer(id, name, query_only){
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var param = {};
param['bp_id'] = record.get('project_id');
param['bp_class'] = record.get('bp_class');
param['function_code'] = 'PRJ501D';
param['function_usage'] = 'QUERY';
param['maintain_type'] = 'READONLY';
param['winid'] = '${/parameter/@layout_code}_project_number_win_id';
param['prj_bp_id'] = record.get('prj_bp_id');
hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}project_number_query_link', record.ds.id, '${/parameter/@layout_code}');
}
function prj501n_contract_number_renderer(id, name, query_only){
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var param = {};
param['contract_id'] = record.get('contract_id');
param['function_code'] = 'CON301';
param['function_usage'] = 'QUERY';
param['winid'] = '${/parameter/@layout_code}_project_number_win_id';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}contract_number_query_link', record.ds.id, '${/parameter/@layout_code}');
}
/*保存前调用,生成项目编号*/ /*保存前调用,生成项目编号*/
...@@ -331,7 +357,6 @@ ...@@ -331,7 +357,6 @@
link_function = 'prj501n_upload_file'; link_function = 'prj501n_upload_file';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>'; return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
} else if (name == 'attach_file_name') { } else if (name == 'attach_file_name') {
if (value != null) { if (value != null) {
var link = '${/request/@context_path}/atm_download.lsc?attachment_id='; var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
var str = value.split(';;'); var str = value.split(';;');
...@@ -354,13 +379,16 @@ ...@@ -354,13 +379,16 @@
return url; return url;
} }
} else if (name = 'bp_link') { } else if (name == 'bp_link' && !record.isNew) {
link_function = 'prj501n_bp_code_renderer'; link_function = 'prj501n_bp_code_renderer';
if (record.get('bp_id')) { return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>'; }else if(name=='project_number'){
} else { link_function = 'prj501n_project_number_renderer';
return ''; return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + value+ '</a>';
}
}else if(name =='contract_number'){
link_function = 'prj501n_contract_number_renderer';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + value+ '</a>';
} }
}; };
...@@ -385,10 +413,10 @@ ...@@ -385,10 +413,10 @@
$(prj_quotation_ds_id).query(); $(prj_quotation_ds_id).query();
} }
var url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}'; var record=$(ds_id).getCurrentRecord();
var url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id='+record.get('bp_id_tenant');
$(tenant_ds_id).setQueryUrl(url); $(tenant_ds_id).setQueryUrl(url);
$(tenant_ds_id).query(); $(tenant_ds_id).query();
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}; };
......
...@@ -46,27 +46,27 @@ ...@@ -46,27 +46,27 @@
var isLoaded = 'N'; var isLoaded = 'N';
// set单元格颜色 load事件无法实现效果 // set单元格颜色 load事件无法实现效果
//hongquan.dai 20180125 //hongquan.dai 20180125
var check_isload = setInterval(function() { // var check_isload = setInterval(function() {
if (isLoaded == 'N') { // if (isLoaded == 'N') {
// var ids = $('${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_ds'); // // var ids = $('${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_ds');
var ids = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref'); // var ids = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
var idsRecord = $(ids).getAll(); // var idsRecord = $(ids).getAll();
for (var i = 0;i < idsRecord.length;i++) { // for (var i = 0;i < idsRecord.length;i++) {
var rowData = idsRecord[i]; // var rowData = idsRecord[i];
var important_flag = rowData.get('important_flag'); // var important_flag = rowData.get('important_flag');
//important_flag 是否必须上传 // //important_flag 是否必须上传
if (important_flag == 'Y') { // if (important_flag == 'Y') {
//普通动态布局 布局代码+组件名+基表名+_layout_grid_id-u- // //普通动态布局 布局代码+组件名+基表名+_layout_grid_id-u-
//支撑文件 布局代码+组件名+基表名+_grid_id-u- // //支撑文件 布局代码+组件名+基表名+_grid_id-u-
//tr_id = '#${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_layout_grid_id-u-' + rowData.id; // //tr_id = '#${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_layout_grid_id-u-' + rowData.id;
tr_id = '#${/parameter/@layout_code}_ACY_con_contract_grid_id-u-' + rowData.id; // tr_id = '#${/parameter/@layout_code}_ACY_con_contract_grid_id-u-' + rowData.id;
jQuery(tr_id).addClass('redBG'); // jQuery(tr_id).addClass('redBG');
} // }
} // }
} else { // } else {
clearInterval(check_isload); // clearInterval(check_isload);
} // }
}, 1000); // }, 1000);
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
new Leaf.Window({ new Leaf.Window({
id: 'contract_history_window', id: 'contract_history_window',
...@@ -267,9 +267,16 @@ ...@@ -267,9 +267,16 @@
var param = record.data; var param = record.data;
param['bp_id'] = record.get('bp_id'); param['bp_id'] = record.get('bp_id');
param['bp_class'] = record.get('bp_class'); param['bp_class'] = record.get('bp_class');
param['function_code'] = 'HLS215D'; /* param['function_code'] = 'HLS215D';
param['function_usage'] = 'QUERY'; param['function_usage'] = 'QUERY';
param['maintain_type'] = 'READONLY'; param['maintain_type'] = 'READONLY';*/
if(record.get('bp_category') =='AGENT'){
param['function_code'] = 'HLS303_Q';
param['function_usage'] = 'QUERY';
}else{
param['function_code'] = 'CON505H';
param['function_usage'] = 'QUERY';
}
param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}'; param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
hls_doc_get_layout_code('${/parameter/@layout_code}_con_contract_get_layout_code_link_id', param, 'con505_hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}'); hls_doc_get_layout_code('${/parameter/@layout_code}_con_contract_get_layout_code_link_id', param, 'con505_hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}');
...@@ -454,6 +461,8 @@ ...@@ -454,6 +461,8 @@
window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function(ds, record, res) { window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function(ds, record, res) {
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'T_HISTORY_INGO', 'hls_bp_master');
if (ds_id) { if (ds_id) {
record = $(ds_id).getAt(0); record = $(ds_id).getAt(0);
var cdd_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref'); var cdd_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
...@@ -659,57 +668,57 @@ ...@@ -659,57 +668,57 @@
}; };
Leaf.onReady(function() { // Leaf.onReady(function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project'); // var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var head_record = $(ds_id).getAt(0); // var head_record = $(ds_id).getAt(0);
head_record.set('owner_user_id', '${/model/user_name_path/record/@user_id}'); // head_record.set('owner_user_id', '${/model/user_name_path/record/@user_id}');
head_record.set('owner_user_id_n', '${/model/user_name_path/record/@user_id_n}'); // head_record.set('owner_user_id_n', '${/model/user_name_path/record/@user_id_n}');
head_record.set('owner_user_tel', '${/model/user_name_path/record/@phone}'); // head_record.set('owner_user_tel', '${/model/user_name_path/record/@phone}');
Leaf.request({ // Leaf.request({
url: $('get_car_organization_id').getUrl(), // url: $('get_car_organization_id').getUrl(),
para: { // para: {
unit_id: head_record.get('unit_id') // unit_id: head_record.get('unit_id')
}, // },
success: function(data) { // success: function(data) {
if (data.result.record && !data.result.record.length) { // if (data.result.record && !data.result.record.length) {
head_record.set('organization_id', data.result.record.organization_id); // head_record.set('organization_id', data.result.record.organization_id);
head_record.set('organization_id_n', data.result.record.organization_name); // head_record.set('organization_id_n', data.result.record.organization_name);
} else { // } else {
//没有找到值置空 // //没有找到值置空
head_record.set('organization_id', ''); // head_record.set('organization_id', '');
head_record.set('organization_id_n', ''); // head_record.set('organization_id_n', '');
} // }
//
}, // },
failure: function() { // failure: function() {
//
}, // },
error: function() { // error: function() {
//
}, // },
scope: this // scope: this
}); // });
//公司带出区域 // //公司带出区域
Leaf.request({ // Leaf.request({
url: $('get_company_distrct_link').getUrl(), // url: $('get_company_distrct_link').getUrl(),
para: { // para: {
company_id: head_record.get('company_id') // company_id: head_record.get('company_id')
}, // },
success: function(data) { // success: function(data) {
if (data.result.record && !data.result.record.length) { // if (data.result.record && !data.result.record.length) {
head_record.set('district', data.result.record.district); // head_record.set('district', data.result.record.district);
head_record.set('district_n', data.result.record.district_n); // head_record.set('district_n', data.result.record.district_n);
} // }
}, // },
failure: function() { // failure: function() {
//
}, // },
error: function() { // error: function() {
//
}, // },
scope: this // scope: this
}); // });
}); // });
//新增和加载时调用(form) //新增和加载时调用(form)
window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records) { window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records) {
......
...@@ -558,6 +558,8 @@ function prj501n_contract_number_renderer(id, name, query_only){ ...@@ -558,6 +558,8 @@ function prj501n_contract_number_renderer(id, name, query_only){
var url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}'; var url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}';
$(bp_ds_id).setQueryUrl(url); $(bp_ds_id).setQueryUrl(url);
$(bp_ds_id).query(); $(bp_ds_id).query();
var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
$(quotation_ds_id).query();
}) })
//序号自增 add by lijingjing //序号自增 add by lijingjing
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) {
......
...@@ -314,9 +314,17 @@ ...@@ -314,9 +314,17 @@
var param = {}; var param = {};
param['bp_id'] = record.get('bp_id'); param['bp_id'] = record.get('bp_id');
param['bp_class'] = record.get('bp_class'); param['bp_class'] = record.get('bp_class');
param['function_code'] = 'HLS215D'; if(record.get('bp_category') =='AGENT'){
param['function_code'] = 'HLS303_Q';
param['function_usage'] = 'QUERY';
}else{
param['function_code'] = 'HLS215D';
param['function_usage'] = 'QUERY';
}
/* param['function_code'] = 'HLS215D';
param['function_usage'] = 'QUERY'; param['function_usage'] = 'QUERY';
param['maintain_type'] = 'READONLY'; param['maintain_type'] = 'READONLY';*/
param['winid'] = '${/parameter/@layout_code}_bp_win_id'; param['winid'] = '${/parameter/@layout_code}_bp_win_id';
param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}'; param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}'); hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}');
......
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