Commit 03f2cbe9 authored by homunculus's avatar homunculus

Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into feature/bp_create_feature

# Conflicts:
#	src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
#	src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
parent 6b7eb3d3
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
<!-- <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="ar510n_cashflow_ds" autoPageSize="true" autoQuery="false" 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="发票抬头"/>
......
<?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
...@@ -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