Merge remote-tracking branch 'origin/remote_dev' into remote_dev

src/main/webapp/modules/hls/HLS303/bp_agent_bounty_detail.lview

@@ -154,11 +154,12 @@
         }
         /* 时间戳转换为时间 */
         function timestampToTime(timestamp) {
+            debugger;
             timestamp = timestamp ? timestamp : null;
             var date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
             var Y = date.getFullYear();
-            var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
-            var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
+            var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : String(date.getMonth() + 1));
+            var D = (date.getDate() < 10 ? '0' + date.getDate() : String(date.getDate()));
             // var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
             // var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
             // var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
@@ -177,6 +178,16 @@
                 return check_flag;
             }
         }
+
+        //新增时调用(grid,table,gridBox)
+        window['${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) {
+            debugger;
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_comsn_policy_ln');
+            var record = $(ds_id).getAt(0);
+            if(record.get('finance_amount_from') ==undefined){
+                record.set('finance_amount_from',0);
+            }
+        };
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>