资管费一阶段问题调整

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT110/csh_transaction_maintain_query.lwm

@@ -100,7 +100,7 @@
         <bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/>
         <bm:field name="deposit_trans_type"/>
        <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
-        <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
+        <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
         <bm:field name="deposit_trans_type_desc"  expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/>
         <bm:field name="approval_status" expression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'))"/>
         <bm:field name="approval_status_desc" expression="(Select v.code_value_name From sys_code_values_v v Where v.code = &apos;WFL_STATUS&apos; And v.code_value = decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')))"/>

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

@@ -53,7 +53,7 @@
             }
              //让历史信息查询
             var history_con_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
-            if(history_con_id){
+            if($(history_con_id)){
             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();

src/main/webapp/modules/csh/CSH501C/csh_payment_asset_req.lview

@@ -58,6 +58,14 @@
                  document.getElementById('${/parameter/@layout_code}_submit_approval').style.display = "none";
              }
             }
+         if('${/parameter/@function_usage}' == 'QUERY'){
+            if($jq('#${/parameter/@layout_code}_AP_INVOICE_DETAIL_G_ADD_layout_dynamic_button_id')){
+                $jq('#${/parameter/@layout_code}_AP_INVOICE_DETAIL_G_ADD_layout_dynamic_button_id').hide();
+               }
+            if($jq('#${/parameter/@layout_code}_AP_INVOICE_DETAIL_G_DELETE_layout_dynamic_button_id')){
+               $jq('#${/parameter/@layout_code}_AP_INVOICE_DETAIL_G_DELETE_layout_dynamic_button_id').hide();
+              }
+         }
 
           //进项发票信息
         var first = document.getElementsByClassName("item-input-wrap");

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

@@ -1439,9 +1439,9 @@
                     record.getField('bp_id_n').setReadOnly(true);
                 }
             }
-             //现金流列表加载时隐藏资管费  18083
+            //现金流列表加载时隐藏资管费  18083
             if(cashflow_ds_id == ds.id &&cashflow_ds_id){
-               var hd_user_col_v06 = $(cashflow_ds_id).getAt(0).get('hd_user_col_v06');
+                //var hd_user_col_v06 = $(cashflow_ds_id).getAt(0).get('hd_user_col_v06');
               if('${/parameter/@asset_fee_flag}'=='N'||'${/parameter/@asset_fee_flag}'==''){
                 if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
@@ -1449,18 +1449,32 @@
                }
 
            }else{
-               if (check_empty(hd_user_col_v06)||hd_user_col_v06=='N' ) {
+            if(Ext.isEmpty($(cashflow_ds_id).getAt(0))){
+                 if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
+                    }
+               }else{
+               if (Ext.isEmpty($(cashflow_ds_id).getAt(0).get('hd_user_col_v06'))) {
                    if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
                     }
                }else{
+                   if($(cashflow_ds_id).getAt(0).get('hd_user_col_v06')=='N'){
+                    if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
+                    }
+                   }else{
                    if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
                    }
+                   }
 
                }
+               }
            }
         }
 

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview

@@ -1156,7 +1156,7 @@
             }
             //现金流列表加载时隐藏资管费  18083
             if(cashflow_ds_id == ds.id &&cashflow_ds_id){
-               var hd_user_col_v06 = $(cashflow_ds_id).getAt(0).get('hd_user_col_v06');
+                //var hd_user_col_v06 = $(cashflow_ds_id).getAt(0).get('hd_user_col_v06');
               if('${/parameter/@asset_fee_flag}'=='N'||'${/parameter/@asset_fee_flag}'==''){
                 if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
@@ -1164,18 +1164,32 @@
                }
 
            }else{
-               if (check_empty(hd_user_col_v06)||hd_user_col_v06=='N' ) {
+            if(Ext.isEmpty($(cashflow_ds_id).getAt(0))){
+                 if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
+                    }
+               }else{
+               if (Ext.isEmpty($(cashflow_ds_id).getAt(0).get('hd_user_col_v06'))) {
                    if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
                     }
                }else{
+                   if($(cashflow_ds_id).getAt(0).get('hd_user_col_v06')=='N'){
+                    if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
+                    }
+                   }else{
                    if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
                    }
+                   }
 
                }
+               }
            }
         }
 

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview

@@ -745,9 +745,9 @@
                     record.getField('bp_id_n').setReadOnly(true);
                 }
             }
-             //现金流列表加载时隐藏资管费  18083
-           if(cashflow_ds_id == ds.id &&cashflow_ds_id){
-               var hd_user_col_v06 = $(cashflow_ds_id).getAt(0).get('hd_user_col_v06');
+            //现金流列表加载时隐藏资管费  18083
+            if(cashflow_ds_id == ds.id &&cashflow_ds_id){
+                //var hd_user_col_v06 = $(cashflow_ds_id).getAt(0).get('hd_user_col_v06');
               if('${/parameter/@asset_fee_flag}'=='N'||'${/parameter/@asset_fee_flag}'==''){
                 if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
@@ -755,18 +755,32 @@
                }
 
            }else{
-               if (check_empty(hd_user_col_v06)||hd_user_col_v06=='N' ) {
+            if(Ext.isEmpty($(cashflow_ds_id).getAt(0))){
+                 if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
+                    }
+               }else{
+               if (Ext.isEmpty($(cashflow_ds_id).getAt(0).get('hd_user_col_v06'))) {
                    if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
                     }
                }else{
+                   if($(cashflow_ds_id).getAt(0).get('hd_user_col_v06')=='N'){
+                    if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
+                    $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
+                    }
+                   }else{
                    if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
                     $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
                    }
+                   }
 
                }
+               }
            }
         }