Skip to content

L
leaf-hlcm
Commit a89398a1 authored by homunculus's avatar homunculus
Browse files
Options

Merge branch 'feature/bp_create_feature' into develop 

# Conflicts:
#	src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
[fix] 修改商业伙伴创建页面
parents 369548ab 03f2cbe9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 131 deletions
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm
View file @ a89398a1
......@@ -51,11 +51,30 @@
<bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String"
physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
<bm:field name="invoice_bp_tax_registry_num" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_method" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_way_n" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_frequency_n" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_object_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="invoice_title" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="object_taxpayer_type" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="invoice_bp_address_phone_num" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="invoice_bp_bank_account" databaseType="VARCHAR2" datatype="java.lang.String"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select t.cashflow_id,
t.bp_name,--承租人姓名
con.billing_method,--开票规则
con.billing_way_n,--开票方式
con.billing_frequency_n,--开票频率
aic.billing_object_name,--开票对象
t.invoice_title,--发票抬头
aic.object_taxpayer_type,--纳税人类型
t.invoice_bp_address_phone_num,--开票地址电话
t.invoice_bp_bank_account,--开户行及账号
t.record_id,
t.billing_object,
(select c.code_value_name
......@@ -141,10 +160,12 @@
t.invoice_bp_tax_registry_num
from acr_invoice_create_tmp t,
con_contract_v con,
con_contract_cashflow_all_v cf
con_contract_cashflow_all_v cf,
acr_invoice_contract_v aic
where t.session_id = ${/session/@session_id}
and t.contract_id = con.contract_id
and t.cashflow_id = cf.cashflow_id
and con.contract_id = aic.contract_id
order by con.contract_id,cf.times,t.cf_item
]]>
</bm:query-sql>
......
src/main/webapp/WEB-INF/classes/acr/ACR510N/acr_inovice_cf_v_n.lwm
View file @ a89398a1
......@@ -50,7 +50,7 @@
and cc.bp_id_agent_level1 = h.bp_id),
t2.tax_registry_num) OBJECT_TAX_REGISTRY_NUM,
nvl(t2.bill_object_bp_class,t1.BILL_OBJECT_BP_CLASS) BILL_OBJECT_BP_CLASS,
nvl(t2.bill_object_bp_class_DESC,t1.BILL_OBJECT_BP_CLASS_DESC) BILL_OBJECT_BP_CLASS_DESC,
nvl(t2.bill_object_bp_class_desc,t1.BILL_OBJECT_BP_CLASS_DESC) BILL_OBJECT_BP_CLASS_DESC,
t1.TAX_TYPE_VAT,
t1.DESCRIPTION,
--t1.INVOICE_TITLE,
......@@ -137,7 +137,7 @@
t1.inv_billing_object_name,
t1.small_scale_taxpayer
FROM ACR_INVOICE_CONTRACT_V t1, ACR_INVOICE_CONTRACT_CF_V t2
#WHERE_CLAUSE#
WHERE t2.due_date<sysdate
ORDER BY
t1.contract_id,
t2.times,
......@@ -341,7 +341,6 @@
<bm:query-field name="bill_flag"
queryExpression="(${@bill_flag} = 'Y' and t1.billing_frequency in (${@times_bill_flag},${@mid_bill_flag},${@final_bill_flag},${@et_bill_flag}) )"/>
<bm:query-field name="all_contract_number"
queryExpression="(t1.contract_number in (Select regexp_substr( replace(replace(replace(${@all_contract_number},chr(32)),chr(10)),chr(13)), '[^,]+', 1, Level) From dual Connect By regexp_substr(replace(replace(replace(${@all_contract_number},chr(32)),chr(10)),chr(13)), '[^,]+', 1, Level) Is Not Null) )"/>
<bm:query-field name="notreceived_amount_from"
......@@ -359,6 +358,7 @@
queryExpression="t1.bill_object_bp_class = ${@bill_object_bp_class}"/>
<bm:query-field name="contract_status"
queryExpression="t1.contract_status = ${@contract_status}"/>
<!-- <bm:query-field name="" queryExpression="t2.due_date &lt;= sysdate"/>-->
</bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query"
......@@ -366,10 +366,10 @@
<bm:data-filter enforceOperations="query" expression="t2.write_off_flag != &apos;NOT&apos;"/>
<bm:data-filter enforceOperations="query"
expression="t2.billing_status != &apos;FULL&apos; and t2.cf_direction=&apos;INFLOW&apos;"/>
<!-- <bm:data-filter enforceOperations="query"
<bm:data-filter enforceOperations="query"
expression="t2.contract_id = t1.contract_id AND t1.billing_status IN (&apos;NOT&apos;, &apos;PARTIAL&apos;) AND t1.contract_status not in (&apos;NEW&apos;,&apos;CANCEL&apos;) AND t2.cf_status = &apos;RELEASE&apos;"/>
<bm:data-filter enforceOperations="query" expression="(t2.times != 0)"/>-->
<bm:data-filter enforceOperations="query" expression="(t2.times != 0)"/>
<bm:data-filter enforceOperations="query"
expression="not (t2.cf_item = 301 and nvl(direct_sales_agent_flag,'N') = 'Y')"/>
......
src/main/webapp/modules/acr/ACR510/acr_invoice_select_cashflow.lview
View file @ a89398a1
......@@ -69,36 +69,36 @@
}
function onLoad_cashflowDs(ds) {
var hd_ds = $('contractDs'),
r = hd_ds.getCurrentRecord();
if (hd_ds.getSelected().indexOf(r) != -1) {
ds.selectAll.defer(5, ds);
}
}
// function onLoad_cashflowDs(ds) {
// var hd_ds = $('contractDs'),
// r = hd_ds.getCurrentRecord();
// if (hd_ds.getSelected().indexOf(r) != -1) {
// ds.selectAll.defer(5, ds);
// }
// }
var isSelectFromLine = false;
function onSelect_contractDs(ds, record) {
ds.locate(ds.indexOf(record) + 1);
if (!isSelectFromLine) {
$('cashflowDs').selectAll();
}
}
function unselect_contractDs(ds, record) {
ds.locate(ds.indexOf(record) + 1);
$('cashflowDs').unSelectAll();
}
function onSelect_invoiceLineDs(ds, record) {
record.dirty = true;
isSelectFromLine = true;
$('contractDs').select($('contractDs').getCurrentRecord());
isSelectFromLine = false;
}
function unSelect_invoiceLineDs(ds, record) {
record.dirty = false;
}
// function onSelect_contractDs(ds, record) {
// ds.locate(ds.indexOf(record) + 1);
// if (!isSelectFromLine) {
// $('cashflowDs').selectAll();
// }
//
// }
// function unselect_contractDs(ds, record) {
// ds.locate(ds.indexOf(record) + 1);
// $('cashflowDs').unSelectAll();
// }
// function onSelect_invoiceLineDs(ds, record) {
// record.dirty = true;
// isSelectFromLine = true;
// $('contractDs').select($('contractDs').getCurrentRecord());
// isSelectFromLine = false;
// }
// function unSelect_invoiceLineDs(ds, record) {
// record.dirty = false;
// }
function render_contractDs_grid(value, record, name) {
if (name == 'billing_object_name') {
......@@ -109,7 +109,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="contractDs" autoQuery="true" fetchAll="true" model="acr.ACR510.acr_invoice_contract_v"
<a:dataSet id="contractDs" autoQuery="false" fetchAll="false" model="acr.ACR510.acr_invoice_contract_v"
queryDataSet="conditionDs"
queryUrl="${/request/@context_path}/autocrud/acr.ACR510.acr_invoice_contract_v/query?company_id=${/parameter/@company_id}"
selectable="true">
......@@ -129,21 +129,21 @@
</a:mapping>
</a:field>
</a:fields>
<a:events>
<a:event name="select" handler="onSelect_contractDs"/>
<a:event name="unselect" handler="unselect_contractDs"/>
</a:events>
<!-- <a:events>-->
<!-- <a:event name="select" handler="onSelect_contractDs"/>-->
<!-- <a:event name="unselect" handler="unselect_contractDs"/>-->
<!-- </a:events>-->
</a:dataSet>
<a:dataSet id="cashflowDs" bindName="line_info" bindTarget="contractDs" fetchAll="true"
model="acr.ACR510.acr_invoice_contract_cf_v" selectable="true">
<a:fields>
<a:field name="last_received_date" datatype="date"/>
</a:fields>
<a:events>
<a:event name="load" handler="onLoad_cashflowDs"/>
<a:event name="select" handler="onSelect_invoiceLineDs"/>
<a:event name="unselect" handler="unSelect_invoiceLineDs"/>
</a:events>
<!-- <a:events>-->
<!-- <a:event name="load" handler="onLoad_cashflowDs"/>-->
<!-- <a:event name="select" handler="onSelect_invoiceLineDs"/>-->
<!-- <a:event name="unselect" handler="unSelect_invoiceLineDs"/>-->
<!-- </a:events>-->
</a:dataSet>
</a:dataSets>
<a:screenBody>
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_billing.lview 0 → 100644
View file @ a89398a1
<?xml version="1.0" encoding="UTF-8"?>
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
<a:init-procedure/>
<a:view>
<!-- <a:link id="BmLink_MainScreen_functionHit" model="sys.sys_page_function_visit" modelaction="update"/>-->
<script><![CDATA[
//退出按钮
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
$('hls_bp_master_billing').close();
}
Leaf.onReady(function () {
var billing_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'hls_bp_master');
// console.log($(billing_ds));
$(billing_ds).setQueryParameter("bp_id","${/parameter/@bp_id}");
$(billing_ds).query();
}
)
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
\ No newline at end of file
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify_entrance.lview
View file @ a89398a1
......@@ -59,7 +59,7 @@
});
}
stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_BP_RESULT', 'hls_bp_master');
// stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_BP_RESULT', 'hls_bp_master');
function open_bp_modify_win(ds_id, record_id) {
......
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