Merge branch 'refs/heads/feature/acr_create' into develop

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/modules/acr/ACR510N/acr_invoice_condition_n.lview

@@ -326,7 +326,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="应收项目"/>