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
Show 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 @@ ...@@ -51,11 +51,30 @@
<bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String" <bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String"
physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/> 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="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:fields>
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select t.cashflow_id, 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.record_id,
t.billing_object, t.billing_object,
(select c.code_value_name (select c.code_value_name
...@@ -141,10 +160,12 @@ ...@@ -141,10 +160,12 @@
t.invoice_bp_tax_registry_num t.invoice_bp_tax_registry_num
from acr_invoice_create_tmp t, from acr_invoice_create_tmp t,
con_contract_v con, 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} where t.session_id = ${/session/@session_id}
and t.contract_id = con.contract_id and t.contract_id = con.contract_id
and t.cashflow_id = cf.cashflow_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 order by con.contract_id,cf.times,t.cf_item
]]> ]]>
</bm:query-sql> </bm:query-sql>
......
src/main/webapp/WEB-INF/classes/acr/ACR510N/acr_inovice_cf_v_n.lwm
View file @ a89398a1
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
and cc.bp_id_agent_level1 = h.bp_id), and cc.bp_id_agent_level1 = h.bp_id),
t2.tax_registry_num) OBJECT_TAX_REGISTRY_NUM, 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,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.TAX_TYPE_VAT,
t1.DESCRIPTION, t1.DESCRIPTION,
--t1.INVOICE_TITLE, --t1.INVOICE_TITLE,
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
t1.inv_billing_object_name, t1.inv_billing_object_name,
t1.small_scale_taxpayer t1.small_scale_taxpayer
FROM ACR_INVOICE_CONTRACT_V t1, ACR_INVOICE_CONTRACT_CF_V t2 FROM ACR_INVOICE_CONTRACT_V t1, ACR_INVOICE_CONTRACT_CF_V t2
#WHERE_CLAUSE# WHERE t2.due_date<sysdate
ORDER BY ORDER BY
t1.contract_id, t1.contract_id,
t2.times, t2.times,
...@@ -341,7 +341,6 @@ ...@@ -341,7 +341,6 @@
<bm:query-field name="bill_flag" <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}) )"/> 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" <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) )"/> 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" <bm:query-field name="notreceived_amount_from"
...@@ -359,6 +358,7 @@ ...@@ -359,6 +358,7 @@
queryExpression="t1.bill_object_bp_class = ${@bill_object_bp_class}"/> queryExpression="t1.bill_object_bp_class = ${@bill_object_bp_class}"/>
<bm:query-field name="contract_status" <bm:query-field name="contract_status"
queryExpression="t1.contract_status = ${@contract_status}"/> queryExpression="t1.contract_status = ${@contract_status}"/>
<!-- <bm:query-field name="" queryExpression="t2.due_date &lt;= sysdate"/>-->
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" <bm:data-filter enforceOperations="query"
...@@ -366,10 +366,10 @@ ...@@ -366,10 +366,10 @@
<bm:data-filter enforceOperations="query" expression="t2.write_off_flag != &apos;NOT&apos;"/> <bm:data-filter enforceOperations="query" expression="t2.write_off_flag != &apos;NOT&apos;"/>
<bm:data-filter enforceOperations="query" <bm:data-filter enforceOperations="query"
expression="t2.billing_status != &apos;FULL&apos; and t2.cf_direction=&apos;INFLOW&apos;"/> 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;"/> 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" <bm:data-filter enforceOperations="query"
expression="not (t2.cf_item = 301 and nvl(direct_sales_agent_flag,'N') = 'Y')"/> 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 @@ ...@@ -69,36 +69,36 @@
} }
function onLoad_cashflowDs(ds) { // function onLoad_cashflowDs(ds) {
var hd_ds = $('contractDs'), // var hd_ds = $('contractDs'),
r = hd_ds.getCurrentRecord(); // r = hd_ds.getCurrentRecord();
if (hd_ds.getSelected().indexOf(r) != -1) { // if (hd_ds.getSelected().indexOf(r) != -1) {
ds.selectAll.defer(5, ds); // ds.selectAll.defer(5, ds);
} // }
} // }
var isSelectFromLine = false; var isSelectFromLine = false;
function onSelect_contractDs(ds, record) { // function onSelect_contractDs(ds, record) {
ds.locate(ds.indexOf(record) + 1); // ds.locate(ds.indexOf(record) + 1);
if (!isSelectFromLine) { // if (!isSelectFromLine) {
$('cashflowDs').selectAll(); // $('cashflowDs').selectAll();
} // }
//
} // }
function unselect_contractDs(ds, record) { // function unselect_contractDs(ds, record) {
ds.locate(ds.indexOf(record) + 1); // ds.locate(ds.indexOf(record) + 1);
$('cashflowDs').unSelectAll(); // $('cashflowDs').unSelectAll();
} // }
function onSelect_invoiceLineDs(ds, record) { // function onSelect_invoiceLineDs(ds, record) {
record.dirty = true; // record.dirty = true;
isSelectFromLine = true; // isSelectFromLine = true;
$('contractDs').select($('contractDs').getCurrentRecord()); // $('contractDs').select($('contractDs').getCurrentRecord());
isSelectFromLine = false; // isSelectFromLine = false;
} // }
function unSelect_invoiceLineDs(ds, record) { // function unSelect_invoiceLineDs(ds, record) {
record.dirty = false; // record.dirty = false;
} // }
function render_contractDs_grid(value, record, name) { function render_contractDs_grid(value, record, name) {
if (name == 'billing_object_name') { if (name == 'billing_object_name') {
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
]]></script> ]]></script>
<a:dataSets> <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" queryDataSet="conditionDs"
queryUrl="${/request/@context_path}/autocrud/acr.ACR510.acr_invoice_contract_v/query?company_id=${/parameter/@company_id}" queryUrl="${/request/@context_path}/autocrud/acr.ACR510.acr_invoice_contract_v/query?company_id=${/parameter/@company_id}"
selectable="true"> selectable="true">
...@@ -129,21 +129,21 @@ ...@@ -129,21 +129,21 @@
</a:mapping> </a:mapping>
</a:field> </a:field>
</a:fields> </a:fields>
<a:events> <!-- <a:events>-->
<a:event name="select" handler="onSelect_contractDs"/> <!-- <a:event name="select" handler="onSelect_contractDs"/>-->
<a:event name="unselect" handler="unselect_contractDs"/> <!-- <a:event name="unselect" handler="unselect_contractDs"/>-->
</a:events> <!-- </a:events>-->
</a:dataSet> </a:dataSet>
<a:dataSet id="cashflowDs" bindName="line_info" bindTarget="contractDs" fetchAll="true" <a:dataSet id="cashflowDs" bindName="line_info" bindTarget="contractDs" fetchAll="true"
model="acr.ACR510.acr_invoice_contract_cf_v" selectable="true"> model="acr.ACR510.acr_invoice_contract_cf_v" selectable="true">
<a:fields> <a:fields>
<a:field name="last_received_date" datatype="date"/> <a:field name="last_received_date" datatype="date"/>
</a:fields> </a:fields>
<a:events> <!-- <a:events>-->
<a:event name="load" handler="onLoad_cashflowDs"/> <!-- <a:event name="load" handler="onLoad_cashflowDs"/>-->
<a:event name="select" handler="onSelect_invoiceLineDs"/> <!-- <a:event name="select" handler="onSelect_invoiceLineDs"/>-->
<a:event name="unselect" handler="unSelect_invoiceLineDs"/> <!-- <a:event name="unselect" handler="unSelect_invoiceLineDs"/>-->
</a:events> <!-- </a:events>-->
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
......
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ a89398a1
...@@ -60,9 +60,9 @@ ...@@ -60,9 +60,9 @@
$('acr_invoice_select_cashflow').close(); $('acr_invoice_select_cashflow').close();
} }
function contractDs_grid_clear() { // function contractDs_grid_clear() {
$('contractDs_grid').clear(); // $('contractDs_grid').clear();
} // }
function allConditionDs_reset() { function allConditionDs_reset() {
$('allConditionDs').reset(); $('allConditionDs').reset();
...@@ -304,11 +304,13 @@ ...@@ -304,11 +304,13 @@
<a:field name="notbilling_amount_from" defaultValue="0.01"/> <a:field name="notbilling_amount_from" defaultValue="0.01"/>
<a:field name="__async__" defaultValue="Y" prompt="异步导出"/> <a:field name="__async__" defaultValue="Y" prompt="异步导出"/>
</a:fields> </a:fields>
<a:events> <!-- <a:events>-->
<a:event name="update" handler="acr510n_query_update"/> <!-- <a:event name="update" handler="acr510n_query_update"/>-->
</a:events> <!-- <a:event name="select" handler="onSelect_contractDs"/>-->
<!-- <a:event name="unselect" handler="unselect_contractDs"/>-->
<!-- </a:events>-->
</a:dataSet> </a:dataSet>
<a:dataSet id="ar510n_cashflow_ds" autoPageSize="true" autoQuery="true" fetchAll="false" <a:dataSet id="ar510n_cashflow_ds" autoPageSize="true" autoQuery="false"
model="acr.ACR510N.acr_inovice_cf_v_n" queryDataSet="allConditionDs" selectable="true"> model="acr.ACR510N.acr_inovice_cf_v_n" queryDataSet="allConditionDs" selectable="true">
<a:fields> <a:fields>
<a:field name="invoice_title" required="true" prompt="发票抬头"/> <a:field name="invoice_title" required="true" prompt="发票抬头"/>
...@@ -332,14 +334,19 @@ ...@@ -332,14 +334,19 @@
</a:field> </a:field>
<a:field name="__async__" defaultValue="Y" prompt="异步导出"/> <a:field name="__async__" defaultValue="Y" prompt="异步导出"/>
</a:fields> </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:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:screenTopToolbar> <a:screenTopToolbar>
<a:screenTitle/> <a:screenTitle/>
<a:gridButton click="contractDs_grid_query" text="HLS.QUERY"/> <a:gridButton click="contractDs_grid_query" text="HLS.QUERY"/>
<a:gridButton click="allConditionDs_reset" text="重置条件"/> <a:gridButton click="allConditionDs_reset" text="重置"/>
<a:gridButton click="contractDs_grid_clear" text="ACR510.BUTTON.CLEAR_CONTRACT"/> <!-- <a:gridButton click="contractDs_grid_clear" text="ACR510.BUTTON.CLEAR_CONTRACT"/>-->
<a:gridButton click="invoiceHd_confirm" text="ACR510.BUTTON.COMFIRM"/> <a:gridButton click="invoiceHd_confirm" text="ACR510.BUTTON.COMFIRM"/>
<!--<a:gridButton click="acr510n_excel" text="导出"/>--> <!--<a:gridButton click="acr510n_excel" text="导出"/>-->
</a:screenTopToolbar> </a:screenTopToolbar>
...@@ -354,6 +361,7 @@ ...@@ -354,6 +361,7 @@
<a:checkBox name="mid_bill_flag" bindTarget="allConditionDs" prompt="年中开票"/> <a:checkBox name="mid_bill_flag" bindTarget="allConditionDs" prompt="年中开票"/>
<a:checkBox name="final_bill_flag" bindTarget="allConditionDs" prompt="年末开票"/> <a:checkBox name="final_bill_flag" bindTarget="allConditionDs" prompt="年末开票"/>
<a:checkBox name="et_bill_flag" bindTarget="allConditionDs" prompt="结清开票"/> <a:checkBox name="et_bill_flag" bindTarget="allConditionDs" prompt="结清开票"/>
</a:formToolBar> </a:formToolBar>
<a:formBody> <a:formBody>
<a:hBox> <a:hBox>
...@@ -374,7 +382,6 @@ ...@@ -374,7 +382,6 @@
<a:lov name="cf_item_desc" bindTarget="allConditionDs" prompt="HLS.RECEIVE_PROJECT"/> <a:lov name="cf_item_desc" bindTarget="allConditionDs" prompt="HLS.RECEIVE_PROJECT"/>
<a:comboBox name="billing_way_n" bindTarget="allConditionDs" prompt="开票方式"/> <a:comboBox name="billing_way_n" bindTarget="allConditionDs" prompt="开票方式"/>
</a:hBox> </a:hBox>
<a:hBox> <a:hBox>
<a:numberField name="notreceived_amount_from" allowDecimals="true" decimalPrecision="2" bindTarget="allConditionDs" prompt="未收金额从"/> <a:numberField name="notreceived_amount_from" allowDecimals="true" decimalPrecision="2" bindTarget="allConditionDs" prompt="未收金额从"/>
...@@ -384,7 +391,6 @@ ...@@ -384,7 +391,6 @@
<a:numberField name="notbilling_amount_to" allowDecimals="true" decimalPrecision="2" bindTarget="allConditionDs" <a:numberField name="notbilling_amount_to" allowDecimals="true" decimalPrecision="2" bindTarget="allConditionDs"
prompt="未开金额到"/> prompt="未开金额到"/>
</a:hBox> </a:hBox>
<a:hBox> <a:hBox>
<a:textField name="inv_billing_object_name" bindTarget="allConditionDs" prompt="代理商"/> <a:textField name="inv_billing_object_name" bindTarget="allConditionDs" prompt="代理商"/>
...@@ -405,115 +411,85 @@ ...@@ -405,115 +411,85 @@
</a:queryForm> </a:queryForm>
<a:tabPanel id="acr510n_detail_tabpanel_id" marginHeight="140" marginWidth="30"> <a:tabPanel id="acr510n_detail_tabpanel_id" marginHeight="140" marginWidth="30">
<a:tabs> <a:tabs>
<a:tab prompt="明细信息" width="120"> <a:tab prompt="开票信息" width="120">
<a:grid id="acr510n_cashflowds_grid" bindTarget="ar510n_cashflow_ds" marginHeight="210" <a:grid id="contractDs_grid" bindTarget="ar510n_cashflow_ds" marginHeight="210" marginWidth="70" navBar="true">
marginWidth="70" navBar="true">
<a:toolBar> <a:toolBar>
<a:button type="excel"/> <a:button type="excel"/>
</a:toolBar> </a:toolBar>
<a:columns> <a:columns>
<!-- <a:column name="con_search_term_1" lock="true" prompt="合同号" width="150"/>-->
<a:column name="contract_number" lock="true" width="150" prompt="合同编号"/> <a:column name="contract_number" lock="true" width="150" prompt="合同编号"/>
<!-- <a:column name="lease_channel_desc" prompt="商业模式"/>--> <a:column name="contract_name" lock="true" width="150" prompt="合同名称"/>
<a:column name="inv_billing_object_name" prompt="代理商"/> <a:column name="inv_billing_object_name" prompt="代理店"/>
<a:column name="business_type_desc" prompt="业务类型"/> <a:column name="business_type_desc" prompt="业务类型"/>
<a:column name="lease_channel_desc" prompt="商业模式"/>
<a:column name="division_desc" prompt="产品线"/> <a:column name="division_desc" prompt="产品线"/>
<a:column name="times" align="center" width="40"/> <a:column name="times" align="right" lock="true" width="40" prompt="期数"/>
<a:column name="cf_item_desc"/> <a:column name="cf_item_desc" prompt="应收项目"/>
<a:column name="due_date" renderer="Leaf.formatDate"/> <a:column name="due_date" renderer="Leaf.formatDate" prompt="到期日"/>
<a:column name="last_received_date" renderer="Leaf.formatDate"/> <a:column name="last_received_date" renderer="Leaf.formatDate" prompt="收款日期"/>
<a:column name="due_amount" align="right" renderer="Leaf.formatMoney"/> <a:column name="due_amount" align="right" renderer="Leaf.formatMoney" prompt="应收金额"/>
<a:column name="principal" align="right" renderer="Leaf.formatMoney"/> <a:column name="principal" align="right" renderer="Leaf.formatMoney" prompt="本金"/>
<a:column name="interest" align="right" renderer="Leaf.formatMoney"/> <a:column name="interest" align="right" renderer="Leaf.formatMoney" prompt="利息"/>
<a:column name="received_amount" align="right" renderer="Leaf.formatMoney"/> <a:column name="received_amount" align="right" renderer="Leaf.formatMoney" prompt="已收金额"/>
<a:column name="received_principal" align="right" renderer="Leaf.formatMoney"/> <a:column name="received_principal" align="right" renderer="Leaf.formatMoney" prompt="已收本金"/>
<a:column name="received_interest" align="right" renderer="Leaf.formatMoney"/> <a:column name="received_interest" align="right" renderer="Leaf.formatMoney" prompt="已收利息"/>
<a:column name="notreceived_amount" align="right" prompt="未收金额" <a:column name="notreceived_amount" align="right" renderer="Leaf.formatMoney" prompt="未收金额"/>
<a:column name="notreceived_principal" align="right" renderer="Leaf.formatMoney" prompt="未收本金"/>
<a:column name="notreceived_interest" align="right" renderer="Leaf.formatMoney" prompt="未收利息"/>
<a:column name="billing_amount" align="right" prompt="已开票金额"
renderer="Leaf.formatMoney"/> renderer="Leaf.formatMoney"/>
<a:column name="notreceived_principal" align="right" prompt="未收本金" <a:column name="billing_principal" align="right" prompt="已开票本金"
renderer="Leaf.formatMoney"/> renderer="Leaf.formatMoney"/>
<a:column name="notreceived_interest" align="right" prompt="未收利息" <a:column name="billing_interest" align="right" prompt="已开票利息"
renderer="Leaf.formatMoney"/> renderer="Leaf.formatMoney"/>
<a:column name="billing_amount" align="right" renderer="Leaf.formatMoney"/> <a:column name="notbilling_amount" align="right" prompt="未开票金额"
<a:column name="billing_principal" align="right" renderer="Leaf.formatMoney"/>
<a:column name="billing_interest" align="right" renderer="Leaf.formatMoney"/>
<a:column name="notbilling_amount" align="right" prompt="未开金额"
renderer="Leaf.formatMoney"/> renderer="Leaf.formatMoney"/>
<a:column name="notbilling_principal" align="right" prompt="未开本金" <a:column name="notbilling_principal" align="right" prompt="未开票本金"
renderer="Leaf.formatMoney"/> renderer="Leaf.formatMoney"/>
<a:column name="notbilling_interest" align="right" prompt="未开利息" <a:column name="notbilling_interest" align="right" prompt="未开票利息"
renderer="Leaf.formatMoney"/> renderer="Leaf.formatMoney"/>
<a:column name="currency_desc" width="60"/> <a:column name="interest" align="right" renderer="Leaf.formatMoney" prompt="利息"/>
<a:column name="exchange_rate" align="right" width="80"/>
<a:column name="exchange_rate_type_desc" width="100"/>
</a:columns> </a:columns>
<a:editors>
<a:lov id="contractDs_grid_editor_lov"/>
<a:textField id="contractDs_grid_editor_tf"/>
</a:editors>
</a:grid> </a:grid>
</a:tab> </a:tab>
<a:tab prompt="开票信息" width="120">
<a:grid id="contractDs_grid" bindTarget="ar510n_cashflow_ds" marginHeight="210" <a:tab prompt="抬头信息" width="120">
marginWidth="70" <a:grid id="titleDs_grid" bindTarget="ar510n_cashflow_ds" marginHeight="210" marginWidth="70" navBar="true">
navBar="true">
<a:toolBar> <a:toolBar>
<a:button type="excel"/> <a:button type="excel"/>
</a:toolBar> </a:toolBar>
<a:columns> <a:columns>
<!-- <a:column name="con_search_term_1" lock="true" prompt="合同号" width="150"/>-->
<!-- <a:column name="project_name" autoAdjust="false" lock="true" showTitle="true" width="200"/> -->
<a:column name="contract_number" lock="true" width="150" prompt="合同编号"/> <a:column name="contract_number" lock="true" width="150" prompt="合同编号"/>
<a:column name="times" align="right" lock="true" width="40"/> <a:column name="contract_name" lock="true" width="150" prompt="合同名称"/>
<!-- <a:column name="serial_number" prompt="机编号" width="80"/>--> <a:column name="bp_name" prompt="承租人名称"/>
<a:column name="contract_status_desc" width="80"/> <a:column name="contract_status_desc" width="80" prompt="合同状态"/>
<a:column name="billing_method_desc" width="100"/> <a:column name="billing_method" prompt="开票规则"/>
<a:column name="billing_way_n" prompt="开票方式" width="80"/> <a:column name="billing_way_n" prompt="开票方式" width="80"/>
<a:column name="billing_frequency_n" prompt="开票频率" width="80"/> <a:column name="billing_frequency_n" prompt="开票频率" width="80"/>
<a:column name="billing_object_name" prompt="开票对象" autoAdjust="false" <a:column name="billing_object_name" prompt="开票对象" autoAdjust="false"
editor="contractDs_grid_editor_lov" renderer="render_contractDs_grid" editor="titleDs_grid_editor_lov" renderer="render_contractDs_grid"
showTitle="true" width="200"/> showTitle="true" width="200"/>
<a:column name="invoice_title" prompt="发票抬头" autoAdjust="false" editor="contractDs_grid_editor_tf" <a:column name="invoice_title" prompt="发票抬头" autoAdjust="false" editor="titleDs_grid_editor_tf"
showTitle="true" width="200"/> showTitle="true" width="200"/>
<a:column name="object_taxpayer_type" prompt="纳税人类型"/>
<a:column name="object_tax_registry_num" prompt="纳税人识别号" width="150" <a:column name="object_tax_registry_num" prompt="纳税人识别号" width="150"
editor="contractDs_grid_editor_tf"/> editor="titleDs_grid_editor_tf"/>
<a:column name="invoice_bp_address_phone_num" prompt="开票地址电话" autoAdjust="false" <a:column name="invoice_bp_address_phone_num" prompt="开票地址电话" autoAdjust="false"
editor="contractDs_grid_editor_tf" showTitle="true" width="200"/> editor="titleDs_grid_editor_tf" showTitle="true" width="200"/>
<a:column name="invoice_bp_bank_account" prompt="开户行及账号" autoAdjust="false" <a:column name="invoice_bp_bank_account" prompt="开户行及账号" autoAdjust="false"
editor="contractDs_grid_editor_tf" showTitle="true" width="150"/> editor="titleDs_grid_editor_tf" showTitle="true" width="150"/>
<a:column name="description" autoAdjust="false" editor="contractDs_grid_editor_tf" <a:column name="description" prompt="备注" autoAdjust="false" editor="titleDs_grid_editor_tf"
showTitle="true" width="200"/> showTitle="true" width="200"/>
<a:column name="object_taxpayer_type_desc"/>
<a:column name="contract_name" autoAdjust="false" showTitle="true" width="200"/>
<!-- <a:column name="inception_of_lease" renderer="Leaf.formatDate" width="80"/> -->
</a:columns> </a:columns>
<a:editors> <a:editors>
<a:lov id="contractDs_grid_editor_lov"/> <a:lov id="titleDs_grid_editor_lov"/>
<a:textField id="contractDs_grid_editor_tf"/> <a:textField id="titleDs_grid_editor_tf"/>
</a:editors> </a:editors>
</a:grid> </a:grid>
</a:tab> </a:tab>
<!--<a:tab prompt="导出" width="100">-->
<!--<a:grid id="contractDs_grid_forexport" bindTarget="ar510n_cashflow_ds" marginHeight="170"-->
<!--marginWidth="70" navBar="true">-->
<!--<a:toolBar>-->
<!--<a:button type="excel"/>-->
<!--</a:toolBar>-->
<!--<a:columns>-->
<!--<a:column name="contract_number" lock="true" prompt="合同编号" width="150"/>-->
<!--&lt;!&ndash; <a:column name="project_name" autoAdjust="false" lock="true" showTitle="true" width="200"/> &ndash;&gt;-->
<!--<a:column name="times" align="right" lock="true" width="40"/>-->
<!--&lt;!&ndash; <a:column name="serial_number" prompt="机编号" width="80"/>&ndash;&gt;-->
<!--<a:column name="cf_item_desc"/>-->
<!--<a:column name="due_amount"/>-->
<!--<a:column name="received_amount" align="right" renderer="Leaf.formatMoney"/>-->
<!--<a:column name="billing_amount" align="right" renderer="Leaf.formatMoney"/>-->
<!--<a:column name="need_bill_amount" align="right" prompt="应开票金额"-->
<!--renderer="Leaf.formatMoney"/>-->
<!--<a:column name="billing_object_name" autoAdjust="false" showTitle="true"-->
<!--width="200"/>-->
<!--<a:column name="invoice_title" autoAdjust="false" showTitle="true" width="200"/>-->
<!--<a:column name="object_tax_registry_num" width="150"/>-->
<!--</a:columns>-->
<!--</a:grid>-->
<!--</a:tab>-->
</a:tabs> </a:tabs>
</a:tabPanel> </a:tabPanel>
</a:screenBody> </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 @@ ...@@ -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) { 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