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

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: feng
+    $Date: 2013-9-11 下午15:13:20
+    $Revision: 1.0
+    $Purpose:
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql>
+                <![CDATA[
+                select c.contract_id, c.contract_number, c.contract_name
+                from con_contract c
+                where c.data_class = 'NORMAL'
+                ]]></bm:query-sql>
+        </bm:operation>
+
+    </bm:operations>
+    <bm:fields>
+        <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: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"/>-->
+<!--        <bm:field name="contract_name" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" forQuery="true" physicalName="contract_name" prompt="ACR310.CONTRACT_NAME"/>-->
+<!--        <bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="contract_id" />-->
+<!--    </bm:fields>-->
+    <bm:query-fields>
+        <bm:query-field field="contract_number" queryOperator="like"/>
+        <bm:query-field field="contract_name" queryOperator="like"/>
+    </bm:query-fields>
+</bm:model>

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

@@ -9,14 +9,13 @@
         <bm:operation name="update">
             <bm:update-sql><![CDATA[
                 begin
-                acp_invoice_import_pkg.acp_invoice_import(p_invoice_type    => ${@invoice_type},
-                                                          p_invoice_code    => ${@invoice_code},
-                                                          p_invoice_number  => ${@invoice_number},
-                                                          p_net_amount      => ${@net_amount},
-                                                          p_invoice_date    => ${@invoice_date},
-                                                          p_last_updated_by => ${/session/@user_id},
-                                                          p_contract_id     => ${@contract_id},
-                                                          p_invoice_line_id => ${@invoice_line_id});
+                acp_invoice_import_pkg.acp_invoice_import(p_invoice_type =>  ${@invoice_type},
+                                                          p_invoice_code =>  ${@invoice_code},
+                                                          p_invoice_number=> ${@invoice_number},
+                                                          p_net_amount   =>  ${@net_amount},
+                                                          p_invoice_date =>  ${@invoice_date},
+                                                          p_user_id      =>  ${/session/@user_id},
+                                                          p_contract_id  =>  ${@contract_id});
                 end;
                 ]]>
             </bm:update-sql>

src/main/webapp/WEB-INF/classes/acp/ACP523/ap_invoice_confirm.lwm

@@ -3,7 +3,11 @@
     <bm:operations>
         <bm:operation name="update">
             <bm:update-sql><![CDATA[
-
+                BEGIN
+                ACP_INVOICE_IMPORT_PKG.ACP_INVOICE_CONFIRM(p_contract_id     => ${@contract_id},
+                                                           p_invoice_line_id => ${@invoice_line_id},
+                                                           p_user_id         => ${/session/@user_id});
+                END;
                 ]]></bm:update-sql>
         </bm:operation>
 

src/main/webapp/WEB-INF/classes/acr/ACR510/acr_bp_agent_ds.lwm

 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    $Author: ZLF  
-    $Date: 2014-12-8 上午11:04:41  
-    $Revision: 1.0  
-    $Purpose: 
--->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false" >
+    <bm:fields>
+        <bm:field name="bp_code" displayWidth="200" forDisplay="true" forQuery="true" prompt="代理店编码"/>
+        <bm:field name="value_name" displayWidth="200" forDisplay="true" forQuery="true" prompt="代理店名称"/>
 
-<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    </bm:fields>
     <bm:operations>
         <bm:operation name="query">
-            <bm:update-sql><![CDATA[
-                SELECT
-                    hbm.bp_id value_code,
-                    hbm.bp_name value_name,
-                    hbm.bp_code
-                FROM
-                    hls_bp_master hbm
-                WHERE
-                    hbm.enabled_flag = 'Y' AND
-                    hbm.bp_category  = 'AGENT'
-            ]]></bm:update-sql>
+            <bm:query-sql><![CDATA[
+           select t1.*
+  from (SELECT hbm.bp_id value_code, hbm.bp_name value_name, hbm.bp_code
+          FROM hls_bp_master hbm
+         WHERE hbm.enabled_flag = 'Y'
+           AND hbm.bp_category = 'AGENT') t1
+
+                #WHERE_CLAUSE#
+    		]]></bm:query-sql>
         </bm:operation>
     </bm:operations>
