Merge branch 'baojiapeizhi' into develop

src/main/webapp/WEB-INF/classes/hls/HLS500/hls_fin_calc_single_variable_calc.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: gaoyang  
+    $Date: 2013-4-24 上午10:17:59  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+            	begin
+            		  aux_single_variable_calc_pkg.calc_real_rate(p_calc_session_id =>${@calc_session_id},
+                                              p_user_id => ${/session/@user_id},
+                                              p_msg => ${@msg});
+            	end;
+            ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="msg" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@msg"/>
+            </bm:parameters>
+        </bm:operation>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+            	begin
+            		  aux_single_variable_calc_pkg.manual_trial_after_calc(p_calc_session_id =>${@calc_session_id},
+                                              p_user_id => ${/session/@user_id},
+                                              p_msg => ${@msg});
+            	end;
+            ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="msg" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@msg"/>
+            </bm:parameters>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/hls/HLS500/hls_fin_calculator_calc.lwm

@@ -15,7 +15,8 @@
             			p_document_category=>${@document_category},
             			p_user_id        =>${/session/@user_id}
             		);
-            		hls_fin_calculator_itfc_pkg.calculate(
+
+            	hls_fin_calculator_itfc_pkg.calculate(
             			p_calc_session_id=>${@calc_session_id},
             			p_recreate_H_formula=>${@recreate_H_formula},
             			p_recreate_L_formula=>${@recreate_L_formula},

src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview

@@ -36,6 +36,8 @@
         <a:link id="con_approval_link_id" model="cont.CON505.contract_approval" modelaction="execute"/>
         <link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
         <script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>
+        <a:link id="${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_calculator_update_link_id"
+                url="${/request/@context_path}/modules/hls/HLS500N/hls_fin_calculator_update_n.lview"/>
         <script type="text/javascript"><![CDATA[
         Ext.ux.Lightbox.register('a[ref=img]', true);
         function lock_current_window() {
@@ -470,6 +472,50 @@
 
         }
 
+        window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () {
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
+            var cashflow_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_cashflow');
+            var record = $(ds_id).getCurrentRecord();
+            var price_list = record.get('price_list');
+            var calc_session_id = record.get('calc_session_id');
+            var parent_pk_value = record.get('contract_id');
+            var calc_type = '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR';
+            var maintain_type='QUERY'
+            if (calc_session_id) {
+                //直接进入报价页面
+                var win = new Leaf.Window({
+                    id: 'hls_fin_calc_quotation_update_link_winid',
+                    params: {
+                        document_id: parent_pk_value,
+                        price_list: price_list,
+                        document_category: 'CONTRACT',
+                        contract_status:record.get('contract_status'),
+                        maintain_type: 'MODIFY',
+                        calc_session_id: record.get('calc_session_id'),
+                        quotation_id: record.get('quotation_id'),
+                        dsId: cashflow_ds_id,
+                        winId: 'hls_fin_calc_quotation_update_link_winid',
+                        global_flag: 'Y',
+                        id_num: 1,
+                        calc_type: calc_type,
+                        recreate_L_formula: 'N'
+                    },
+                    url: $('${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_calculator_update_link_id').getUrl(),
+                    fullScreen: true,
+                    draggable: true
+                });
+                win.on('close', function () {
+                    $(cashflow_ds_id).query();
+                    $(ds_id).query();
+                });
+
+
+            }
+        }
+
+
+    ;
+
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview

@@ -234,7 +234,6 @@
                             draggable: true
                         });
                         win.on('close', function () {
-                            debugger;
                             $(quotation_ds_id).query();
                             $(history_ds_id).query();
                         });
@@ -285,7 +284,6 @@
                                     draggable: true
                                 });
                                 win.on('close', function () {
-
                                     $(quotation_ds_id).query();
                                     $(history_ds_id).query();