【fix】bug修复

src/main/webapp/WEB-INF/classes/cont/CON3100N/business_write_detail_report.lwm

@@ -57,8 +57,10 @@
         <bm:query-field name="journal_date_to" queryExpression="trunc(t.write_off_date) &lt;=  trunc(to_date(${@journal_date_to},'yyyy-mm-dd'))"/>
         <bm:query-field name="transaction_num" queryExpression="t.transaction_number like &apos;%&apos; || ${@transaction_num} || &apos;%&apos;"/>
         <bm:query-field name="cf_item_n" queryExpression="t.cf_item_n like &apos;%&apos; || ${@cf_item_n} || &apos;%&apos;"/>
+        <bm:query-field name="extra_nam" queryExpression="t.extra_name like &apos;%&apos; || ${@extra_nam} || &apos;%&apos;"/>
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter enforceOperations="query" expression="t.session_id=${/session/@session_id}"/>
+        <bm:data-filter enforceOperations="query" expression="exists (select 1 from aut_trx_user_authorize a1, aut_owner_user_authorize a2 WHERE a1.trx_category = 'CONTRACT' and a1.trx_id = t.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)))"/>
     </bm:data-filters>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm

@@ -122,6 +122,7 @@
                 (select 1
                 from exp_emp_assign_e_v ee
                where ee.user_id = ${/session/@user_id}
+                  and ee.unit_id not in (1565,1552,1564,1551,1559,1547,1560,1545,1546,1568,1566,1570,1550,1569,1555,1571,1558)
                   and ee.unit_id=(SELECT h.unit_id FROM hls_bp_master h WHERE h.bp_id=t1.bp_id)
                   and ${/session/@role_id} in (select v.role_id from sys_role_vl v where v.role_code in ('0018','0019')) ) )
                   or (${/session/@role_id} not in (select v.role_id from sys_role_vl v where v.role_code in ('0018','0019')) ))"/>

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

@@ -25,7 +25,7 @@
             if (name == 'object_tax_registry_num' || name == 'invoice_bp_address_phone_num' || name == 'invoice_bp_bank_account') {
                 if (Ext.isEmpty(value)) {
                     //if (record.get('bill_object_bp_class') == 'NP' || record.get('object_taxpayer_type') == 'SMALL_SCALE_TAXPAYER' || record.get('tax_type_vat') != 'Y') {
-                    if (record.get('bill_object_bp_class') == 'NP') {
+                    if (record.get('bill_object_bp_class') == 'NP'||record.get('object_taxpayer_type')=='SMALL_SCALE_TAXPAYER') {
                         return true;
                     } else  if (record.get('bill_object_bp_class') == 'ORG') {
                         return '必输字段不能为空!';

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain.lview

@@ -265,7 +265,7 @@
 <!--                <a:comboBox name="lease_organization_name" bindTarget="con560_contract_query_ds" prompt="事业部"/>-->
                 <a:comboBox name="contract_status_n" bindTarget="con560_contract_query_ds" prompt="合同状态"/>
             </a:form>
-            <a:grid id="con560_con_contract_grid_ds" bindTarget="con560_contract_result_ds" height="250"
+            <a:grid id="con560_con_contract_grid_ds" bindTarget="con560_contract_result_ds" height="350"
                     marginWidth="30" navBar="true">
                 <a:toolBar>