Commit 94517bd1 authored by niminmin's avatar niminmin

Merge branch 'refs/heads/feature/线上bug修复' into develop

parents f882bc9c 8c507ca8
Pipeline #4677 canceled with stages
/*
* Created on 2008-5-28
*/
package leaf.bm;
import leaf.utils.ConfigUtils;
import uncertain.composite.DynamicObject;
import uncertain.core.ConfigurationError;
import uncertain.exception.BuiltinExceptionFactory;
import leaf.database.sql.BaseField;
import leaf.database.sql.CompareExpression;
import leaf.database.sql.Condition;
import leaf.database.sql.ConditionList;
import leaf.database.sql.ILogicalExpression;
import leaf.database.sql.ISqlStatement;
import leaf.database.sql.RawSqlExpression;
public class QueryField extends DynamicObject {
public static final String KEY_LOGICAL_OPERATOR = "logicaloperator";
public static final String KEY_FIELD = "field";
public static final String KEY_NAME = "name";
public static final String KEY_QUERY_OPERATOR = "queryoperator";
public static final String KEY_MATCH_ANY="matchany";
public boolean getMatchAny(){
if(Boolean.valueOf(ConfigUtils.getProp("leaf.queryMatchAny"))){
return getBoolean(KEY_MATCH_ANY, true);
}
return getBoolean(KEY_MATCH_ANY, false);
}
public void setMatchAny(boolean value){
putBoolean(KEY_MATCH_ANY, value);
}
public String getQueryOperator(){
return getString(KEY_QUERY_OPERATOR);
}
public void setQueryOperator( String op ){
putString(KEY_QUERY_OPERATOR, op);
}
public String getField(){
return getString(KEY_FIELD);
}
public void setField( String field ){
putString(KEY_FIELD, field);
}
public String getQueryExpression(){
return getString(Field.KEY_QUERY_EXPRESSION);
}
public void setQueryExpression( String exp ){
putString( Field.KEY_QUERY_EXPRESSION, exp );
}
public String getLogicalOperator(){
return getString(KEY_LOGICAL_OPERATOR);
}
public void setLogicalOperator( String op){
putString(KEY_LOGICAL_OPERATOR, op);
}
/*
public String getParameterPath(){
return getString(Field.KEY_PARAMETER_PATH);
}
public void setParameterPath(String path){
putString(Field.KEY_PARAMETER_PATH, path);
}
*/
public String getName(){
return getString(Field.KEY_NAME);
}
public void setName(String name){
putString(Field.KEY_NAME, name);
}
public void addToWhereClause( ConditionList list, String param_path ){
addToWhereClause( list, null, param_path);
}
public void addToWhereClause( ConditionList list, ISqlStatement left_field, String param_path ){
String op = getQueryOperator();
ILogicalExpression stmt = null;
if(op!=null){
//ISqlStatement left_field = base_field==null ? new RawSqlExpression(getName()) : (ISqlStatement) base_field;
int op_id = CompareExpression.getOperatorID(op);
if(op_id<0) throw new ConfigurationError("queryOperator '"+op+"' is invalid in query field config:"+getObjectContext().toXML());
if(CompareExpression.isSingleOperator(op_id))
stmt = new CompareExpression( left_field, op_id, null);
else{
String sqlExpression=Field.defaultParamExpression(param_path);
if(getMatchAny()&&"like".equalsIgnoreCase(op))
sqlExpression="'%'||"+sqlExpression+"||'%'";
stmt = new CompareExpression( left_field, op_id, new RawSqlExpression(sqlExpression));
}
}else{
String exp = getQueryExpression();
if(exp!=null) stmt = new RawSqlExpression(exp);
else
throw BuiltinExceptionFactory.createOneAttributeMissing(getObjectContext().asLocatable(), "queryOperator,queryExpression");
}
String logical_op = getLogicalOperator();
if(logical_op==null)
logical_op = Condition.AND;
if(stmt!=null)
list.addCondition(logical_op, stmt);
}
}
......@@ -35,6 +35,7 @@ public class WordToPdf {
public static boolean word2pdf(String inFilePath, String outFilePath) {
logger.info("Word转PDF开始启动...");
logger.info("Word转PDF开始启动..."+outFilePath);
long start = System.currentTimeMillis();
ActiveXComponent app = null;
Dispatch doc = null;
......@@ -170,9 +171,9 @@ public class WordToPdf {
// String jacobDllPath = "D:\\ideaProjects\\leaf-hlcm\\src\\main\\webapp\\WEB-INF\\server-script\\jacob\\jacob-1.18-x64.dll";
// System.setProperty("jacob.dll.path", jacobDllPath);
// System.setProperty("com.jacob.debug", "true");
// word2pdf("D:\\hand-Prpjects\\付款请求书打印.doc",
// "D:\\hand-Prpjects\\付款请求书打印.pdf");
cutPdf("D:\\\\hand-Prpjects\\\\付款请求书打印.pdf");
// word2pdf("D:\\u01\\hls_file\\excel\\8F5D12B0B1504518928FDD193C67A0A5con28168",
// "D:\\hand-Prpjects\\融资租赁合同文本-4pdf.pdf");
// cutPdf("D:\\\\hand-Prpjects\\\\付款请求书打印.pdf");
// excel2pdf("D:\\work\\leafProjects\\YondaTl\\src\\test.xlsx",
// "D:\\work\\leafProjects\\YondaTl\\src\\付款通知书NEW.pdf");
// excel2pdfOrientation("D:\\work\\leafProjects\\YondaTl\\src\\test.xlsx",
......
......@@ -15,7 +15,7 @@
from con_contract c
where c.data_class = 'NORMAL'
and c.contract_status IN ('REPURING','ETING','INCEPT','PENDING')
and not exists (select 1 from acp_invoice_ln an where an.contract_id=c.contract_id and an.confirmation_status='APPROVING')
and not exists (select 1 from acp_invoice_ln an where an.contract_id=c.contract_id and an.confirmation_status in('APPROVING','APPROVED'))
) V
#WHERE_CLAUSE#
]]></bm:query-sql>
......
......@@ -18,5 +18,22 @@
<bm:parameter name="record_id" dataType="java.lang.Double" output="true" outputPath="/parameter/@record_id"/>
</bm:parameters>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
BEGIN
hls_doc_file_templet_pkg.office_insert_fnd_atm_new(
p_table_name =>${@table_name},
p_table_pk_value =>${@content_id},
p_file_name =>${@file_name},
p_file_path =>${@file_path},
p_user_id =>nvl(${@user_id},${/session/@user_id}),
p_source_type =>${@source_type},
p_file_size =>${@file_size},
p_file_type_code =>${@file_type_code},
p_mime_type => ${@mime_type}
);
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
......@@ -111,12 +111,12 @@
</bm:operations>
<bm:query-fields>
<bm:query-field name="contract_number"
queryExpression="contract_number like upper(&apos;%&apos;||${@contract_number}||&apos;%&apos;)"/>
queryExpression="contract_number like ${@contract_number}"/>
<bm:query-field name="bp_id_tenant" queryExpression="t1.bp_id_tenant = ${@bp_id_tenant}"/>
<bm:query-field name="contract_name" queryExpression="t1.contract_name like &apos;%&apos;||${@contract_name}||&apos;%&apos;"/>
<bm:query-field name="project_number" queryExpression="t1.project_number = ${@project_number}"/>
<bm:query-field name="contract_name" queryExpression="t1.contract_name like ${@contract_name} "/>
<bm:query-field name="project_number" queryExpression="t1.project_number like ${@project_number}"/>
<!--<bm:query-field name="bp_id_tenant_desc" queryExpression="t1.bp_id_tenant_desc like ${@bp_id_tenant_desc}"/>-->
<bm:query-field name="bp_id_agent_desc" queryExpression="t1.bp_id_agent_desc like &apos;%&apos;||${@bp_id_agent_desc}||&apos;%&apos;"/>
<bm:query-field name="bp_id_agent_desc" queryExpression="t1.bp_id_agent_desc like ${@bp_id_agent_desc}"/>
<!-- <bm:query-field name="lease_start_date_from" queryExpression="t1.inception_of_lease &gt;=to_date(${@lease_start_date_from},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="lease_start_date_to" queryExpression="t1.inception_of_lease &lt;=to_date(${@lease_start_date_to},&apos;yyyy-mm-dd&apos;)"/>
-->
......
......@@ -11,6 +11,8 @@
<bm:parameter name="fund_possession_time" dataType="java.lang.Double" input="false" output="true" outputPath="@fund_possession_time"/>
<bm:parameter name="fund_possession_cost" dataType="java.lang.Double" input="false" output="true" outputPath="@fund_possession_cost"/>
<bm:parameter name="sum_unreceived_principal" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_unreceived_principal"/>
<bm:parameter name="fund_possession_rate" dataType="java.lang.Double" input="false" output="true" outputPath="@fund_possession_rate"/>
<bm:parameter name="last_rent_due_date" dataType="date" input="false" output="true" outputPath="@last_rent_due_date"/>
</bm:parameters>
<bm:update-sql><![CDATA[
BEGIN
......@@ -25,6 +27,9 @@
p_fund_possession_time => ${@fund_possession_time},
p_fund_possession_cost => ${@fund_possession_cost},
p_sum_unreceived_principal => ${@sum_unreceived_principal},
p_fund_possession_rate=>${@fund_possession_rate},
p_last_rent_due_date=>${@last_rent_due_date},
p_residual_value=>${@residual_value},
p_user_id => ${/session/@user_id});
END;
]]>
......
......@@ -9,6 +9,7 @@
<bm:parameter name="sum_overdue_amount" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_overdue_amount"/>
<bm:parameter name="sum_unreceived_principal" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_unreceived_principal"/>
<bm:parameter name="due_amount" dataType="java.lang.Double" input="false" output="true" outputPath="@due_amount"/>
<bm:parameter name="penalty" dataType="java.lang.Double" input="false" output="true" outputPath="@penalty"/>
</bm:parameters>
<bm:update-sql><![CDATA[
BEGIN
......@@ -20,6 +21,7 @@
p_sum_overdue_amount => ${@sum_overdue_amount},
p_sum_unreceived_principal => ${@sum_unreceived_principal},
p_due_amount => ${@due_amount},
p_penalty => ${@penalty},
p_user_id => ${/session/@user_id});
END;
]]>
......
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
......
......@@ -10,7 +10,8 @@
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
aux_single_variable_calc_pkg.calc_real_rate(p_calc_session_id =>${@calc_session_id},
cus_con_contract_repo_pkg.calc_repo_cashflow(p_contract_id=>${@contract_id},
p_calc_session_id =>${@calc_session_id},
p_user_id => ${/session/@user_id},
p_msg => ${@msg});
end;
......@@ -22,12 +23,10 @@
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
aux_single_variable_calc_pkg.manual_trial_after_calc(p_calc_session_id =>${@calc_session_id},
cus_con_contract_repo_pkg.calc_repo_cashflow(p_contract_id=>${@contract_id},
p_calc_session_id =>${@calc_session_id},
p_user_id => ${/session/@user_id},
p_msg => ${@msg}
);
p_msg => ${@msg});
end;
]]></bm:update-sql>
<bm:parameters>
......
......@@ -5,7 +5,7 @@
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
......
......@@ -5,7 +5,7 @@
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num" needAccessControl="false">
<bm:fields>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
......@@ -116,8 +116,8 @@
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
<bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
<bm:query-field field="bp_bank_account_name" queryOperator="like"/>
<bm:query-field field="receipt_type" queryOperator="="/>
<bm:query-field field="opposite_band_na" queryOperator="="/>
<bm:query-field field="receipt_type" queryOperator="like"/>
<bm:query-field field="opposite_band_na" queryOperator="like"/>
<bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
<bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
<bm:query-field name="bank_slip_num" queryExpression="t1.bank_slip_num like &apos;%&apos;||${@bank_slip_num}||&apos;%&apos;"/>
......@@ -145,6 +145,7 @@
<bm:query-field field="reversed_flag" queryOperator="="/>
<bm:query-field field="period_name" queryOperator="="/>
<bm:query-field field="payment_method_id" queryOperator="="/>
<bm:query-field field="bp_bank_account_num" queryOperator="like"/>
<!-- <bm:query-field field="posted_flag" queryOperator="="/> -->
<bm:query-field field="transaction_category" queryOperator="="/>
<bm:query-field field="transaction_type" queryOperator="="/>
......
......@@ -27,6 +27,7 @@
<bm:update-sql><![CDATA[
begin
hlcm_cux_deposit_pkg.create_deposit_transfer_je(
p_hd_contract_id=>${@hd_contract_id},
p_contract_id=>${@source_contract_id},
p_user_id=>${/session/@user_id}
);
......
......@@ -26,6 +26,7 @@
select * from ( select v1.contract_id,
(select cc.contract_number from con_contract cc where cc.contract_id=v1.contract_id)contract_number,
(select cc.contract_name from con_contract cc where cc.contract_id=v1.contract_id)contract_name,
--to_char(v1.unwrite_off_amount,'FM999,999,999,990.00')unwrite_off_amount,
v1.unwrite_off_amount,
v1.deposit_trans_type,
(select t.bp_name
......@@ -42,7 +43,8 @@
(select v.code_value_name
from sys_code_values_v v
where v.code = 'DEPOSIT_TRANS_TYPE'
and v.code_value = v1.deposit_trans_type) deposit_trans_type_n
and v.code_value = v1.deposit_trans_type) deposit_trans_type_n,
nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id=>v1.contract_id,p_user_id=>1) ),'正常')approve_status
from (select tt.ref_contract_id contract_id,
tt.deposit_trans_type,
......@@ -53,14 +55,15 @@
and tt.ref_contract_id is not null
and tt.transaction_amount > 0
and tt.deposit_trans_type is not null
group by tt.ref_contract_id, tt.deposit_trans_type) v1)v
group by tt.ref_contract_id, tt.deposit_trans_type) v1
where v1.unwrite_off_amount>0)v
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:data-filters>
<bm:data-filter name="query" expression="(v.unwrite_off_amount>0)"/>
</bm:data-filters>
<!--<bm:data-filters>-->
<!--<bm:data-filter name="query" expression="(to_number(v.unwrite_off_amount)>0)"/>-->
<!--</bm:data-filters>-->
<bm:query-fields>
<bm:query-field name="contract_number" queryExpression="v.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name_n" queryExpression="v.bp_name = ${@bp_name_n}"/>
......
......@@ -5,7 +5,7 @@
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num" needAccessControl="false">
<bm:fields>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
......@@ -103,6 +103,7 @@
<bm:field name="deposit_trans_type_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
<bm:field name="approve_status" expression=" nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_transaction_id=>t1.transaction_id,p_user_id=>1) ),'正常')" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -121,7 +122,7 @@
<bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
<bm:query-field field="bp_bank_account_name" queryOperator="like"/>
<bm:query-field field="receipt_type" queryOperator="="/>
<bm:query-field field="opposite_band_na" queryOperator="="/>
<bm:query-field field="opposite_band_na" queryOperator="like"/>
<bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
<bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
<bm:query-field name="bank_slip_num" queryExpression="t1.bank_slip_num like &apos;%&apos;||${@bank_slip_num}||&apos;%&apos;"/>
......@@ -149,6 +150,7 @@
<bm:query-field field="reversed_flag" queryOperator="="/>
<bm:query-field field="period_name" queryOperator="="/>
<bm:query-field field="payment_method_id" queryOperator="="/>
<bm:query-field field="bp_bank_account_num" queryOperator="like"/>
<!-- <bm:query-field field="posted_flag" queryOperator="="/> -->
<bm:query-field field="transaction_category" queryOperator="="/>
<bm:query-field field="transaction_type" queryOperator="="/>
......
......@@ -5,7 +5,7 @@
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num " needAccessControl="false">
<bm:fields>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
......@@ -104,7 +104,7 @@
<bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
<bm:field name="deposit_trans_type_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/>
<bm:field name="approve_status" expression=" nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_transaction_id=>t1.transaction_id,p_user_id=>1) ),'正常')" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -123,7 +123,8 @@
<bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
<bm:query-field field="bp_bank_account_name" queryOperator="like"/>
<bm:query-field field="receipt_type" queryOperator="="/>
<bm:query-field field="opposite_band_na" queryOperator="="/>
<bm:query-field field="opposite_band_na" queryOperator="like"/>
<bm:query-field field="bp_bank_account_num" queryOperator="like"/>
<bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
<bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
<bm:query-field name="bank_slip_num" queryExpression="t1.bank_slip_num like &apos;%&apos;||${@bank_slip_num}||&apos;%&apos;"/>
......
......@@ -5,7 +5,7 @@
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num" needAccessControl="false">
<bm:fields>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
......
......@@ -27,21 +27,22 @@
nvl(t.accr_overdue_amount, 0) accr_overdue_amount
from cus_deposit_overdue_temp t, CON_CONTRACT CC
where t.contract_id = cc.contract_id
order by cc.contract_number, t.times) v
and (nvl(t.overdue_amount, 0)>0 or nvl(t.accr_overdue_amount, 0)>0)
order by cc.contract_number, t.times
) v
#WHERE_CLAUSE#
#ORDER_BY_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="contract_number" queryExpression="v.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="contract_number" queryExpression="v.contract_number like ${@contract_number}"/>
<bm:query-field name="bp_id_agent_level1" queryExpression="v.bp_id_agent_level1 = ${@bp_id_agent_level1}"/>
<bm:query-field name="bp_id_tenant" queryExpression="v.bp_id_tenant =${@bp_id_tenant}"/>
<bm:query-field name="overdue_max_days_from" queryExpression="v.overdue_max_days &lt;= ${@overdue_max_days_from}"/>
<bm:query-field name="overdue_max_days_to" queryExpression="v.overdue_max_days &gt;= ${@overdue_max_days_to}"/>
<bm:query-field name="due_date_from" queryExpression="v.due_date &lt;= ${@due_date_from}"/>
<bm:query-field name="due_date_to" queryExpression="v.due_date &gt;= ${@due_date_to}"/>
<bm:query-field name="due_date_from" queryExpression="v.due_date &gt;= ${@due_date_from}"/>
<bm:query-field name="due_date_to" queryExpression="v.due_date &lt;= ${@due_date_to}"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="session_id" expression="v.session_id=${/session/@session_id}"/>
......
......@@ -5,7 +5,7 @@
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num" needAccessControl="false">
<bm:fields>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
......@@ -103,6 +103,7 @@
<bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
<bm:field name="source_type"/>
<bm:field name="approve_status" expression=" nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_transaction_id=>t1.transaction_id,p_user_id=>1) ),'正常')" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -123,7 +124,7 @@
<bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
<bm:query-field field="bp_bank_account_name" queryOperator="like"/>
<bm:query-field field="receipt_type" queryOperator="="/>
<bm:query-field field="opposite_band_na" queryOperator="="/>
<bm:query-field field="opposite_band_na" queryOperator="like"/>
<bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
<bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
<bm:query-field name="bank_slip_num" queryExpression="t1.bank_slip_num like &apos;%&apos;||${@bank_slip_num}||&apos;%&apos;"/>
......@@ -155,6 +156,7 @@
<bm:query-field field="transaction_type" queryOperator="="/>
<bm:query-field field="transaction_id" queryOperator="="/>
<bm:query-field field="collection_classes" queryOperator="="/>
<bm:query-field field="bp_bank_account_num" queryOperator="like"/>
<bm:query-field name="bp_id_from" queryExpression="t1.bp_id &gt;= ${@bp_id_from}"/>
<bm:query-field name="bp_id_to" queryExpression="t1.bp_id &lt;= ${@bp_id_to}"/>
<bm:query-field name="reverse_write_off_amount_flag" queryExpression="t1.write_off_amount &gt; 0 and ${@reverse_write_off_amount_flag}=&apos;Y&apos;"/>
......
......@@ -10,7 +10,7 @@
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
aux_single_variable_calc_pkg.calc_real_rate(p_calc_session_id =>${@calc_session_id},
aux_single_variable_calc_pkg.calc_main(p_calc_session_id =>${@calc_session_id},
p_user_id => ${/session/@user_id},
p_msg => ${@msg});
end;
......@@ -22,7 +22,7 @@
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
aux_single_variable_calc_pkg.manual_trial_after_calc(p_calc_session_id =>${@calc_session_id},
aux_single_variable_calc_pkg.calc_main(p_calc_session_id =>${@calc_session_id},
p_user_id => ${/session/@user_id},
p_msg => ${@msg});
end;
......
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT to_char(to_date(month||'01','YYYYMMDD'),'YYYY-MM-DD') AS DAY_1,
to_char(to_date(month||'01','YYYYMMDD') +1,'YYYY-MM-DD') AS DAY_2,
to_char(to_date(month||'01','YYYYMMDD') +2,'YYYY-MM-DD') AS DAY_3,
to_char(to_date(month||'01','YYYYMMDD') +3,'YYYY-MM-DD') AS DAY_4,
to_char(to_date(month||'01','YYYYMMDD') +4,'YYYY-MM-DD') AS DAY_5,
to_char(to_date(month||'01','YYYYMMDD') +5,'YYYY-MM-DD') AS DAY_6,
to_char(to_date(month||'01','YYYYMMDD') +6,'YYYY-MM-DD') AS DAY_7,
to_char(to_date(month||'01','YYYYMMDD') +7,'YYYY-MM-DD') AS DAY_8,
to_char(to_date(month||'01','YYYYMMDD') +8,'YYYY-MM-DD') AS DAY_9,
to_char(to_date(month||'01','YYYYMMDD') +9,'YYYY-MM-DD') AS DAY_10,
to_char(to_date(month||'01','YYYYMMDD') +10,'YYYY-MM-DD') AS DAY_11,
to_char(to_date(month||'01','YYYYMMDD') +11,'YYYY-MM-DD') AS DAY_12,
to_char(to_date(month||'01','YYYYMMDD') +12,'YYYY-MM-DD') AS DAY_13,
to_char(to_date(month||'01','YYYYMMDD') +13,'YYYY-MM-DD') AS DAY_14,
to_char(to_date(month||'01','YYYYMMDD') +14,'YYYY-MM-DD') AS DAY_15,
to_char(to_date(month||'01','YYYYMMDD') +15,'YYYY-MM-DD') AS DAY_16,
to_char(to_date(month||'01','YYYYMMDD') +16,'YYYY-MM-DD') AS DAY_17,
to_char(to_date(month||'01','YYYYMMDD') +17,'YYYY-MM-DD') AS DAY_18,
to_char(to_date(month||'01','YYYYMMDD') +18,'YYYY-MM-DD') AS DAY_19,
to_char(to_date(month||'01','YYYYMMDD') +19,'YYYY-MM-DD') AS DAY_20,
to_char(to_date(month||'01','YYYYMMDD') +20,'YYYY-MM-DD') AS DAY_21,
to_char(to_date(month||'01','YYYYMMDD') +21,'YYYY-MM-DD') AS DAY_22,
to_char(to_date(month||'01','YYYYMMDD') +22,'YYYY-MM-DD') AS DAY_23,
to_char(to_date(month||'01','YYYYMMDD') +23,'YYYY-MM-DD') AS DAY_24,
to_char(to_date(month||'01','YYYYMMDD') +24,'YYYY-MM-DD') AS DAY_25,
to_char(to_date(month||'01','YYYYMMDD') +25,'YYYY-MM-DD') AS DAY_26,
to_char(to_date(month||'01','YYYYMMDD') +26,'YYYY-MM-DD') AS DAY_27,
to_char(to_date(month||'01','YYYYMMDD') +27,'YYYY-MM-DD') AS DAY_28,
to_char(to_date(month||'01','YYYYMMDD') +28,'YYYY-MM-DD') AS DAY_29,
to_char(to_date(month||'01','YYYYMMDD') +29,'YYYY-MM-DD') AS DAY_30,
to_char(to_date(month||'01','YYYYMMDD') +30,'YYYY-MM-DD') AS DAY_31
FROM RPT5010_DAY_REPORT
where
month = ${@month}
and rownum=1
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:data-filters><![CDATA[
]]></bm:data-filters>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select to_number(to_char(sysdate, 'YYYYMM')) value_code,
to_char(sysdate, 'YYYY') || '年' || to_char(sysdate, 'MM') || '月' value_name
from dual
union
select to_number(to_char(add_months(sysdate, -1), 'YYYYMM')) value_code,
to_char(add_months(sysdate, -1), 'YYYY') || '年' ||
to_char(add_months(sysdate, -1), 'MM') || '月' value_name
from dual
union
select to_number(to_char(add_months(sysdate, -2), 'YYYYMM')) value_code,
to_char(add_months(sysdate, -2), 'YYYY') || '年' ||
to_char(add_months(sysdate, -2), 'MM') || '月' value_name
from dual
union
select to_number(to_char(add_months(sysdate, -3), 'YYYYMM')) value_code,
to_char(add_months(sysdate, -3), 'YYYY') || '年' ||
to_char(add_months(sysdate, -3), 'MM') || '月' value_name
from dual
order by value_code desc
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:data-filters><![CDATA[
]]></bm:data-filters>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wuts
$Date: 2018-12-21 上午10:43:21
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
rpt5010_not_write_off_pkg.calc_month_days(
p_month =>${@month},
p_user_id =>${/session/@user_id},
p_days => ${@days}
);
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="days" dataType="java.lang.Long" input="true" output="true" outputPath="/parameter/@days"/>
</bm:parameters>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
rpt5010_not_write_off_pkg.rpt5010_run_job(
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
......@@ -20,5 +20,6 @@ var con_print_path = {
function set_parameter_file_path(name) {
$ctx.parameter.file_path = '/u01/hls_file/excel/';
$ctx.parameter.file_path = 'D:/u01/hls_file/excel/';
$ctx.parameter.pdf_path = 'D:/u01/hls_file/content_pdf/';
};
var override_queryfields = [
{
field : 'bp_credit_hd_id',
queryoperator : "="
}
];
override();
......@@ -19,10 +19,7 @@ var override_queryfields = [
name : 'bp_id',
queryexpression : "exists (select 1 from prj_project_bp b where b.project_id=t1.project_id and b.bp_id=${@bp_id})"
},
{
name : 'bp_name',
queryexpression : "exists (select 1 from prj_project_bp_v b where b.project_id=t1.project_id and b.bp_name like '%'||${@bp_name}||'%')"
},
//{
// field : 'employee_id',
// queryoperator : "="
......
......@@ -41,6 +41,8 @@
$session.subject = 'HAP';
}
$ctx.parameter.global_tab_flag='Y';
]]>
</s:server-script>
</a:init-procedure>
......@@ -188,6 +190,87 @@
}
</style>
<script type="text/javascript"><![CDATA[
if (!document.querySelectorAll) {
document.querySelectorAll = function (selectors) {
var style = document.createElement('style'), elements = [], element;
document.documentElement.firstChild.appendChild(style);
document._qsa = [];
style.styleSheet.cssText = selectors + '{x-qsa:expression(document._qsa && document._qsa.push(this))}';
window.scrollBy(0, 0);
style.parentNode.removeChild(style);
while (document._qsa.length) {
element = document._qsa.shift();
element.style.removeAttribute('x-qsa');
elements.push(element);
}
document._qsa = null;
return elements;
};
}
if (!document.querySelector) {
document.querySelector = function (selectors) {
var elements = document.querySelectorAll(selectors);
return (elements.length) ? elements[0] : null;
};
}
// 用于在IE6和IE7浏览器中,支持Element.querySelectorAll方法
var qsaWorker = (function () {
var idAllocator = 10000;
function qsaWorkerShim(element, selector) {
var needsID = element.id === "";
if (needsID) {
++idAllocator;
element.id = "__qsa" + idAllocator;
}
try {
return document.querySelectorAll("#" + element.id + " " + selector);
}
finally {
if (needsID) {
element.id = "";
}
}
}
function qsaWorkerWrap(element, selector) {
return element.querySelectorAll(selector);
}
// Return the one this browser wants to use
return document.createElement('div').querySelectorAll ? qsaWorkerWrap : qsaWorkerShim;
})();
if ( !Array.prototype.forEach ) {
Array.prototype.forEach = function forEach( callback, thisArg ) {
var T, k;
if ( this == null ) {
throw new TypeError( "this is null or not defined" );
}
var O = Object(this);
var len = O.length >>> 0;
if ( typeof callback !== "function" ) {
throw new TypeError( callback + " is not a function" );
}
if ( arguments.length > 1 ) {
T = thisArg;
}
k = 0;
while( k < len ) {
var kValue;
if ( k in O ) {
kValue = O[ k ];
callback.call( T, kValue, k, O );
}
k++;
}
};
}
function refreshFrame() {
$("mainTab").selectTab($("mainTab").getTab($("mainTab").activeTab).index, true);
}
......@@ -2188,7 +2271,7 @@
!function () {
document.getElementById('fast_button').style.width = '336px';
Leaf.request({
url: $('bmLink_function_query').getUrl(),
url: $('').getUrl(),
para: {
role_id: ${/session/@role_id}
},
......
......@@ -7,6 +7,7 @@
<a:view>
<a:link id="acp_invoice_inf_import_link" model="acp.ACP522.acp_invoice_inf_import" modelaction="update"/>
<a:link id="acp_invoice_inf_import_submit_link" model="acp.ACP522.acp_invoice_inf_import" modelaction="execute"/>
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
<script><![CDATA[
//移除前事件(grid,attach,gridbox,table)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_brfore_remove'] = function(ds, record, bp_seq) {
......@@ -39,7 +40,7 @@
var hd_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'acp_invoice_ln');
var hd_record = $(hd_id).getAt(0);
var lease_item_amount=hd_record.get('lease_item_amount')*1;
var lease_item_amount=hd_record.get('lease_item_amount');
if($(ds_id).getAll().dirty){
alert(111);
return;
......@@ -59,7 +60,8 @@
return;
}
var tempa=records[i].get('total_amount')||0;
var tempb=((records[i].get('net_amount')||0)+(records[i].get('tax_amount')||0));
//var tempb=((records[i].get('net_amount')||0)+(records[i].get('tax_amount')||0));
var tempb=plus((records[i].get('net_amount')||0),(records[i].get('tax_amount')||0));
if(tempa!=tempb){
Leaf.showMessage('提示', '发票明细行存在价税合计不等于不含税金额和税额之和!');
return;
......@@ -70,12 +72,12 @@
if (!isNaN(n)) {
sum = plus(sum, n);
}
for (var j =i+1;j < records.length;j++) {
if(records[i].get('invoice_code')==records[j].get('invoice_code')||records[i].get('invoice_number')==records[j].get('invoice_number')){
Leaf.showMessage('提示', '发票代码和发票号码不能重复!');
return;
}
}
// for (var j =i+1;j < records.length;j++) {
// if(records[i].get('invoice_code')==records[j].get('invoice_code')||records[i].get('invoice_number')==records[j].get('invoice_number')){
// Leaf.showMessage('提示', '发票代码和发票号码不能重复!');
// return;
// }
// }
}
if(sum!=lease_item_amount){
Leaf.showMessage('提示', '本次发票明细含税总计不等于该合同设备价!');
......
......@@ -3,9 +3,11 @@
<a:init-procedure>
<a:model-query fetchAll="true" model="cont.CON500.con_contract_get_guid_file_name" rootPath="guid_file_name_path"/>
<!--<a:model-query fetchAll="true" model="cont.CON500.con_doc_file_templet_get_atm" rootPath="file_templet_get_atm_path"/>-->
<s:server-script><![CDATA[
importPackage(Packages.hls.plugin.docx4j);
<s:server-script import="contract_print_path.js"><![CDATA[
importPackage(java.io);
importPackage(Packages.hls.plugin.docx4j);
importPackage(Packages.leaf.plugin.word2pdf);
importPackage(Packages.org.apache.commons.io);
function copyFile(fOld, fNew) {
var fis = new java.io.FileInputStream(fOld);
......@@ -18,15 +20,49 @@
fis.close();
fos.close();
}
//删除文件
function deleteFile(filePath) {
var file = new File(filePath);
if (file.exists()) {
file.delete();
}
}
//生成pdf
function wordToPdf(word_file_path,pdf_file_path) {
// word转pdf
var pdf_file_path_new = pdf_file_path + '.pdf';
var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.18-x64.dll");
wordToPdf.word2pdf(word_file_path, pdf_file_path_new);
//删除word文件
// deleteFile(word_file_path);
return pdf_file_path_new;
}
//按日期创建目录
function getDatePath() {
set_parameter_file_path();
var file_path = $ctx.parameter.pdf_path; //file_path = c:/hls_test_files/content_files/
var now = new Date()
y = now.getFullYear()
m = now.getMonth() + 1
m = m < 10 ? "0" + m : m
var datePath = file_path + y + "/" + m + "/";
return datePath; //datePath = d:/hls_test_files/fileupload/2018/04/
}
//第一步生成合同文本
$bm('cont.CON505.con_contract_create_content').update({
contract_id: $ctx.parameter.contract_id,
content_type:'NORMAL'
});
//var from_file_data = $ctx.get('/model/file_templet_get_atm_path').getChildren();
var datePath = getDatePath();
FileUtils.forceMkdir(new File(datePath)); //根据日期创建目录
var from_file_data_map=$bm('cont.CON500.con_doc_file_templet_get_atm').queryAsMap({
contract_id:$ctx.parameter.contract_id,
batch_flag:$ctx.parameter.batch_flag,
batch_flag:$ctx.parameter.batch_flag
});
var from_file_data = from_file_data_map.getChildren();
for (var i = 0;i < from_file_data.length;i++) {
......@@ -42,28 +78,36 @@
copyFile(from_file_path, to_file_path);
$bm('cont.CON500.con_file_content_copy_update').update({
table_name: 'CON_CONTRACT_CONTENT',
content_id: record_data.content_id,
file_name: to_file_name.toString(),
file_path: to_file_path.toString()
});
try {
// println(111);
var brwt = new BookmarksReplaceWithText($instance('leaf.database.service.IDatabaseServiceFactory'), $instance('uncertain.ocm.IObjectRegistry'), $ctx.getData());
// println($ctx.getData());
brwt.replaceBookmarkFromContent(to_file_path.toString(), record_data.content_id);
} catch (e) {
raise_app_error(e);
}
// word转pdf
var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con' + record_data.content_id;
var outputfilepath = wordToPdf(to_file_path,pdf_file_path);
var outputfilename= record_data.to_file_name +'.pdf';
var pdf_file = new File(outputfilepath);
println(outputfilepath);
var file_size = 0;
if (pdf_file.exists()) {
file_size = pdf_file.length();
}
//保存文本名及路径
$bm('cont.CON500.con_file_content_copy_update').execute({
table_name: 'CON_CONTRACT_CONTENT',
content_id: record_data.content_id,
file_name: outputfilename.toString(),
file_path: outputfilepath.toString(),
file_size: file_size,
file_type_code: 'pdf',
mime_type: 'application/pdf',
user_id: $ctx.parameter.user_id
});
}
}
//remove by chenlingfeng
// var last_check_bm = $bm('cont.CON500.con_calc_due_date_after_print');
// last_check_bm.update({
// contract_id: $ctx.parameter.contract_id
// });
]]></s:server-script>
</a:init-procedure>
</a:service>
\ No newline at end of file
......@@ -284,12 +284,6 @@
<a:column name="bp_id_agent_desc" align="center" prompt="代理店" width="200"/>
<a:column name="business_type_n" align="center" prompt="业务类型" width="60"/>
<a:column name="division_n" align="center" prompt="租赁物" width="60" footerRenderer="summaryRenderer"/>
<a:column name="account_due_times" align="center" prompt="会计逾期总期数"
width="100"/>
<a:column name="account_due_days" align="center" prompt="会计逾期总天数"
width="100"/>
<a:column name="account_due_amount" align="right" prompt="会计逾期总金额" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
width="100"/>
<a:column name="business_due_times" align="center" prompt="营业逾期总期数"
width="100"/>
<a:column name="business_due_days" align="center" prompt="营业逾期总天数"
......@@ -298,6 +292,12 @@
width="100"/>
<a:column name="over_due_amount" align="right" prompt="违约金" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
width="100"/>
<a:column name="account_due_times" align="center" prompt="会计逾期总期数"
width="100"/>
<a:column name="account_due_days" align="center" prompt="会计逾期总天数"
width="100"/>
<a:column name="account_due_amount" align="right" prompt="会计逾期总金额" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
width="100"/>
</a:columns>
</a:grid>
</a:screenBody>
......
......@@ -3,7 +3,9 @@
2019-09 变更申请-维护
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure/>
<a:init-procedure>
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
</a:init-procedure>
<a:view>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="con_contract_modify_link" url="${/request/@context_path}/modules/cont/CON501N/con_contract_modify.lview"/>
......@@ -16,6 +18,18 @@
var current_index = 0;
var file_path = '${/parameter/@file_path}';
var download_arr = [];
Leaf.onReady(function() {
debugger;
if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") {
document.getElementById("CON736_F_QUERY_NULL_BP_ID_AGENT_LEVEL1_prompt").style.display = "";
document.getElementById("CON736_F_QUERY_NULL_BP_ID_AGENT_LEVEL1").style.display = "";
} else {
document.getElementById("CON736_F_QUERY_NULL_BP_ID_AGENT_LEVEL1_prompt").style.display = "none";
document.getElementById("CON736_F_QUERY_NULL_BP_ID_AGENT_LEVEL1").style.display = "none";
}
});
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
......@@ -110,14 +124,14 @@
};
//变更申请打印单
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var xmlTemp = '';
var fileName = '';
xmlTemp = 'con_contract_change_req_apply.xml';
fileName = '变更申请单.pdf';
var url = $('con_contract_change_req_link').getUrl() + '?xmlTemp=' + xmlTemp + '&fileName=' + fileName;
window.open(url);
};
// window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
// var xmlTemp = '';
// var fileName = '';
// xmlTemp = 'con_contract_change_req_apply.xml';
// fileName = '变更申请单.pdf';
// var url = $('con_contract_change_req_link').getUrl() + '?xmlTemp=' + xmlTemp + '&fileName=' + fileName;
// window.open(url);
// };
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');
......
......@@ -121,42 +121,42 @@
};
//变更申请打印单
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
var xmlTemp = '';
var fileName = '';
xmlTemp = 'con_contract_change_req_apply.xml';
fileName = '变更申请单.pdf';
var url = $('con_contract_change_req_link').getUrl() + '?xmlTemp=' + xmlTemp + '&fileName=' + fileName;
window.open(url);
};
// window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
// var xmlTemp = '';
// var fileName = '';
// xmlTemp = 'con_contract_change_req_apply.xml';
// fileName = '变更申请单.pdf';
// var url = $('con_contract_change_req_link').getUrl() + '?xmlTemp=' + xmlTemp + '&fileName=' + fileName;
// window.open(url);
// };
//生成权利义务转让协议书
window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function () {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var prj_project_result_ds = $(ds_id);
var records = prj_project_result_ds.getSelected();
if (records.length != 1) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.SELECT_RECORD}');
return false;
}
var record = records[0];
var ccr_document_type = record.get('ccr_document_type');
var req_status = record.get('req_status');
var contract_id = record.get('contract_id');
if (req_status != 'APPROVED') {
Leaf.showMessage('${l:PROMPT}', '只有审批通过的合同才能打印!');
return false;
}
if (ccr_document_type == 'LEASE_CHAG') {
var templet_code = 'ASSIGNMENT_AGREEMENT';
var url = $('assignment_agreement_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
window.open(url, '_self');
}
if(ccr_document_type == 'ACC_CHAG'){
}
};
// window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function () {
// var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
// var prj_project_result_ds = $(ds_id);
// var records = prj_project_result_ds.getSelected();
// if (records.length != 1) {
// Leaf.showMessage('${l:PROMPT}', '${l:HLS.SELECT_RECORD}');
// return false;
// }
// var record = records[0];
// var ccr_document_type = record.get('ccr_document_type');
// var req_status = record.get('req_status');
// var contract_id = record.get('contract_id');
// if (req_status != 'APPROVED') {
// Leaf.showMessage('${l:PROMPT}', '只有审批通过的合同才能打印!');
// return false;
// }
// if (ccr_document_type == 'LEASE_CHAG') {
// var templet_code = 'ASSIGNMENT_AGREEMENT';
// var url = $('assignment_agreement_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
// window.open(url, '_self');
// }
// if(ccr_document_type == 'ACC_CHAG'){
// }
//
//
// };
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');
......
......@@ -36,7 +36,7 @@
return value;
};
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
$('${/parameter/@layout_code}_user_button1').disable(); //按钮不可用
// $('${/parameter/@layout_code}_user_button1').disable(); //按钮不可用
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var prj_project_result_ds = $(ds_id);
var records = prj_project_result_ds.getSelected();
......@@ -91,11 +91,11 @@
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_change_link', ds_id);
},
failure: function () {
$('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
// $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
$('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
// $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
......
......@@ -23,7 +23,7 @@
}
function contractQueryScreen_add() {
$('et_create').disable(); //按钮不可用
//$('et_create').disable(); //按钮不可用
var records = $('contractQueryScreen_mainDs').getSelected();
var record = records[0],
contract_id = record.get('contract_id');
......@@ -38,7 +38,7 @@
req_type: ccr_document_type
},
success: function (res) {
$('et_create').enable(); //按钮启用
// $('et_create').enable(); //按钮启用
var param = record.data;
param['change_req_id'] = res.result.change_req_id;
param['contract_id'] = res.result.change_req_id;
......@@ -54,16 +54,16 @@
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
$('et_create').enable(); //按钮启用
// $('et_create').enable(); //按钮启用
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
$('et_create').enable(); //按钮启用
// $('et_create').enable(); //按钮启用
},
scope: this
});
}, function () {
$('et_create').enable(); //按钮启用
// $('et_create').enable(); //按钮启用
}, 300, 150);
}
]]></script>
......
......@@ -27,7 +27,7 @@
var req_status = record.get('req_status');
var change_req_id = record.get('change_req_id');
var contract_id=record.get('contract_id');
if('NEW' == req_status || 'REJECT' == req_status){
if('NEW' == req_status){
return '<a href="javascript:open_change_req_detail(' + change_req_id + ',' + contract_id + ')">'+value+'</a>';
}else{
return '<a href="javascript:open_change_req_readonly_detail(' + change_req_id + ',' + contract_id + ')">'+value+'</a>';
......@@ -141,7 +141,7 @@
<a:screenTitle/>
<a:gridButton click="contractQueryScreen_query" text="HLS.QUERY"/>
<a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/>
<a:gridButton click="con_gur_np_pint" text="提前结清补充协议"/>
<!--<a:gridButton click="con_gur_np_pint" text="提前结清补充协议"/>-->
</a:screenTopToolbar>
<a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
<a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="合同变更编号"/>
......
......@@ -295,7 +295,7 @@
<a:field name="receipt_type"/>
<a:field name="receipt_type_des" displayField="code_value_name" options="receipt_type_ds" returnField="receipt_type" valueField="code_value"/>
<a:field name="description"/>
<a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE">
<a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov?bp_category=AGENT" lovWidth="500" title="HLS.BP_TITLE">
<a:mapping>
<a:map from="bp_id" to="bp_id"/>
<a:map from="bp_name" to="bp_name"/>
......@@ -304,27 +304,27 @@
<a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<!--对方账户的-->
<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<!--<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
<!--<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
<!--<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="cus_deposit.CUS_DEPOSIT100.csh_transaction_for_lov?bp_bank_account_name is not null" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
</a:fields>
<a:events>
......@@ -357,11 +357,11 @@
<!--银行流水号-->
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<!--对方账户户名-->
<a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<!--对方银行名称-->
<a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<!--对方账户账号-->
<a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="代理店"/>
</a:fieldSet>
</a:hBox>
......@@ -373,20 +373,20 @@
</a:toolBar>-->
<a:columns>
<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110" align="center"/>
<a:column name="bp_name" prompt="代理店" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="bp_name" prompt="代理店" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center" forExport="false"/>
</a:column>
<a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center" forExport="false"/>
</a:column>
<!--<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/>-->
<!--<a:column name="debt_confirmed_by_desc" prompt="CSH510.CSH_TRANSACTION.DEPT_CONFIRMER" align="center"/>-->
......
......@@ -24,8 +24,19 @@
var saveData = [];
debugger;
param['source_contract_id'] = '${/parameter/@contract_id}';
param['je_date'] =deposit_records[0].get('je_date');
param['hd_contract_id'] =deposit_records[0].get('contract_id');
//param['bp_id'] = head_record.get('bp_id');
// param['bp_category'] = head_record.get('bp_category');
for (var k = 0; k < deposit_records.length; k++) {
for (var m = k+1; m< deposit_records.length; m++) {
if ( Leaf.formatDate(deposit_records[k].get('je_date'))!= Leaf.formatDate(deposit_records[m].get('je_date'))){
Leaf.showMessage('${l:PROMPT}', "经济发生日请保持一致!");
return;
}
}
}
for (var i = 0; i < deposit_records.length; i++) {
var deposit_record;
deposit_record = deposit_records[i];
......@@ -109,14 +120,14 @@
var change_value = get_minus_amount(value, oldvalue);
var current_apply_amount = get_current_amount(head_record.get('current_apply_amount') || 0);
if (((current_apply_amount - oldvalue + (value || 0))) < 0) {
Leaf.showMessage('${l:PROMPT}', "本次入账金额不能为负!");
Leaf.showMessage('${l:PROMPT}', "本次划转金额不能为负!");
setTimeout(function () {
record.set('deposit_amount', '');
}, 10);
head_record.set('current_apply_amount', 0);
return;
}
if ((current_apply_amount - oldvalue + (value || 0)) <= unwrite_off_amount && (current_apply_amount - oldvalue + (value || 0)) >= 0) {
if ((current_apply_amount - oldvalue + (value || 0)) <=unwrite_off_amount && (current_apply_amount - oldvalue + (value || 0)) >= 0) {
head_record.set('current_apply_amount', current_apply_amount - oldvalue + (value || 0));
} else {
Leaf.showMessage('${l:PROMPT}', "本次入账金额小于剩余可入账金额!");
......@@ -141,7 +152,7 @@
}
function on_csh_trx_deposit_write_off_add(ds, record, index) {
record.set('je_date', '${/model/sys_time_default_value_path/record/@now_time}');
// record.set('je_date', '${/model/sys_time_default_value_path/record/@now_time}');
// record.set('write_off_type', 'DEPOSIT_ENTRY');
}
......@@ -152,6 +163,7 @@
<a:dataSet id="CUS102_DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
<a:dataSet id="deposit_transfer_detail_result_ds" loadData="true" selectable="true">
<a:fields>
<a:field name="je_date" required="true" prompt="经济业务发生日"/>
<a:field name="transaction_category" defaultValue="BUSINESS"/>
<a:field name="transaction_type" defaultValue="DEPOSIT"/>
<a:field name="document_category" defaultValue="CONTRACT"/>
......@@ -181,7 +193,7 @@
<a:events>
<a:event name="update" handler="on_csh_trx_deposit_write_off_update"/>
<a:event name="remove" handler="on_csh_trx_deposit_write_off_remove"/>
<a:event name="add" handler="on_csh_trx_deposit_write_off_add"/>
<!--<a:event name="add" handler="on_csh_trx_deposit_write_off_add"/>-->
</a:events>
</a:dataSet>
</a:dataSets>
......@@ -204,7 +216,7 @@
</a:box>
</a:fieldSet>
<a:grid id="deposit_transfer_detail_result_grid" bindTarget="deposit_transfer_detail_result_ds" height="200"
<a:grid id="deposit_transfer_detail_result_grid" bindTarget="deposit_transfer_detail_result_ds" marginHeight="170"
navBar="false" width="800">
<a:toolBar>
<a:button type="add"/>
......
......@@ -107,12 +107,13 @@
<a:fieldSet labelWidth="150" style="margin-left:20px">
<a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="deposit_transfer_maintain_result_ds" marginHeight="165" marginWidth="100" navBar="true" >
<a:columns>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="contract_name" prompt="合同名称" align="center" width="150"/>
<a:column name="bp_name" prompt="代理店" align="center" width="200"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center" width="120"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="contract_name" prompt="合同名称" align="center" width="150"/>
<a:column name="deposit_trans_type_n" prompt="保证金类型" width="110" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" width="110" align="right" renderer="Leaf.formatMoney"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" width="110" renderer="Leaf.formatMoney" align="right" />
<a:column name="approve_status" prompt="状态" width="120" align="center"/>
</a:columns>
</a:grid>
</a:fieldSet>
......
......@@ -418,33 +418,33 @@
<!--<a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>-->
<!--对方账户的-->
<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550"
lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"
title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550"
lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"
title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550"
lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"
title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<!--<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550"-->
<!--lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"-->
<!--title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
<!--<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550"-->
<!--lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"-->
<!--title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
<!--<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550"-->
<!--lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"-->
<!--title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
</a:fields>
<a:events>
......@@ -491,13 +491,13 @@
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<!--对方账户户名-->
<a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<!--对方银行名称-->
<a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds"
<a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<!--对方账户账号-->
<a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField name="contract_number" prompt="合同编号"
bindTarget="csh_transaction_receipt_maintain_query_ds"/>
......@@ -521,30 +521,31 @@
<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" width="110"
align="center"/>
<!--<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="csh531n_detail_renderer" width="110" align="center"/>-->
<a:column name="bp_name" prompt="代理店" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT"
width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="bp_name" prompt="代理店" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
<a:column name="approve_status" prompt="状态" width="120" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name"
align="center"/>
align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name"
align="center"/>
align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num"
align="center"/>
align="center" forExport="false"/>
</a:column>
<a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name"
align="center"/>
align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na"
align="center"/>
align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num"
align="center"/>
align="center" forExport="false" />
</a:column>
</a:columns>
</a:grid>
......
......@@ -87,7 +87,7 @@
});
}
function openWindow(url) {
function openReturnWindow(url) {
new Leaf.Window({
id: 'csh_transaction_deposit_link_winid',
params: {
......@@ -267,27 +267,27 @@
<!--<a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>-->
<!--对方账户的-->
<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<!--<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
<!--<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
<!--<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
</a:fields>
<a:events>
......@@ -320,11 +320,11 @@
<!--银行流水号-->
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<!--对方账户户名-->
<a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<!--对方银行名称-->
<a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<!--对方账户账号-->
<a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField name="contract_number" prompt="合同编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="bp_name_n" prompt="代理店" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
......@@ -339,24 +339,25 @@
</a:toolBar>-->
<a:columns>
<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" width="110" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可退金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="applying_amount" prompt="退款中金额" align="right" renderer="seedetail_return_num"/>
<a:column name="bp_name" prompt="代理店" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可退金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="deposit_trans_type_desc" prompt="保证金类型" width="110" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
<a:column name="applying_amount" prompt="退款中金额" align="right" renderer="seedetail_return_num"/>
<a:column name="approve_status" prompt="状态" width="120" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center" forExport="false"/>
</a:column>
<a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center" forExport="false"/>
</a:column>
</a:columns>
</a:grid>
......
......@@ -240,27 +240,27 @@
<a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<!--对方账户的-->
<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<!--<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
<!--<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
<!--<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
</a:fields>
<a:events>
......@@ -292,11 +292,11 @@
<!--银行流水号-->
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<!--对方账户户名-->
<a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<!--对方银行名称-->
<a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<!--对方账户账号-->
<a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField name="contract_number" prompt="合同编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="bp_name_n" prompt="代理店" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
......@@ -318,16 +318,16 @@
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center" forExport="false"/>
</a:column>
<a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center" forExport="false"/>
</a:column>
</a:columns>
</a:grid>
......
......@@ -287,28 +287,28 @@
</a:field>
<a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<!--对方账户的-->
<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<!--&lt;!&ndash;对方账户的&ndash;&gt;-->
<!--<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
<!--<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
<!--<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
<!--<a:mapping>-->
<!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
<!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
<!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
</a:fields>
<a:events>
......@@ -340,11 +340,11 @@
<!--银行流水号-->
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<!--对方账户户名-->
<a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<!--对方银行名称-->
<a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<!--对方账户账号-->
<a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField name="contract_number" prompt="合同编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="bp_name_n" prompt="代理店" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
......@@ -357,23 +357,24 @@
<a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="csh_transaction_receipt_maintain_result_ds" marginHeight="200" marginWidth="80" navBar="true" >
<a:columns>
<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="bp_name" prompt="代理店" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
<a:column name="approve_status" prompt="状态" width="120" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center" forExport="false"/>
</a:column>
<a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center" forExport="false"/>
</a:column>
</a:columns>
</a:grid>
......
......@@ -16,8 +16,7 @@ $Purpose: 商业伙伴授信维护
<script type="text/javascript"><![CDATA[
Leaf.onReady(function() {
var credit_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd');
console.log('${/parameter/@bp_credit_hd_id}');
$(credit_ds).setQueryParameter('bp_credit_hd_id', '${/parameter/@bp_credit_hd_id}')
$(credit_ds).setQueryParameter('bp_credit_hd_id', ${/parameter/@bp_credit_hd_id});
$(credit_ds).query();
})
......
......@@ -105,7 +105,7 @@ $Purpose: 商业伙伴授信维护
param['credit_date_from']=datas[0].get('credit_date_from');
param['credit_total_amount']=datas[0].get('credit_total_amount');
param['bp_code']=datas[0].get('bp_code');
param['bp_id']=datas[0].get('bp_id');
// param['bp_id']=datas[0].get('bp_id');
param['credit_status']=datas[0].get('credit_status');
param['winid']='hls_bp_credit_winId';
......
......@@ -16,9 +16,9 @@ $Purpose: 商业伙伴授信维护
<script type="text/javascript"><![CDATA[
Leaf.onReady(function(){
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd');
var record = $(ds_id).getCurrentRecord();
$(ds_id).setQueryParameter('bp_id','${/parameter/@bp_id}');
$(ds_id).setQueryParameter('bp_credit_hd_id',${/parameter/@bp_credit_hd_id});
$(ds_id).query();
})
......
......@@ -336,6 +336,7 @@
hd_lov_mapping_ds.on('load', clear_mapping_detail);
hd_lov_mapping_ds.query();
}
function onEditorupdate_setEmpty(ds, record, name, value, old_value, fromLoad) {
if (!fromLoad) {
......@@ -359,14 +360,52 @@
call_back_after_check_limit(ds, record, name, value, old_value);
}
}
function getNextMonth(date) {
debugger;
var arr = date.toString().split('-');
var year = arr[0]; //获取当前日期的年份
var month = arr[1]; //获取当前日期的月份
var day = arr[2]; //获取当前日期的日
var month2 = parseInt(month) + 1;
if (month2 == 13) {
year = parseInt(year) + 1;
month2 = 1;
}
var day2 = day;
var days2 = new Date(year, month2, 0);
days2 = days2.getDate();
if (day2 > days2) {
day2 = days2;
}
if (month2 < 10) {
month2 = '0' + month2;
}
var t2 = year + '-' + month2 + '-' + day2;
return t2;
}
function onEditorupdate(ds, record, name, value, old_value, fromLoad) {
debugger;
if (record.get('lov_return_vcode') == 'N' && (record.get('validation_type') == 'COMBOBOX' || record.get('validation_type') == 'LOV') && name == 'column_value') {
return;
}
var column_name = record.get('column_name');
var column_value = record.get('column_value');
var temp_hd_attribute_ds = $('temp_hd_attribute_ds');
var exchange_rate_type_record, exchange_rate_record, currency_record, lease_start_date_record, exchange_rate_type_field;
//add by niminmin 填写租赁开始日期 自动带出支付日
if (column_name == 'lease_start_date'&&value&&column_value==value&&'${/parameter/@document_category}'!='CONTRACT') {
var lease_start_date_record = get_ds_record(ds, temp_hd_attribute_ds, 'lease_start_date');
var contract_inception_date_reocrd = get_ds_record(ds, temp_hd_attribute_ds, 'contract_inception_date');
var lease_start_date = get_record_column_value(lease_start_date_record);
var contract_inception_date = get_record_column_value(contract_inception_date_reocrd);
if(lease_start_date_record){
//var day = new Date(value.replace(/-/g, '/')).getDate();
var day = new Date(column_value).format('yyyy-mm-dd');
var nextDay=getNextMonth(day);
from_load_or_update_set(contract_inception_date_reocrd, fromLoad, 'column_value', nextDay);
}
}
if (column_name == 'lease_times' || column_name == 'annual_pay_times') {
var lease_times_record = get_ds_record(ds, temp_hd_attribute_ds, 'lease_times'),
annual_pay_times_record = get_ds_record(ds, temp_hd_attribute_ds, 'annual_pay_times'),
......
......@@ -2,8 +2,17 @@
<a:service xmlns:s="leaf.plugin.script" xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
<a:init-procedure>
<s:server-script><![CDATA[
// println($ctx.parameter.toXML());
println($ctx.parameter.toXML());
var root=$ctx.parameter;
var children = root.getChildren();
for (var i = 0;i < children.length;i++) {
var sub_children = children[i].getChildren();
println(sub_children[0]);
println(sub_children[1]);
println(sub_children[2]);
}
function recursive_dynamic_save(root, base_table) {
if (!root || !base_table) return;
var children = root.getChildren();
......
......@@ -428,8 +428,31 @@
window.location.href = url;
}
}
function getNextMonth(date) {
var arr = date.split('-');
var year = arr[0]; //获取当前日期的年份
var month = arr[1]; //获取当前日期的月份
var day = arr[2]; //获取当前日期的日
var month2 = parseInt(month) + 1;
if (month2 == 13) {
year = parseInt(year) + 1;
month2 = 1;
}
var day2 = day;
var days2 = new Date(year, month2, 0);
days2 = days2.getDate();
if (day2 > days2) {
day2 = days2;
}
if (month2 < 10) {
month2 = '0' + month2;
}
var t2 = year + '-' + month2 + '-' + day2;
return t2;
}
function do_hls500_head_update(ds, record, name, value, old_value) {
if (record.get('lov_return_vcode') == 'N' && (record.get('validation_type') == 'COMBOBOX' || record.get('validation_type') == 'LOV')) {
value = record.get('column_value_c');
} else {
......@@ -515,7 +538,7 @@
<a:screenTopToolbar style="height:40px;padding:0;border-bottom-color:#000;">
<div style="font-size:15px;margin:10px 5px 0 5px"><![CDATA[${l:HLS.FIN_CALCULATOR}]]></div>
<a:gridButton click="hls_hls500_return" style="margin-top:10px;margin-left:5px" text="HLS.RETURN"/>
<a:gridButton id="hls_hls500_save_id" click="hls_hls500_save" style="margin-top:10px;margin-left:5px" text="HLS.CALCULATIONS"/>
<a:gridButton id="hls_hls500_save_id" click="hls_hls500_save" style="margin-top:10px;margin-left:5px" text="保存"/>
</a:screenTopToolbar>
<a:hBox padding="0" style="padding:3px">
<a:grid id="hls_fin_calculator_hd_grid_id" bindTarget="hls_fin_calculator_hd_ds" marginHeight="120" rowRenderer="hd_grid_rowrenderer" style="margin-right:3px" width="${/model/calc_config_hd_path/record/@grid_left_width}">
......
......@@ -404,10 +404,7 @@
var file_name = temp[0].toUpperCase();
var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
if (file_name.indexOf('.PDF') >= 0) {
url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
} //else if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
else if (file_name.indexOf('.BMP') >= 0 || file_name.indexOf('.JPG') >= 0 || file_name.indexOf('.JPEG') >= 0 || file_name.indexOf('.PNG') >= 0 || file_name.indexOf('.GIF') >= 0) {
if (file_name.indexOf('.BMP') >= 0 || file_name.indexOf('.JPG') >= 0 || file_name.indexOf('.JPEG') >= 0 || file_name.indexOf('.PNG') >= 0 || file_name.indexOf('.GIF') >= 0) {
url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
} else {
url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
......@@ -776,10 +773,10 @@
var down_payment = quoation_record.get('down_payment') || 0;
var calc_session_id = quoation_record.get('calc_session_id');
var other_payment2;
if (old_value && value && calc_session_id && value == 'NO_DEDUCTION') {
if (value &&calc_session_id&& value == 'NO_DEDUCTION') {
other_payment2 = 0;
} else if (old_value && value && calc_session_id && value != 'NO_DEDUCTION') {
other_payment2 = down_payment;
} else if (value &&calc_session_id&& value != 'NO_DEDUCTION'){
other_payment2=down_payment;
}
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wutuansen
$Date: 2018-12-20 上午9:30:25
$Revision: 1.0
$Purpose: 会计需求
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true" trace="true">
<a:init-procedure><![CDATA[
]]></a:init-procedure>
<a:view>
<a:link id="rpt5010_print_link_id" model="rpt.RPT5010.rpt5010_print" modelaction="update"/>
<a:link id="rpt5010_run_job_link_id" model="rpt.RPT5010.rpt5010_print" modelaction="execute"/>
<script><![CDATA[
function rpt5110_reset() {
$('rpt5110_query_ds').reset();
}
function ref_n01_time(record, name, value) {
var reg = /^\d\d\d\d\d\d$/;
if (reg.test(value)) {
return true;
}
return '时间格式应为【yyyymm】,举例【201812】';
}
function rpt5110_print() {
debugger;
Leaf.Masker.mask(Ext.getBody(), '${l:BEING_IMPLEMENTED}');
var record = $('rpt5110_query_ds').getAt(0);
if (!record) {
Leaf.Masker.unmask(Ext.getBody());
Leaf.showMessage('${l:PROMPT}', '年月未填写');
return;
}
var month = record.get('month');
if (!month) {
Leaf.Masker.unmask(Ext.getBody());
Leaf.showMessage('${l:PROMPT}', '年月未填写');
return;
}
// var reg = /^\d\d\d\d\d\d$/;
// if (reg.test(month)) {
// } else {
// Leaf.Masker.unmask(Ext.getBody());
// Leaf.showMessage('${l:PROMPT}', '时间格式应为【yyyymm】,举例【201812】');
// return;
// }
Leaf.request({
url: $('rpt5010_print_link_id').getUrl(),
para: {
month: month
},
success: function(res) {
var days = res.result.days;
Leaf.Masker.unmask(Ext.getBody());
var url = '${/request/@context_path}/modules/rpt/RPT5010/export_excel_sheets' + days + '.lsc?month=' + month + '&file_name=' + month + '每日合同未收本金表.xls';
window.open(encodeURI(url), '_self');
},
error: function() {
Leaf.Masker.unmask(Ext.getBody());
},
failure: function() {
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
}
function rpt5110_run_job() {
Leaf.showConfirm('${l:HLS.PROMPT}', '<font color="red">该任务需执行约1小时,请耐心等待!</font></br></br><font color="red">【特别注意】任务发起后1小时内请勿重复点击</font>', function() {
Leaf.Masker.mask(Ext.getBody(), '${l:BEING_IMPLEMENTED}');
Leaf.request({
url: $('rpt5010_run_job_link_id').getUrl(),
para: {},
success: function(res) {
Leaf.Masker.unmask(Ext.getBody());
Leaf.SideBar.show({
msg: '发起成功!',
duration: 2000
});
},
error: function() {
Leaf.Masker.unmask(Ext.getBody());
},
failure: function() {
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
}, null, 300, 150);
}
]]></script>
<a:dataSets>
<a:dataSet id="four_month_date_ds" loadData="true" model="rpt.RPT5010.rpt5010_four_month"/>
<a:dataSet id="rpt5110_query_ds">
<a:fields>
<a:field name="month"/>
<a:field name="month_desc" displayField="value_name" options="four_month_date_ds" required="true" returnField="month" valueField="value_code"/>
</a:fields>
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
<a:screenTitle/>
<a:gridButton click="rpt5110_print" text="打印"/>
<a:gridButton click="rpt5110_reset" text="HLS.RESET"/>
<!-- <a:gridButton click="rpt5110_run_job" text="发起校准任务"/>-->
</a:screenTopToolbar>
<a:form Width="250" column="1" labelWidth="100" title="条件" width="300">
<a:comboBox name="month_desc" bindTarget="rpt5110_query_ds" prompt="年月"/>
</a:form>
</a:screenBody>
</a:view>
</a:screen>
This diff is collapsed.
......@@ -12,7 +12,9 @@
<script type="text/javascript"><![CDATA[
function query_zjwfl5110_toDoDs() {
$("zjwfl5110_toDoDs").query();
//$("zjwfl5110_toDoDs").query();
window.parent.location.reload();
}
function winOpen_zjwfl5110_wfl_approve(instance_id, node_id, record_id, workflow_id, record_type) {
......
......@@ -167,7 +167,8 @@
}
function zjwfl5110_approvePage_close() {
wflCmp('zj_wfl_approve_win').close();
// wflCmp('zj_wfl_approve_win').close();
window.parent.location.reload();
}
function zjwfl5110_approvePage_mask() {
......
......@@ -28,13 +28,13 @@
<a:link id="prj_attach_downloadfile_link" url="${/request/@context_path}/downloadFile.lview"/>
<!-- <a:link id="check_agent_link" model="zjwfl.ZJWFL1060.zj_wfl_check_agent_re" modelaction="update"/> -->
<style><![CDATA[
.cell_n{
word-wrap : break-word;
word-break: break-all;
}
.cell_n{
white-space:normal;
}
]]></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';
function render_action_type_desc(value, record, name) {
return f_zjwfl.getApproveImg(record.get('record_type'), value);
}
......@@ -116,18 +116,21 @@
</a:dataSets>
<a:screenBody>
<a:form marginWidth="30" padding="0">
<a:table id="zj_wfl_approve_history_table_id" bindTarget="approveHistoryDs" canWheel="false" className="cell_n" percentWidth="100">
<a:grid id="zj_wfl_approve_history_table_id" bindTarget="approveHistoryDs" marginWidth="30" marginHeight="250">
<a:columns>
<a:column name="create_date_fmt" prompt="审批时间" width="150"/>
<a:column name="action_type_desc" prompt="审批操作" renderer="render_action_type_desc" width="200"/>
<a:column name="comment_text" prompt="审批意见" width="250"/>
<a:column name="action_type_desc" prompt="审批操作" renderer="render_action_type_desc" width="150"/>
<a:column name="comment_text" prompt="审批意见" width="600" editor="textArea_e"/>
<!--<a:column name="comment_text_out" prompt="审批意见" width="400"/>-->
<a:column name="node_desc" prompt="审批节点" width="200"/>
<a:column name="approver" prompt="审批人" renderer="check_agent_renderer" width="200"/>
<a:column name="approver" prompt="审批人" renderer="check_agent_renderer" width="140" />
<a:placeHolder id="dynamicLineColumn_id"/>
<!--<a:column name="attachement" align="center" prompt="附件查看" renderer="attachement_renderer" width="80"/>-->
</a:columns>
</a:table>
<a:editors>
<a:textArea id="textArea_e" readOnly="true" height="100"/>
</a:editors>
</a:grid>
</a:form>
</a:screenBody>
<script type="text/javascript"><![CDATA[
......
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