Merge remote-tracking branch 'origin/master'

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

@@ -9,10 +9,49 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-      select * from(
-       select *
-       FROM con_contract_history_lv t1
-       WHERE t1.bp_id = ${@bp_id} )tt
+--代理店权限(自然人)
+select *
+  from con_contract_history_lv t
+ where t.Id_Card_No =
+       (select hbm.id_card_no from hls_bp_master hbm where hbm.bp_id = ${@bp_id})
+   and t.unit_id in (select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id})
+   and t.Id_Card_No is not null
+   and exists(
+select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id} and vv.POSITION_TYPE = 'SALES'
+   )
+union all
+--非代理店(自然人)
+select *
+  from con_contract_history_lv t
+ where t.Id_Card_No =
+       (select hbm.id_card_no from hls_bp_master hbm where hbm.bp_id = ${@bp_id})
+   and t.Id_Card_No is not null
+   and  not exists(
+select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id} and vv.POSITION_TYPE = 'SALES'
+   )
+union all
+--代理店(法人)
+select *
+  from con_contract_history_lv t
+ where t.social_code = (select hbm.social_code
+                          from hls_bp_master hbm
+                         where hbm.bp_id = ${@bp_id})
+   and t.unit_id in (select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id})
+   and t.Id_Card_No is not null
+   and exists(
+select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id} and vv.POSITION_TYPE = 'SALES'
+   )
+union all
+--非代理店(法人)
+select *
+  from con_contract_history_lv t
+ where t.social_code = (select hbm.social_code
+                          from hls_bp_master hbm
+                         where hbm.bp_id = ${@bp_id})
+   and t.Id_Card_No is not null
+   and not exists(
+select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id} and vv.POSITION_TYPE = 'SALES'
+   )
 #WHERE_CLAUSE#
             ]]></bm:query-sql>
         </bm:operation>

src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview

@@ -53,6 +53,12 @@
                 $(ds_con_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
                 $(ds_con_id).query();
             }
+            //让历史信息查询
+            var history_con_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
+            var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?bp_id=${/parameter/@bp_id}';
+            $(history_con_id).setQueryUrl(url);
+            $(history_con_id).query();
+
             if('${/model/get_contract_division/record/@division}' !='70' && '${/model/get_contract_division/record/@division}' != ''){
             if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE")){
             document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE_prompt").style.display = "none";
@@ -159,7 +165,8 @@
                     if(name=='bp_id_tenant'){
                         //让历史信息查询
                         var history_con_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
-                        $(history_con_id).setQueryParameter('bp_id', value);
+                        var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?bp_id='+value;
+                        $(history_con_id).setQueryUrl(url);
                         $(history_con_id).query();
                         var tennat_score_ds_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
                         var tenant_score_record=$(tennat_score_ds_id).getAt(0);
@@ -460,7 +467,6 @@
                 }
             //add by xsh35973 调整后不为默认值高亮显示
             //调整后逾期罚息
-            debugger;
             var ds_id_req = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_change_req');
             if (ds_id_req == ds.id && ds_id_req) {
                 if(record.get('document_type')=='REPUR_CHAG'|| record.get('document_type')=='ET_CHAG'){
@@ -890,7 +896,8 @@
             var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item');
             if(ds.id == lease_ds_id&&lease_ds_id){
                 var gridId= ds.bindname+'_layout_grid_id';
-                if(record.data.division=='70' || record.data.division=='92'){
+                var division =$(project_ds_id).getAt(0).get('division');
+                if(division=='70' || division=='92'){
                     $(gridId).hideColumn('full_name');
                     $(gridId).hideColumn('machine_number');
                 }else {

src/main/webapp/modules/zjwfl/zj_wfl_approve_history.lview

@@ -53,6 +53,16 @@
                 });
             }
 
+        function open_downloadfile_win_acr_reverse(instance_id) {
+            new Leaf.Window({
+                id: 'zj_wfl_approve_history_downloadfile_win',
+                url: $('prj_attach_downloadfile_link').getUrl() + '?table_name=ZJ_WFL_INSTANCE_ACR_REVERSE&header_id=' + instance_id,
+                title: '附件查看',
+                width: 850,
+                height: 400
+            });
+        }
+
         function open_uploadfile_win(rcpt_record_id) {
             new Leaf.Window({
                 id: 'zj_wfl_approve_history_downloadfile_win',
@@ -72,31 +82,38 @@
                 height: 400
             });
         }
-            
-            function attachement_renderer(value, record, name) {
-                if (record.get('rcpt_record_id')) {
-                    if(record.get('workflow_code') == 'DCFL_CSH_PAYMENT_REQ' &&
-                        record.get('instance_status') == '10' &&
-                        record.get('node_sequence_num') == '10'){
 
-                        if(record.get('role_code') == '0014' && record.get('attach_count') == 0){
-                            return '<a href="javascript:open_uploadonlyfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
-                        }else if(record.get('role_code') == '0014' && record.get('attach_count') >0){
-                            return '<a style="color:red" href="javascript:open_uploadonlyfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
-                        }else if((record.get('role_code') == 'HAND'||record.get('role_code') =='0017') && record.get('attach_count') == 0) {
-                            return '<a href="javascript:open_uploadfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
-                        }else if((record.get('role_code') == 'HAND'||record.get('role_code') =='0017')&& record.get('attach_count') > 0){
-                            return '<a style="color:red" href="javascript:open_uploadfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
-                        }
+        function attachement_renderer(value, record, name) {
+            if (record.get('rcpt_record_id')) {
+                if(record.get('workflow_code') == 'DCFL_CSH_PAYMENT_REQ' &&
+                    record.get('instance_status') == '10' &&
+                    record.get('node_sequence_num') == '10'){
 
+                    if(record.get('role_code') == '0014' && record.get('attach_count') == 0){
+                        return '<a href="javascript:open_uploadonlyfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
+                    }else if(record.get('role_code') == '0014' && record.get('attach_count') >0){
+                        return '<a style="color:red" href="javascript:open_uploadonlyfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
+                    }else if((record.get('role_code') == 'HAND'||record.get('role_code') =='0017') && record.get('attach_count') == 0) {
+                        return '<a href="javascript:open_uploadfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
+                    }else if((record.get('role_code') == 'HAND'||record.get('role_code') =='0017')&& record.get('attach_count') > 0){
+                        return '<a style="color:red" href="javascript:open_uploadfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
                     }
 
+                }
+                if(record.get('workflow_code') == 'ACR_INVOICE_REVERSE_WFL'){
                     if (record.get('attach_count') > 0) {
-                        return '<a style="color:red" href="javascript:open_downloadfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
+                        return '<a style="color:red" href="javascript:open_downloadfile_win_acr_reverse(' + record.get('instance_id') + ')">附件查看</a>';
+                    }else{
+                        return '<a href="javascript:open_downloadfile_win_acr_reverse(' + record.get('instance_id') + ')">附件查看</a>';
                     }
-                    return '<a href="javascript:open_downloadfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
                 }
+
+                if (record.get('attach_count') > 0) {
+                    return '<a style="color:red" href="javascript:open_downloadfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
+                }
+                return '<a href="javascript:open_downloadfile_win(' + record.get('rcpt_record_id') + ')">附件查看</a>';
             }
+        }
             
             function prj_atm_renderer(value, record, name) {
                 if (record.get('rcpt_record_id')) {