+   <bm:query-fields>
+        <bm:query-field field="bp_code" queryOperator="like" />
+        <bm:query-field field="value_name" queryOperator="like" />
+
+    </bm:query-fields>
 </bm:model>
+

src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm

@@ -182,9 +182,11 @@
     <bm:data-filters>
         <bm:data-filter enforceOperations="query" expression="nvl(t2.billing_amount,0)&lt;t2.received_amount"/>
         <bm:data-filter enforceOperations="query" expression="t1.contract_id = t2.contract_id"/>
-        <bm:data-filter enforceOperations="query" expression="t2.cf_item in(&apos;1&apos;,&apos;8&apos;,&apos;9&apos;,&apos;10&apos;,&apos;12&apos;,&apos;13&apos;,&apos;200&apos;,&apos;912&apos;,&apos;913&apos;,&apos;301&apos;)"/>
+        <bm:data-filter name="cf_item" enforceOperations="query" expression="t2.cf_item in(&apos;2&apos;,&apos;1&apos;,&apos;9&apos;,&apos;8&apos;,&apos;200&apos;,&apos;250&apos;)"/>
         <bm:data-filter enforceOperations="query" expression="t2.write_off_flag != &apos;NOT&apos;"/>
         <bm:data-filter enforceOperations="query" expression="t2.cf_status = &apos;RELEASE&apos;"/>
         <bm:data-filter enforceOperations="query" expression="t2.billing_status != &apos;FULL&apos; and t2.cf_direction=&apos;INFLOW&apos;"/>
+        <bm:data-filter name="contract_status" enforceOperations="query" expression="t1.contract_status in(&apos;NEW&apos;,&apos;INCEPT&apos;,&apos;ETING&apos;,&apos;REPURING&apos;,&apos;CLOSED&apos;)"/>
+
     </bm:data-filters>
 </bm:model>

src/main/webapp/WEB-INF/classes/acr/ACR510/contract_status_lov.lwm

@@ -14,7 +14,7 @@
                     FROM
                         sys_code_values_v v
                     WHERE
-                        v.code in ('CON500_CONTRACT_STATUS','CON660_CONTRACT_STATUS') AND
+                        v.code in ('CON500_CONTRACT_STATUS') AND
                         v.code_enabled_flag       = 'Y' AND
                         v.code_value_enabled_flag = 'Y'
                     ORDER BY
@@ -28,5 +28,7 @@
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter name="code" expression="t1.code =decode(${@lease_channel},&apos;00&apos;,&apos;CON500_CONTRACT_STATUS&apos;,&apos;01&apos;,&apos;CON660_CONTRACT_STATUS&apos;,&apos;CON500_CONTRACT_STATUS&apos;)"/>
+        <bm:data-filter name="code_value" enforceOperations="query" expression="t1.code_value in(&apos;NEW&apos;,&apos;INCEPT&apos;,&apos;ETING&apos;,&apos;REPURING&apos;,&apos;CLOSED&apos;)"/>
+
     </bm:data-filters>
 </bm:model>

src/main/webapp/WEB-INF/classes/acr/ACR510/hls_cashflow_item_v_lov.lwm

@@ -25,6 +25,6 @@
     </ns1:query-fields>
     <ns1:data-filters>
         <ns1:data-filter name="enabled_flag" enforceOperations="query" expression="t1.enabled_flag=&apos;Y&apos;"/>
