Merge branch 'feature/ifrs9_report' into develop

src/main/webapp/WEB-INF/classes/cont/CON3500/contract_ifrs9_report_temp.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+     SELECT t1.bp_code,
+                t1.bp_name,
+                t1.contract_number,
+                (t1.int_rate_display*100)||'%' int_rate_display,
+                t1.lease_start_date,
+                t1.contract_amount TOTAL_SIGN,
+                t1.pre_pay_amount  DOWN_PAYMENT,
+                t1.contract_principal_amount HD_USER_COL_N11,
+                (csh_write_off_pkg.get_ifr_overdue_amount(p_contract_id => t1.ref_contract_id,
+                       p_base_date => t1.base_date)) TOTAL_OVERDUE_AMOUNT,
+               (csh_write_off_pkg.get_overdue_day(p_contract_id => t1.ref_contract_id,
+                                                                   p_calc_date   => t1.base_date,
+                                                                   p_user_id     => 1))OVERDUE_MAX_DAYS,
+                t1.rest_amount RESIDUAL_CLAIMS,
+                t1.pay_date PAYDATE_1,
+                t1.pay_amount RESIDUAL_VALUE,
+                t1.industry_belonged INDUSTRY,
+                t1.lease_item_location LEASE_ITEM_LOCATION,
+                t1.base_date,
+                t1.created_by,
+                t1.creation_date,
+                t1.last_updated_by,
+                t1.last_update_date,
+                t1.ifrs_id,
+                t1.period_day period_name,
+                t1.ref_contract_id
+          FROM con_contract_ifrs9 t1
+          #WHERE_CLAUSE#
+                ]]>
+            </bm:query-sql>
+        </bm:operation>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+            	begin
+            		csh_write_off_pkg.update_ifrs9_col(
+        			 p_period_name =>${@period_name}
+        			 );
+            	end;
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:query-fields>
+        <bm:query-field name="period_name" queryExpression="t1.period_day=${@period_name}"/>
+<!--        <bm:query-field name="journal_date_to" queryExpression="to_char(t.journal_date,&apos;yyyy-mm-dd&apos;) &lt;= ${@journal_date_to}"/>-->
+<!--        <bm:query-field name="bp_id_agent_level1" queryExpression="t.bp_id_agent_level1=${@bp_id_agent_level1}"/>-->
+    </bm:query-fields>
+</bm:model>

src/main/webapp/modules/acr/ACR513/acr_invoice_confirm.lview

@@ -124,7 +124,7 @@
                  }
             for (var i=0;i<records.length;i++){
                 if (records[i].get('created_by') == ' ${/session/@user_id}') {
-                    Leaf.showMessage('提示', '确认人不能和开票人一样，请勿确认！');
+                    Leaf.showMessage('提示', '确认人不能和创建人一样，请勿确认！');
                     return;
                  }
                 if(records[i].get('invoice_status')!='CONFIRMING'){

src/main/webapp/modules/cont/CON3500/contract_ifrs9_report_query.lview

@@ -5,17 +5,50 @@
     <a:view>
         <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
                 modelaction="update"/>
+        <a:link id="save_ifrs9_report_link" model="cont.CON3500.contract_ifrs9_report_temp"
+                modelaction="update"/>
         <a:link id="${/parameter/@layout_code}con_contract_query_link"
                 url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
         <script type="text/javascript"><![CDATA[
 
-         console.log('${/parameter/@period_name}');
 
         Leaf.onReady(function(){
-            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_ifrs9');
             $(ds_id).setQueryParameter("period_name",'${/parameter/@period_name}');
             $(ds_id).query();
         })
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_ifrs9');
+            $(ds_id).setQueryUrl('${/request/@context_path}/autocrud/cont.CON3500.contract_ifrs9_report_temp/query');
+            $(ds_id).setQueryParameter('period_name','${/parameter/@period_name}');
+            $(ds_id).query();
+        }
+        //保存数据
+        window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
+           var period_name="${/parameter/@period_name}";
+            Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
+            Leaf.request({
+                url: $('save_ifrs9_report_link').getUrl(),
+                para: {
+                    period_name:period_name
+                },
+                success: function() {
+                    Leaf.SideBar.show({
+                        msg: '保存成功',
+                        duration: 2000
+                    });
+                    Leaf.Masker.unmask(Ext.getBody());
+                    $(ds_id).query();
+                },
+                failure: function() {
+                    Leaf.Masker.unmask(Ext.getBody());
+                },
+                error: function() {
+                    Leaf.Masker.unmask(Ext.getBody());
+                },
+                scope: this
+            });
+        }
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>