Merge branch 'contract' into develop

src/main/webapp/WEB-INF/classes/cont/CON500/con_contract_content_v.lwm

@@ -186,7 +186,7 @@
 			    CON_CONTRACT_CONTENT_V t1
 			WHERE
 			    t1.templet_code !='GH_WITHHOLD_AGREE'
-			    UNION ALL 
+			    UNION ALL
 		    SELECT
 			    t1.content_id,
 			    t1.contract_id,

src/main/webapp/WEB-INF/classes/cont/CON505/con_contract_content_save.lwm

@@ -46,5 +46,15 @@
             	end;
             ]]></bm:update-sql>
         </bm:operation>
+        <bm:operation name="delete">
+            <bm:update-sql><![CDATA[
+
+        			begin
+        				con_contract_content_pkg.delete_contract_content(p_content_id=>${@content_id},
+        																 p_user_id=>${/session/@user_id});
+        			end;
+
+        	]]></bm:update-sql>
+        </bm:operation>
     </bm:operations>
 </bm:model>

src/main/webapp/WEB-INF/server-script/contract_print_path.js

-var con_print_path = {
-	
-	'con_print_path' : '/u01/hls_file/excel/',
-	'tomcat_source':'hls_file'
-    
-	//'con_print_path'  : '//128.1.12.135/c/project/bcml_hls/print_save'
-		
-   //'con_print_path'	: '//128.1.18.17/bcml_hls/save_print'	
-};
-
-
-
 function print_insert_fnd_atm(type) {
 	var guid_file_name_path = $ctx.get('/model/guid_file_name_path')
-			.getChildren();
+		.getChildren();
+	var contract_file_path = $ctx.get('/model/contract_file_path')
+		.getChildren();
 	var file_name = $ctx.parameter.file_name + '.' + type;
-	var file_path = con_print_path['con_print_path']
-			+ guid_file_name_path[0].guid_file_name;
+
+	var file_path = contract_file_path[0].contract_file_path+encodeURI($ctx.parameter.file_name, 'utf-8')+'.'+ type;;
 	$bm('cont.CON500.con_sign_content_update').update( {
 		table_name : 'CON_CONTRACT_CONTENT',
 		content_id : $ctx.parameter.content_id,
 		file_name : file_name.toString(),
 		file_path : file_path.toString()
 	});
-}
+}
\ No newline at end of file
+var con_print_path = {
+	'con_print_path' : '/u01/hls_file/excel/'
+
+};
+
+
+function set_parameter_file_path(name) {
+	$ctx.parameter.file_path = '/u01/hls_file/excel/';
+};

src/main/webapp/modules/cont/CON505/con_contract_content_save.lsc

 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: gaoyang
+    $Date: 2013-7-26 上午10:29:11
+    $Revision: 1.0
+    $Purpose:
+-->
 <a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
     <a:init-procedure>
-        <a:batch-apply sourcepath="/parameter">
-            <p:switch test="@current_parameter/@_status">
-                <p:case value="update">
-                    <a:model-update model="cont.CON505.con_contract_content_save"/>
-                </p:case>
-                <p:case value="insert">
-                    <a:model-insert model="cont.CON505.con_contract_content_save"/>
-                </p:case>
-            </p:switch>
-        </a:batch-apply>
+        <a:model-batch-update model="cont.CON505.con_contract_content_save"/>
     </a:init-procedure>
     <a:service-output output="/parameter"/>
 </a:service>