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

src/main/webapp/WEB-INF/classes/prj/PRJ501N/prj_project_history_display.lwm

@@ -20,7 +20,8 @@
        t1.bp_id,
        t1.description,
        t1.project_id,
-       t1.contract_id
+       t1.contract_id,
+       t1.bp_category
   FROM prj_project_history_lv t1
 WHERE t1.bp_id = ${@bp_id}
 and  t1.project_id <> ${@project_id})   tt

src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview

@@ -44,7 +44,8 @@
                 url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_history_display.lview"/>
         <a:model-query fetchAll="true" model="prj.PRJ500D.prj_occu_object_display" rootPath="occu_object"/>
         <a:link id="prj_two_secondary_lease_link_id" model="prj.PRJ501N.insert_two_secondary_lease" modelaction="update"/>
-
+        <a:link id="${/parameter/@layout_code}contract_number_query_link"
+                url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
         <script type="text/javascript"><![CDATA[
       //  alert('${/parameter/@division}')
         //add by zhuxianfei
@@ -126,6 +127,7 @@
                                 draggable: true
                             });
                             win.on('close', function () {
+
                                 $(quotation_ds_id).query();
                                 $(history_ds_id).query();
 
@@ -166,6 +168,7 @@
                             draggable: true
                         });
                         win.on('close', function () {
+
                             $(quotation_ds_id).query();
                             $(history_ds_id).query();
                         });
@@ -272,7 +275,30 @@
             hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}');
         }
 
+        function prj501n_project_number_renderer(id, name, query_only){
+            var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
+            var param = {};
+            param['bp_id'] = record.get('project_id');
+            param['bp_class'] = record.get('bp_class');
+            param['function_code'] = 'PRJ501D';
+            param['function_usage'] = 'QUERY';
+            param['maintain_type'] = 'READONLY';
+            param['winid'] = '${/parameter/@layout_code}_project_number_win_id';
+            param['prj_bp_id'] = record.get('prj_bp_id');
+
+            hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}project_number_query_link', record.ds.id, '${/parameter/@layout_code}');
+        }
+        function prj501n_contract_number_renderer(id, name, query_only){
+            var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
+            var param = {};
+            param['contract_id'] = record.get('contract_id');
+            param['function_code'] = 'CON301';
+            param['function_usage'] = 'QUERY';
+            param['winid'] = '${/parameter/@layout_code}_project_number_win_id';
+            param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
+            hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}contract_number_query_link', record.ds.id, '${/parameter/@layout_code}');
 
+        }
 
 
         /*保存前调用，生成项目编号*/
@@ -331,7 +357,6 @@
                 link_function = 'prj501n_upload_file';
                 return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
             } else if (name == 'attach_file_name') {
-
                 if (value != null) {
                     var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
                     var str = value.split(';;');
@@ -354,13 +379,16 @@
                     return url;
 
                 }
-            } else if (name = 'bp_link') {
+            }  else if (name == 'bp_link' && !record.isNew) {
                 link_function = 'prj501n_bp_code_renderer';
-                if (record.get('bp_id')) {
-                    return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
-                } else {
-                    return '';
-                }
+                return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
+            }else if(name=='project_number'){
+                link_function = 'prj501n_project_number_renderer';
+                return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + value+ '</a>';
+
+            }else if(name =='contract_number'){
+                link_function = 'prj501n_contract_number_renderer';
+                return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + value+ '</a>';
             }
         };