Skip to content

L
leaf-hlcm
Commit 7388bf7c authored by 18083's avatar 18083
Browse files
Options

手工凭证导入页面优化

parent 58e50dd1
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 74 deletions
src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header.lwm
View file @ 7388bf7c
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select * from ( select * from (
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
t1.journal_submit_batch_id, t1.journal_submit_batch_id,
t1.journal_num, t1.journal_num,
t1.error_message, t1.error_message,
t1.total_amount_dr,
t1.total_amount_cr,
(select c.company_short_name (select c.company_short_name
from fnd_companies_vl c from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name, where c.company_id = t1.je_company_id) js_company_short_name,
...@@ -57,11 +59,13 @@ ...@@ -57,11 +59,13 @@
t1.journal_submit_batch_id, t1.journal_submit_batch_id,
t1.journal_num, t1.journal_num,
t1.error_message, t1.error_message,
t1.total_amount_dr,
t1.total_amount_cr,
(select c.company_short_name (select c.company_short_name
from fnd_companies_vl c from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name, where c.company_id = t1.je_company_id) js_company_short_name,
t1.period_name, t1.period_name,
t1.journal_date, t1.journal_date,
t1.currency_code, t1.currency_code,
(SELECT gc.currency_name (SELECT gc.currency_name
FROM gld_currency_v gc FROM gld_currency_v gc
...@@ -100,11 +104,13 @@ ...@@ -100,11 +104,13 @@
t1.journal_submit_batch_id, t1.journal_submit_batch_id,
t1.journal_num, t1.journal_num,
t1.error_message, t1.error_message,
t1.total_amount_dr,
t1.total_amount_cr,
(select c.company_short_name (select c.company_short_name
from fnd_companies_vl c from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name, where c.company_id = t1.je_company_id) js_company_short_name,
t1.period_name, t1.period_name,
t1.journal_date, t1.journal_date,
t1.currency_code, t1.currency_code,
(SELECT gc.currency_name (SELECT gc.currency_name
FROM gld_currency_v gc FROM gld_currency_v gc
...@@ -143,11 +149,13 @@ ...@@ -143,11 +149,13 @@
t1.journal_submit_batch_id, t1.journal_submit_batch_id,
t1.journal_num, t1.journal_num,
t1.error_message, t1.error_message,
t1.total_amount_dr,
t1.total_amount_cr,
(select c.company_short_name (select c.company_short_name
from fnd_companies_vl c from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name, where c.company_id = t1.je_company_id) js_company_short_name,
t1.period_name, t1.period_name,
t1.journal_date, t1.journal_date,
t1.currency_code, t1.currency_code,
(SELECT gc.currency_name (SELECT gc.currency_name
FROM gld_currency_v gc FROM gld_currency_v gc
......
src/main/webapp/modules/hls/HLS536/hls_journal_import_entrance.lview
View file @ 7388bf7c
...@@ -44,13 +44,6 @@ ...@@ -44,13 +44,6 @@
} }
function lock_current_window(msg) {
Leaf.Masker.mask(Ext.getBody(), msg);
}
function unlock_current_window() {
Leaf.Masker.unmask(Ext.getBody());
}
function hls536_journal_import(){ function hls536_journal_import(){
new Leaf.Window({ new Leaf.Window({
...@@ -226,7 +219,6 @@ ...@@ -226,7 +219,6 @@
function hls536_link_dynamic(reocrd_id, journal_header_id) { function hls536_link_dynamic(reocrd_id, journal_header_id) {
//增加逻辑：审批中、审批通过的只读；新建、审批拒绝的可编辑 //增加逻辑：审批中、审批通过的只读；新建、审批拒绝的可编辑
debugger;
var record = $('hls_journal_header_result_ds').findById(reocrd_id); var record = $('hls_journal_header_result_ds').findById(reocrd_id);
if(record.get('wfl_status') == 'NEW' || record.get('wfl_status') == 'REJECT'){ if(record.get('wfl_status') == 'NEW' || record.get('wfl_status') == 'REJECT'){
var maintain_type = 'UPDATE'; var maintain_type = 'UPDATE';
...@@ -281,73 +273,13 @@ ...@@ -281,73 +273,13 @@
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/> <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<a:dataSets> <a:dataSets>
<a:dataSet id="hls536_wfl_status_ds" lookupCode="HLS536_WFL_STATUS"/> <a:dataSet id="hls536_wfl_status_ds" lookupCode="HLS536_WFL_STATUS"/>
<!--<a:dataSet id="hls_document_type_ds"> <a:dataSet id="hls_journal_header_query">
<a:datas dataSource="/model/hls_document_type_path"/>
</a:dataSet>-->
<a:dataSet id="hls_journal_header_query">
<a:fields> <a:fields>
<a:field name="contract_number"/>
<a:field name="journal_num"/> <a:field name="journal_num"/>
<!--<a:field name="category_code_desc" displayField="description" options="hls_document_type_ds" returnField="category_code" valueField="document_type"/>-->
<a:field name="journal_date_from"/> <a:field name="journal_date_from"/>
<a:field name="journal_date_to"/> <a:field name="journal_date_to"/>
<a:field name="total_amount_dr_from"/> <a:field name="total_amount_dr_from"/>
<a:field name="total_amount_dr_to"/> <a:field name="total_amount_dr_to"/>
<a:field name="period_name"/>
<a:field name="external_journal_num"/>
<!--
<a:field name="bp_id_tenant_desc" lovGridHeight="400" lovHeight="550" lovService="hls.HLS301.hls_bp_master_v_for_lov" lovWidth="500">
<a:mapping>
<a:map from="bp_name" to="bp_id_tenant_desc"/>
<a:map from="bp_id" to="bp_id_tenant"/>
</a:mapping>
</a:field>-->
<!--<a:field name="source_table"/>
<a:field name="reference1"/>
<a:field name="je_transaction_code"/>
<a:field name="je_transaction_desc" lovGridHeight="420" lovHeight="550" lovPageSize="20" lovService="gld.GLD104.gld_je_transaction_for_lov" lovWidth="500">
<a:mapping>
<a:map from="je_transaction_code" to="je_transaction_code"/>
<a:map from="je_transaction_desc" to="je_transaction_desc"/>
</a:mapping>
</a:field>
<a:field name="responsibility_center_name_from" lovHeight="500" lovLabelWidth="100" lovService="fnd.FND2110.fnd_responsibility_centers_lov" lovWidth="550" title="HLS.RESPONSIBILITY_CENTER_NAME">
<a:mapping>
<a:map from="responsibility_center_id" to="responsibility_center_id"/>
<a:map from="responsibility_center_code" to="responsibility_center_code_from"/>
<a:map from="responsibility_center_name" to="responsibility_center_name_from"/>
</a:mapping>
</a:field>
<a:field name="responsibility_center_name_to" lovHeight="500" lovLabelWidth="100" lovService="fnd.FND2110.fnd_responsibility_centers_lov" lovWidth="550" title="HLS.RESPONSIBILITY_CENTER_NAME">
<a:mapping>
<a:map from="responsibility_center_code" to="responsibility_center_code_to"/>
<a:map from="responsibility_center_name" to="responsibility_center_name_to"/>
</a:mapping>
</a:field>-->
<!--<a:field name="account_code_from" autoComplete="true" lovHeight="500" lovLabelWidth="100" lovService="hls.HLS301.hls_journal_account_for_lov" lovWidth="500" title="HLS530.ACCOUNT_NAME">
<a:mapping>
<a:map from="account_code" to="account_code_from"/>
<a:map from="description" to="account_name_from"/>
</a:mapping>
</a:field>
<a:field name="account_code_to" autoComplete="true" lovHeight="600" lovLabelWidth="100" lovUrl="${/request/@context_path}/modules/hls/HLS530/gld_company_account_tree.lview" lovWidth="550" title="HLS530.ACCOUNT_NAME">
<a:mapping>
<a:map from="account_code" to="account_code_to"/>
<a:map from="description" to="account_name_to"/>
</a:mapping>
</a:field>-->
<!--<a:field name="company_short_name" lovHeight="500" lovLabelWidth="100" lovService="fnd.fnd_companies_lov" lovWidth="550" title="HLS530.JOURNAL_COMPANY">
<a:mapping>
<a:map from="company_id" to="je_company_id"/>
<a:map from="company_short_name" to="company_short_name"/>
</a:mapping>
</a:field>-->
<!--<a:field name="currency_code" lovHeight="500" lovLabelWidth="100" lovService="basic.gld_currency_v_lov" lovWidth="550">
<a:mapping>
<a:map from="currency_code" to="currency_code"/>
<a:map from="currency_name" to="currency_name"/>
</a:mapping>
</a:field>-->
<a:field name="description"/> <a:field name="description"/>
<a:field name="wfl_status_n" displayField="code_value_name" options="hls536_wfl_status_ds" returnField="wfl_status" valueField="code_value"/> <a:field name="wfl_status_n" displayField="code_value_name" options="hls536_wfl_status_ds" returnField="wfl_status" valueField="code_value"/>
<a:field name="wfl_status" /> <a:field name="wfl_status" />
...@@ -384,7 +316,6 @@ ...@@ -384,7 +316,6 @@
<a:column name="journal_date" align="center" prompt="凭证日期" renderer="Leaf.formatDate" width="90"/> <a:column name="journal_date" align="center" prompt="凭证日期" renderer="Leaf.formatDate" width="90"/>
<a:column name="currency_desc" align="center" prompt="币种" width="80"/> <a:column name="currency_desc" align="center" prompt="币种" width="80"/>
<a:column name="total_amount_fuc_dr" align="right" prompt="金额" renderer="Leaf.formatMoney" width="120"/> <a:column name="total_amount_fuc_dr" align="right" prompt="金额" renderer="Leaf.formatMoney" width="120"/>
<!--<a:column name="je_transaction_desc" prompt="凭证来源" width="150"/>-->
<a:column name="description" prompt="凭证摘要" width="220"/> <a:column name="description" prompt="凭证摘要" width="220"/>
<a:column name="je_detail_count" prompt="凭证行数量" width="50"/> <a:column name="je_detail_count" prompt="凭证行数量" width="50"/>
<a:column name="wfl_status_n" prompt="凭证导入状态" width="100"/> <a:column name="wfl_status_n" prompt="凭证导入状态" width="100"/>
......
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