北京卡家业务

src/main/webapp/WEB-INF/classes/prj/PRJ501N/project_approval.lwm

@@ -7,13 +7,34 @@
 -->
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
     <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                 SELECT COUNT(1) v_count
+      FROM (SELECT p.project_id
+              FROM prj_project p, prj_project_lease_item v
+             WHERE p.project_id = v.project_id
+               AND (v.machine_number_70 = ${@machine_number} or v.machine_number = ${@machine_number})
+               AND p.project_status <> 'CLOSED'
+               AND nvl(p.secondary_lease, 'NO') = 'NO'
+               and p.project_id <> nvl(${@project_id},1)
+            UNION
+            SELECT c.project_id
+              FROM con_contract c, con_contract_lease_item h
+             WHERE c.contract_id = h.contract_id
+               AND (h.machine_number_70 = ${@machine_number} or h.machine_number = ${@machine_number})
+               AND c.contract_status <> 'CANCEL'
+               AND nvl(c.secondary_lease, 'NO') = 'NO'
+               AND c.data_class = 'NORMAL'
+               and c.project_id != nvl(${@project_id},1))
+                ]]>
+            </bm:query-sql>
+        </bm:operation>
         <bm:operation name="update">
             <bm:update-sql><![CDATA[
                 begin
                     prj_project_pkg.project_submit(
                     p_project_id =>${@project_id}, 
                     p_user_id => ${/session/@user_id}
-
                     );
                 end;
             ]]></bm:update-sql>
