进项导入（经租）

src/main/webapp/WEB-INF/classes/acp/ACP522/acp_import_contract_lov.lwm

@@ -11,13 +11,23 @@
             <bm:query-sql>
                 <![CDATA[
                 select *
-                   from (select c.contract_id, c.contract_number, c.contract_name
+                from (select c.contract_id,
+                c.contract_number,
+                c.contract_name,
+                c.business_type,
+                (SELECT description
+                FROM HLS_BUSINESS_TYPE_V a
+                WHERE a.business_type = c.business_type) business_type_n
                 from con_contract c
                 where c.data_class = 'NORMAL'
-                and c.contract_status  IN ('REPURING','ETING','INCEPT','PENDING')
-                and c.business_type <>'LEASEBACK'
-                and not exists (select 1 from acp_invoice_ln an where an.contract_id=c.contract_id and an.confirmation_status in('APPROVING','APPROVED'))
-                ) V
+                and c.contract_status IN
+                ('REPURING', 'ETING', 'INCEPT', 'PENDING')
+                and c.business_type <> 'LEASEBACK'
+                and not exists
+                (select 1
+                from acp_invoice_ln an
+                where an.contract_id = c.contract_id
+                and an.confirmation_status in ('APPROVING', 'APPROVED'))) V
                 #WHERE_CLAUSE#
                 ]]></bm:query-sql>
         </bm:operation>
@@ -27,6 +37,9 @@
         <bm:field name="contract_number" forDisplay="true"  forQuery="true" prompt="ACR310.CONTRACT_NUMBER"/>
         <bm:field name="contract_name"  forDisplay="true" forQuery="true" prompt="ACR310.CONTRACT_NAME"/>
         <bm:field name="contract_id"/>
+        <bm:field name="business_type_n" forDisplay="true" forQuery="true" prompt="业务类型"/>
+        <bm:field name="business_type" forDisplay="true" forQuery="true" prompt="业务类型"/>
+
     </bm:fields>
 <!--    <bm:fields>-->
 <!--        <bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" forQuery="true" physicalName="contract_number" prompt="ACR310.CONTRACT_NUMBER"/>-->
@@ -36,5 +49,8 @@
     <bm:query-fields>
         <bm:query-field field="contract_number" queryOperator="like"/>
         <bm:query-field field="contract_name" queryOperator="like"/>
+        <bm:query-field field="business_type_n" queryOperator="like"/>
+        <bm:query-field field="business_type" queryOperator="like"/>
+
     </bm:query-fields>
 </bm:model>

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

+var override_queryfields = [
+];
+
+override();

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

@@ -8,6 +8,8 @@
         <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
         <a:link id="ap_invoice_import_detail_link1"
                 url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_import_detail.lview"/>
+        <a:link id="jz_invoice_import_detail_link1"
+                url="${/request/@context_path}/modules/acp/ACP522/jz_invoice_import_detail.lview"/>
         <script><![CDATA[
 
         function invoice_inf_process(dataset, record, name, value, oldvalue) {
@@ -61,22 +63,39 @@
             }
         }
         function acp522_save() {
+            var record=$('acp522_acp_invoice_import_detail_ds').getCurrentRecord();
+            if(record.get('business_type')=='LEASE'){
                 if($('acp522_acp_invoice_import_detail_ds').validate()){
                     $('ap_invoice_import_scanning').close();
                     var record=$('acp522_acp_invoice_import_detail_ds').getCurrentRecord();
                     var record_id=record.id;
-                var ds_id=record.ds.id
-               // var record = $(ds_id).findById(record_id);
+                    var ds_id=record.ds.id;
+                    console.log(record.get('business_type'));
                     var param = record.data;
                     param['function_usage'] = 'MODIFY';
                     param['function_code'] = 'ACP522I';
                     param['contract_id'] = record.get('contract_id');
+                    //param['business_type'] = record.get('business_type');
                     param['url_title'] = '进项发票详情';
                     param['winId'] = 'aaaaa';
                     hls_doc_get_layout_code('hn9040_project_get_layout_code_link_id', param, 'ap_invoice_import_detail_link1', ds_id);
-
                 }
-
+            }else{
+                if($('acp522_acp_invoice_import_detail_ds').validate()){
+                    $('ap_invoice_import_scanning').close();
+                    var record=$('acp522_acp_invoice_import_detail_ds').getCurrentRecord();
+                    var record_id=record.id;
+                    var ds_id=record.ds.id;
+                    var param = record.data;
+                    param['function_usage'] = 'MODIFY';
+                    param['function_code'] = 'ACP522J';
+                    param['contract_id'] = record.get('contract_id');
+                    //param['business_type'] = record.get('business_type');
+                    param['url_title'] = '进项发票详情(经租)';
+                    param['winId'] = 'bbbbb';
+                    hls_doc_get_layout_code('hn9040_project_get_layout_code_link_id', param, 'jz_invoice_import_detail_link1', ds_id);
+                }
+            }
         }
       function acp522_back() {
           $('ap_invoice_import_scanning').close();
@@ -94,6 +113,7 @@
                             <a:map from="contract_number" to="contract_number"/>
                             <a:map from="contract_name" to="contract_name"/>
                             <a:map from="contract_id" to="contract_id"/>
+                            <a:map from="business_type" to="business_type"/>
                         </a:mapping>
                     </a:field>
                 </a:fields>