[fix] 修改金税接口显示，调整授信的审批人

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

+var add_datafilters = [ {
+	name : 'contract_id',
+	expression : 't1.contract_id=${/parameter/@contract_id}'
+} ];
+
+add_datafilter();
\ No newline at end of file

src/main/webapp/modules/acp/ACP517/acp_invoice_entrance.lview

@@ -29,6 +29,14 @@
         <link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
         <script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>
         <script type="text/javascript"><![CDATA[
+        Leaf.onReady(function(){
+            var acp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'acp_invoice_ln');
+           if('${/parameter/@contract_id}'){
+               $(acp_ds_id).setQueryParameter('contract_id','${/parameter/@contract_id}');
+               $(acp_ds_id).query();
+           }
+
+        })
 
         Ext.ux.Lightbox.register('a[ref=img]', true);
 

src/main/webapp/modules/acr/ACR515/acr_invoice_vat.lview

@@ -243,7 +243,13 @@
             var kind = $('acr515_invoiceVatParaDs').getAt(0).get('invoice_kind');
             //默认为2
             kind=2;
-            window.location.href = $('acr515_interface_import_link').getUrl()+'?kind='+kind;
+            new Leaf.Window({
+                id: 'gld_interface_window',
+                url: $('acr515_interface_import_link').getUrl()+'?kind='+kind,
+                title: '导入开票结果',
+                fullScreen :true
+            });
+           // window.location.href =
         }
         function summaryRenderer(datas, name) {
             var sum=0;

src/main/webapp/modules/csh/CSH501/csh_payment_req.lview

@@ -403,13 +403,11 @@
             var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
             var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
             var records_l = $(lnds_id).getAll();
-            console.log(records_l);
             var hd_record = $(hdds_id).getCurrentRecord();
             //add by st
             var url;
            /* url = $('tre_loan_con_print_excel_link_id').getUrl() + '?payment_req_id=' +hd_record.get('payment_req_id');
             window.open(href = url);*/
-           debugger
                 /*var sale_id = record[0].get('sale_id');
                 var sale_code = record[0].get('sale_code');*/
                 var template_name = 'payment_apply_content.xml';
@@ -496,10 +494,12 @@
 
         //发票确认
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
-            var contract_id = '${/parameter/@contract_id}';
+            var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
+            var datas=$(lnds_id).getAt(0);
+            var contract_id =datas.get('contract_id') ;
             var param = {};
-            param['function_code'] = 'ACP517_CONFIRM';
-            param['function_usage'] = 'MODIFY';
+            param['function_code'] = 'ACR_INVOICE_QUERY_N';
+            param['function_usage'] = 'QUERY';
             param['contract_id'] = contract_id;
             param['winid'] = 'csh501_confirm_invoice_link_winid';
             param['url_title'] = '发票确认';

src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview

@@ -282,6 +282,7 @@
             //
 
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
+           debugger
             var head_record = $(ds_id).getCurrentRecord();
             var bp_class = head_record.get('bp_class');
             //alert('${/parameter/@unbrand}');
@@ -297,7 +298,7 @@
                         para: {
                             document_category: 'BP',
                             // document_type: head_record.get('bp_type'),
-                            document_type: 'TENANT',
+                            document_type: head_record.get('bp_type'),
                             bp_class: head_record.get('bp_class'),
                             id_type: head_record.get('id_type'),
                             id_card_no: head_record.get('id_card_no'),
@@ -339,7 +340,7 @@
                     para: {
                         document_category: 'BP',
                         // document_type: head_record.get('bp_type'),
-                        document_type: 'TENANT',
+                        document_type: head_record.get('bp_type'),
                         bp_class: head_record.get('bp_class'),
                         id_type: head_record.get('id_type'),
                         id_card_no: head_record.get('id_card_no'),

src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview

@@ -8,7 +8,7 @@ $Purpose: 商业伙伴授信维护
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
     <a:init-procedure>
-        <a:model-query  defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(00215,00215)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/>
+        <a:model-query  defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(006,007)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/>
 
     </a:init-procedure>
     <a:view>

src/main/webapp/modules/hls/HLS362N/hls_bp_master_credit_confirm.lview

@@ -8,7 +8,7 @@ $Purpose: 商业伙伴授信维护
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
     <a:init-procedure>
-        <a:model-query  defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(002)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/>
+        <a:model-query  defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(003)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/>
 
     </a:init-procedure>
     <a:view>

src/main/webapp/modules/sys/SYS405/sys_mail_send.lview

@@ -96,7 +96,7 @@
                             'mail_cc': record.get('mail_cc'),
                             'subject': record.get('subject'),
                             'body': record.get('body'),
-                            'mail_list_id':record.get('mail_list_id')
+                            // 'mail_list_id':record.get('mail_list_id')
                         },
                         success: function(res) {
                             unlock_window();