Skip to content

L
leaf-hlcm
Commit 96bdbe5a authored by 陆正友's avatar 陆正友
Browse files
Options

进项修改

parent b6daa11b
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 37 deletions
src/main/webapp/WEB-INF/classes/acp/ACP522/acp_import_contract_lov.lwm
View file @ 96bdbe5a
......@@ -14,7 +14,7 @@
from (select c.contract_id,
c.contract_number,
c.contract_name,
c.business_type,
decode(c.business_type,'LEASE','直租') business_type,
c.search_term_1,
(SELECT description
FROM HLS_BUSINESS_TYPE_V a
......@@ -45,43 +45,30 @@
union
select c.contract_id,
c.contract_number,
c.contract_name,
c.business_type,
' ' contract_name,
decode(c.business_type, 'OTHERS', '经营性租赁') business_type,
c.search_term_1,
(SELECT description
FROM HLS_BUSINESS_TYPE_V a
WHERE a.business_type = c.business_type) business_type_n,
(select pp.project_number
from PRJ_PROJECT pp, prj_project_lease_item t2
where t2.source_project_id = pp.project_id
and c.project_id = t2.project_id) project_number,
c.contract_number project_number,
(select bp.bp_name
from hls_bp_master bp
where bp.bp_id =
(SELECT pp.bp_id_tenant
FROM PRJ_PROJECT pp,
prj_project_lease_item t2
where bp.bp_id = (SELECT pp.bp_id_tenant
FROM PRJ_PROJECT pp, prj_project_lease_item t2
WHERE t2.source_project_id = pp.project_id
and c.project_id = t2.project_id)) bp_id_tenant_n
from con_contract c,
con_contract_lease_item ci,
prj_project_lease_item pi,
prj_project pp
where c.contract_id = ci.contract_id
and ci.project_lease_item_id = pi.project_lease_item_id
and pi.source_project_id = pp.project_id
from con_contract c, con_contract_cashflow ccc, prj_project pp
where pp.project_id = c.project_id
and c.contract_id = ccc.contract_id
and c.data_class = 'NORMAL'
and c.contract_id =
con_contract_pkg.get_first_contract_id(pp.project_id)
and c.contract_status IN
('REPURING', 'ETING', 'INCEPT', 'PENDING')
and c.business_type = 'LEASEOPERAT'
and c.business_type = 'OTHERS'
and pp.purchase_type = 'RENTING'
and not exists
(select 1
from acp_invoice_ln an
where an.contract_id = c.contract_id
and an.confirmation_status in
('APPROVING', 'APPROVED'))) V
and an.confirmation_status in ('APPROVING', 'APPROVED'))) V
#WHERE_CLAUSE#
]]></bm:query-sql>
......@@ -89,13 +76,13 @@
</bm:operations>
<bm:fields>
<bm:field name="project_number" forDisplay="true" forQuery="true" prompt="采购单编号"/>
<bm:field name="contract_number" forDisplay="true" forQuery="true" prompt="ACR310.CONTRACT_NUMBER"/>
<!-- <bm:field name="project_number" forDisplay="true" forQuery="true" prompt="采购单编号"/>-->
<bm:field name="contract_number" forDisplay="true" forQuery="true" prompt="合同编号/采购单编号"/>
<bm:field name="contract_name" forDisplay="true" forQuery="true" prompt="ACR310.CONTRACT_NAME"/>
<bm:field name="contract_id"/>
<bm:field name="bp_id_tenant_n" forDisplay="true" forQuery="true" prompt="厂商"/>
<bm:field name="search_term_1" forDisplay="true" forQuery="true" prompt="厂商合同编号"/>
<bm:field name="business_type_n" forDisplay="true" forQuery="true" prompt="业务类型"/>
<!-- <bm:field name="bp_id_tenant_n" forDisplay="true" forQuery="true" prompt="厂商"/>-->
<!-- <bm:field name="search_term_1" forDisplay="true" forQuery="true" prompt="厂商合同编号"/>-->
<bm:field name="business_type" forDisplay="true" forQuery="true" prompt="业务类型"/>
<!-- <bm:field name="business_type" forDisplay="true" forQuery="true" prompt="业务类型"/>-->
</bm:fields>
......@@ -105,12 +92,12 @@
<!-- <bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="contract_id" />-->
<!-- </bm:fields>-->
<bm:query-fields>
<bm:query-field field="project_number" queryOperator="like"/>
<!-- <bm:query-field field="project_number" queryOperator="like"/>-->
<bm:query-field field="contract_number" queryOperator="like"/>
<bm:query-field field="contract_name" queryOperator="like"/>
<bm:query-field field="bp_id_tenant_n" queryOperator="like"/>
<bm:query-field field="search_term_1" queryOperator="like"/>
<bm:query-field field="business_type_n" queryOperator="like"/>
<!-- <bm:query-field field="bp_id_tenant_n" queryOperator="like"/>-->
<!-- <bm:query-field field="search_term_1" queryOperator="like"/>-->
<bm:query-field field="business_type" queryOperator="like"/>
<!-- <bm:query-field field="business_type" queryOperator="like"/>-->
......
src/main/webapp/modules/acp/ACP522/ap_invoice_import_scanning.lview
View file @ 96bdbe5a
......@@ -64,7 +64,9 @@
}
function acp522_save() {
var record=$('acp522_acp_invoice_import_detail_ds').getCurrentRecord();
if(record.get('business_type_n')=='经营性租赁'){
debugger;
console.log(record.get('business_type'));
if(record.get('business_type')=='经营性租赁'){
if($('acp522_acp_invoice_import_detail_ds').validate()){
$('ap_invoice_import_scanning').close();
var record=$('acp522_acp_invoice_import_detail_ds').getCurrentRecord();
......@@ -106,14 +108,14 @@
<a:dataSets>
<a:dataSet id="acp522_acp_invoice_import_detail_ds" autoCreate="true">
<a:fields>
<a:field name="contract_number" prompt="合同编号" required="true" lovGridHeight="350" lovHeight="580" lovWidth="990" lovLabelWidth="200"
<a:field name="contract_number" prompt="合同编号" required="true" lovGridHeight="350" lovHeight="550" lovWidth="550" lovLabelWidth="200"
lovService="acp.ACP522.acp_import_contract_lov"
title="SELECT_CONTRACT" autoComplete="true">
<a:mapping>
<a:map from="contract_number" to="contract_number"/>
<a:map from="contract_name" to="contract_name"/>
<a:map from="contract_id" to="contract_id"/>
<a:map from="business_type_n" to="business_type_n"/>
<a:map from="business_type" to="business_type"/>
</a:mapping>
</a:field>
</a:fields>
......
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