-        <ns1:data-filter name="cf_item" enforceOperations="query" expression="t1.cf_item in(&apos;1&apos;,&apos;8&apos;,&apos;9&apos;,&apos;10&apos;,&apos;12&apos;,&apos;13&apos;,&apos;200&apos;,&apos;912&apos;,&apos;913&apos;,&apos;301&apos;)"/>
+        <ns1:data-filter name="cf_item" enforceOperations="query" expression="t1.cf_item in(&apos;2&apos;,&apos;1&apos;,&apos;9&apos;,&apos;8&apos;,&apos;200&apos;,&apos;250&apos;)"/>
     </ns1:data-filters>
 </ns1:model>

src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_sys_user_lov.lwm

@@ -27,8 +27,8 @@
     </bm:operations>
     <bm:fields>
         <bm:field name="user_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="USER_ID"/>
-        <bm:field name="user_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="100" forDisplay="true" forQuery="true" physicalName="USER_NAME" prompt="用户编码" queryWidth="100"/>
-        <bm:field name="description" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="100" forDisplay="true" forQuery="true" physicalName="DESCRIPTION" prompt="用户名称" queryWidth="100"/>
+        <bm:field name="user_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="100" forDisplay="false" forQuery="false" physicalName="USER_NAME" prompt="用户编码" queryWidth="100"/>
+        <bm:field name="description" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="100" forDisplay="false" forQuery="false" physicalName="DESCRIPTION" prompt="用户名称" queryWidth="100"/>
         <bm:field name="employee_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="EMPLOYEE_ID"/>
         <bm:field name="employee_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="100" forDisplay="true" forQuery="true" physicalName="EMPLOYEE_CODE" prompt="员工编码" queryWidth="100"/>
         <bm:field name="name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="100" forDisplay="true" forQuery="true" physicalName="NAME" prompt="员工姓名" queryWidth="100"/>
@@ -36,8 +36,8 @@
     </bm:fields>
     <bm:query-fields>
         <bm:query-field name="employee_code" queryExpression="e.employee_code like ${@employee_code}"/>
-        <bm:query-field name="user_name" queryExpression="su.user_name like ${@user_name}"/>
-        <bm:query-field name="description" queryExpression="su.description like ${@description}"/>
+      <!--  <bm:query-field name="user_name" queryExpression="su.user_name like ${@user_name}"/>
+        <bm:query-field name="description" queryExpression="su.description like ${@description}"/>-->
         <bm:query-field name="name" queryExpression="e.name like ${@name}"/>
     </bm:query-fields>
     <bm:data-filters>

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

 var override_queryfields = [
 ];
-var add_datafilters = [ {
-    name : 'confirmation_status',
-    expression : "t1.confirmation_status is null"
-} ];
-add_datafilter();
+
 override();

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

 var override_queryfields = [
 ];
-var add_datafilters = [ {
-    name : 'confirmation_status',
-    expression : "t1.confirmation_status is not null"
-} ];
-add_datafilter();
+
 override();

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

@@ -14,5 +14,17 @@ var add_datafilters = [
         expression : "(exists (select 1 from aut_trx_user_authorize a1, aut_owner_user_authorize a2  where a1.trx_category = 'CONTRACT' and a1.trx_id = t1.contract_id and trunc(sysdate) between a1.start_date and nvl(a1.end_date, trunc(sysdate)) and a1.user_id = a2.owner_user_id and a1.trx_category = a2.trx_category and a2.authorized_user_id = ${/session/@user_id} and trunc(sysdate) between a2.start_date and nvl(a2.end_date, trunc(sysdate))))"
     }
 ];
+var override_queryfields = [
+    {
+        name : 'contract_creation_date_from',
+        queryexpression : "trunc(t1.contract_creation_date) >= to_date(${@contract_creation_date_from},'yyyy-mm-dd')"
+    },
+    {
+        name : 'contract_creation_date_to',
+        queryexpression : "trunc(t1.contract_creation_date) <= to_date(${@contract_creation_date_to},'yyyy-mm-dd')"
+    }
+];
+
+override();
 
 add_datafilter();
\ No newline at end of file

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

@@ -14,4 +14,16 @@ var add_datafilters = [
     }
 
 ];
