博雷顿

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','95'))
+                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','95')
+                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

@@ -309,6 +309,7 @@
                     <a:record code_value="80" 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">

src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview

@@ -1613,12 +1613,6 @@
         }
 
         function hls_hls500_save_new(nextStep, source_procedure) {
-            if ('${/parameter/@division}'==93) {
-                Leaf.SideBar.show({
-                    msg:'首付款比例不能低于15%',
-                    duration: 10000
-                })
-            }
             var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
             var H1, H54, H159, H16, H12,H99,H102,H15,H44;
             var is_constru_unit = '${/parameter/@is_constru_unit}' || 'N';
@@ -1661,6 +1655,21 @@
             //    unlock_calc_current_window();
             //    return false;
             //}
+            if ('${/parameter/@division}'==93) {
+                var dowm_money = mul(div(H16,H99),100)
+                if(dowm_money<15){
+                    Leaf.SideBar.show({
+                        msg:'当前首付款比例低于15%！',
+                        duration: 10000
+                    })
+                }
+                if(H1 > 36){
+                    Leaf.SideBar.show({
+                        msg:'租赁期限超过36期！',
+                        duration: 10000
+                    })
+                }
+            }
             if (H54 < 0) {
                 Leaf.showMessage('${l:PROMPT}', '利率最低值不能低于4.75');
                 unlock_calc_current_window();
@@ -1688,7 +1697,7 @@
             if ('${/parameter/@document_category}' == 'PROJECT' && '${/parameter/@business_type}'=='LEASEBACK' && is_constru_unit != 'Y') {
                 var dowm_payment = div(H16, plus(H99,H102)).toFixed(2) * 100;
                 if (dowm_payment < 15) {
-                    if ('${/parameter/@division}'!=91) {
+                    if ('${/parameter/@division}'!=91&&'${/parameter/@division}'!=93) {
                         Leaf.showMessage('${l:PROMPT}', '回租首付款比例不低于15%');
                         unlock_calc_current_window();
                         return false;

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview

@@ -1266,11 +1266,17 @@
 
                     }
                 }
+                if(division !='93'){
+                    record.getField('customer_margin').setReadOnly(true);
+                    record.getField('customer_margin_n').setReadOnly(true);
+                }
                 if(division!='70'&&division!='92'&&division!=''){
-                    if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN')){
-                        document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN_prompt').style.display = 'none';
-                        document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN').style.display = 'none';
+                    if(division != '93'){
+                        if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN')){
+                            document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN_prompt').style.display = 'none';
+                            document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN').style.display = 'none';
 
+                        }
                     }
                     if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_BRAND_VALUE')){
                         document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_BRAND_VALUE_prompt').style.display = 'none';