Skip to content

L
leaf-hlcm
Commit 6d1717f7 authored by niminmin's avatar niminmin
Browse files
Options

Merge branch 'feature/销项发票反冲开发' into develop 

# Conflicts:
#	src/main/webapp/WEB-INF/uncertain.local.xml
parents 42e86897 7371a861
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2404 additions and 1328 deletions
.gitignore
View file @ 6d1717f7
......@@ -30,3 +30,5 @@ pom.xml
atm_upload.svc
atm_upload_unUseSubFolder.svc
!/src/main/webapp/WEB-INF/uncertain.local.xml
src/main/webapp/WEB-INF/uncertain.local.xml
src/main/webapp/WEB-INF/uncertain.local.xml
src/main/java/leaf/presentation/component/std/Upload.java 0 → 100644
View file @ 6d1717f7
This diff is collapsed.
src/main/webapp/WEB-INF/classes/acr/ACR512N/acr_invoice_update_for_submit.lwm
View file @ 6d1717f7
......@@ -17,11 +17,13 @@
p_note => ${@note},
p_company_id => ${/session/@company_id},
p_user_id => ${/session/@user_id},
p_apply_mode => ${@apply_mode});
p_apply_mode => ${@apply_mode},
p_invoice_apply_num=> ${@invoice_apply_num});
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="invoice_apply_id" dataType="java.lang.Long" input="false" output="true" outputPath="/parameter/@invoice_apply_id"/>
<bm:parameter name="invoice_apply_num" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@invoice_apply_num"/>
</bm:parameters>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/acr/ACR514/sys_session_info.lwm 0 → 100644
View file @ 6d1717f7
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: DJ
$Date: 2013-4-13 下午03:08:40
$Revision: 1.0
$Purpose: session中的信息
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:fields>
<bm:field name="today" datatype="java.util.Date"/>
<bm:field name="current_year" datatype="java.lang.Long"/>
<bm:field name="current_month" datatype="java.lang.Long"/>
<bm:field name="current_day" datatype="java.lang.Long"/>
<bm:field name="never_date" datatype="java.util.Date"/>
<bm:field name="company_id" datatype="java.lang.Long"/>
<bm:field name="company_code" datatype="java.lang.String"/>
<bm:field name="company_short_name" datatype="java.lang.String"/>
<bm:field name="company_full_name" datatype="java.lang.String"/>
<bm:field name="role_id" datatype="java.lang.Long"/>
<bm:field name="role_name" datatype="java.lang.String"/>
<bm:field name="role_code" datatype="java.lang.String"/>
<bm:field name="country_id" datatype="java.lang.Long"/>
<bm:field name="country_name" datatype="java.lang.String"/>
<bm:field name="lease_channel" datatype="java.lang.String"/>
<bm:field name="lease_channel_desc" datatype="java.lang.String"/>
<bm:field name="division" datatype="java.lang.String"/>
<bm:field name="division_desc" datatype="java.lang.String"/>
<bm:field name="lease_organization" datatype="java.lang.String"/>
<bm:field name="lease_organization_desc" datatype="java.lang.String"/>
<bm:field name="currency_code" datatype="java.lang.String"/>
<bm:field name="currency_name" datatype="java.lang.String"/>
<bm:field name="user_name" datatype="java.lang.String"/>
<bm:field name="user_desc" datatype="java.lang.String"/>
<bm:field name="bp_category" datatype="java.lang.String"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select to_char(sysdate, 'yyyy-mm-dd') as today,
to_char(sysdate, 'yyyy') as current_year,
to_number(to_char(sysdate, 'mm')) as current_month,
to_number(to_char(sysdate, 'dd')) as current_day,
'3000-01-01' as never_date,
t1.company_id,
t1.company_code,
t1.company_short_name,
t1.company_full_name,
t2.role_id,
t2.role_name,
t2.role_code,
t3.country_id,
t3.description as country_name,
t4.lease_channel,
t4.description as lease_channel_desc,
t5.division,
t5.description as division_desc,
t6.lease_organization,
t6.description as lease_organization_desc,
t7.currency_code,
t7.currency_name,
t8.user_name,
t8.description as user_desc,
t8.bp_category
from dual t
left join fnd_companies_vl t1
on t1.company_id = ${/session/@company_id}
and t1.enabled_flag = 'Y'
left join sys_role_vl t2
on t2.role_id = ${/session/@role_id}
and t2.enabled_flag = 'Y'
left join fnd_country t3
on t3.country_code = 'CHN'
and t3.enabled_flag='Y'
left join hls_lease_channel t4
on t4.lease_channel = ${/session/@lease_channel}
and t4.enabled_flag='Y'
left join hls_division t5
on t5.division = ${/session/@division}
and t5.enabled_flag='Y'
left join hls_lease_organization t6
on t6.lease_organization = ${/session/@lease_organization}
and t6.enabled_flag='Y'
left join gld_currency_vl t7
on t7.currency_code='CNY'
and t7.enabled_flag='Y'
left join sys_user t8
on t8.user_id = ${/session/@user_id}
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/acr/ACR515/acr_interface_tmp.lwm
View file @ 6d1717f7
......@@ -20,6 +20,17 @@
insert into ACR_INTERFACE_TMP(session_id,invoice_hd_id) values(${/session/@session_id},${@invoice_hd_id})
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
acr_invoice_wfl_pkg.check_invoice_select_num(p_invoice_apply_id => ${@invoice_apply_id},
p_select_count => ${@select_count},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
......
src/main/webapp/WEB-INF/classes/acr/ACR605/acr_invoice_claim_confirm_new.lwm
View file @ 6d1717f7
......@@ -128,7 +128,9 @@
reversed_flag,
claim_status,
ref_n02,
vat_interface_status_desc
invoice_apply_num,
ACR_INVOICE_WFL_PKG.get_invoice_transaction_flag(t1.invoice_hd_id)csh_transaction_flag,
decode(ACR_INVOICE_WFL_PKG.get_invoice_transaction_flag(t1.invoice_hd_id),'NOT','未收款','PARTIAL','部分收款','FULL','完全收款')csh_transaction_flag_desc
FROM acr_invoice_hd_v t1
#WHERE_CLAUSE#
......@@ -157,10 +159,12 @@
<bm:query-field name="contract_number" queryExpression="t1.contract_number like ${@contract_number}"/>
<bm:query-field name="contract_name" queryExpression="t1.contract_name like ${@contract_name}"/>
<bm:query-field name="invoice_title" queryExpression="t1.invoice_title like ${@invoice_title}"/>
<bm:query-field name="invoice_apply_num" queryExpression="t1.invoice_apply_num like ${@invoice_apply_num}"/>
<bm:query-field name="invoice_code" queryExpression="t1.invoice_code like ${@invoice_code}"/>
<bm:query-field name="vat_invoice_code" queryExpression="t1.vat_invoice_code like ${@vat_invoice_code}"/>
<bm:query-field name="invoice_number" queryExpression="t1.invoice_number like ${@invoice_number}"/>
<bm:query-field name="invoice_date_from" queryExpression=" trunc(t1.invoice_date) &gt;= to_date(${@invoice_date_from},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="invoice_date_to" queryExpression="trunct1.invoice_date) &lt;= to_date(${@invoice_date_to},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="query_contract_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, con_contract cc where df.contract_id = cc.contract_id and df.ar_invoice_hd_id = t1.invoice_hd_id and cc.contract_number between nvl(${@contract_number_f}, cc.contract_number) and nvl(${@contract_number_t}, cc.contract_number))"/>
<bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/>
</bm:query-fields>
......
src/main/webapp/WEB-INF/classes/acr/ACR620/acr_invoice_reverse_apply_detail.lwm
View file @ 6d1717f7
......@@ -37,24 +37,38 @@
From sys_code_values_v v
Where v.code = 'ACR510_AR_INVOICE_STATUS'
And v.code_value = h.invoice_status) invoice_status_n,
(decode((Select he.status
From acr_ele_invoice_hd he
Where he.invoice_hd_id = h.invoice_hd_id),
'DOWNLOAD',
'BACK',
h.vat_interface_status)) vat_interface_status,
(Select ahd.vat_interface_status
From acr_invoice_hd ahd
Where ahd.invoice_hd_id=h.invoice_hd_id) vat_interface_status,
(Select v.code_value_name
From sys_code_values_v v
From sys_code_values_v v, acr_invoice_hd ahd
Where v.code = 'ACR515_VAT_INTERFACE_STATUS'
And v.code_value =
(decode((Select he.status
From acr_ele_invoice_hd he
Where he.invoice_hd_id = h.invoice_hd_id),
'DOWNLOAD',
'金税已回写',
h.vat_interface_status))) vat_interface_status_n,
And v.code_value = ahd.vat_interface_status
and v.code_enabled_flag = 'Y'
and v.code_value_enabled_flag = 'Y'
and ahd.invoice_hd_id=h.invoice_hd_id) As vat_interface_status_n,
to_char(h.accounting_date, 'yyyy-mm-dd') accounting_date,
h.vat_red_notice_num
h.vat_red_notice_num,
h.invoice_hd_id,
(Select he.reversed_flag
From acr_invoice_hd he
Where he.invoice_hd_id = h.invoice_hd_id)reversed_flag,
(Select v.code_value_name
From sys_code_values_v v,acr_invoice_hd he
Where v.code = 'ACR514_AR_INVOICE_REVERSED_FLAG'
And v.code_value =nvl(he.reversed_flag,'N')
and he.invoice_hd_id = h.invoice_hd_id)reversed_flag_n,
NVL((Select he.claim_status
From acr_invoice_hd he
Where he.invoice_hd_id = h.invoice_hd_id),'UNCLAIMED')claim_status,
(select v.code_value_name
from sys_code_values_v v
where v.code = 'CLAIM_STATUS'
and v.code_value = NVL((Select he.claim_status
From acr_invoice_hd he
Where he.invoice_hd_id = h.invoice_hd_id),'UNCLAIMED'))claim_status_n
From acr_invoice_hd_wfl h #WHERE_CLAUSE#
order by h.invoice_hd_wfl_id desc
]]></bm:query-sql>
......
src/main/webapp/WEB-INF/classes/acr/acr_invoice_hd_v.lwm
View file @ 6d1717f7
......@@ -113,6 +113,10 @@
<bm:field name="express_by" databaseType="NUMBER" datatype="java.lang.Long" physicalName="EXPRESS_BY"/>
<bm:field name="express_note" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXPRESS_NOTE" prompt="ACR.EXPRESS_NOTE"/>
<bm:field name="billing_way_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="billing_way_desc" prompt="开票方式"/>
<bm:field name="invoice_apply_num" expression="(select ap.invoice_apply_num from acr_invoice_apply ap, acr_invoice_hd_wfl aw where ap.wfl_apply_status='APPROVED' and ap.apply_mode='APPLY' and ap.invoice_apply_id=aw.invoice_apply_id
and aw.invoice_hd_id=t1.invoice_hd_id)"/>
<bm:field name="invoice_apply_id" expression="(select ap.invoice_apply_id from acr_invoice_apply ap, acr_invoice_hd_wfl aw where ap.wfl_apply_status='APPROVED' and ap.apply_mode='APPLY' and ap.invoice_apply_id=aw.invoice_apply_id
and aw.invoice_hd_id=t1.invoice_hd_id)"/>
</bm:fields>
<bm:query-fields>
<bm:query-field name="document_number_f" queryExpression="t1.document_number &gt;= ${@document_number_f}"/>
......@@ -141,6 +145,8 @@
<bm:query-field name="confirmed_by" queryExpression="t1.confirmed_by = ${@confirmed_by}"/>
<bm:query-field name="query_contract_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, con_contract cc where df.contract_id = cc.contract_id and df.ar_invoice_hd_id = t1.invoice_hd_id and cc.contract_number between nvl(${@contract_number_f}, cc.contract_number) and nvl(${@contract_number_t}, cc.contract_number))"/>
<bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/>
<bm:query-field name="invoice_apply_num" queryExpression="${@invoice_apply_num}=(select ap.invoice_apply_num from acr_invoice_apply ap, acr_invoice_hd_wfl aw where ap.wfl_apply_status='APPROVED' and ap.apply_mode='APPLY' and ap.invoice_apply_id=aw.invoice_apply_id
and aw.invoice_hd_id=t1.invoice_hd_id)"/>
</bm:query-fields>
<bm:data-filters>
......
src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_result_query.lwm
View file @ 6d1717f7
......@@ -184,6 +184,7 @@
(select to_char(due_date, 'yyyy-mm-dd')
from con_contract_cashflow
where contract_id = ct.contract_id
and cf_status='RELEASE'
and cf_item =
8) residual_date,
-- 合同终了
......
src/main/webapp/WEB-INF/uncertain.local.xml deleted 100644 → 0
View file @ 42e86897
<?xml version="1.0" encoding="UTF-8"?>
<uncertain-engine defaultLogLevel="INFO">
<path-config logPath="E:\sanling\leaf-hlcm\logs" uiPackageBasePath="E:\sanling\leaf-hlcm\target\hlcm\lib\LeafUI\src"/>
</uncertain-engine>
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ 6d1717f7
......@@ -133,7 +133,7 @@
}
var datas = ds.getJsonData(true);
var lease_count=0, leaseback_count=0;
var lease_count = 0, leaseback_count = 0;
for (var i = 0; i < datas.length; i++) {
if (datas[i].business_type == 'LEASE') {
lease_count = lease_count + 1;
......@@ -267,6 +267,7 @@
<a:dataSet id="allConditionDs" autoCreate="true">
<a:fields>
<a:field name="business_type"/>
<a:field name="bill_object_bp_class"/>
<a:field name="business_type_desc" displayField="code_value_name" options="business_type_desc_ds"
returnField="business_type" valueField="code_value"/>
<a:field name="object_taxpayer_type_desc" displayField="code_value_name" options="taxpayer_type_ds"
......@@ -306,8 +307,11 @@
<a:field name="billing_object_name" lovGridHeight="300" lovHeight="450" lovLabelWidth="100"
lovService="basic.hls_bp_master_v_for_lov" lovWidth="600" title="承租人">
<a:mapping>
<a:map from="bp_code" to="billing_object_name"/>
<a:map from="bp_code" to="billing_object_code"/>
<a:map from="bp_name" to="billing_object_name"/>
<a:map from="bp_id" to="billing_object_id"/>
<a:map from="bp_class" to="bill_object_bp_class"/>
</a:mapping>
</a:field>
<a:field name="bp_code_tenant_from" lovGridHeight="300" lovHeight="450" lovLabelWidth="100"
......@@ -423,7 +427,7 @@
<a:gridButton click="contractDs_grid_clear" text="ACR510.BUTTON.CLEAR_CONTRACT"/>
<a:gridButton click="invoiceHd_confirm" text="ACR510.BUTTON.COMFIRM"/>
</a:screenTopToolbar>
<a:form id="condition_queryForm" width="1300">
<a:form id="condition_queryForm" marginWidth="55">
<a:hBox>
<a:lov name="billing_object_name" bindTarget="allConditionDs" prompt="开票对象"/>
......@@ -446,6 +450,8 @@
<a:datePicker name="last_received_date_from" bindTarget="allConditionDs" prompt="收款日期从"/>
<a:datePicker name="last_received_date_to" bindTarget="allConditionDs" prompt="收款日期到"/>
<a:lov name="bp_id_agent_level1_n" bindTarget="allConditionDs" prompt="代理店"/>
<a:comboBox name="bill_object_bp_class_desc" bindTarget="allConditionDs" prompt="商业伙伴分类"/>
</a:hBox>
<!-- <a:formBody column="4" labelWidth="400">
<a:lov name="contract_number_from" bindTarget="allConditionDs" prompt="HLS.CONTRACT_NUMBER_FROM"/>
......@@ -509,6 +515,8 @@
<!-- <a:column name="currency_desc" width="60"/>
<a:column name="exchange_rate" align="right" width="80"/>
<a:column name="exchange_rate_type_desc" width="100"/> -->
<a:column name="bill_object_bp_class_desc" width="100" align="center" prompt="商业伙伴分类" />
</a:columns>
</a:grid>
</a:tab>
......
src/main/webapp/modules/acr/ACR512/acr_invoice_update_for_submit.lsc
View file @ 6d1717f7
......@@ -5,6 +5,7 @@
<batch-apply sourcePath="/parameter/details">
<a:model-update model="acr.ACR512N.acr_invoice_update_for_submit" trace="true"/>
</batch-apply>
<!-- <a:model-update model="acr.ACR610.acr_invoice_apply_query" trace="true"/>-->
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
src/main/webapp/modules/acr/ACR515/acr_invoice_insert_tmp.lsc
View file @ 6d1717f7
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc"
xmlns:t="http://www.leaf-framework.org/application" trace="true">
<a:init-procedure>
<a:model-delete model="acr.ACR515.acr_interface_tmp" trace="true"/>
<a:model-execute model="acr.ACR515.acr_interface_tmp" trace="true"/>
<batch-apply sourcePath="/parameter/details">
<a:model-insert model="acr.ACR515.acr_interface_tmp" trace="true"/>
</batch-apply>
......
src/main/webapp/modules/acr/ACR517/acr_invoice_claim_confirm.lview
View file @ 6d1717f7
......@@ -103,10 +103,12 @@
}
$L.showConfirm("提示",'确认执行该操作？',function(){
Leaf.Masker.mask(Ext.getBody(),'正在操作...');
Leaf.request({
url: '${/request/@context_path}/autocrud/acr.ACR605.acr_invoice_claim_return/batch_update',
para: datas,
success: function () {
Leaf.Masker.unmask(Ext.getBody());
Leaf.SideBar.show({
msg: '操作成功',
duration: 2000
......@@ -139,14 +141,25 @@
<a:datas dataSource="/model/hls_cashflow_item_list"/>
</a:dataSet>
<!-- <a:dataSet id="claim_status_ds" loadData="true" lookupCode="CLAIM_STATUS"/>-->
<a:dataSet id="csh_transaction_flag_ds">
<a:datas>
<a:record code_value="NOT" code_value_name="未收款"/>
<a:record code_value="FULL" code_value_name="完全收款"/>
<a:record code_value="PARTIAL" code_value_name="部分收款"/>
</a:datas>
</a:dataSet>
<a:dataSet id="acr517_invoice_query_ds" autoCreate="true">
<a:fields>
<a:field name="document_number"/>
<a:field name="invoice_apply_num"/>
<a:field name="invoice_kind_desc" displayField="code_value_name" options="acr517_invoice_kind_ds"
returnField="invoice_kind" valueField="code_value"/>
<a:field name="invoice_status_desc" displayField="code_value_name" options="acr517_invoice_statu_ds" returnField="invoice_status" valueField="code_value"/>
<a:field name="total_amount"/>
<a:field name="csh_transaction_flag"/>
<a:field name="csh_transaction_flag_desc" options="csh_transaction_flag_ds"
displayField="code_value_name" returnField="code_value" valueField="csh_transaction_flag"/>
<a:field name="cf_item"/>
<a:field name="cf_item_n" options="cf_item_options" displayField="description" returnField="cf_item" valueField="cf_item"/>
<!-- <a:field name="claim_status" options="claim_status_ds" displayField="code_value_name" valueField="code_value" returnField="claim_status"/>-->
......@@ -160,7 +173,7 @@
returnField="claim_status" valueField="code_value"/>
</a:fields>
</a:dataSet>
<a:dataSet id="acr517_invoice_result_ds" autoPageSize="true" autoQuery="true"
<a:dataSet id="acr517_invoice_result_ds" autoQuery="true" fetchAll="false" autoPageSize="true"
model="acr.ACR605.acr_invoice_claim_confirm_new" queryDataSet="acr517_invoice_query_ds" selectable="true">
<a:events>
<a:event name="submitsuccess" handler="submit_success_btn"/>
......@@ -176,18 +189,23 @@
<a:toolbarButton click="acr517_invoice_return" text="退回"/>
</a:screenTopToolbar>
<a:form marginWidth="30" padding="0" title="查询条件" column="4">
<a:textField name="document_number" bindTarget="acr517_invoice_query_ds" prompt="单据编号" width="135"/>
<a:textField name="contract_number" bindTarget="acr517_invoice_query_ds" prompt="合同编号" width="135"/>
<a:textField name="contract_name" bindTarget="acr517_invoice_query_ds" prompt="合同名称" width="135"/>
<a:textField name="document_number" bindTarget="acr517_invoice_query_ds" prompt="单据编号" width="120"/>
<a:textField name="contract_number" bindTarget="acr517_invoice_query_ds" prompt="合同编号" width="120"/>
<a:textField name="contract_name" bindTarget="acr517_invoice_query_ds" prompt="合同名称" width="120"/>
<!-- <a:lov name="cf_item_desc" bindTarget="acr517_invoice_query_ds" prompt="现金流项目" width="135"/>-->
<a:numberField name="total_amount_f" allowFormat="true" bindTarget="acr517_invoice_query_ds" prompt="开票金额含税额从" width="135"/>
<a:numberField name="total_amount_t" allowFormat="true" bindTarget="acr517_invoice_query_ds" prompt="开票金额含税额到" width="135"/>
<a:textField name="invoice_title" bindTarget="acr517_invoice_query_ds" prompt="发票抬头" width="135"/>
<a:comboBox name="invoice_kind_desc" bindTarget="acr517_invoice_query_ds" prompt="ACR.INVOICE_KIND" width="135"/>
<a:numberField name="total_amount_f" allowFormat="true" bindTarget="acr517_invoice_query_ds" prompt="开票金额含税额从" width="120"/>
<a:numberField name="total_amount_t" allowFormat="true" bindTarget="acr517_invoice_query_ds" prompt="开票金额含税额到" width="120"/>
<a:textField name="invoice_title" bindTarget="acr517_invoice_query_ds" prompt="发票抬头" width="120"/>
<a:comboBox name="invoice_kind_desc" bindTarget="acr517_invoice_query_ds" prompt="ACR.INVOICE_KIND" width="120"/>
<!-- <a:comboBox name="invoice_status_desc" bindTarget="acr517_invoice_query_ds" prompt="发票状态" width="135"/>-->
<a:textField name="vat_invoice_code" bindTarget="acr517_invoice_query_ds" prompt="发票代码" width="135"/>
<a:textField name="invoice_number" bindTarget="acr517_invoice_query_ds" prompt="发票号码" width="135"/>
<a:comboBox name="claim_status_n" bindTarget="acr517_invoice_query_ds" prompt="认领状态" width="135"/>
<a:textField name="vat_invoice_code" bindTarget="acr517_invoice_query_ds" prompt="发票代码" width="120"/>
<a:textField name="invoice_number" bindTarget="acr517_invoice_query_ds" prompt="发票号码" width="120"/>
<a:comboBox name="claim_status_n" bindTarget="acr517_invoice_query_ds" prompt="认领状态" width="120"/>
<a:comboBox name="csh_transaction_flag_desc" bindTarget="acr516_invoice_query_ds" prompt="收款标记"
width="120"/>
<a:textField name="invoice_apply_num" bindTarget="acr516_invoice_query_ds" prompt="申请编号" width="120"/>
<a:datePicker name="invoice_date_from" bindTarget="acr516_invoice_query_ds" prompt="发票日期从" width="120"/>
<a:datePicker name="invoice_date_to" bindTarget="acr516_invoice_query_ds" prompt="发票日期到" width="120"/>
</a:form>
<a:grid id="acr516_invoice_grid_id" bindTarget="acr517_invoice_result_ds" marginHeight="225" marginWidth="30" navBar="true">
<a:columns>
......@@ -200,21 +218,23 @@
<a:column name="vat_invoice_code" width="120" prompt="发票代码"/>
<a:column name="invoice_date" renderer="Leaf.formatDate" prompt="发票日期" width="100"/>
<a:column name="invoice_bp_code" prompt="开票客户编号" width="100"/>
<a:column name="invoice_bp_name" autoAdjust="false" showTitle="true" prompt="开票客户名称" width="150"/>
<!-- <a:column name="invoice_bp_name" autoAdjust="false" showTitle="true" prompt="开票客户名称" width="150"/>-->
<a:column name="invoice_title" autoAdjust="false" showTitle="true" prompt="发票抬头" width="150"/>
<a:column name="total_amount" align="right" renderer="Leaf.formatMoney" prompt="发票金额" width="100"/>
<a:column name="tax_amount" align="right" renderer="Leaf.formatMoney" prompt="税额" width="100"/>
<a:column name="net_amount" align="right" renderer="Leaf.formatMoney" prompt="不含税金额" width="100"/>
<a:column name="currency" prompt="币种" width="80"/>
<!-- <a:column name="currency" prompt="币种" width="80"/>-->
<a:column name="created_by_name" autoAdjust="false" showTitle="true" prompt="创建人" width="150"/>
<a:column name="invoice_status_desc" prompt="发票状态" width="100"/>
<a:column name="vat_interface_status_desc" prompt="金税状态" width="100"/>
<!-- <a:column name="invoice_status_desc" prompt="发票状态" width="100"/>-->
<!-- <a:column name="vat_interface_status_desc" prompt="金税状态" width="100"/>-->
<a:column name="accounting_date" renderer="Leaf.formatDate" prompt="期间序号" width="100"/>
<a:column name="create_je_flag" prompt="凭证标志" width="60"/>
<!-- <a:column name="create_je_flag" prompt="凭证标志" width="60"/>-->
<a:column name="bp_tax_registry_num" prompt="纳税人识别号"/>
<!-- <a:column name="ele_invoice_status_desc" prompt="电子发票状态"/>-->
<!-- <a:column name="swno" prompt="电子发票流水号" width="100"/>-->
<a:column name="claim_status_n" prompt="认领状态" width="100"/>
<a:column name="invoice_apply_num" prompt="申请编号" width="120"/>
<a:column name="csh_transaction_flag_desc" prompt="收款标记" width="80"/>
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/acr/ACR610/acr_invoice_apply_query.lview
View file @ 6d1717f7
......@@ -7,10 +7,14 @@
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true">
<a:view>
<a:link id="acr_invoice_apply_detail_link" url="${/request/@context_path}/modules/acr/ACR610/acr_invoice_apply_detail.lview"/>
<a:link id="acr_invoice_apply_detail_readonly_link" url="${/request/@context_path}/modules/acr/ACR610/acr_invoice_apply_detail_wfl.lview"/>
<a:link id="acr610_invoice_apply_status_change" model="acr.ACR610.acr_invoice_apply_query" modelaction="delete"/>
<a:link id="acr_invoice_finish_print_link_id" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_history_pdf_print.lsc"/>
<a:link id="acr_invoice_apply_detail_link"
url="${/request/@context_path}/modules/acr/ACR610/acr_invoice_apply_detail.lview"/>
<a:link id="acr_invoice_apply_detail_readonly_link"
url="${/request/@context_path}/modules/acr/ACR610/acr_invoice_apply_detail_wfl.lview"/>
<a:link id="acr610_invoice_apply_status_change" model="acr.ACR610.acr_invoice_apply_query"
modelaction="delete"/>
<a:link id="acr_invoice_finish_print_link_id"
url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_history_pdf_print.lsc"/>
<script><![CDATA[
function lock_current_window() {
......@@ -39,7 +43,7 @@
title: '申请明细',
fullScreen: true
});
win.on('close',function(){
win.on('close', function () {
$('acr610_invoice_result_ds').query();
});
}
......@@ -47,7 +51,7 @@
function acr610_apply_num_render(value, record, name) {
if (name == 'invoice_apply_num') {
if (record.get('wfl_apply_status') == 'NEW') {
url = $('acr_invoice_apply_detail_link').getUrl() + '?invoice_apply_id=' + record.get('invoice_apply_id') + '&invoice_apply_num=' + record.get('invoice_apply_num') + '&invoice_apply_user_n=' + record.get('invoice_apply_user_n') + '&invoice_apply_date=' + record.get('invoice_apply_date') ;
url = $('acr_invoice_apply_detail_link').getUrl() + '?invoice_apply_id=' + record.get('invoice_apply_id') + '&invoice_apply_num=' + record.get('invoice_apply_num') + '&invoice_apply_user_n=' + record.get('invoice_apply_user_n') + '&invoice_apply_date=' + record.get('invoice_apply_date');
} else {
url = $('acr_invoice_apply_detail_readonly_link').getUrl() + '?invoice_apply_id=' + record.get('invoice_apply_id') + '&invoice_apply_num=' + record.get('invoice_apply_num') + '&invoice_apply_user_n=' + record.get('invoice_apply_user_n') + '&invoice_apply_date=' + record.get('invoice_apply_date') + '&button_flag=YES';
}
......@@ -66,7 +70,7 @@
return;
}
var record = records[0];
if(record.get('wfl_apply_status') != 'NEW'){
if (record.get('wfl_apply_status') != 'NEW') {
$L.showInfoMessage('提示', '仅新建状态的申请单据可以取消！');
return;
}
......@@ -96,32 +100,32 @@
}
function acr610_invoice_result_select(ds, record, bp_seq) {
if(record.get('wfl_apply_status') != 'NEW'){
if (record.get('wfl_apply_status') != 'NEW') {
document.getElementById("acr610_invoice_cancel_id").style.display = "none";
}else{
} else {
document.getElementById("acr610_invoice_cancel_id").style.display = "";
}
if(record.get('wfl_apply_status') == 'CANCEL'){
if (record.get('wfl_apply_status') == 'CANCEL') {
document.getElementById("acr610_invoice_print_id").style.display = "none";
}else{
} else {
document.getElementById("acr610_invoice_print_id").style.display = "";
}
}
function acr610_invoice_print(){
function acr610_invoice_print() {
var record = $('acr610_invoice_result_ds').getSelected()[0];
var document_id = record.get('invoice_apply_id');
var url_l = $('acr_invoice_finish_print_link_id').getUrl() + '?document_id=' + document_id + '&document_table=ACR_INVOICE_APPLY&batch_flag=Y&source_type=COMMON';
var OpenWindow = window.open(href = url_l, target = "_blank");
}
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<a:dataSets>
<a:dataSet id="acr610_invoice_apply_status_ds" lookupCode="WFL_STATUS"/>
<a:dataSet id="acr610_invoice_apply_query_ds">
<a:fields>
<a:fields>
<a:field name="invoice_apply_num"/>
<a:field name="invoice_apply_date"/>
<a:field name="invoice_apply_user_n" lovGridHeight="320" lovHeight="500"
......@@ -132,12 +136,15 @@
</a:mapping>
</a:field>
<a:field name="invoice_apply_user"/>
<a:field name="wfl_apply_status_n" displayField="code_value_name" options="acr610_invoice_apply_status_ds"
<a:field name="wfl_apply_status_n" displayField="code_value_name"
options="acr610_invoice_apply_status_ds"
returnField="wfl_apply_status" valueField="code_value"/>
</a:fields>
</a:dataSet>
<a:dataSet id="acr610_invoice_result_ds" autoPageSize="true" autoQuery="true"
model="acr.ACR610.acr_invoice_apply_query" queryUrl="${/request/@context_path}/autocrud/acr.ACR610.acr_invoice_apply_query/query?apply_mode=APPLY" queryDataSet="acr610_invoice_apply_query_ds"
model="acr.ACR610.acr_invoice_apply_query"
queryUrl="${/request/@context_path}/autocrud/acr.ACR610.acr_invoice_apply_query/query?apply_mode=APPLY"
queryDataSet="acr610_invoice_apply_query_ds"
selectable="true" selectionModel="single">
<a:events>
<a:event name="select" handler="acr610_invoice_result_select"/>
......@@ -154,19 +161,27 @@
</a:screenTopToolbar>
<a:form marginWidth="200" padding="0" title="销项发票申请">
<a:hBox labelSeparator=" ">
<a:textField name="invoice_apply_num" bindTarget="acr610_invoice_apply_query_ds" prompt="申请编号" width="135"/>
<a:datePicker name="invoice_apply_date" bindTarget="acr610_invoice_apply_query_ds" prompt="申请时间" width="135"/>
<a:lov name="invoice_apply_user_n" bindTarget="acr610_invoice_apply_query_ds" prompt="申请人" width="135"/>
<a:comboBox name="wfl_apply_status_n" bindTarget="acr610_invoice_apply_query_ds" prompt="申请状态" width="135"/>
<a:textField name="invoice_apply_num" bindTarget="acr610_invoice_apply_query_ds" prompt="申请编号"
width="135"/>
<a:datePicker name="invoice_apply_date" bindTarget="acr610_invoice_apply_query_ds" prompt="申请时间"
width="135"/>
<a:lov name="invoice_apply_user_n" bindTarget="acr610_invoice_apply_query_ds" prompt="申请人"
width="135"/>
<a:comboBox name="wfl_apply_status_n" bindTarget="acr610_invoice_apply_query_ds" prompt="申请状态"
width="135"/>
</a:hBox>
</a:form>
<a:grid id="acr610_invoice_update_grid_ds" bindTarget="acr610_invoice_result_ds" marginHeight="250" marginWidth="30" navBar="true">
<a:grid id="acr610_invoice_update_grid_ds" bindTarget="acr610_invoice_result_ds" marginHeight="135"
marginWidth="30" navBar="true">
<a:columns>
<a:column name="invoice_apply_num" lock="true" prompt="申请编号" renderer="acr610_apply_num_render" align="center" width="150"/>
<a:column name="invoice_apply_num" lock="true" prompt="申请编号" renderer="acr610_apply_num_render"
align="center" width="150"/>
<a:column name="invoice_apply_date" prompt="申请日期" align="center" width="100"/>
<a:column name="invoice_apply_user_n" prompt="申请人" align="center" width="100"/>
<a:column name="total_amount" prompt="开票总金额" align="right" renderer="acr610_formatMoney" width="100"/>
<a:column name="net_amount" prompt="不含税总金额" align="right" renderer="acr610_formatMoney" width="100"/>
<a:column name="total_amount" prompt="开票总金额" align="right" renderer="acr610_formatMoney"
width="100"/>
<a:column name="net_amount" prompt="不含税总金额" align="right" renderer="acr610_formatMoney"
width="100"/>
<a:column name="tax_amount" prompt="税额总金额" align="right" renderer="acr610_formatMoney" width="150"/>
<a:column name="wfl_apply_status_n" prompt="申请状态" align="center" width="150"/>
</a:columns>
......
src/main/webapp/modules/acr/ACR620/acr_invoice_reverse_apply_detail.lview
View file @ 6d1717f7
......@@ -114,7 +114,10 @@
}
function acr620_invoice_reverse_load(ds, record, index) {
if(ds.data[0].data.vat_interface_status && ds.data[0].data.vat_interface_status == 'UNTRANSFERED'){
debugger;
//reverse_method: "REVERSE"
//if(ds.data[0].data.vat_interface_status && ds.data[0].data.vat_interface_status == 'UNTRANSFERED'){
if(ds.data[0].data.reverse_method && ds.data[0].data.reverse_method == 'REVERSE'){
ds.data[0].getField('reverse_method_n').setReadOnly(true);
}
}
......@@ -159,7 +162,7 @@
<a:comboBox name="reverse_method_n" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="反冲方式" width="135"/>
</a:hBox>
</a:form>
<a:grid id="acr620_invoice_reverse_detail_grid_ds" bindTarget="acr620_invoice_reverse_detail_result_ds" marginHeight="250"
<a:grid id="acr620_invoice_reverse_detail_grid_ds" bindTarget="acr620_invoice_reverse_detail_result_ds" marginHeight="135"
marginWidth="30" navBar="true">
<a:columns>
<a:column name="document_number" lock="true" prompt="单据编号" align="center" renderer="acr620_detail_renderer" width="120"/>
......@@ -174,6 +177,8 @@
<a:column name="invoice_status_n" prompt="发票状态" align="center" width="100"/>
<a:column name="vat_interface_status_n" prompt="金税状态" align="center" width="100"/>
<a:column name="accounting_date" prompt="记账日期" renderer="Leaf.formatDate" align="center" width="100"/>
<a:column name="claim_status_n" prompt="认领状态" width="85" align="center"/>
<a:column name="reversed_flag_n" prompt="反冲标志" align="center" width="80"/>
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/acr/ACR620/acr_invoice_reverse_apply_detail_wfl.lview
View file @ 6d1717f7
......@@ -136,7 +136,7 @@
</a:form>
<a:switch test="/parameter/@button_flag">
<a:case value="YES">
<a:grid id="acr620_invoice_reverse_detail_grid_ds" bindTarget="acr620_invoice_reverse_detail_result_ds" marginHeight="250"
<a:grid id="acr620_invoice_reverse_detail_grid_ds" bindTarget="acr620_invoice_reverse_detail_result_ds" marginHeight="135"
marginWidth="30" navBar="true">
<a:columns>
<a:column name="document_number" lock="true" prompt="单据编号" align="center" renderer="acr620_detail_renderer" width="120"/>
......@@ -159,7 +159,7 @@
</a:grid>
</a:case>
<a:case value="*">
<a:grid id="acr620_invoice_reverse_detail_grid_ds" bindTarget="acr620_invoice_reverse_detail_result_ds" marginHeight="250"
<a:grid id="acr620_invoice_reverse_detail_grid_ds" bindTarget="acr620_invoice_reverse_detail_result_ds" marginHeight="200"
marginWidth="30" navBar="true">
<a:columns>
<a:column name="document_number" lock="true" prompt="单据编号" align="center" renderer="acr620_detail_renderer" width="120"/>
......@@ -174,6 +174,8 @@
<a:column name="invoice_status_n" prompt="发票状态" align="center" width="100"/>
<a:column name="vat_interface_status_n" prompt="金税状态" align="center" width="100"/>
<a:column name="accounting_date" prompt="记账日期" renderer="Leaf.formatDate" align="center" width="100"/>
<a:column name="claim_status_n" prompt="认领状态" width="85" align="center"/>
<a:column name="reversed_flag_n" prompt="反冲标志" align="center" width="80"/>
</a:columns>
</a:grid>
</a:case>
......
src/main/webapp/modules/acr/ACR620/acr_invoice_reverse_apply_query.lview
View file @ 6d1717f7
......@@ -152,7 +152,7 @@
<a:comboBox name="vat_interface_status_n" bindTarget="acr620_invoice_reverse_apply_query_ds" prompt="金税状态" width="135"/>
</a:hBox>
</a:form>
<a:grid id="acr620_invoice_reverse_update_grid_ds" bindTarget="acr620_invoice_reverse_result_ds" marginHeight="250" marginWidth="30" navBar="true">
<a:grid id="acr620_invoice_reverse_update_grid_ds" bindTarget="acr620_invoice_reverse_result_ds" marginHeight="200" marginWidth="30" navBar="true">
<a:columns>
<a:column name="invoice_apply_num" lock="true" prompt="申请编号" renderer="acr620_apply_num_render" align="center" width="150"/>
<a:column name="invoice_apply_date" prompt="申请日期" align="center" width="100"/>
......
src/main/webapp/modules/cont/CON3500/contract_ifrs9_report_query.lview
View file @ 6d1717f7
......@@ -179,8 +179,8 @@
},
url: url,
title: '承租人最大逾期天数',
width: 600,
height: 400
width: 900,
height: 600
}).on('close', function () {
null;
});
......
src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview
View file @ 6d1717f7
......@@ -308,13 +308,14 @@
debugger;
// var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract');
var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'con_contract');
var req_reason_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'con_contract_change_req');
var req_record = $(req_ds_id).getCurrentRecord();
var case_type = '';
var document_type = '${/parameter/@document_type}';
var calc_session_id = req_record.get('calc_session_id');
//计算标志
var offset_flag=req_record.get('offset_flag');
if (req_record.dirty == true) {
if (req_record.dirty == true|| $(req_reason_ds_id).getCurrentRecord().dirty == true) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
......
src/main/webapp/modules/gld/FND5800/gld_period_status.lview
View file @ 6d1717f7
......@@ -103,26 +103,26 @@
}
function doQuery() {
$('close_open_ds').setQueryParameter('period_set_code', '${/model/fieldset/record/@period_set_code}');
$('close_open_ds').query();
}
// function doQuery() {
// $('close_open_ds').setQueryParameter('period_set_code', '${/model/fieldset/record/@period_set_code}');
// $('close_open_ds').query();
//
// }
function find_index() {
var close_open_ds = $('close_open_ds');
var ds_length = close_open_ds.getAll().length;
var internal_period_num_max = close_open_ds.getCurrentRecord(0).get('internal_period_num_max');
var record = close_open_ds.find('internal_period_num', internal_period_num_max);
var index = close_open_ds.indexOf(record);
index = index + 3;
// var close_open_ds = $('close_open_ds');
// var ds_length = close_open_ds.getAll().length;
// var internal_period_num_max = close_open_ds.getCurrentRecord(0).get('internal_period_num_max');
// var record = close_open_ds.find('internal_period_num', internal_period_num_max);
// var index = close_open_ds.indexOf(record);
// index = index + 3;
// 如果查询的数据是倒数第一条至倒数第三条，则直接定位到倒数第一条
if (index > ds_length) {
close_open_ds.locate(ds_length);
} else {
close_open_ds.locate(index);
}
// if (index > ds_length) {
// close_open_ds.locate(ds_length);
// } else {
// close_open_ds.locate(index);
// }
}
function monthly_closed_flag_save(){
......@@ -147,7 +147,7 @@
<a:field name="company_short_name" prompt="FND_COMPANIES.COMPANY_SHORT_NAME" readOnly="true"/>
</a:fields>
</a:dataSet>
<a:dataSet id="close_open_ds" autoQuery="true" fetchAll="true" model="gld.FND5800.gld_period_status_u_query" queryDataSet="status_fieldset_ds" queryUrl="${/request/@context_path}/autocrud/gld.FND5800.gld_period_status_u_query/query?period_set_code=${/model/fieldset/record/@period_set_code}">
<a:dataSet selectable="true" selectionModel="single" id="close_open_ds" autoQuery="true" fetchAll="true" model="gld.FND5800.gld_period_status_u_query" queryDataSet="status_fieldset_ds" queryUrl="${/request/@context_path}/autocrud/gld.FND5800.gld_period_status_u_query/query?period_set_code=${/model/fieldset/record/@period_set_code}">
<a:fields>
<a:field name="monthly_closed_flag_desc" displayField="code_value_name" options="monthly_closed_flag_ds" returnField="monthly_closed_flag" valueField="code_value"/>
</a:fields>
......@@ -166,7 +166,7 @@
<a:textField name="period_set_name" bindTarget="status_fieldset_ds"/>
<a:textField name="company_short_name" bindTarget="status_fieldset_ds"/>
</a:fieldSet>
<a:grid id="close_open_grid" bindTarget="close_open_ds" marginHeight="165" marginWidth="30">
<a:grid id="close_open_grid" bindTarget="close_open_ds" marginHeight="165" marginWidth="30" >
<a:columns>
<a:column name="period_year" align="center" prompt="GLD_PERIODS.PERIOD_YEAR" sortable="true" width="100"/>
<a:column name="period_num" align="center" prompt="FND_DIMENSIONS.DIMENSION_SEQUENCE" sortable="true" width="80"/>
......
src/main/webapp/modules/prj/PRJ500N/javascripts/input_validator.js
View file @ 6d1717f7
......@@ -174,7 +174,7 @@ changeFivteenToEighteen = function(card) {
function checkMobile(str) {
// var re = /^1\d{10}$/;
//var re=/^(0[0-9]{2,3}\-)?([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$|(^(13[0-9]|15[0|3|6|7|8|9]|18[8|9])\d{8}$)/;
var re=/^((0\d{2,3}-\d{7,8})|(1[358476]\d{9}))$/;
var re=/^((0\d{2,3}-\d{7,8})|(1[3584769]\d{9}))$/;
if (re.test(str)) {
return true;
} else {
......
src/main/webapp/modules/zjwfl/zj_wfl_workflow.lview
View file @ 6d1717f7
......@@ -87,6 +87,8 @@
</a:mapping>
</a:field>
<a:field name="sub_category_desc" displayField="code_value_name" options="sub_category_ds" returnField="sub_category" valueField="code_value"/>
<a:field name="enabled_flag_desc" defaultValue="是" displayField="code_value_name" options="yes_no_ds" returnField="enabled_flag" valueField="code_value"/>
<a:field name="enabled_flag" defaultValue="Y"/>
</a:fields>
</a:dataSet>
<a:dataSet id="workflowDs" autoPageSize="true" autoQuery="true" model="zjwfl.zj_wfl_workflow" queryDataSet="para_workflowDs" selectable="true">
......@@ -118,11 +120,12 @@
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:form column="4" labelWidth="80" marginWidth="30" title="查询条件">
<a:form column="5" labelWidth="80" marginWidth="30" title="查询条件">
<a:lov name="workflow_type_code" bindTarget="para_workflowDs" prompt="工作流类型"/>
<a:textField name="workflow_code" bindTarget="para_workflowDs" maxLength="200" prompt="工作流代码" typeCase="upper"/>
<a:textField name="workflow_desc" bindTarget="para_workflowDs" maxLength="2000" prompt="工作流描述"/>
<a:comboBox name="sub_category_desc" bindTarget="para_workflowDs" prompt="主从属性"/>
<a:comboBox name="enabled_flag_desc" bindTarget="para_workflowDs" prompt="是否启用"/>
</a:form>
<a:hBox>
<a:button click="workflowDs_query" text="HAP_QUERY"/>
......
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