@@ -22,6 +43,7 @@
             <bm:update-sql><![CDATA[
                 begin
                     prj_project_check_pkg.check_prj_lease_item(
+                    p_project_id      =>${@project_id},
                     p_machine_number =>${@machine_number},
                     p_user_id => ${/session/@user_id}
 
@@ -30,4 +52,7 @@
             ]]></bm:update-sql>
         </bm:operation>
     </bm:operations>
+    <bm:fields>
+        <bm:field name="v_count" databaseType="NUMBER" datatype="java.lang.Long" physicalName="v_count"/>
+    </bm:fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/wx/WX100/con_contract_list_query.lwm

@@ -26,6 +26,9 @@
          where hm.bp_id = t1.bp_id_agent_level1) id_card_no_agent,
        decode(t1.division,70,(SELECT i.machine_number_70
                   FROM con_contract_lease_item i
+                 WHERE i.contract_id = t1.contract_id
+                   AND i.equipment_type = 'MAIN'),92,(SELECT i.machine_number_70
+                  FROM con_contract_lease_item i
                  WHERE i.contract_id = t1.contract_id
                    AND i.equipment_type = 'MAIN'),(SELECT i.machine_number
           FROM con_contract_lease_item i

src/main/webapp/WEB-INF/classes/wx/WX100/con_contract_query.lwm

@@ -38,6 +38,10 @@ select *
                    and ci.equipment_type = 'MAIN') brand_id,
                decode(t1.division,70,(select a.brand_value          --update by xsh35973 20220323
                    from CON_CONTRACT_LEASE_ITEM a
+                   where a.contract_id = t1.contract_id),
+                    92,
+                      (select a.brand_value --update by 34291
+                         from CON_CONTRACT_LEASE_ITEM a
                         where a.contract_id = t1.contract_id),NVL((SELECT a.description
                      FROM hls_car_brands_vl a
                     WHERE a.brand_id =
@@ -50,7 +54,10 @@ select *
                   from con_contract_lease_item ci
                  where ci.contract_id = t1.contract_id
                    and ci.equipment_type = 'MAIN') modelcd, --机型
-               decode(t1.division,70,(SELECT i.machine_number_70        --update by xsh35973 20220323
+              decode(t1.division,70,(SELECT i.machine_number_70
+                  FROM con_contract_lease_item i
+                 WHERE i.contract_id = t1.contract_id
+                   AND i.equipment_type = 'MAIN'),92,(SELECT i.machine_number_70
                   FROM con_contract_lease_item i
                  WHERE i.contract_id = t1.contract_id
                    AND i.equipment_type = 'MAIN'),(SELECT i.machine_number

src/main/webapp/WEB-INF/classes/wx/WX100/con_file_download.lwm

@@ -58,7 +58,17 @@ select fa.file_name,fa.file_path,fa.attachment_id
                                 'FINANCE_LEASE_CONTRACT_TJ_FR_E',
                                 'FINANCE_LEASE_CONTRACT_TJ_FR_E',
                                 'CON_GUR_NP',
-                                'CON_GUR_NP')
+                                'CON_GUR_NP',
+                                'FINANCE_LEASE_CONTRACT_FR_KJ_E','FINANCE_LEASE_CONTRACT_FR_KJ_E',--update by gzj 北京卡家电子签约
+                                'FINANCE_LEASE_CONTRACT_KJ_FR_E','FINANCE_LEASE_CONTRACT_KJ_FR_E',
+                                'FINANCE_LEASE_CONTRACT_KJ_S_E','FINANCE_LEASE_CONTRACT_KJ_S_E',
+                                'FINANCE_LEASE_CONTRACT_KJ_E','FINANCE_LEASE_CONTRACT_KJ_E',
+                                'CSH_PAYMENT_REQ_KJ_1_E','CSH_PAYMENT_REQ_KJ_1_E',
+                                'CON_CONTRACT_MORTGAGE_KJ_E','CON_CONTRACT_MORTGAGE_KJ_E',
+                                'LEASE_CONTRACT_PAR_KJ_E','LEASE_CONTRACT_PAR_KJ_E',
+                                'LEASE_CONTRACT_PAR_KJ_1_E','LEASE_CONTRACT_PAR_KJ_1_E',
+                                'CON_COLLECTION_PAYMENT_KJ_E','CON_COLLECTION_PAYMENT_KJ_E'
+                                )
                     from con_ele_signer_file cf, con_contract_ele_signer cs
                    where cf.con_ele_signer_id = cs.con_ele_signer_id
                      and cs.contract_id = ${@contract_id}

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

@@ -119,6 +119,7 @@
 
 
         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');
@@ -297,7 +298,7 @@
                     <a:record code_value="50" code_value_name="星邦高空作业车"/>
                     <a:record code_value="90" code_value_name="租赁二手机"/>
                     <a:record code_value="91" code_value_name="神钢建机"/>
-
+                    <a:record code_value="92" code_value_name="北京卡家"/>
                 </a:datas>
             </a:dataSet>
             <a:dataSet id="acr510n_invoice_method_ds">

src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview

@@ -38,6 +38,7 @@
                 url="${/request/@context_path}/uploadFile.lview"/>
         <a:link id="${/parameter/@layout_code}_prj500_cdd_downloadFile_id"
                 url="${/request/@context_path}/downloadFile.lview"/>
+        <a:link id="check_machine_number_id" model="prj.PRJ501N.project_approval" modelaction="query"/>
         <!--打印使用-->
         <a:link id="${/parameter/@layout_code}_con505_contract_content_id" model="cont.CON505.con505_contract_content"
                 modelaction="update"/>
@@ -92,7 +93,7 @@
                 //     record.getField('guarantee_letter_f').setReadOnly(true);
                 //     record.getField('guarantee_letter_f_n').setReadOnly(true);
                 // }else
-                if (record.get('division')!='70'){
+                if (record.get('division')!='70'&&record.get('division')!='92'){
                     document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN').style.display = 'none';
                     if(document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT_prompt')!=null){
@@ -116,7 +117,7 @@
 
                     document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_PRODUCE_DATE_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_PRODUCE_DATE').style.display = 'none';
-                }else if (record.get('division')=='70'){
+                }else if (record.get('division')=='70'||record.get('division')=='92'){
                     document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE').style.display = 'none';
 
@@ -126,6 +127,12 @@
                     document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE2_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE2').style.display = 'none';
                 }
+                if(record.get('division')=='92'){
+                    document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT').style.display = 'none';
+                }
 
 
                 if (record.get('business_type') == 'LEASE') {
@@ -154,7 +161,7 @@
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT').style.display = 'none';
                 }
-                if('${/parameter/@layout_code}' == "CONTRACT_CREATE_INC" && record.get('division') == '70'){
+                if('${/parameter/@layout_code}' == "CONTRACT_CREATE_INC" && (record.get('division') == '70'&&record.get('division') == '92')){
                     if(Ext.isEmpty(record.get('guarantee_letter_f'))){
                         record.set('guarantee_letter_f','N');
                         record.set('guarantee_letter_f_n','否');
@@ -605,6 +612,10 @@
                     Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租');
                     return;
                 }
+                // if(record.get('division')=='92'&&record.get('write_off_amount')<record.get('customer_margin')){
+                //     Leaf.showMessage('${l:PROMPT}', '北京卡家业务需要保证金入账后才能起租');
+                //     return;
+                // }
                 Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () {
                     window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
                     Leaf.request({
@@ -719,7 +730,7 @@
             var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'con_contract_lease_item');
             if(ds.id == lease_item_ds_id&&lease_item_ds_id){
                 var gridId= ds.bindname+'_layout_grid_id';
-                if(record.data.division=='70'){
+                if(record.data.division=='70' ||record.data.division=='92'){
                     $(gridId).hideColumn('full_name');
                     $(gridId).hideColumn('division_n');
                     $(gridId).hideColumn('equipments');
@@ -741,14 +752,6 @@
                     $(gridId).hideColumn('created_by_n');
                 }
 
-                if(record.data.division=='30'||record.data.division=='50'||record.data.division=='80'){
-                    record.getField('set_number').setRequired(true);
-                }else{
-                    record.getField('set_number').setReadOnly(true);
-                    if(Ext.isEmpty(record.get('set_number'))){
-                        record.set('set_number',1);
-                    }
-                }
             }
             var cashflow_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_CASHFLOW_1', 'con_contract_cashflow');
             if(ds.id == cashflow_ds_id&&cashflow_ds_id){
@@ -758,6 +761,45 @@
                 }
             }
         };
+        var count = 0;
+        window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
+            debugger;
+            var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'con_contract_lease_item');
+            var lease_item_record = $(lease_item_ds_id).getCurrentRecord();
+            var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
+            var contract_record = $(con_ds_id).getAt(0);
+            var project_id = contract_record.get('project_id');
+            var machine_number = lease_item_record.get('machine_number_70');
+            var division = lease_item_record.get('division');
+            var machine_number_num = 0;
+            if(division == '92' && !Leaf.isEmpty(machine_number)){
+                Leaf.request({
+                    url: $('check_machine_number_id').getUrl(),
+                    para: {
+                        machine_number: machine_number,
+                        project_id : project_id
+                    },
+                    scope: this,
+                    success: function (res) {
+                        machine_number_num= res.result.record.v_count;
+                    },
+                    failure: function () {
+                        return false;
+                    },
+                    scope: this,
+                    sync: true
+                });
+
+            }
+            if (machine_number_num>0 && count == 0){
+                count = count+1;
+                $L.showErrorMessage('提示', '该机号已存在，请重新确认！');
+                return false;
+            }else if(machine_number_num> 0 && count != 0){
+                count = 0;
+                return false;
+            }
+        }
 
 
         ]]></script>
@@ -774,3 +816,4 @@
     ]]></script>
     </a:view>
 </a:screen>
+

src/main/webapp/modules/cont/CON3400/contract_sales_report.lview

@@ -112,6 +112,9 @@
             };
             if(record.data.lease_name91=='Y'){//addby xsh35973 20221011 I-12357新增产品线
                 record.data.division=record.data.division+',91';
+            };
+            if(record.data.lease_name92=='Y'){//add by gzj
+                record.data.division=record.data.division+',92';
             };
                 record.data.division=record.data.division.substr(1,record.data.division.length);
             $('contract_sales_result_ds').query();
@@ -204,7 +207,7 @@
                 <a:checkBox name="lease_name90" bindTarget="contract_sales_report_ds" prompt="租赁二手机"/>
                 <a:checkBox name="lease_name40" bindTarget="contract_sales_report_ds" prompt="其它"/>
                 <a:checkBox name="lease_name91" bindTarget="contract_sales_report_ds" prompt="神钢建机"/>//addby xsh35973 20221011 I-12357新增产品线
-
+                <a:checkBox name="lease_name92" bindTarget="contract_sales_report_ds" prompt="北京卡家"/>
             </a:form>
 
             <a:grid id="contract_sales_result_ds_grid" bindTarget="contract_sales_result_ds" marginHeight="150" navBar="true" marginWidth="40">

src/main/webapp/modules/cont/CON3500/contract_ifrs9_report.lview

@@ -34,6 +34,7 @@
             record.data.division8='';
             record.data.division9='';
             record.data.division10='';
+            record.data.division11='';
             if(record.data.lease_name10=='Y'){
                 record.data.division1='10';
             }
@@ -64,9 +65,12 @@
             if(record.data.lease_name91=='Y'){
                 record.data.division10='91';
             };
+            if(record.data.lease_name92=='Y'){
+                record.data.division11='92';
+            };
          //   record.data.division=record.data.division.substr(1,record.data.division.length);
             if(record.data.division1 == ''&&record.data.division2 == ''&&record.data.division3 == ''&&record.data.division4 == ''
-                &&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''&&record.data.division10 == ''){
+                &&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''&&record.data.division10 == ''&&record.data.division11 == ''){
                // record.data.division1='10,20,30,40,50,60,70,80';
                 record.data.division1='10';
                 record.data.division2='20';
@@ -78,6 +82,7 @@
                 record.data.division8='80';
                 record.data.division9='90';
                 record.data.division10='91';
+                record.data.division11='92';
             };
             param['division1']= record.data.division1;
             param['division2']= record.data.division2;
@@ -89,6 +94,7 @@
             param['division8']= record.data.division8;
             param['division9']= record.data.division9;
             param['division10']= record.data.division10;
+            param['division11']= record.data.division11;
             param['period_name']=period_name;
             param['function_code'] = 'CON3400N';
             param['function_usage'] = 'MODIFY';

src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc

@@ -122,7 +122,11 @@
                 ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_D_ESWJ' ||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ_OEC'||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ'
                 ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_TJ'  //update by xsh35973 添加法人铁甲保证函
                 //addby xsh35973 20221017 神钢建机
-                ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_SG'||record_data.templet_code =='FINANCE_LEASE_CON_SG'||record_data.templet_code =='BUSINESS_CONTRACT_SG'||record_data.templet_code =='CON_CONTRACT_LEASE_BACK_SG') {
+                ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_SG'||record_data.templet_code =='FINANCE_LEASE_CON_SG'||record_data.templet_code =='BUSINESS_CONTRACT_SG'||record_data.templet_code =='CON_CONTRACT_LEASE_BACK_SG'
+                //add by gzj 2022-12-23 北京卡家
+                ||record_data.templet_code =='CON_COLLECTION_PAYMENT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ_1'||record_data.templet_code =='CSH_PAYMENT_REQ_KJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ_SURE'
+                ||record_data.templet_code =='CSH_PAYMENT_REQ_KJ_1'||record_data.templet_code =='CON_CONTRACT_MORTGAGE_KJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ_FR'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_KJ'
+                ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ'||record_data.templet_code =='PERSONAL_CREDIT_KJ'||record_data.templet_code =='ENTERPRISE_CREDIT_KJ') {
 
             // word转pdf
             var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id;

src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview

@@ -45,6 +45,9 @@
                 if(record.data.lease_name91=='Y'){//addby xsh35973 20221011 I-12357新增产品线
                     record.data.division=record.data.division+',91';
                 };
+                if(record.data.lease_name92=='Y'){//add by gzj 2022-12-19 10:17:53
+                    record.data.division=record.data.division+',92';
+                };
                 record.data.division=record.data.division.substr(1,record.data.division.length);
                 Leaf.Masker.mask(Ext.getBody(), '正在统计并查询，请稍等...');
                 Leaf.request({
@@ -126,6 +129,7 @@
                     <a:field checkedValue="Y" name="lease_name70" uncheckedValue="N" defaultValue="N"/>
                     <a:field checkedValue="Y" name="lease_name80" uncheckedValue="N" defaultValue="N"/>
                     <a:field checkedValue="Y" name="lease_name90" uncheckedValue="N" defaultValue="N"/>
+                    <a:field checkedValue="Y" name="lease_name92" uncheckedValue="N" defaultValue="N"/>
                     <a:field name="division" />
                     <a:field name="overdue_day1" required="true" prompt="已到期1个月界定天数" defaultValue="30"/>
                     <a:field name="overdue_day2" required="true" prompt="已到期2个月界定天数" defaultValue="60"/>
@@ -173,7 +177,7 @@
                     <a:checkBox name="lease_name90" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="租赁二手机"/>
                     <a:checkBox name="lease_name40" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="其它"/>
                 <a:checkBox name="lease_name91" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="神钢建机"/>//addby xsh35973 20221011 I-12357新增产品线
-
+                <a:checkBox name="lease_name92" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="北京卡家"/>
 
 
 

src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview

@@ -39,7 +39,7 @@
                 $(ds_con_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
                 $(ds_con_id).query();
             }
-            if ('${/model/pilot_run_user/record/@pilot_run_flag}' != 'Y'){
+            if ('${/model/pilot_run_user/record/@pilot_run_flag}' != 'Y') {
                 if ('${/parameter/@simulation_flag}' == 'Y') {
                     if (document.getElementById('${/parameter/@layout_code}_submit_approval')) {
                         document.getElementById('${/parameter/@layout_code}_submit_approval').style.display = 'none';
@@ -50,16 +50,16 @@
                     if (document.getElementById('${/parameter/@layout_code}_user_button4')) {
                         document.getElementById('${/parameter/@layout_code}_user_button4').style.display = 'none';
                     }
-            }
-            else{
+                } else {
                     if (document.getElementById('${/parameter/@layout_code}_user_button5')) {
                         document.getElementById('${/parameter/@layout_code}_user_button5').style.display = 'none';
                     }
                 }
-            if ('${/model/pilot_run_user/record/@pilot_run_flag}' == 'N'){
+                if ('${/model/pilot_run_user/record/@pilot_run_flag}' == 'N') {
                     $('${/parameter/@layout_code}_user_button4').hide();
                 }
             }
+        }
         });
         var calc_flag = 'N';
         //新增和加载时调用form

src/main/webapp/modules/cont/CON_ET003/con_early_termination_modify_query.lview

@@ -7,7 +7,7 @@
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
     <a:init-procedure>
-        <a:model-query fetchAll="true" model="basic.sys_code_value_v_lease" rootPath="hls_division_path"/>
+        <a:model-query fetchAll="true" model="basic.hls_division_for_lov" rootPath="hls_division_path"/>
     </a:init-procedure>
     <a:view>
         <a:link id="con_et_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
@@ -151,7 +151,7 @@
                         </a:mapping>
                     </a:field>
                     <!--产品线-->
-                    <a:field name="division_n" displayField="value_name" options="hls_division_ds" returnField="division" valueField="value_code"/>
+                    <a:field name="division_n" displayField="description" options="hls_division_ds" returnField="division" valueField="division"/>
                     <a:field name="contract_status"/>
                     <a:field name="contract_status_desc" displayField="code_value_name" options="contract_status_ds" returnField="contract_status" valueField="code_value"/>
                     <a:field name="req_employee_n"/>

src/main/webapp/modules/csh/CSH501/csh_payment_create_entrance.lview

@@ -215,8 +215,6 @@
 
             var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
-
-
             var param = {};
             param['payment_req_id'] = record.get('payment_req_id');
             param['document_category'] = record.get('document_category');
@@ -234,6 +232,7 @@
             } else if (record.get('business_type') == 'PREPAYMENT') {
                 param['function_code'] = 'CSH501_PRE_D';
             }
+
             if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN' || record.get('approval_status') == 'REJECT') {
                 param['function_usage'] = 'UPDATE';
                 param['function_code'] = 'CSH501D';

src/main/webapp/modules/csh/CSH501/csh_payment_req.lview

@@ -175,7 +175,7 @@
             var lnds_records = $(ds_id).getAll();
             if (ds.id == ds_id) {
                 for (var i = 0; i < lnds_records.length; i++) {
-                    if (lnds_records[i].get('division') == '70') {
+                    if (lnds_records[i].get('division') == '70' || lnds_records[i].get('division') == '92') {
                         lnds_records[i].getField('tenant_bank_account_number').setRequired(false);
                         lnds_records[i].getField('tenant_bank_account_number_n').setRequired(false);
                     }
@@ -227,7 +227,7 @@
             }
 
 
-            if ('${/parameter/@division}' ==91||'${/parameter/@division}' =='神钢建机'){
+            if ('${/parameter/@division}' ==91||'${/parameter/@division}' =='神钢建机'||'${/parameter/@division}' ==92||'${/parameter/@division}' =='北京卡家' ){
                 debugger
                 if (con_business_type == 'LEASEBACK'){
                     var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');

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

@@ -1535,7 +1535,7 @@
             debugger;
 
             var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
-            var H1, H54, H159, H16, H12,H99,H102;
+            var H1, H54, H159, H16, H12,H99,H102,H15,H44;
             for (var i = 0; i < temp_head_records.length; i++) {
                 if (temp_head_records[i].get('column_code') == 'H1') {
                     H1 = temp_head_records[i].get('column_value') || 0;
@@ -1553,6 +1553,12 @@
                 else if (temp_head_records[i].get('column_code') == 'H102') {
                     H102 = temp_head_records[i].get('column_value') || 0;
                 }
+                else if (temp_head_records[i].get('column_code') == 'H15') {
+                    H15 = temp_head_records[i].get('column_value') || 0;
+                }
+                else if (temp_head_records[i].get('column_code') == 'H44') {
+                    H44 = temp_head_records[i].get('column_value') || 0;
+                }
             }
 
             // if ('${/parameter/@division}'==91 && (((H1<=12 && plus(H54,4.75) != 6.75) || (H1 > 12 && plus(H54,4.75) != 7.3))||H54 < 0)){
@@ -1576,6 +1582,20 @@
                 unlock_calc_current_window();
                 return false;
             }
+            if('${/parameter/@division}'==92){
+                var dowm_payment = div(H16, plus(H99,H102)).toFixed(2) * 100;
+                if(dowm_payment < 30){
+                    Leaf.showMessage('${l:PROMPT}', '首付比例不低于30%');
+                    unlock_calc_current_window();
+                    return false;
+                }
+                if(H44!=100){
+                    Leaf.showMessage('${l:PROMPT}', '留购金需要为100元');
+                    unlock_calc_current_window();
+                    return false;
+                }
+            }
+
             if (H1 == 1 && (H159 == 'HL_PRICR_NTEST' || H159 == 'HL_PRICR_TEST')) {
                 Leaf.showMessage('${l:PROMPT}', '均等还款期数应大于1期');
                 unlock_calc_current_window();
@@ -1596,6 +1616,7 @@
                             });
                     }
                 }
+
             }
 
             lock_calc_current_window('${l:HLS.CALCULATING}');

src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview

@@ -33,6 +33,11 @@
                 $L.showErrorMessage("提示", '租赁物为铁甲业务的业务类型只能是售后回租！');
                 return false;
             }
+            if(record.data.division=='92'&&record.data.business_type!='LEASEBACK'){
+                debugger;
+                $L.showErrorMessage("提示", '租赁物为北京卡家的业务类型只能是售后回租！');
+                return false;
+            }
             if ($(ds_id).validate()) {
                 record.set('function_code', 'PRJ500D');
                 record.set('function_usage', 'CREATE');

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

@@ -76,6 +76,7 @@
             }
         }
 
+
         window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
             if (name == 'project_number' && value) {
                 return '<a href="javascript:open_project_modify_win(\'' + record.id + '\',\'' + record.ds.id + '\')">' + value + '</a>';