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

src/main/webapp/WEB-INF/server-script/layoutconfig/layout_config.js

@@ -351,5 +351,6 @@ var enableLayoutConfig = {
 	'modules/csh/CSH501C/csh_payment_asset_req.lview':true,
 	'modules/cont/CON1370/con_asset_fee_detail.lview':true,
 	'modules/hls/HLS303/bp_agent_bounty_create.lview':true,
-	'modules/hls/HLS303/bp_agent_bounty_detail.lview':true
+	'modules/hls/HLS303/bp_agent_bounty_detail.lview':true,
+	'modules/acp/ACP522/ap_invoice_com_detail.lview':true
 };
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:view>
+        <script><![CDATA[
+        ]]></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/ACP522/ap_invoice_import.lview

@@ -6,6 +6,8 @@
                 modelaction="update"/>
         <a:link id="ap_invoice_import_detail_link"
                 url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_import_detail.lview"/>
+        <a:link id="ap_invoice_com_detail_link"
+                url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_com_detail.lview"/>
         <a:link id="ap_invoice_import_detail_wfl_link"
                 url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_import_detail_wfl.lview"/>
         <a:link id="ap_invoice_import_scanning_link"
@@ -35,6 +37,9 @@
             if (name == 'items') {
                 return '<a href="javascript:ap_invoice_detail(\'' + record.id + '\',\'' + record.ds.id + '\',\'' +record.get('payment_req_id') + '\');">' + value + '</a>';
             }
+            if(name == 'com_amount'){
+                return '<a href="javascript:ap_invoice_com_detail(\'' + record.id + '\',\'' + record.ds.id + '\',\'' +record.get('payment_req_id') + '\');">' + value + '</a>';
+            }
         };
 
         function ap_invoice_import_detail(record_id,ds_id){
@@ -67,6 +72,17 @@
             // param['items'] = record.get('items');
             hls_doc_get_layout_code('hn9040_project_get_layout_code_link_id',param,'ap_invoice_detail_link', ds_id,'AP_INVOICE_DETAILS');
         }
+        //佣金政策
+        function ap_invoice_com_detail(record_id, ds_id,payment_req_id) {
+            debugger;
+            var record = $(ds_id).findById(record_id);
+            var param = record.data;
+            param['function_usage'] = 'QUERY';
+            param['function_code'] = 'ACP522_COM';
+            param['payment_req_id'] = payment_req_id;
+            param['url_title'] = '进项发票详情';
+            hls_doc_get_layout_code('hn9040_project_get_layout_code_link_id',param,'ap_invoice_com_detail_link', ds_id,'AP_INVOICE_COM_DETAIL');
+        }