博雷顿

src/main/webapp/WEB-INF/classes/basic/sys_code_value_v_lease.lwm

@@ -37,14 +37,14 @@
                 FROM exp_emp_assign_e_v t
                 WHERE t.user_id = ${/session/@user_id}
                 and PARENT_UNIT_ID <> 1544
-                AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60'))
+                AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60','95','93'))
                 UNION ALL
                 SELECT v.code_value AS value_code, v.code_value_name AS value_name
                 FROM sys_code_values_v v
                 WHERE v.code_enabled_flag = 'Y'
                 AND v.code_value_enabled_flag = 'Y'
                 AND v.code = 'DIVISION'
-                AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60')
+                AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60','95','93')
                 AND NOT EXISTS (SELECT 1
                 FROM exp_emp_assign_e_v t
                 WHERE t.user_id = ${/session/@user_id}

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

@@ -54,8 +54,7 @@
         }
 
         function contractDs_grid_add() {
-            $('contractDs_grid').showEditorByRecord($('ar510n_cashflow_ds')
-                .create());
+            $('contractDs_grid').showEditorByRecord($('ar510n_cashflow_ds').create());
         }
 
         function invoiceHd_close() {
@@ -119,7 +118,6 @@
 
 
         function invoiceHd_confirm() {
-            debugger;
             Leaf.Masker.mask(Ext.getBody());
             var final_bill_flag = $('allConditionDs').getAt(0).get('final_bill_flag');
             var cat_ini_flag = $('allConditionDs').getAt(0).get('cat_ini_flag');
@@ -289,7 +287,7 @@
                     <a:record code_value="REPUR" code_value_name="解约回购"/>
                 </a:datas>
             </a:dataSet>
-            <a:dataSet id="acr510n_invoice_type_ds">
+			<a:dataSet id="acr510n_invoice_type_ds">
                 <a:datas>
                     <a:record code_value="ECT" code_value_name="电子发票"/>
                     <a:record code_value="PAPER" code_value_name="纸质发票"/>
@@ -308,8 +306,10 @@
                     <a:record code_value="92" code_value_name="北京心诚"/>
                     <a:record code_value="99" code_value_name="工程机械"/>
                     <a:record code_value="80" code_value_name="叉车"/>
-<!--                    <a:record code_value="70" code_value_name="铁甲业务"/>-->
+                    <!--<a:record code_value="70" code_value_name="铁甲业务"/>-->
                     <a:record code_value="70" code_value_name="二手机业务"/>
+                    <a:record code_value="95" code_value_name="经租设备"/>
+                    <a:record code_value="93" code_value_name="新业务-厂商担保"/>
                 </a:datas>
             </a:dataSet>
             <a:dataSet id="acr510n_invoice_method_ds">
@@ -320,7 +320,7 @@
             </a:dataSet>
             <a:dataSet id="allConditionDs" autoCreate="true">
                 <a:fields>
-                    <a:field name="invoice_method"/>
+					<a:field name="invoice_method"/>
                     <a:field displayField="code_value_name" name="invoice_method_n" options="acr510n_invoice_method_ds"
                              returnField="invoice_method" valueField="code_value"/>
                     <a:field name="division"/>
@@ -461,9 +461,9 @@
                     <a:field name="billing_status"/>
                     <a:field name="billing_status_n" displayField="code_value_name" options="billing_status_ds"
                              returnField="billing_status" valueField="code_value"/>
-                     <a:field name="full_elec_invoice_flag"/>
-                                        <a:field name="full_elec_invoice_flag_n" displayField="code_value_name" options="overdue_status_ds"
-                                                 returnField="full_elec_invoice_flag" valueField="code_value"/>
+					 <a:field name="full_elec_invoice_flag"/>
+                    <a:field name="full_elec_invoice_flag_n" displayField="code_value_name" options="overdue_status_ds"
+                             returnField="full_elec_invoice_flag" valueField="code_value"/>
                 </a:fields>
                 <a:events>
                     <a:event name="update" handler="queryUpdateFunction"/>
@@ -539,8 +539,7 @@
                 </a:hBox>
                 <a:hBox>
                     <a:comboBox bindTarget="allConditionDs" name="billing_status_n" prompt="开票状态"/>
-                    <a:comboBox bindTarget="allConditionDs" name="full_elec_invoice_flag_n" prompt="是否全电发票"/>
-
+					<a:comboBox bindTarget="allConditionDs" name="full_elec_invoice_flag_n" prompt="是否全电发票"/>
                 </a:hBox>
                 <!-- <a:formBody column="4" labelWidth="400">
                      <a:lov name="contract_number_from" bindTarget="allConditionDs" prompt="HLS.CONTRACT_NUMBER_FROM"/>
@@ -605,13 +604,13 @@
                                 <a:column name="exchange_rate" align="right" width="80"/>
                                 <a:column name="exchange_rate_type_desc" width="100"/> -->
                                 <a:column name="bill_object_bp_class_desc" width="100" align="center" prompt="商业伙伴分类" />
-                                <a:column name="invoice_method_n" prompt="开票方式" width="100"/>
+								 <a:column name="invoice_method_n" prompt="开票方式" width="100"/>
                                 <a:column name="division_n" prompt="租赁物" width="100"/>
                                 <a:column name="write_off_flag_desc" width="100" align="center" prompt="核销标记" />
-                                <a:column name="rl_flag_n" width="100" align="center" prompt="是否日立为优质客户付租金" />
+                                <a:column name="rl_flag_n" width="100" align="center" prompt="是否日立返还金" />
                                 <a:column name="billing_status_n" width="100" align="center" prompt="开票状态" />
-                                <a:column name="full_elec_invoice_flag_n" width="100" align="center" prompt="是否全电发票" />
-                       </a:columns>
+								<a:column name="full_elec_invoice_flag_n" width="100" align="center" prompt="是否全电发票" />
+                            </a:columns>
                         </a:grid>
                     </a:tab>
                     <a:tab prompt="抬头信息" width="150">
@@ -622,8 +621,7 @@
                                 <!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>-->
                                 <a:column name="contract_number" prompt="合同编号" align="center" width="100"/>
                                 <a:column name="contract_status_desc" prompt="合同状态" align="center" width="80"/>
-                                <a:column name="billing_method_desc" prompt="开票规则"
-                                          width="155"/>
+                                <a:column name="billing_method_desc" prompt="开票规则" width="155"/>
                                 <a:column name="billing_object_name" autoAdjust="false"
                                           editor="contractDs_grid_editor_lov" prompt="开票对象名称"
                                           renderer="render_contractDs_grid" showTitle="true" width="200"/>
@@ -631,7 +629,7 @@
                                           width="200"/>
                                 <a:column name="object_tax_registry_num" prompt="纳税人识别号" width="150"/>
                                 <a:column name="object_taxpayer_type_desc" prompt="纳税人类型" align="center" width="150"/>
-                                <a:column name="invoice_type_n" prompt="开票类型" width="150"/>
+                                <a:column name="invoice_type_n" prompt="开票类型" width="150"/>								
                                 <a:column name="invoice_bp_address_phone_num" autoAdjust="false" prompt="开票地址电话"
                                           showTitle="true" width="200"/>
                                 <a:column name="invoice_bp_bank_account" autoAdjust="false" prompt="开户行及账号"