Commit bac965dc authored by 18083's avatar 18083

Merge remote-tracking branch 'origin/remote_dev' into remote_dev

parents d52d4e1c 4b596f28
...@@ -56,7 +56,8 @@ ...@@ -56,7 +56,8 @@
lower(t.lov_cascade_para2) lov_cascade_para2, lower(t.lov_cascade_para2) lov_cascade_para2,
lower(t.lov_cascade_para3) lov_cascade_para3, lower(t.lov_cascade_para3) lov_cascade_para3,
t.lower_limit, t.lower_limit,
t.upper_limit t.upper_limit,
(select h.source_doc_category from hls_fin_calculator_hd h where h.calc_session_id = ${@calc_session_id} )source_doc_category
from hls_fin_calc_config t,hls_price_list p from hls_fin_calc_config t,hls_price_list p
#WHERE_CLAUSE# #WHERE_CLAUSE#
order by t.display_order,t.column_name order by t.display_order,t.column_name
...@@ -64,6 +65,7 @@ ...@@ -64,6 +65,7 @@
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
<bm:fields> <bm:fields>
<bm:field name="source_doc_category" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="column_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_CODE"/> <bm:field name="column_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_CODE"/>
<bm:field name="column_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_NAME"/> <bm:field name="column_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_NAME"/>
<bm:field name="prompt" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROMPT"/> <bm:field name="prompt" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROMPT"/>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<a:view> <a:view>
<!-- <a:link id="hls_parameter_value_lov_link" url="${/request/@context_path}/modules/hls/HLS500/hls_parameter_value_lov.lview"/> --> <!-- <a:link id="hls_parameter_value_lov_link" url="${/request/@context_path}/modules/hls/HLS500/hls_parameter_value_lov.lview"/> -->
<a:link id="hls_fin_calculator_price_list" url="${/request/@context_path}/modules/hls/HLS500N/hls_fin_calculator_price_list_n.lview"/> <a:link id="hls_fin_calculator_price_list" url="${/request/@context_path}/modules/hls/HLS500N/hls_fin_calculator_price_list_n.lview"/>
<a:link id="hls_fin_calculator_update" url="${/request/@context_path}/modules/hls/HLS500N/hls_fin_calculator_update_n.lview"/> <a:link id="hls_fin_calculator_update" url="${/request/@context_path}/modules/hls/HLS500N/hls_fin_calculator_update_new.lview"/>
<style><![CDATA[ <style><![CDATA[
div.grid-cell.item-notBlank{ div.grid-cell.item-notBlank{
background: #fff9c2; background: #fff9c2;
......
...@@ -1599,7 +1599,7 @@ ...@@ -1599,7 +1599,7 @@
// unlock_calc_current_window(); // unlock_calc_current_window();
// return false; // return false;
//} //}
if (H54 < 0&&'${/parameter/@division}'!=91) { if (H54 < 0) {
Leaf.showMessage('${l:PROMPT}', '利率最低值不能低于4.75'); Leaf.showMessage('${l:PROMPT}', '利率最低值不能低于4.75');
unlock_calc_current_window(); unlock_calc_current_window();
return false; return false;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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