+var override_queryfields = [
+    {
+        name : 'contract_creation_date_from',
+        queryexpression : "trunc(t1.contract_creation_date) >= to_date(${@contract_creation_date_from},'yyyy-mm-dd')"
+    },
+    {
+        name : 'contract_creation_date_to',
+        queryexpression : "trunc(t1.contract_creation_date) <= to_date(${@contract_creation_date_to},'yyyy-mm-dd')"
+    }
+];
+
+override();
 add_datafilter();
\ No newline at end of file

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

@@ -6,33 +6,44 @@
                 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_import_scanning_link"
+                url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_import_scanning.lview"/>
         <script><![CDATA[
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
-
+            var url = $('ap_invoice_import_scanning_link').getUrl();
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'acp_invoice_ln');
+            Leaf.Window({
+                id: 'ap_invoice_import_scanning',
+                url: url,
+                title:'发票导入',
+                width: 400,
+                height:140
+            }).on('close', function() {
+                $(ds_id).query();
+            });
         };
 
-        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>';
-            }
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {debugger;
             if(name == 'contract_number'){
-                return '<a href="javascript:ap_invoice_import_detail(\'' + invoice_line_id + '\',\'' + record.id + '\',\'' + record.ds.id + '\');">' + value + '</a>';
+                return '<a href="javascript:ap_invoice_import_detail(\'' + record.id + '\',\'' + record.ds.id + '\');">' + value + '</a>';
             }
         };
 
+        function ap_invoice_import_detail(record_id,ds_id){debugger;
+            var record = $(ds_id).findById(record_id);
+            var param = record.data;
+            param['function_usage'] = 'MODIFY';
+            param['function_code'] = 'ACP522I';
+            param['contract_id'] = record.get('contract_id');
+            param['url_title'] = '进项发票详情';
+            hls_doc_get_layout_code('hn9040_project_get_layout_code_link_id', param, 'ap_invoice_import_detail_link', ds_id);
+        }
+
+
+
+
+
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>

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

@@ -2,31 +2,15 @@
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
           trace="true">
     <a:view>
-        <a:link id="ap_invoice_import_scanning_link"
-                url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_import_scanning.lview"/>
         <script><![CDATA[
 
-        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
-            var url = $('ap_invoice_import_scanning_link').getUrl();
-            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'acp_invoice_ln');
-            var rs = $(ds_id).getSelected();
-            var contract_id = rs[0].get('contract_id');
-            var invoice_line_id = rs[0].get('invoice_line_id');
-            Leaf.Window({
-                id: 'ap_invoice_import_scanning',
-                url: url,
-                params: {
-                    contract_id: contract_id,
-                    invoice_line_id: invoice_line_id
-                },
-                title:'${l:HLS.SUPPORTING_DOCUMENT}',
-                width: 300,
-                height:100
-            }).on('close', function() {
-                $('AP_INVOICE_IMPORT_DETAIL_G_AP_acp_invoice_ln_ds').query();
-            });
-        };
-
+        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();
+            }
+        });
 
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>

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

