Merge branch 'refs/heads/feature/agent' into develop

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain.lview

@@ -10,6 +10,8 @@
         ]]>
     </a:init-procedure>
     <a:view>
+        <a:link id="${/parameter/@layout_code}con_contract_query_link"
+                url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
         <a:link id="con_contract_terminate_link_id" model="cont.CON560.con_contract_terminate"
                 modelaction="batch_update"/>
         <a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/>
@@ -47,9 +49,19 @@
             }, null, null);
         }
 
+        function open_contract_win(ds_id, record_id) {
+            var record = $(ds_id).findById(record_id);
+            var param = record.data;
+                param['function_code'] = 'CON301';
+                param['function_usage'] = 'QUERY';
+            param['winid'] = 'con_contract_modify_win_id';
+            param['download'] = 'Y';
+            param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
+            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id);
+        }
         function con560_render_contractMaintainDs_grid(value, record, name) {
             if (name == 'contract_number') {
-                return '<a href="javascript:con560_contractMaintainDs_grid_update(' + record.id + ');">' + value + '</a>';
+                return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
             }
         }
 

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain_wfl.lview

@@ -10,6 +10,8 @@
         ]]>
     </a:init-procedure>
     <a:view>
+        <a:link id="${/parameter/@layout_code}con_contract_query_link"
+                url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
         <a:link id="con_contract_terminate_link_id" model="cont.CON560.con_contract_terminate"
                 modelaction="batch_update"/>
         <a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/>
@@ -46,10 +48,20 @@
             //     return;
             // }, null, null);
         }
+        function open_contract_win(ds_id, record_id) {
+            var record = $(ds_id).findById(record_id);
+            var param = record.data;
+            param['function_code'] = 'CON301';
+            param['function_usage'] = 'QUERY';
+            param['winid'] = 'con_contract_modify_win_id';
+            param['download'] = 'Y';
+            param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
+            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id);
+        }
 
         function con560_render_contractMaintainDs_grid(value, record, name) {
             if (name == 'contract_number') {
-                return '<a href="javascript:con560_contractMaintainDs_grid_update(' + record.id + ');">' + value + '</a>';
+                return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
             }
         }