Skip to content

L
leaf-hlcm
Commit f0efcedf authored by xiaochao's avatar xiaochao
Browse files
Options

【收款维护申请bug修复】

parent 42e86897
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 12 deletions
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm
View file @ f0efcedf
......@@ -68,7 +68,7 @@
<bm:field name="functional_currency_code" expression="(select gb.functional_currency_code from fnd_companies fc, gld_set_of_books gb where fc.company_id = ${/session/@company_id} and fc.set_of_books_id = gb.set_of_books_id)" forInsert="false" forUpdate="false"/>
<bm:field name="rate_method_code" expression="(select t.rate_method_code from gld_exchangerate_types t where t.type_code=t1.exchange_rate_type)" forInsert="false" forUpdate="false"/>
<bm:field name="zero_amounts_allowed" expression="(select d.zero_amounts_allowed from csh_bank_account_v d where d.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false"/>
<!-- <bm:field name="transaction_type_desc" forInsert="false" forUpdate="false" prompt="HLS.TRANSACTION_TYPE"/>-->
<!-- <bm:field name="transaction_type_desc" forInsert="false" forUpdate="false" prompt="HLS.TRANSACTION_TYPE"/>-->
<bm:field name="unwrite_off_amount" expression="(nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0))" forInsert="false" forUpdate="false" prompt="HLS.UNWRITEOFF_AMOUNT"/>
<bm:field name="precision" expression="(select g.precision from gld_currency g where g.currency_code =t1.currency_code)" forInsert="false" forUpdate="false"/>
<bm:field name="reverse_amount" expression="(-1*t1.transaction_amount)" forInsert="false" forUpdate="false" prompt="CSH511.REVERSE_AMOUNT"/>
......@@ -101,7 +101,7 @@
<bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/>
<bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/>
<bm:field name="guarantor_name_duty" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="GUARANTOR_NAME_DUTY" prompt="担保人履行担保义务" />
<bm:field name="extra_nam" expression="(select v.extra_nam from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_category = 'AGENT' and v.bp_id = t1.bp_id)" forInsert="false" forUpdate="false"/>
<bm:field name="extra_nam" expression="(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t1.bp_id))" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -126,7 +126,7 @@
<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;"/>
<!-- <bm:query-field name="bank_slip_num_to" queryExpression="t1.bank_slip_num &lt;= ${@bank_slip_num_to}"/>-->
<!-- <bm:query-field name="bank_slip_num_to" queryExpression="t1.bank_slip_num &lt;= ${@bank_slip_num_to}"/>-->
<bm:query-field name="transaction_amount_from" queryExpression="t1.transaction_amount &gt;= ${@transaction_amount_from}"/>
<bm:query-field name="transaction_amount_to" queryExpression="t1.transaction_amount &lt;= ${@transaction_amount_to}"/>
<bm:query-field name="currency_code_from" queryExpression="t1.currency_code &gt;= ${@currency_code_from}"/>
......@@ -141,7 +141,7 @@
<bm:query-field name="full_write_off_flag" queryExpression="t1.write_off_flag!=${@full_write_off_flag}"/>
<bm:query-field name="full_returned_flag" queryExpression="t1.returned_flag!=${@full_returned_flag}"/>
<bm:query-field name="not_write_off_flag" queryExpression="t1.write_off_flag!=${@not_write_off_flag}"/>
<!-- <bm:query-field name="not_reversed_flag_r" queryExpression="t1.reversed_flag!=${@not_reversed_flag_r}"/>-->
<!-- <bm:query-field name="not_reversed_flag_r" queryExpression="t1.reversed_flag!=${@not_reversed_flag_r}"/>-->
<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 field="write_off_flag" queryOperator="="/>
......
src/main/webapp/WEB-INF/classes/csh/CSH510N/csh_transaction_list_tmp.lwm
View file @ f0efcedf
......@@ -60,8 +60,19 @@
t.csh_bank_account_id bank_account_id,
t.exists_flag,
t.temp_id,
(select v.extra_nam from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_category = 'AGENT' and v.bp_id = t.bp_id) extra_nam,
(case when t.paid_byother_flag = 'T' and (select v.extra_nam from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_category = 'AGENT' and v.bp_id = t.bp_id) = '深圳美鹏' then
(
case when
(select count(v.unit_id) from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t.bp_id) = 1
then
(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t.bp_id))
else
' '
end
)
extra_nam,
(case when t.paid_byother_flag = 'T' and
(select v.extra_nam from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_category = 'AGENT' and v.bp_id = t.bp_id) = '深圳美鹏'
then
'是'
else
'否'
......
src/main/webapp/WEB-INF/classes/csh/CSH511/check_extra_nam_count.lwm 0 → 100644
View file @ f0efcedf
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: ZLF
$Date: 2014-11-21 上午11:18:06
$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
${@extra_name_count}:= csh_transaction_pkg.query_extra_nam_count
(
p_bp_id =>${@bp_id}
);
end;]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="extra_name_count" output="true" outputPath="@extra_name_count"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH511/query_extra_nam_data.lwm 0 → 100644
View file @ f0efcedf
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: ZLF
$Date: 2014-11-21 上午11:18:06
$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
${@extra_name}:= csh_transaction_pkg.query_extra_nam_name
(
p_bp_id =>${@bp_id}
);
end;]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="extra_name" output="true" outputPath="@extra_name"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
View file @ f0efcedf
......@@ -24,6 +24,10 @@
<a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/>
<a:link id="update_import_csh_transaction_receipt_data_link_id"
model="csh.CSH510N.csh_transaction_list_tmp_update" modelaction="batch_update"/>
<a:link id="extra_nam_csh_transaction_receipt_data_link_id"
model="csh.CSH511.check_extra_nam_count" modelaction="update"/>
<a:link id="get_extra_nam_csh_transaction_receipt_data_link_id"
model="csh.CSH511.query_extra_nam_data" modelaction="update"/>
<script type="text/javascript"><![CDATA[
//导出
// window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
......@@ -121,6 +125,41 @@
}else{
record.set('guarantor_name_duty','否');
}
}else if (name =='bp_name'){
var bp_id = record.get('bp_id');
Leaf.request({
url: $('extra_nam_csh_transaction_receipt_data_link_id').getUrl(),
para: {bp_id : bp_id},
scope: this,
success: function (res) {
//先查询数量
var count = res.result.extra_name_count;
if (count == 1){
//根据数量，一个直接查询显示，多个显示空
Leaf.request({
url: $('get_extra_nam_csh_transaction_receipt_data_link_id').getUrl(),
para: {bp_id : bp_id},
scope: this,
success: function (res) {
var extra_name = res.result.extra_name;
record.set('extra_nam',extra_name);
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
}
});
}
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
}
});
}
}
......@@ -199,6 +238,14 @@
<a:map from="bp_category_name" to="bp_category_display"/>
</a:mapping>
</a:field>
<a:field name="extra_nam" required="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="90"
lovService="csh.CSH510.csh_extra_nam_add_lov" lovWidth="550" title="代理店简称">
<a:mapping>
<a:map from="extra_nam" to="extra_nam"/>
</a:mapping>
</a:field>
<a:field name="bp_id"/>
<a:field name="bp_category"/>
<a:field name="transaction_date" datatype="date"/>
......@@ -241,7 +288,8 @@
<a:column name="attribute_24" prompt="附言" width="80"/>
<a:column name="extra_nam" prompt="代理店简称" width="80"/>
<a:column name="extra_nam" prompt="代理店简称" width="80" editor="grid_lov"/>
<a:column name="guarantor_name_duty" prompt="担保人履行担保义务" width="80"/>
</a:columns>
......@@ -255,16 +303,11 @@
</a:screenBody>
<script type="text/javascript"><![CDATA[
Leaf.onReady(init);
function init() {
if (document.getElementById("tre_withdraw_subscriber_import_grid_id_tb")) {
document.getElementById("tre_withdraw_subscriber_import_grid_id_tb").style.display = "none";
}
}
]]></script>
</a:view>
</a:screen>
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