资管费测试问题调整

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

@@ -351,27 +351,7 @@
                 check_flag = false;
                 return;
             }
-            //付给代理店资产管理费总金额
-            var total_amount_agent = 0;
-            var total_apply_amount = 0;
-            var line_datas = $(ds_line_id).data;
-            var head_record = $(ds_id).getAt(0);
 
-            for (var i = 0; i < line_datas.length; i++) {
-                var line_data = line_datas[i];
-                //应付我司金额
-                var amount_agent = get_current_amount(line_data.get('amount_agent'));
-                var due_amount = get_current_amount(line_data.get('due_amount'));
-               //本次申请金额等于委托加我司加应付承租人金额
-                //var this_apply_amount = amount_agent;
-                total_apply_amount = plus(total_apply_amount, amount_agent);
-                line_data.set('amount', total_apply_amount);
-                total_amount_agent = plus(total_amount_agent, amount_agent);
-             }
-               //给头表赋值
-            $(ds_id).getAt(0).set('amount_agent_total', total_amount_agent);
-            $(ds_id).getAt(0).set('amount', total_apply_amount);
-            $(ds_id).getAt(0).set('company_id', '${/session/@company_id}');
             //确认保存
             var hd_record = $(ds_id).getCurrentRecord();
             var payment_req_id = hd_record.get('payment_req_id');

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

@@ -106,7 +106,6 @@
           }
 		
         window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () {
-
             var url;
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
             var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
@@ -248,6 +247,12 @@
                     if(check_empty(int_rate_display)){
                         int_rate_display=0;
                     }
+                    if(check_empty(cal_btb_int_rate)){
+                        cal_btb_int_rate =0;
+                    }
+                    if(check_empty(cal_int_rate_display)){
+                        cal_int_rate_display=0;
+                    }
                     if ((cal_hd_price_list == price_list&&'${/parameter/@asset_fee_flag}'=='N')
                     ||(cal_hd_price_list == price_list&&'${/parameter/@asset_fee_flag}'=='Y'&&cal_hd_user_col_v06==hd_user_col_v06
                         &&cal_btb_int_rate==btb_int_rate&&cal_int_rate_display==int_rate_display)) {

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

@@ -138,7 +138,6 @@
 
         //add by zhuxianfei
         window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () {
-
             var url;
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
             var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
@@ -290,6 +289,12 @@
                     if(check_empty(int_rate_display)){
                         int_rate_display=0;
                     }
+                    if(check_empty(cal_btb_int_rate)){
+                         cal_btb_int_rate =0;
+                    }
+                    if(check_empty(cal_int_rate_display)){
+                        cal_int_rate_display=0;
+                    }
                     if ((cal_hd_price_list == price_list&&'${/parameter/@asset_fee_flag}'=='N')
                         ||(cal_hd_price_list == price_list&&'${/parameter/@asset_fee_flag}'=='Y'&&cal_hd_user_col_v06==hd_user_col_v06
                             &&cal_btb_int_rate==btb_int_rate&&cal_int_rate_display==int_rate_display)) {

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

@@ -1169,7 +1169,7 @@
                     if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
                         document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
                     }
-                    if($('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
+                    if($('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                     $('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
                     $('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
                     }
@@ -1200,7 +1200,7 @@
                         $('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
                         $('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
                         }
-                        if( $('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').){
+                        if( $('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                         $('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
                         $('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
                         }