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

src/main/webapp/modules/cont/CON1380/con_commission_report.lview

@@ -5,7 +5,6 @@
         <a:link id="query_job" model="cont.CON1380.con1380_result_query_job" modelaction="update"/>
         <script><![CDATA[
         $L.onReady(function(){
-            debugger;
             var headers_ds = $('${/parameter/@layout_code}_F_QUERY__ds');
             var record = headers_ds.getCurrentRecord();
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_monthly_report_temp');
@@ -15,7 +14,6 @@
 
         //更新全量数据
         window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
-            debugger;
             var headers_ds = $('${/parameter/@layout_code}_F_QUERY__ds');
             var record = headers_ds.getAt(0);
             if (Ext.isEmpty(record.get('base_date'))) {
@@ -46,6 +44,15 @@
                 });
             }, null, 300, 150);
         };
+
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
+            var headers_ds = $('${/parameter/@layout_code}_F_QUERY__ds');
+            var record = headers_ds.getCurrentRecord();
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_monthly_report_temp');
+            $(ds_id).setQueryParameter('commission_month',record.get('base_date'));
+            $(ds_id).query();
+        };
+
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>