Skip to content

L
leaf-hlcm
Commit 9253029d authored by Darming's avatar Darming
Browse files
Options

[fix]评分、建行划扣

parent dd63640b
Show whitespace changes
Inline Side-by-side
Showing with 211 additions and 116 deletions
src/main/webapp/WEB-INF/classes/ccb/CCB600/con_contract_cashflow_query.lwm
View file @ 9253029d
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
c.contract_number, c.contract_number,
ccc.CF_DIRECTION, ccc.CF_DIRECTION,
ccc.cf_status, ccc.cf_status,
c.bank_branch_num bank_account_num,
c.bp_id_tenant bp_id,
decode(ccc.cf_item, decode(ccc.cf_item,
9, 9,
(SELECT due_date (SELECT due_date
...@@ -17,7 +19,7 @@ ...@@ -17,7 +19,7 @@
AND times = ccc.times AND times = ccc.times
AND contract_id = ccc.contract_id), AND contract_id = ccc.contract_id),
due_date) due_date_order, due_date) due_date_order,
to_char(ccc.due_date,'yyyy-mm-dd') due_date, to_char(ccc.due_date, 'yyyy-mm-dd') due_date,
c.contract_name, c.contract_name,
c.bp_id_tenant, c.bp_id_tenant,
c.data_class, c.data_class,
...@@ -35,35 +37,30 @@ ...@@ -35,35 +37,30 @@
c.pay_method, c.pay_method,
(ccc.due_amount - nvl(ccc.received_amount, 0)) due_amount, (ccc.due_amount - nvl(ccc.received_amount, 0)) due_amount,
(ccc.due_amount - nvl(ccc.received_amount, 0)) manual_amount (ccc.due_amount - nvl(ccc.received_amount, 0)) manual_amount
FROM con_contract c, con_contract_cashflow ccc FROM con_contract c,
WHERE c.contract_id = ccc.contract_id con_contract_cashflow ccc #WHERE_CLAUSE#) t
AND c.data_class = 'NORMAL' where not exists(select 1
AND ccc.write_off_flag != 'FULL' from hls_ebank_batch_group g,
AND c.contract_status IN ('INCEPT') hls_ebank_batch_ln l
AND ccc.cf_status = 'RELEASE' where g.status in ('NEW', 'DEAL')
AND ccc.cf_direction = 'INFLOW' and g.group_id = l.group_id
AND c.pay_method IS NOT NULL and l.cashflow_id = t.cashflow_id)
AND ccc.cf_item IN (1, 9)) t ORDER BY t.due_date_ORDER, t.contract_id, t.times, t.cf_item DESC
#WHERE_CLAUSE# ]]></bm:query-sql>
ORDER BY t.due_date_ORDER, t.cf_item DESC, t.contract_id
]]>
</bm:query-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="pay_method" queryExpression="(t.pay_method = ${@pay_method})"/> <bm:query-field name="pay_method" queryExpression="(c.pay_method = ${@pay_method})"/>
<bm:query-field name="due_date_from" <bm:query-field name="due_date_from"
queryExpression="(to_date(t.due_date,'yyyy-mm-dd') &gt;= to_date(${@due_date_from},'yyyy-mm-dd'))"/> queryExpression="(ccc.due_date &gt;= to_date(${@due_date_from},'yyyy-mm-dd'))"/>
<bm:query-field name="due_date_to" <bm:query-field name="due_date_to"
queryExpression="(to_date(t.due_date,'yyyy-mm-dd') &lt;= to_date(${@due_date_to},'yyyy-mm-dd'))"/> queryExpression="(ccc.due_date &lt;= to_date(${@due_date_to},'yyyy-mm-dd'))"/>
<bm:query-field name="contract_id" queryExpression="(t.contract_id = ${@contract_id})"/> <bm:query-field name="contract_id" queryExpression="(ccc.contract_id = ${@contract_id})"/>
<bm:query-field name="cf_item" queryExpression="(t.cf_item = ${@cf_item})"/> <bm:query-field name="cf_item" queryExpression="(ccc.cf_item = ${@cf_item})"/>
<bm:query-field name="bp_id_tenant" queryExpression="(bp_id_tenant = ${@bp_id_tenant})"/> <bm:query-field name="bp_id_tenant" queryExpression="(bp_id_tenant = ${@bp_id_tenant})"/>
<bm:query-field name="bp_id_agent" queryExpression="(bp_id_agent = ${@bp_id_agent})"/> <bm:query-field name="bp_id_agent" queryExpression="(bp_id_agent = ${@bp_id_agent})"/>
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter name="query" <bm:data-filter name="query" expression="(c.contract_id = ccc.contract_id AND c.data_class = 'NORMAL' AND ccc.write_off_flag != 'FULL' AND c.contract_status IN ('INCEPT') AND ccc.cf_status = 'RELEASE' AND ccc.cf_direction = 'INFLOW' AND c.pay_method IS NOT NULL AND ccc.cf_item IN (1, 8, 9))"/>
expression="not exists(select 1 from hls_ebank_batch_group g,hls_ebank_batch_ln l where g.status in ('NEW','DEAL') and g.group_id = l.group_id and l.cashflow_id = t.cashflow_id)"/>
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
\ No newline at end of file
src/main/webapp/WEB-INF/classes/ccb/CCB600/hls_ebank_batch_group.lwm
View file @ 9253029d
...@@ -17,16 +17,23 @@ ...@@ -17,16 +17,23 @@
(Select c.contract_name (Select c.contract_name
From con_contract c From con_contract c
Where c.contract_id = t1.contract_id) contract_name, Where c.contract_id = t1.contract_id) contract_name,
decode((select MERGER_RULES from HLS_EBANK_BATCH where BATCH_ID = t1.BATCH_ID),'CUSTOMER',
(select bp_name from hls_bp_master where bp_id = t1.bp_id),
(Select m.bp_name (Select m.bp_name
From hls_bp_master m, con_contract c From hls_bp_master m, con_contract c
Where m.bp_id = c.bp_id_tenant Where m.bp_id = c.bp_id_tenant
And c.contract_id = t1.contract_id) bp_name, And c.contract_id = t1.contract_id)) bp_name,
decode((select MERGER_RULES from HLS_EBANK_BATCH where BATCH_ID = t1.BATCH_ID),'CUSTOMER',
t1.bank_account_num,
(Select c.bankacctid (Select c.bankacctid
From con_contract c From con_contract c
Where c.contract_id = t1.contract_id) ebank_account_num, Where c.contract_id = t1.contract_id)) ebank_account_num,
decode((select MERGER_RULES from HLS_EBANK_BATCH where BATCH_ID = t1.BATCH_ID),'CUSTOMER',
(select bank_account_name from hls_bp_master_bank_account where bp_id = t1.bp_id and bank_account_num = t1.bank_account_num
and rownum = 1),
(Select c.bankacctname (Select c.bankacctname
From con_contract c From con_contract c
Where c.contract_id = t1.contract_id) ebank_account_name, Where c.contract_id = t1.contract_id)) ebank_account_name,
(Select m.extra_nam (Select m.extra_nam
From hls_bp_master m, con_contract c From hls_bp_master m, con_contract c
Where m.bp_id = c.bp_id_agent_level1 Where m.bp_id = c.bp_id_agent_level1
......
src/main/webapp/WEB-INF/classes/ccb/CCB600/hls_ebank_batch_ln.lwm
View file @ 9253029d
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
prompt="HLS_EBANK_BATCH_LN.GROUP_ID"/> prompt="HLS_EBANK_BATCH_LN.GROUP_ID"/>
<bm:field name="cashflow_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CASHFLOW_ID" <bm:field name="cashflow_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CASHFLOW_ID"
prompt="HLS_EBANK_BATCH_LN.CASHFLOW_ID"/> prompt="HLS_EBANK_BATCH_LN.CASHFLOW_ID"/>
<bm:field name="amount" databaseType="NUMBER" datatype="java.lang.Long" physicalName="AMOUNT" <bm:field name="amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT"
prompt="HLS_EBANK_BATCH_LN.AMOUNT"/> prompt="HLS_EBANK_BATCH_LN.AMOUNT"/>
<bm:field name="manual_amount" databaseType="NUMBER" datatype="java.lang.Long" physicalName="MANUAL_AMOUNT" <bm:field name="manual_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="MANUAL_AMOUNT"
prompt="HLS_EBANK_BATCH_LN.MANUAL_AMOUNT"/> prompt="HLS_EBANK_BATCH_LN.MANUAL_AMOUNT"/>
<bm:field name="write_off_flag" databaseType="VARCHAR2" datatype="java.lang.String" <bm:field name="write_off_flag" databaseType="VARCHAR2" datatype="java.lang.String"
physicalName="WRITE_OFF_FLAG" prompt="HLS_EBANK_BATCH_LN.WRITE_OFF_FLAG"/> physicalName="WRITE_OFF_FLAG" prompt="HLS_EBANK_BATCH_LN.WRITE_OFF_FLAG"/>
...@@ -53,6 +53,8 @@ ...@@ -53,6 +53,8 @@
p_manual_amount => ${@manual_amount}, p_manual_amount => ${@manual_amount},
p_batch_id => ${../../@batch_id}, p_batch_id => ${../../@batch_id},
p_cashflow_id => ${@cashflow_id}, p_cashflow_id => ${@cashflow_id},
p_bank_account_num => ${@bank_account_num},
p_bp_id => ${@bp_id},
p_user_id => ${/session/@user_id}); p_user_id => ${/session/@user_id});
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
......
src/main/webapp/WEB-INF/classes/ccb/CCB600/hls_ebank_batch_ln_group.lwm
View file @ 9253029d
...@@ -11,17 +11,17 @@ ...@@ -11,17 +11,17 @@
<bm:field name="hd_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="HD_ID" prompt="HLS_EBANK_BATCH_GROUP.HD_ID"/> <bm:field name="hd_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="HD_ID" prompt="HLS_EBANK_BATCH_GROUP.HD_ID"/>
<bm:field name="batch_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BATCH_ID" prompt="HLS_EBANK_BATCH_GROUP.BATCH_ID"/> <bm:field name="batch_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BATCH_ID" prompt="HLS_EBANK_BATCH_GROUP.BATCH_ID"/>
<bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CONTRACT_ID" prompt="HLS_EBANK_BATCH_GROUP.CONTRACT_ID"/> <bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CONTRACT_ID" prompt="HLS_EBANK_BATCH_GROUP.CONTRACT_ID"/>
<bm:field name="apply_amount" databaseType="NUMBER" datatype="java.lang.Long" physicalName="APPLY_AMOUNT" prompt="HLS_EBANK_BATCH_GROUP.APPLY_AMOUNT"/> <bm:field name="apply_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="APPLY_AMOUNT" prompt="HLS_EBANK_BATCH_GROUP.APPLY_AMOUNT"/>
<bm:field name="actual_amount" databaseType="NUMBER" datatype="java.lang.Long" physicalName="ACTUAL_AMOUNT" prompt="HLS_EBANK_BATCH_GROUP.ACTUAL_AMOUNT"/> <bm:field name="actual_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="ACTUAL_AMOUNT" prompt="HLS_EBANK_BATCH_GROUP.ACTUAL_AMOUNT"/>
<bm:field name="status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="STATUS" prompt="HLS_EBANK_BATCH_GROUP.STATUS"/> <bm:field name="status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="STATUS" prompt="HLS_EBANK_BATCH_GROUP.STATUS"/>
<bm:field name="real_amount" databaseType="NUMBER" datatype="java.lang.Long" physicalName="REAL_AMOUNT" prompt="HLS_EBANK_BATCH_GROUP.REAL_AMOUNT"/> <bm:field name="real_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="REAL_AMOUNT" prompt="HLS_EBANK_BATCH_GROUP.REAL_AMOUNT"/>
<bm:field name="res_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="RES_CODE" prompt="HLS_EBANK_BATCH_GROUP.RES_CODE"/> <bm:field name="res_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="RES_CODE" prompt="HLS_EBANK_BATCH_GROUP.RES_CODE"/>
<bm:field name="res_msg" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="RES_MSG" prompt="HLS_EBANK_BATCH_GROUP.RES_MSG"/> <bm:field name="res_msg" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="RES_MSG" prompt="HLS_EBANK_BATCH_GROUP.RES_MSG"/>
<bm:field name="interface_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="INTERFACE_ID" prompt="HLS_EBANK_BATCH_GROUP.INTERFACE_ID"/> <bm:field name="interface_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="INTERFACE_ID" prompt="HLS_EBANK_BATCH_GROUP.INTERFACE_ID"/>
<bm:field name="receive_date" databaseType="DATE" datatype="java.util.Date" physicalName="RECEIVE_DATE" prompt="HLS_EBANK_BATCH_GROUP.RECEIVE_DATE"/> <bm:field name="receive_date" databaseType="DATE" datatype="java.util.Date" physicalName="RECEIVE_DATE" prompt="HLS_EBANK_BATCH_GROUP.RECEIVE_DATE"/>
<bm:field name="deal_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DEAL_FLAG" prompt="HLS_EBANK_BATCH_GROUP.DEAL_FLAG"/> <bm:field name="deal_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DEAL_FLAG" prompt="HLS_EBANK_BATCH_GROUP.DEAL_FLAG"/>
<bm:field name="bank_account_num" expression="(select bank_branch_num from con_contract where contract_id = t1.contract_id)" forInsert="false" forceUpdate="false"/> <bm:field name="bank_account_num" expression="(nvl(t1.bank_account_num,(select bank_branch_num from con_contract where contract_id = t1.contract_id)))" forInsert="false" forceUpdate="false"/>
<bm:field name="bank_account_name" expression="(select bank_account_name from con_contract where contract_id = t1.contract_id)" forInsert="false" forceUpdate="false"/> <bm:field name="bank_account_name" expression="(nvl((select bank_account_name from hls_bp_master_bank_account where bp_id = t1.bp_id and bank_account_num = t1.bank_account_num and rownum = 1),(select bank_account_name from con_contract where contract_id = t1.contract_id)))" forInsert="false" forceUpdate="false"/>
<bm:field name="sequence_num" expression="(rownum)" forInsert="false" forceUpdate="false"/> <bm:field name="sequence_num" expression="(rownum)" forInsert="false" forceUpdate="false"/>
<bm:field name="abc_sequence_num" expression="(lpad(ROWNUM,'4','0'))" forceUpdate="false" forInsert="false"/> <bm:field name="abc_sequence_num" expression="(lpad(ROWNUM,'4','0'))" forceUpdate="false" forInsert="false"/>
<bm:field name="csh_bank_account_num" expression="(select bank_account_num from csh_bank_account cba,hls_ebank_batch heb where cba.bank_account_id = heb.bank_account_id and heb.batch_id = t1.batch_id)" forInsert="false" forceUpdate="false"/> <bm:field name="csh_bank_account_num" expression="(select bank_account_num from csh_bank_account cba,hls_ebank_batch heb where cba.bank_account_id = heb.bank_account_id and heb.batch_id = t1.batch_id)" forInsert="false" forceUpdate="false"/>
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
<bm:field name="abc_usage" expression="'代收用途'" defaultValue="代收用途"/> <bm:field name="abc_usage" expression="'代收用途'" defaultValue="代收用途"/>
<bm:field name="abc_fen_code" expression="'01'" defaultValue="01"/> <bm:field name="abc_fen_code" expression="'01'" defaultValue="01"/>
<bm:field name="abc_curr_flag" expression="0" defaultValue="0"/> <bm:field name="abc_curr_flag" expression="0" defaultValue="0"/>
<bm:field name="multi_bank_flag" expression="0" defaultValue="0"/>
<bm:field name="ccb_summary" expression="'代收用途'" defaultValue="代收用途"/>
</bm:fields> </bm:fields>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="batch_id" queryExpression="t1.batch_id = ${@batch_id}"/> <bm:query-field name="batch_id" queryExpression="t1.batch_id = ${@batch_id}"/>
......
src/main/webapp/WEB-INF/classes/prj/PRJ500D/bp_tenant_old_r_query.lwm
View file @ 9253029d
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
SELECT * SELECT *
FROM ( FROM (SELECT *
SELECT bp.*, fsr.object_id bp_id FROM (SELECT fsr.object_id bp_id, bp.*
FROM bp_tenant_rate_detail_v bp, FROM bp_tenant_rate_detail_v bp,
fnd_sc_score fss, fnd_sc_score fss,
fnd_sc_score_result fsr, fnd_sc_score_result fsr,
...@@ -13,7 +13,88 @@ ...@@ -13,7 +13,88 @@
WHERE bp.project_id = fss.project_id WHERE bp.project_id = fss.project_id
AND fss.sc_score_id = fsr.sc_score_id AND fss.sc_score_id = fsr.sc_score_id
AND fsr.score_template_id = fst.score_template_id AND fsr.score_template_id = fst.score_template_id
AND fst.score_template_code = 'HL_CM_NP' order by bp.BP_DETAIL_ID desc) t1 AND fst.score_template_code = 'HL_CM_NP'
UNION
SELECT bp_id,
-1 bp_detail_id,
NULL,
h.date_of_birth bp_birth,
h.marital_status bp_marriage,
(SELECT code_value_name
FROM sys_code_values_v
WHERE code LIKE 'MARITAL_STATUS'
AND code_value_enabled_flag = 'Y'
AND code_value = h.marital_status) bp_marriage_n,
h.industry work_type,
(SELECT code_value_name
FROM sys_code_values_v
WHERE code LIKE 'INDUSTRY_HL'
AND code_value_enabled_flag = 'Y'
AND code_value = h.industry) WORK_TYPE_n,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
FROM hls_bp_master h)
ORDER BY bp_detail_id DESC) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
......
src/main/webapp/modules/ccb/CCB600/ccb_ebank_create.lview
View file @ 9253029d
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<a:dataSet id="hls_ccb_form_query_ds"> <a:dataSet id="hls_ccb_form_query_ds">
<a:fields> <a:fields>
<a:field name="due_date_from" /> <a:field name="due_date_from" />
<a:field name="due_date_to" /> <a:field name="due_date_to" defaultValue="${/model/create_date_path/record/@now_date}" />
<a:field name="bp_agent_name" lovGridHeight="350" lovHeight="550" lovLabelWidth="50" lovWidth="550" <a:field name="bp_agent_name" lovGridHeight="350" lovHeight="550" lovLabelWidth="50" lovWidth="550"
autoComplete="true" autoCompleteField="bp_agent_name" autoComplete="true" autoCompleteField="bp_agent_name"
lovService="basic.hls_bp_master_v_for_lov?bp_category=AGENT" lovService="basic.hls_bp_master_v_for_lov?bp_category=AGENT"
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
</a:field> </a:field>
<a:field name="bp_id_agent" /> <a:field name="bp_id_agent" />
<a:field name="bp_id_tenant"/> <a:field name="bp_id_tenant"/>
<a:field name="contract_number" lovGridHeight="350" lovHeight="500" lovService="ccb.CCB600.con_contract_lov" lovWidth="470" title="合同"> <a:field name="contract_number" lovGridHeight="350" lovHeight="500" lovService="ccb.CCB600.con_contract_lov?pay_method=CCB_THREE" lovWidth="470" title="合同">
<a:mapping> <a:mapping>
<a:map from="contract_id" to="contract_id"/> <a:map from="contract_id" to="contract_id"/>
<a:map from="contract_number" to="contract_number"/> <a:map from="contract_number" to="contract_number"/>
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
<a:field name="bank_name" readOnly="true"/> <a:field name="bank_name" readOnly="true"/>
<a:field name="currency" readOnly="true"/> <a:field name="currency" readOnly="true"/>
<a:field name="due_date" datatype="date" defaultValue="${/model/create_date_path/record/@now_date}" required="true" prompt="应收日期"/> <a:field name="due_date" datatype="date" defaultValue="${/model/create_date_path/record/@now_date}" required="true" prompt="应收日期"/>
<a:field name="merger_rules" defaultValue="NONE"/> <a:field name="merger_rules" defaultValue="CUSTOMER"/>
<!-- <a:field name="merger_rules" defaultValue="CONTRACT"/>--> <!-- <a:field name="merger_rules" defaultValue="CONTRACT"/>-->
</a:fields> </a:fields>
<a:events> <a:events>
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
selectable="true"> selectable="true">
</a:dataSet> </a:dataSet>
<a:dataSet id="hls_ccb_grid_ln_ds" fetchAll="true" queryDataSet="hls_ccb_form_query_ds" model="ccb.CCB600.hls_ebank_batch_ln" queryUrl="${/request/@context_path}/autocrud/ccb.CCB600.con_contract_cashflow_query/query"> <a:dataSet id="hls_ccb_grid_ln_ds" fetchAll="true" queryDataSet="hls_ccb_form_query_ds" model="ccb.CCB600.hls_ebank_batch_ln" queryUrl="${/request/@context_path}/autocrud/ccb.CCB600.con_contract_cashflow_query/query?pay_method=CCB_THREE">
<a:fields> <a:fields>
<a:field name="cashflow_id"/> <a:field name="cashflow_id"/>
<a:field name="bp_tenant_name" readOnly="true"/> <a:field name="bp_tenant_name" readOnly="true"/>
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
<a:field name="times" readOnly="true"/> <a:field name="times" readOnly="true"/>
<a:field name="cf_item" readOnly="true"/> <a:field name="cf_item" readOnly="true"/>
<a:field name="due_amount" readOnly="true"/> <a:field name="due_amount" readOnly="true"/>
<a:field name="manual_amount" required="true" prompt="扣款金额" validator="check_manual_amount"/> <a:field name="manual_amount" datatype="java.lang.Double" required="true" prompt="扣款金额" validator="check_manual_amount"/>
<a:field name="description"/> <a:field name="description"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
...@@ -255,19 +255,20 @@ ...@@ -255,19 +255,20 @@
<a:fieldSet title="合并规则" column="2"> <a:fieldSet title="合并规则" column="2">
<a:radio name="merger_rules" bindTarget="hls_ccb_form_create_ds" layout="horizontal" width="600"> <a:radio name="merger_rules" bindTarget="hls_ccb_form_create_ds" layout="horizontal" width="600">
<a:items> <a:items>
<a:item label="按合同" value="CONTRACT"/> <!-- <a:item label="按合同" value="CONTRACT"/>-->
<a:item label="按期数" value="TIMES"/> <!-- <a:item label="按期数" value="TIMES"/>-->
<a:item label="不合并" value="NONE"/> <a:item label="按客户" value="CUSTOMER"/>
<!-- <a:item label="不合并" value="NONE"/>-->
</a:items> </a:items>
</a:radio> </a:radio>
</a:fieldSet> </a:fieldSet>
<a:fieldSet title="查询条件" column="3"> <a:fieldSet title="查询条件" column="3">
<a:datePicker name="due_date_from" bindTarget="hls_ccb_form_query_ds" prompt="付款日期从"/> <!-- <a:datePicker name="due_date_from" bindTarget="hls_ccb_form_query_ds" prompt="付款日期从"/>-->
<a:datePicker name="due_date_to" bindTarget="hls_ccb_form_query_ds" prompt="付款日期到"/> <a:datePicker name="due_date_to" bindTarget="hls_ccb_form_query_ds" prompt="付款日期到"/>
<a:lov name="bp_agent_name" bindTarget="hls_ccb_form_query_ds" prompt="代理店"/> <a:lov name="bp_agent_name" bindTarget="hls_ccb_form_query_ds" prompt="代理店"/>
<a:lov name="bp_tenant_name" bindTarget="hls_ccb_form_query_ds" prompt="客户名称"/> <a:lov name="bp_tenant_name" bindTarget="hls_ccb_form_query_ds" prompt="客户名称"/>
<a:lov name="contract_number" bindTarget="hls_ccb_form_query_ds" prompt="合同号"/> <a:lov name="contract_number" bindTarget="hls_ccb_form_query_ds" prompt="合同号"/>
<a:lov name="cf_item_desc" bindTarget="hls_ccb_form_query_ds" prompt="现金流类型"/> <!-- <a:lov name="cf_item_desc" bindTarget="hls_ccb_form_query_ds" prompt="现金流类型"/>-->
<!-- <a:numberField name="payment_amount_from" bindTarget="hls_ccb_form_create_ds" prompt="付款金额从"/>--> <!-- <a:numberField name="payment_amount_from" bindTarget="hls_ccb_form_create_ds" prompt="付款金额从"/>-->
<!-- <a:numberField name="payment_amount_to" bindTarget="hls_ccb_form_create_ds" prompt="付款金额到"/>--> <!-- <a:numberField name="payment_amount_to" bindTarget="hls_ccb_form_create_ds" prompt="付款金额到"/>-->
</a:fieldSet> </a:fieldSet>
...@@ -281,6 +282,7 @@ ...@@ -281,6 +282,7 @@
<a:grid id="hls_ccb_ln_grid" bindTarget="hls_ccb_grid_ln_ds" height="340" width="850" navBar="true"> <a:grid id="hls_ccb_ln_grid" bindTarget="hls_ccb_grid_ln_ds" height="340" width="850" navBar="true">
<a:columns> <a:columns>
<a:column name="bp_tenant_name" prompt="客户名称" align="center" /> <a:column name="bp_tenant_name" prompt="客户名称" align="center" />
<a:column name="bank_account_num" prompt="扣款账号"/>
<a:column name="contract_number" prompt="合同号" align="center" /> <a:column name="contract_number" prompt="合同号" align="center" />
<a:column name="times" prompt="期数" align="center"/> <a:column name="times" prompt="期数" align="center"/>
<a:column name="due_date" prompt="应付日期" align="center" renderer="Leaf.formatDate"/> <a:column name="due_date" prompt="应付日期" align="center" renderer="Leaf.formatDate"/>
......
src/main/webapp/modules/ccb/CCB600/ccb_ebank_detail.lview
View file @ 9253029d
...@@ -51,11 +51,11 @@ ...@@ -51,11 +51,11 @@
<a:screenBody> <a:screenBody>
<a:screenTopToolbar height="29"> <a:screenTopToolbar height="29">
<a:gridButton click="query_batch_detail" text="查询"/> <a:gridButton click="query_batch_detail" text="查询"/>
<a:gridButton click="upload_batch_detail" text="导入"/> <!-- <a:gridButton click="upload_batch_detail" text="导入"/>-->
<a:gridButton click="return_batch_detail" text="返回"/> <a:gridButton click="return_batch_detail" text="返回"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form column="3"> <a:form column="3">
<a:textField name="contract_number" bindTarget="hls_ccb_batch_query_ds1" prompt="合同编号"/> <!-- <a:textField name="contract_number" bindTarget="hls_ccb_batch_query_ds1" prompt="合同编号"/>-->
<a:textField name="bp_name" bindTarget="hls_ccb_batch_query_ds1" prompt="客户名称"/> <a:textField name="bp_name" bindTarget="hls_ccb_batch_query_ds1" prompt="客户名称"/>
</a:form> </a:form>
<a:grid id="hls_ccb_batch_detail_grid" bindTarget="hls_ccb_grid_detail_ds" height="500" width="850" <a:grid id="hls_ccb_batch_detail_grid" bindTarget="hls_ccb_grid_detail_ds" height="500" width="850"
...@@ -64,8 +64,9 @@ ...@@ -64,8 +64,9 @@
<a:button type="excel" text="导出"/> <a:button type="excel" text="导出"/>
</a:toolBar> </a:toolBar>
<a:columns> <a:columns>
<a:column name="contract_number" align="left" prompt="合同编号" width="100"/> <!-- <a:column name="contract_number" align="left" prompt="合同编号" width="100"/>-->
<a:column name="bp_name" align="left" prompt="客户名称" width="180"/> <a:column name="bp_name" align="left" prompt="客户名称" width="180"/>
<a:column name="bank_account_num" align="left" prompt="扣款账号" width="180"/>
<a:column name="apply_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney" width="150"/> <a:column name="apply_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney" width="150"/>
<a:column name="actual_amount" align="right" prompt="扣款金额" renderer="Leaf.formatMoney" <a:column name="actual_amount" align="right" prompt="扣款金额" renderer="Leaf.formatMoney"
width="150"/> width="150"/>
......
src/main/webapp/modules/ccb/CCB600/ccb_ebank_detail_query.lview
View file @ 9253029d
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<a:dataSet id="hls_ccb_grid_detail_ds" autoQuery="true" fetchAll="true" <a:dataSet id="hls_ccb_grid_detail_ds" autoQuery="true" fetchAll="true"
model="ccb.CCB600.hls_ebank_batch_group" pageSize="15" model="ccb.CCB600.hls_ebank_batch_group" pageSize="15"
queryDataSet="hls_ccb_batch_query_ds2" queryDataSet="hls_ccb_batch_query_ds2"
queryUrl="${/request/@context_path}/autocrud/ccb.CCB600.hls_ebank_batch_group/query?hd_id=${/parameter/@hd_id}" queryUrl="${/request/@context_path}/autocrud/ccb.CCB600.hls_ebank_batch_group/query?batch_id=${/parameter/@batch_id}"
selectable="true"> selectable="true">
<a:fields> <a:fields>
<a:field name="res_msg" readOnly="true"/> <a:field name="res_msg" readOnly="true"/>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<a:gridButton click="return_batch_detail" text="返回"/> <a:gridButton click="return_batch_detail" text="返回"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form column="3"> <a:form column="3">
<a:textField name="contract_number" bindTarget="hls_ccb_batch_query_ds2" prompt="合同编号"/> <!-- <a:textField name="contract_number" bindTarget="hls_ccb_batch_query_ds2" prompt="合同编号"/>-->
<a:textField name="bp_name" bindTarget="hls_ccb_batch_query_ds2" prompt="客户名称"/> <a:textField name="bp_name" bindTarget="hls_ccb_batch_query_ds2" prompt="客户名称"/>
<a:comboBox name="status_desc" bindTarget="hls_ccb_batch_query_ds2" prompt="返回状态"/> <a:comboBox name="status_desc" bindTarget="hls_ccb_batch_query_ds2" prompt="返回状态"/>
</a:form> </a:form>
...@@ -70,9 +70,9 @@ ...@@ -70,9 +70,9 @@
<a:button type="excel" text="导出"/> <a:button type="excel" text="导出"/>
</a:toolBar> </a:toolBar>
<a:columns> <a:columns>
<a:column name="contract_number" align="left" prompt="合同编号" width="100"/> <!-- <a:column name="contract_number" align="left" prompt="合同编号" width="100"/>-->
<a:column name="bp_name" align="left" prompt="客户名称" width="180"/> <a:column name="bp_name" align="left" prompt="客户名称" width="120"/>
<a:column name="bp_agent" align="left" prompt="代理商名称" width="180"/> <!-- <a:column name="bp_agent" align="left" prompt="代理商名称" width="180"/>-->
<a:column name="ebank_account_num" align="center" prompt="银行账号" width="180"/> <a:column name="ebank_account_num" align="center" prompt="银行账号" width="180"/>
<a:column name="ebank_account_name" align="center" prompt="银行账号名" width="130"/> <a:column name="ebank_account_name" align="center" prompt="银行账号名" width="130"/>
<a:column name="apply_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney" width="100"/> <a:column name="apply_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney" width="100"/>
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
width="100"/> width="100"/>
<a:column name="real_amount" align="right" prompt="实扣金额" renderer="Leaf.formatMoney" width="100"/> <a:column name="real_amount" align="right" prompt="实扣金额" renderer="Leaf.formatMoney" width="100"/>
<a:column name="status_desc" align="left" prompt="返回状态" width="80"/> <a:column name="status_desc" align="left" prompt="返回状态" width="80"/>
<a:column name="receive_date_desc" align="left" prompt="返回日期" width="80"/> <!-- <a:column name="receive_date_desc" align="left" prompt="返回日期" width="80"/>-->
<a:column name="res_msg" align="left" prompt="返回描述" editor="ta_grid" width="150"/> <a:column name="res_msg" align="left" prompt="返回描述" editor="ta_grid" width="150"/>
</a:columns> </a:columns>
<a:editors> <a:editors>
......
src/main/webapp/modules/ccb/CCB600/ccb_ebank_manager.lview
View file @ 9253029d
...@@ -369,12 +369,12 @@ ...@@ -369,12 +369,12 @@
<a:column name="bank_account_num" prompt="账号（必填）"/> <a:column name="bank_account_num" prompt="账号（必填）"/>
<a:column name="bank_account_name" prompt="户名（必填）"/> <a:column name="bank_account_name" prompt="户名（必填）"/>
<a:column name="actual_amount" align="right" renderer="Leaf.formatMoney" prompt="金额（必填）"/> <a:column name="actual_amount" align="right" renderer="Leaf.formatMoney" prompt="金额（必填）"/>
<a:column prompt="跨行标识（选填 建行填0 他行填1）"/> <a:column name="multi_bank_flag" prompt="跨行标识（选填 建行填0 他行填1）"/>
<a:column prompt="行名（跨行业务与联行行号不能同时为空）"/> <a:column prompt="行名（跨行业务与联行行号不能同时为空）"/>
<a:column prompt="联行行号（跨行业务与行名不能同时为空）"/> <a:column prompt="联行行号（跨行业务与行名不能同时为空）"/>
<a:column prompt="多方协议号（跨行代收必填）"/> <a:column prompt="多方协议号（跨行代收必填）"/>
<a:column prompt="标识号（选填）"/> <a:column prompt="标识号（选填）"/>
<a:column prompt="摘要（选填 显示在收款账户流水明细中）"/> <a:column name="ccb_summary" prompt="摘要（选填 显示在收款账户流水明细中）"/>
<a:column prompt="备注（选填）"/> <a:column prompt="备注（选填）"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
......
src/main/webapp/modules/ccb/CCB600/ccb_ebank_query.lview
View file @ 9253029d
...@@ -97,9 +97,9 @@ ...@@ -97,9 +97,9 @@
</a:dataSet> </a:dataSet>
<a:dataSet id="pay_methods_ds"> <a:dataSet id="pay_methods_ds">
<a:datas> <a:datas>
<a:record code_value="AGRI_THREE" code_value_name="农行扣款（三方）"/> <!-- <a:record code_value="AGRI_THREE" code_value_name="农行扣款（三方）"/>-->
<a:record code_value="CCB_THREE" code_value_name="建行扣款（三方）"/> <a:record code_value="CCB_THREE" code_value_name="建行扣款（三方）"/>
<a:record code_value="AGRI_TWO" code_value_name="农行扣款（两方）"/> <!-- <a:record code_value="AGRI_TWO" code_value_name="农行扣款（两方）"/>-->
</a:datas> </a:datas>
</a:dataSet> </a:dataSet>
<a:dataSet id="hls_ccb_form_create_ds" autoQuery="true" model="ccb.CCB600.hls_ebank_batch" <a:dataSet id="hls_ccb_form_create_ds" autoQuery="true" model="ccb.CCB600.hls_ebank_batch"
...@@ -170,9 +170,11 @@ ...@@ -170,9 +170,11 @@
<a:fieldSet title="合并规则" column="2"> <a:fieldSet title="合并规则" column="2">
<a:radio name="merger_rules" bindTarget="hls_ccb_form_create_ds" layout="horizontal" width="600"> <a:radio name="merger_rules" bindTarget="hls_ccb_form_create_ds" layout="horizontal" width="600">
<a:items> <a:items>
<a:item label="按合同" value="CONTRACT"/> <!-- <a:item label="按合同" value="CONTRACT"/>-->
<a:item label="按期数" value="TIMES"/> <!-- <a:item label="按期数" value="TIMES"/>-->
<a:item label="不合并" value="NONE"/> <!-- <a:item label="不合并" value="NONE"/>-->
<!-- <a:item label="不合并" value="NONE"/>-->
<a:item label="按客户" value="CUSTOMER"/>
</a:items> </a:items>
</a:radio> </a:radio>
</a:fieldSet> </a:fieldSet>
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ 9253029d
...@@ -419,7 +419,6 @@ ...@@ -419,7 +419,6 @@
$(tenant_ds_id).query(); $(tenant_ds_id).query();
$(prj_project_lease_item_ds_id).query(); $(prj_project_lease_item_ds_id).query();
$(prj_quotation_ds_id).query(); $(prj_quotation_ds_id).query();
} }
var record = $(ds_id).getCurrentRecord(); var record = $(ds_id).getCurrentRecord();
var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=' + record.get('bp_id_tenant'); var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=' + record.get('bp_id_tenant');
...@@ -566,10 +565,7 @@ ...@@ -566,10 +565,7 @@
$(prj_project_history_ds_id).setQueryParameter("bp_id", bp_id_tenant); $(prj_project_history_ds_id).setQueryParameter("bp_id", bp_id_tenant);
$(prj_project_history_ds_id).query(); $(prj_project_history_ds_id).query();
Leaf.Masker.mask(Ext.getBody()); Leaf.Masker.mask(Ext.getBody());
if ($(score_ds_id).getCurrentRecord() && !$(score_ds_id).getCurrentRecord().get('score_name')) { $(score_ds_id).getCurrentRecord().set('score_name', value);
var score_name = record.get('legal_person') || value;
$(score_ds_id).getCurrentRecord().set('score_name', score_name);
}
Leaf.request({ Leaf.request({
url: $('bp_tenant_detail_query_link').getUrl(), url: $('bp_tenant_detail_query_link').getUrl(),
para: { para: {
...@@ -581,7 +577,7 @@ ...@@ -581,7 +577,7 @@
var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord(); var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
if (bp_tenant_detail_r) { if (bp_tenant_detail_r) {
for (var key in bp_tenant_detail_r.data) { for (var key in bp_tenant_detail_r.data) {
if (key != 'bp_detail_id' && key != 'score_name') { if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age') {
var vl = obj[key]; var vl = obj[key];
if (key == 'bp_birth' && obj[key]) { if (key == 'bp_birth' && obj[key]) {
vl = new Date(obj[key].toString()); vl = new Date(obj[key].toString());
...@@ -604,6 +600,9 @@ ...@@ -604,6 +600,9 @@
scope: this scope: this
}); });
} }
if(name == 'legal_person' && value){
$(score_ds_id).getCurrentRecord().set('score_name', value);
}
if(name == 'bp_id_tenant'){ if(name == 'bp_id_tenant'){
if(!value){ if(!value){
var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord(); var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
...@@ -746,6 +745,7 @@ ...@@ -746,6 +745,7 @@
draggable: true draggable: true
}); });
win.on('close', function () { win.on('close', function () {
$(ds_id).setQueryParameter('project_id',record.get('project_id'));
$(ds_id).query(); $(ds_id).query();
}); });
} }
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 9253029d
...@@ -459,13 +459,14 @@ ...@@ -459,13 +459,14 @@
var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master'); var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
var cdd_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref'); var cdd_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
var virtual_ds_id = '${/parameter/@layout_code}_virtual_ds'; var virtual_ds_id = '${/parameter/@layout_code}_virtual_ds';
var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
if (ds_id == ds.id || virtual_ds_id == ds.id) { if (ds_id == ds.id || virtual_ds_id == ds.id) {
$(cdd_item_ds_id).query(); $(cdd_item_ds_id).query();
$(bp_ds_id).query(); $(bp_ds_id).query();
$(tenant_ds_id).query(); $(tenant_ds_id).query();
$(prj_project_lease_item_ds_id).query(); $(prj_project_lease_item_ds_id).query();
$(prj_quotation_ds_id).query(); $(prj_quotation_ds_id).query();
$(score_ds_id).query();
} }
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
...@@ -576,10 +577,7 @@ ...@@ -576,10 +577,7 @@
$(prj_project_history_ds_id).query(); $(prj_project_history_ds_id).query();
Leaf.Masker.mask(Ext.getBody()); Leaf.Masker.mask(Ext.getBody());
if ($(score_ds_id).getCurrentRecord() && !$(score_ds_id).getCurrentRecord().get('score_name')) { $(score_ds_id).getCurrentRecord().set('score_name', value);
var score_name = record.get('legal_person') || record.get('bp_id_tenant_n');
$(score_ds_id).getCurrentRecord().set('score_name', score_name);
}
Leaf.request({ Leaf.request({
url: $('bp_tenant_detail_query_link').getUrl(), url: $('bp_tenant_detail_query_link').getUrl(),
para: { para: {
...@@ -591,7 +589,7 @@ ...@@ -591,7 +589,7 @@
var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord(); var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
if (bp_tenant_detail_r) { if (bp_tenant_detail_r) {
for (var key in bp_tenant_detail_r.data) { for (var key in bp_tenant_detail_r.data) {
if (key != 'bp_detail_id' && key != 'score_name') { if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age') {
var vl = obj[key]; var vl = obj[key];
if (key == 'bp_birth' && obj[key]) { if (key == 'bp_birth' && obj[key]) {
vl = new Date(obj[key].toString()); vl = new Date(obj[key].toString());
...@@ -614,6 +612,9 @@ ...@@ -614,6 +612,9 @@
scope: this scope: this
}); });
} }
if(name == 'legal_person' && value){
$(score_ds_id).getCurrentRecord().set('score_name', value);
}
if (name == 'pay_method') { if (name == 'pay_method') {
if (record.get('pay_method') == 'WIRE_TRANSFER') { if (record.get('pay_method') == 'WIRE_TRANSFER') {
record.set('bank_account_id', null); record.set('bank_account_id', null);
......
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