@@ -8,39 +8,50 @@
         <script><![CDATA[
 
         function invoice_inf_process(dataset, record, name, value, oldvalue) {
-            debugger;
-            var test = $('acp522_acp_invoice_import_ds').getAt(0).get('invoice');
-            var strs = new Array();
-            strs = test.split(',');
-            var invoice_type = strs[1];
-            var invoice_code = strs[2];
-            var invoice_number = strs[3];
-            var net_amount = strs[4];
-            var invoice_date = strs[5];
-            if (strs.length == 8) {
-                Leaf.request({
-                    url: $('acp_invoice_inf_import_link').getUrl(),
-                    para: {
-                        invoice_type: invoice_type,
-                        invoice_code: invoice_code,
-                        invoice_number: invoice_number,
-                        net_amount: net_amount,
-                        invoice_date: invoice_date,
-                        contract_id: '${/parameter/@contract_id}',
-                        invoice_line_id: '${/parameter/@invoice_line_id}'
-                    },
-                    success: function (res) {
-                        Leaf.SideBar.show({
-                            msg: '导入成功',
-                            duration: 2000
-                        });
-                    },
-                    scope: this
-                });
-                $('ap_invoice_import_scanning').close();
-            } else {
-                // $('acp600_acp_invoice_hd_ds').getAt(0).setReadOnly(true);
-                Leaf.showMessage('提示', '发票信息误！');
+            if(name == 'invoice') {
+                record.getField('invoice').setReadOnly(true);
+                var contract_id = record.get('contract_id');
+                var strs = value.split(',');
+                var invoice_type = strs[1];
+                var invoice_code = strs[2];
+                var invoice_number = strs[3];
+                var net_amount = strs[4];
+                var invoice_date = strs[5];
+                if (strs.length == 8) {
+                    Leaf.request({
+                        url: $('acp_invoice_inf_import_link').getUrl(),
+                        para: {
+                            invoice_type: invoice_type,
+                            invoice_code: invoice_code,
+                            invoice_number: invoice_number,
+                            net_amount: net_amount,
+                            invoice_date: invoice_date,
+                            contract_id: contract_id
+                        },
+                        success: function () {
+                            Leaf.SideBar.show({
+                                    msg: '导入成功',
+                                    duration: 2000
+                                },
+                                $('ap_invoice_import_scanning').close()
+                            );
+                        },failure: function() {
+                            record.getField('invoice').setReadOnly(false);
+                        },
+                        error: function() {
+                            record.getField('invoice').setReadOnly(false);
+                        },
+                        scope: this
+                    });
+                } else {
+                    // $('acp600_acp_invoice_hd_ds').getAt(0).setReadOnly(true);
+                    Leaf.showMessage('提示', '发票信息误！');
+                    record.getField('invoice').setReadOnly(false);
+                }
+            }else {
+                if(value){
+                    record.getField('invoice').setReadOnly(false);
+                }
             }
         }
 
@@ -48,7 +59,16 @@
         <a:dataSets>
             <a:dataSet id="acp522_acp_invoice_import_ds">
                 <a:fields>
-                    <a:field name="invoice" required="true"/>
+                    <a:field name="invoice" required="true" readOnly="true"/>
+                    <a:field name="contract_name" required="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="100"
+                             lovService="acp.ACP522.acp_import_contract_lov" lovWidth="520"
+                             title="SELECT_CONTRACT">
+                        <a:mapping>
+                            <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:mapping>
+                    </a:field>
                 </a:fields>
                 <a:events>
                     <a:event name="update" handler="invoice_inf_process"/>
@@ -57,7 +77,9 @@
         </a:dataSets>
         <a:screenBody>
             <a:form title="请扫描发票二维码">
-                <a:textField name="invoice" width="270" bindTarget="acp522_acp_invoice_import_ds"/>
+                <a:lov name="contract_name" bindTarget="acp522_acp_invoice_import_ds" width="270" prompt="SELECT_CONTRACT"/>
+<!--                <a:textField name="contract_number" bindTarget="acp522_acp_invoice_import_ds" width="270" prompt="SELECT_CONTRACT"/>-->
+                <a:textField name="invoice" width="270" bindTarget="acp522_acp_invoice_import_ds" prompt="扫描发票"/>
             </a:form>
         </a:screenBody>
     </a:view>

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

@@ -5,7 +5,9 @@
           <a:model-query defaultWhereClause="document_category=&apos;CONTRACT&apos;" fetchAll="true" model="basic.hls_document_type_v_lov" rootPath="contract_type_list"/>
           <a:model-query defaultWhereClause="t1.enabled_flag = &apos;Y&apos;" model="prj.PRJ505.con_billing_method" rootPath="billing_method_list"/>
            <a:model-query fetchAll="true" model="basic.hls_lease_channel_for_lov" rootPath="acr510_lease_list"/>
+<!--
           <a:model-query fetchAll="true" model="acr.ACR510.acr_bp_agent_ds" rootPath="bp_id_agent_ds"/>
+-->
     </a:init-procedure>
     <a:view>
       <a:link id="pageLink_select_cashflow" url="${/request/@context_path}/modules/acr/ACR510/acr_invoice_select_cashflow.lview"/>
@@ -159,9 +161,9 @@
             <a:dataSet id="billingMethodDs">
                 <a:datas dataSource="/model/billing_method_list"/>
             </a:dataSet>
-            <a:dataSet id="bp_agent_ds">
+          <!--  <a:dataSet id="bp_agent_ds">
                 <a:datas dataSource="/model/bp_id_agent_ds"/>
-            </a:dataSet>
+            </a:dataSet>-->
        <a:dataSet id="allConditionDs" autoCreate="true">
                 <a:fields>
                     <a:field name="bill_object_bp_class_desc" displayField="code_value_name" options="acr510_bp_class" returnField="bill_object_bp_class" valueField="code_value"/>
@@ -240,7 +242,22 @@
                     <a:field name="prj_search_term_2"/>
                     <a:field name="con_search_term_2"/>
                     <a:field name="document_type_desc" displayField="description" options="acr510_document_type_name_ds" returnField="document_type" valueField="document_type"/>
+<!--
                     <a:field name="bp_id_agent_level1" displayField="value_name" options="bp_agent_ds" returnField="value_code" valueField="value_code"/>
+-->
+               <!--   <a:field name="bp_id_agent_level1" lovGridHeight="300" lovHeight="450" lovLabelWidth="100" lovService="acr.ACR510.acr_bp_agent_ds" lovWidth="600" title="代理店">
+                        <a:mapping>
+                            <a:map from="bp_code" to="bp_id_agent_level1"/>
+                            <a:map from="bp_name" to="bp_id_agent_level1"/>
+                        </a:mapping>
+                    </a:field>-->
+                    <a:field name="bp_id_agent_level1" lovGridHeight="300" lovHeight="450" lovLabelWidth="100" lovService="acr.ACR510.acr_bp_agent_ds" lovWidth="600" title="代理店">
+                        <a:mapping>
+                            <a:map from="value_code" to="bp_id_agent_level1"/>
+                            <a:map from="value_name" to="bp_id_agent_level1"/>
+                        </a:mapping>
+                    </a:field>
+
                 </a:fields>
                 <a:events>
                     <a:event name="update" handler="queryUpdateFunction"/>
@@ -290,7 +307,7 @@
                     <a:comboBox name="invoice_type_desc" bindTarget="allConditionDs" prompt="发票类型"/>
 -->
                     <a:comboBox name="contract_status_desc" bindTarget="allConditionDs" prompt="合同状态"/>
-                    <a:comboBox name="bp_id_agent_level1" bindTarget="allConditionDs" prompt="代理店"/>
+                    <a:lov name="bp_id_agent_level1" bindTarget="allConditionDs" prompt="代理店"/>
                     <a:lov name="cf_item_desc" bindTarget="allConditionDs" prompt="HLS.RECEIVE_PROJECT"/>
 
                 </a:formToolBar>
@@ -326,7 +343,7 @@
                                 <!--<a:column name="invoice_type_desc" prompt="发票类型"/>-->
                                 <!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>-->
                                 <a:column name="contract_number" lock="true" prompt="合同编号" width="150"/>
-                                <a:column name="invoice_title" prompt="承租人"/>
+                                <a:column name="invoice_title" prompt="开票对象名称"/>
                                 <a:column name="bp_id_agent_level1" prompt="代理店"/>
                                 <a:column name="times" align="right" lock="true" prompt="期数" width="40"/>
                                 <a:column name="cf_item_desc" lock="true" prompt="应收项目"/>

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

@@ -184,7 +184,7 @@
             <a:dataSet id="acr512_invoice_query_ds">
                 <a:fields>
                     <a:field name="currency_name" displayField="currency_name" options="acr512_currency_ds" returnField="currency" valueField="currency_code"/>
-                    <a:field name="invoice_kind" defaultValue="2"/>
+                    <a:field name="invoice_kind" />
                     <a:field name="invoice_kind_desc"   displayField="code_value_name" options="acr512_invoice_kind_ds" returnField="invoice_kind" valueField="code_value"/>
                     <a:field name="business_type_desc" displayField="business_type_desc" options="acr512_business_type_ds" returnField="business_type" valueField="business_type"/>
                     <a:field name="created_by_name" lovGridHeight="320" lovHeight="500" lovService="acr.ACR512.acr_invoice_sys_user_lov" lovWidth="500" title="开票人选择">

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

@@ -115,6 +115,16 @@
         }
 
         function acr513_invoice_confirm() {
+            var records = $('acr513_invoice_result_ds').getSelected();
+            if (records.length != 1) {
+                     Leaf.showMessage('提示', '请选择一条数据');
+                    return;
+                 }
+            if (records[0].get('created_by') == ' ${/session/@user_id}') {
+                        Leaf.showMessage('提示', '确认人不能和开票人一样，请勿确认！');
+                        return;
+            }
+
             $('acr513_invoice_result_ds').submitSelected();
         }
 

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

@@ -11,6 +11,9 @@
         <a:model-query fetchAll="true" model="acr.ACR512.acr_invoice_business_type_list" rootPath="acr515_business_type_list"/>
     </a:init-procedure>
     <a:view>
+        <a:link id="acr513_invoice_readonly_page"
+                url="${/request/@context_path}/modules/cont/CON500/con_contract_update.lview"/>        <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
+
         <a:link id="bmLink_vat_pause_or_submit" model="acr.ACR515.acr_invoice_vat" modelaction="batch_update"/>
         <a:link id="bmLink_vat_receive" model="acr.ACR515.acr_invoice_vat" modelaction="execute"/>
         <a:link id="acr515_update_post_link" url="${/request/@context_path}/modules/acr/ACR515/acr_invoice_insert_tmp.lsc"/>
@@ -292,7 +295,26 @@
                 return '<font color="red">' + Leaf.formatNumber(sum2 ,2)+ '</font>';
             }
         }
