Merge branch 'remote_dev' of https://hel.hand-china.com/hlcm/leaf-hlcm into remote_dev

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

@@ -296,7 +296,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:record code_value="92" code_value_name="北京心诚"/>
                 </a:datas>
             </a:dataSet>
             <a:dataSet id="acr510n_invoice_method_ds">

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

@@ -210,9 +210,9 @@
                 <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:checkBox name="lease_name92" bindTarget="contract_sales_report_ds" prompt="北京心诚"/>
                 <a:checkBox name="lease_name99" bindTarget="contract_sales_report_ds" prompt="工程机械"/>
-            </a:form>
+             </a:form>
 
             <a:grid id="contract_sales_result_ds_grid" bindTarget="contract_sales_result_ds" marginHeight="150" navBar="true" marginWidth="40">
                 <a:columns>

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

@@ -209,7 +209,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="北京卡家"/>
+                <a:checkBox name="lease_name92" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="北京心诚"/>
                 <a:checkBox name="lease_name99" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="工程机械"/>
 
 

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

@@ -300,7 +300,7 @@
                     }
                 }
             }
-            if ('${/parameter/@division}' ==91||'${/parameter/@division}' =='神钢建机'||'${/parameter/@division}' ==92||'${/parameter/@division}' =='北京卡家' ){
+            if ('${/parameter/@division}' ==91||'${/parameter/@division}' =='神钢建机'||'${/parameter/@division}' ==92||'${/parameter/@division}' =='北京心诚' ){
                 if (con_business_type == 'LEASEBACK'){
                     var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
                     var records = $(ds_id).getAll();

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

@@ -37,7 +37,7 @@
             }
             if(record.data.division=='92'&&record.data.business_type!='LEASEBACK'){
                 debugger;
-                $L.showErrorMessage("提示", '租赁物为北京卡家的业务类型只能是售后回租！');
+                $L.showErrorMessage("提示", '租赁物为北京心诚的业务类型只能是售后回租！');
                 return false;
             }
             if ($(ds_id).validate()) {