Merge branch 'contract_change_quotation' into develop

src/main/webapp/WEB-INF/classes/cont/CON_REPO001/calc_cashflow.lwm

@@ -4,7 +4,7 @@
         <bm:operation name="execute">
             <bm:update-sql><![CDATA[
                 BEGIN
-                cus_con_contract_repo_pkg.calc_repo_cashflows(p_contract_id=>${@contract_id},
+                con_change_single_calc_pkg.calc_repo_cashflows(p_contract_id=>${@contract_id},
                                                               p_user_id=>${/session/@user_id});
                 END;
                 ]]>

src/main/webapp/WEB-INF/classes/cont/CON_REPO001/con_change_calc_from_con.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                con_change_single_calc_pkg.con_single_calc(p_contract_id=>${@contract_id},
+                                                              p_user_id=>${/session/@user_id});
+                END;
+                ]]>
+            </bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/cont/CON_REPO001/con_change_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/cont/CON_REPO001/save_calc_from_con.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                con_change_single_calc_pkg.copy_contract_from_calcultor(p_contract_id=>${@contract_id},
+                                                              p_user_id=>${/session/@user_id});
+
+                END;
+                ]]>
+            </bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/cont/CON_REPO001/submit_change_req.lwm

@@ -2,10 +2,6 @@
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:operations>
         <bm:operation name="execute">
-            <bm:parameters>
-                <bm:parameter name="change_req_id" dataType="java.lang.Long" input="true" output="false"/>
-                <bm:parameter name="user_id" dataType="java.lang.Long" input="true" output="false"/>
-            </bm:parameters>
             <bm:update-sql><![CDATA[
                 begin
                     cus_con_contract_repo_pkg.submit_change_req_repo(p_change_req_id=>${@change_req_id},

src/main/webapp/WEB-INF/server-script/layoutconfig/con_buyback_03_g_result_queryfields.js

@@ -68,7 +68,7 @@ var override_queryfields = [
 var add_datafilters = [
     {
         name: "req_status",
-        expression: "t1.req_status = 'NEW' and Not Exists (Select 1 From prj_project p Where p.project_id = t1.project_id  And p.division = '09')"
+        expression: " Not Exists (Select 1 From prj_project p Where p.project_id = t1.project_id  And p.division = '09')"
     }
 //		{
 //			name : "ccr_document_type",

src/main/webapp/modules/cont/CON_REPO003/con_ccr_repo_modify_entrance.lview

@@ -55,14 +55,15 @@
                 var req_status = record.get('req_status');
                 param['change_req_id'] = record.get('contract_id');
                 param['contract_id'] = record.get('contract_id');
-                param['function_code'] = 'CON_REPO001D';
-                param['function_usage'] = 'MODIFY';
+
                 param['req_status'] = req_status;
                 param['url_title'] = '合同回购';
                 if (req_status == 'APPROVED' || req_status == 'APPROVING' || req_status == 'CANCEL') {
                     param['maintain_type'] = 'READONLY';
+                    param['function_code'] = 'CON_REPO001D_Q';
                 } else {
                     param['maintain_type'] = 'UPDATE';
+                    param['function_code'] = 'CON_REPO001D';
                 }
                 param['document_type'] = record.get('ccr_document_type');
                 hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_repo_change_link', ds_id);