+        function open_document_win(ds_id, record_id) {
+            var record = $(ds_id).findById(record_id);
+            var param = record.data;
+            param['function_code'] = 'ACR513';
+            param['document_id'] = record.get('invoice_hd_id');
+            param['function_usage'] = 'QUERY';
+            param['url_title'] = '${l:ACR.INVOICE_DETAIL}';
+            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'acr513_invoice_readonly_page', 'acr515_invoiceVatDs');
+        }
+        function acr512_document_number_render(value, record, name) {
+            if (name == 'document_number' && value) {
+                return '<a href="javascript:open_document_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
+            }
+            return value;
+        }
+
+
         ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+
         <a:dataSets>
             <a:dataSet id="acr515_invoiceKindDs" lookupCode="ACR510_INVOICE_KIND"/>
             <a:dataSet id="acr515_invoiceStatusDs" lookupCode="ACR510_AR_INVOICE_STATUS"/>
@@ -427,7 +449,7 @@
             <a:grid id="acr515_invoiceVatDs_grid" bindTarget="acr515_invoiceVatDs"  marginWidth="80" navBar="true" height="300">
                 <a:columns>
                     <a:column name="contract_number" width="120"/>
-                    <a:column name="document_number" lock="true" width="120"/>
+                    <a:column name="document_number" lock="true" width="120"  renderer="acr512_document_number_render"/>
                     <a:column name="business_type_desc" width="80"/>
                     <a:column name="billing_way_desc" width="80" prompt="开票方式"/>
                     <a:column name="invoice_kind_desc" width="100"/>