Merge branch 'feature/租后变更开发' into develop

src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview

@@ -47,10 +47,12 @@
         };
         //新增和加载时调用form
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
-            if('${/parameter/@layout_code}'=='CON_REPO001D') {
+            if('${/parameter/@function_code}'=='CON_REPO001D') {
+
                 var repurchase_types = record.get('repurchase_types');
                 if (repurchase_types == 'ONE_TIME_REPURCHASE') {
                     record.set('payment_period', 1);
+                    record.getField('payment_period').setReadOnly(true);
                     record.getField('price_list').setReadOnly(true);
                     record.getField('price_list_n').setReadOnly(true);
                 } else {
@@ -220,7 +222,7 @@
                     record.set('repurchase_count_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
                 }
                 // 手续费
-                if (name == 'repurchase_service_charges'&&value) {
+                if (name == 'repurchase_service_charges'&&value>=0) {
                     var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
                         , record.get('residual_value') || 0);
                     var repurchase_tatal_amount = plus(plus(repurchase_count_amount, value || 0), record.get('fund_possession_cost') || 0);
@@ -228,7 +230,7 @@
                     record.set('repurchase_count_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
                 }
                 // 资金占用费value
-                if (name == 'fund_possession_cost'&&value) {
+                if (name == 'fund_possession_cost'&&value>=0) {
                     var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
                         , record.get('residual_value') || 0);
                     var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), value || 0);
@@ -268,7 +270,7 @@
                             record.set('due_amount', res.result.due_amount || 0);
                             record.set('ccr_due_amount', res.result.due_amount || 0);
                             record.set('offset_flag', 'N');
-                            record.set('fund_possession_cost', res.result.fund_possession_cost || 0);
+                            //record.set('fund_possession_cost', res.result.fund_possession_cost || 0);
                         },
                         failure: function () {
                             record.set('last_rent_due_date', '');
@@ -279,7 +281,7 @@
                             record.set('sum_unreceived_principal', '');
                             record.set('due_amount', '');
                             record.set('ccr_due_amount', '');
-                            record.set('fund_possession_cost', 0);
+                           // record.set('fund_possession_cost', 0);
                         },
                         error: function () {
                             record.set('repurchase_date', '');
@@ -290,7 +292,7 @@
                             record.set('sum_unreceived_principal', '');
                             record.set('due_amount', '');
                             record.set('ccr_due_amount', '');
-                            record.set('fund_possession_cost', 0);
+                           // record.set('fund_possession_cost', 0);
                         },
                         scope: this
                     });

src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview

@@ -1687,7 +1687,8 @@ debugger;
                     recreate_H_formula = 'N';
                     recreate_L_formula = 'N';
                     //open_after_save_execute();
-                    hls_hls500_user_button2();
+                    //hls_hls500_user_button2();
+                    unlock_calc_current_window();
                 },
                 failure: function() {
                     unlock_calc_current_window();