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

src/main/webapp/modules/cont/CON311/con_contract_update_print_word_detail.lview

@@ -75,8 +75,8 @@
                 url: $('con_contract_create_content_link_id').getUrl(),
                 para: {
                     contract_id: '${/parameter/@contract_id}',
-                    content_type: '${/parameter/@content_type}',
-                    templet_usage: 'CON_SALE'
+                    content_type: '${/parameter/@content_type}'
+                  /*  templet_usage: 'CON_SALE'*/
                 },
                 success: function(res) {
                     var result_ds = $('con_contract_update_print_detail_line_ds');
@@ -102,7 +102,7 @@
 
         function update_attachment_renderer(value, record, name) {
             var content_id = record.get('content_id');
-            return '<a href="javascript:downloadfile_link(' + content_id + ')">下载</a>';
+            return '<a href="javascript:downloadfile_link(' + content_id +')">下载</a>';
         }
 
         function downloadfile_link(content_id) {
@@ -219,8 +219,8 @@
                     <a:column name="bp_category_desc" prompt="HLS.BP_CATEGORY"/>
                     <a:column name="content_print_flag_name" prompt="CON505.CON_CONTENT_STATUS" width="80"/>
                     <a:column name="attachment" align="center" prompt="HLS.ATTACHMENT" renderer="update_attachment_renderer" width="50"/>
-                    <a:column align="center" prompt="附件上传" renderer="attachment_upload" width="80"/>
-                    <a:column name="file_name" align="left" prompt="附件名" renderer="con500_link_render" width="220"/>
+                  <!--  <a:column align="center" prompt="附件上传" renderer="attachment_upload" width="80"/>
+                    <a:column name="file_name" align="left" prompt="附件名" renderer="con500_link_render" width="220"/>-->
                 </a:columns>
             </a:grid>
         </a:screenBody>

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

@@ -216,10 +216,16 @@
             param['document_category'] = 'BP';
             param['bp_class'] = record.get('bp_class');
             param['bp_category'] = record.get('bp_category');
-            param['bp_type'] = record.get('bp_type');
+            if( record.get('bp_category')=='AGENT'){
+                param['function_code'] = 'HLS303_Q';
+                param['function_usage'] = 'QUERY';
+            }else{
                 param['function_code'] = 'CON505H';
                 param['function_usage'] = 'QUERY';
-            param['maintain_type'] = 'QUERY';
+            }
+            param['bp_type'] = record.get('bp_type');
+
+
             param['url_title'] = '${l:HLS212.BP_MASTER_QUERY}';
             hls_doc_get_layout_code('${/parameter/@layout_code}_con_contract_get_layout_code_link_id', param, 'con505_hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}');
         };