Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into develop

src/main/webapp/modules/acp/ACP522/ap_invoice_import.lview

@@ -4,23 +4,36 @@
     <a:view>
         <a:link id="hn9040_project_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
                 modelaction="update"/>
+        <a:link id="ap_invoice_import_detail_link"
+                url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_import_detail.lview"/>
         <script><![CDATA[
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
 
+        };
+
+        function ap_invoice_import_detail(){
+            var param = {};
+            param['function_code'] = 'ACP522I';
+            param['function_usage'] = 'MODIFY';
+            param['maintain_type'] = 'UPDATE';
+            param['url_title'] = '进项发票导入';
+            hls_doc_get_layout_code('hn9040_project_get_layout_code_link_id', param, 'ap_invoice_import_detail_link');
         }
 
         //超链接渲染
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
-            //
             var link_function = '';
             var invoice_line_id = record.get('invoice_line_id');
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
             if (name == 'attachment') {
                 return '<a href="javascript:attachment_window_open(\'' + invoice_line_id + '\',\'' + record.id + '\',\'' + record.ds.id + '\');">' + '上传' + '</a>';
             }
+            if(name == 'contract_number'){
+                return '<a href="javascript:ap_invoice_import_detail(\'' + invoice_line_id + '\',\'' + record.id + '\',\'' + record.ds.id + '\');">' + value + '</a>';
+            }
         };
 
-            ]]></script>
+        ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>
 </a:screen>
\ No newline at end of file

src/main/webapp/modules/acp/ACP523/ap_invoice_confirm.lview

@@ -4,9 +4,25 @@
     <a:view>
         <a:link id="hn9040_project_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
                 modelaction="update"/>
+        <a:link id="ap_invoice_confirm_link" model="acp.ACP523.ap_invoice_confirm" modelaction="update"/>
         <script><![CDATA[
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
-        }
+
+
+            Leaf.request({
+                url: $('ap_invoice_confirm_link').getUrl(),
+                scope: this,
+                success: function (res) {
+                    if (res.result.record) {
+                        var datas = res.result.record.overdue_amount;
+                        $jq("#con-overdue-week").append(formatCurrency(datas));
+                    } else {
+                        $jq("#con-overdue-week").append('￥3400.00');
+                    }
+                }
+            })
+
+        };
 
         //超链接渲染
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {

src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview

@@ -109,7 +109,6 @@
                 winNoMask();
                 return;
             }
-            debugger
             var datas = ds.getJsonData(true);
             for (var i = 0; i < datas.length; i++) {
                 datas[i].final_bill_flag = final_bill_flag;

src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview

@@ -17,11 +17,11 @@
             function acr512_invoice_query() {
                 $('acr512_invoice_result_ds').query();
             }
-            
+
             function acr512_invoice_reset() {
                 $('acr512_invoice_query_ds').reset();
             }
-            
+
             function acr512_grid_update(reocrd_id, invoice_hd_id, status) {
                 var maintain_type = 'UPDATE';
                 var currency_reocrd = $('acr512_invoice_result_ds').findById(reocrd_id);
@@ -33,15 +33,15 @@
                 param['url_title'] = '销项发票明细';
                 hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'acr512_invoice_update_page', 'acr512_invoice_result_ds');
             }
-            
+
             function acr512_document_number_render(value, record, name) {
                 return '<a href="javascript:acr512_grid_update(' + record.id + ',' + record.get('invoice_hd_id') + ',\'' + record.get('invoice_status') + '\');">' + value + '</a>';
             }
-            
+
             function acr512_formatMoney(value, record, name) {
                 return Leaf.formatNumber(value);
             }
-            
+
             function acr512_invoice_query_Onupdate(ds, record, name, value, oldVlaue) {
                 if (name == 'document_number_f') {
                     if (Leaf.isEmpty(record.get('document_number_t'))) {
@@ -76,7 +76,7 @@
                         record.set('accounting_date_t', value);
                     }
                 }
-                
+
                 if(Ext.isEmpty(record.get('project_number_f'))&&Ext.isEmpty(record.get('project_number_t')))
                 {
                     record.set('query_project_number','');
@@ -94,7 +94,7 @@
                     record.set('query_contract_number','Y');
                 }
             }
-            
+
             function acr512_invoice_delete(){
                 $('acr512_invoice_update_grid_ds').remove();
             }

src/main/webapp/modules/acr/ACR517/acr_invoice_claim_confirm.lview

@@ -23,7 +23,7 @@
             Leaf.request({
                 url: $("bmLink_acr_invoice_claim_confirm").getUrl(),
                 para: {
-                    invoice_hd_id:invoice_hd_id,
+                    invoice_hd_id:invoice_hd_id
                 },
                 success:function(){
                     Leaf.SideBar.show({