Skip to content

L
leaf-hlcm
Commit d05524c1 authored by 邓乾隆's avatar 邓乾隆
Browse files
Options

铁甲业务产品线描述校验提示修改为二手机业务

parent fb74f44f
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 20 deletions
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ d05524c1
...@@ -294,12 +294,14 @@ ...@@ -294,12 +294,14 @@
<a:record code_value="30" code_value_name="高空作业车"/> <a:record code_value="30" code_value_name="高空作业车"/>
<a:record code_value="40" code_value_name="其它"/> <a:record code_value="40" code_value_name="其它"/>
<a:record code_value="50" code_value_name="星邦高空作业车"/> <a:record code_value="50" code_value_name="星邦高空作业车"/>
<a:record code_value="90" code_value_name="租赁二手机"/> <!--<a:record code_value="90" code_value_name="租赁二手机"/>-->
<a:record code_value="90" code_value_name="租赁二手机（日立）"/>
<a:record code_value="91" 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:record code_value="99" code_value_name="工程机械"/> <a:record code_value="99" code_value_name="工程机械"/>
<a:record code_value="80" 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:datas> </a:datas>
</a:dataSet> </a:dataSet>
<a:dataSet id="acr510n_invoice_method_ds"> <a:dataSet id="acr510n_invoice_method_ds">
......
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ d05524c1
...@@ -613,7 +613,8 @@ ...@@ -613,7 +613,8 @@
if ($(ds_id).validate()) { if ($(ds_id).validate()) {
if('${/model/wfl_status/record/@mar_status}' == 'Y' || Ext.isEmpty('${/model/wfl_status/record/@mar_status}')){ if('${/model/wfl_status/record/@mar_status}' == 'Y' || Ext.isEmpty('${/model/wfl_status/record/@mar_status}')){
if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin')){ if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin')){
Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租'); // Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租');
Leaf.showMessage('${l:PROMPT}', '二手机业务需要保证金入账后才能起租');
return; return;
} }
} }
......
src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
View file @ d05524c1
...@@ -205,9 +205,11 @@ ...@@ -205,9 +205,11 @@
<a:checkBox name="lease_name30" bindTarget="contract_sales_report_ds" prompt="高空作业车"/> <a:checkBox name="lease_name30" bindTarget="contract_sales_report_ds" prompt="高空作业车"/>
<a:checkBox name="lease_name50" bindTarget="contract_sales_report_ds" prompt="星邦高空作业车"/> <a:checkBox name="lease_name50" bindTarget="contract_sales_report_ds" prompt="星邦高空作业车"/>
<a:checkBox name="lease_name60" bindTarget="contract_sales_report_ds" prompt="新业务"/> <a:checkBox name="lease_name60" bindTarget="contract_sales_report_ds" prompt="新业务"/>
<a:checkBox name="lease_name70" bindTarget="contract_sales_report_ds" prompt="铁甲业务"/> <!-- <a:checkBox name="lease_name70" bindTarget="contract_sales_report_ds" prompt="铁甲业务"/>-->
<a:checkBox name="lease_name70" bindTarget="contract_sales_report_ds" prompt="二手机业务"/>
<a:checkBox name="lease_name80" bindTarget="contract_sales_report_ds" prompt="叉车"/> <a:checkBox name="lease_name80" bindTarget="contract_sales_report_ds" prompt="叉车"/>
<a:checkBox name="lease_name90" bindTarget="contract_sales_report_ds" prompt="租赁二手机"/> <!-- <a:checkBox name="lease_name90" bindTarget="contract_sales_report_ds" prompt="租赁二手机"/>-->
<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_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_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="北京心诚"/>
......
src/main/webapp/modules/cont/CON733/hls_con_contract_et_create_entrance.lview
View file @ d05524c1
...@@ -120,7 +120,8 @@ ...@@ -120,7 +120,8 @@
} }
if(record.get('division') == '70' && ccr_document_type == 'LEASE_CHAG'){ if(record.get('division') == '70' && ccr_document_type == 'LEASE_CHAG'){
//if(record.get('division') == '70' &&(ccr_document_type == 'LEASE_CHAG' ||ccr_document_type == 'CUT_CHAG')){ //if(record.get('division') == '70' &&(ccr_document_type == 'LEASE_CHAG' ||ccr_document_type == 'CUT_CHAG')){
Leaf.showErrorMessage('${l:PROMPT}', '铁甲业务无法操作此项变更!'); // Leaf.showErrorMessage('${l:PROMPT}', '铁甲业务无法操作此项变更!');
Leaf.showErrorMessage('${l:PROMPT}', '二手机业务无法操作此项变更!');
return; return;
} }
//if((record.get('division') != '70' && record.get('division') != '92') && ccr_document_type == 'CCR_BEFORE_SIGN'){ //if((record.get('division') != '70' && record.get('division') != '92') && ccr_document_type == 'CCR_BEFORE_SIGN'){
......
src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview
View file @ d05524c1
...@@ -204,9 +204,11 @@ ...@@ -204,9 +204,11 @@
<a:checkBox name="lease_name50" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="星邦高空作业车"/> <a:checkBox name="lease_name50" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="星邦高空作业车"/>
<a:checkBox name="lease_name60" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务"/> <a:checkBox name="lease_name60" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务"/>
<a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="铁甲业务"/> <!-- <a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="铁甲业务"/>-->
<a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="二手机业务"/>
<a:checkBox name="lease_name80" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="叉车"/> <a:checkBox name="lease_name80" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="叉车"/>
<a:checkBox name="lease_name90" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="租赁二手机"/> <!-- <a:checkBox name="lease_name90" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="租赁二手机"/>-->
<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_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_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="北京心诚"/>
......
src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview
View file @ d05524c1
...@@ -63,7 +63,8 @@ ...@@ -63,7 +63,8 @@
} }
//对铁甲和非铁甲的校验 add 18943 //对铁甲和非铁甲的校验 add 18943
if (a[i].get('division') != division) { if (a[i].get('division') != division) {
$L.showErrorMessage("提示", '铁甲业务合同和非铁甲业务合同不可同一批次申请，请确认！'); // $L.showErrorMessage("提示", '铁甲业务合同和非铁甲业务合同不可同一批次申请，请确认！');
$L.showErrorMessage("提示", '二手机业务合同和非二手机业务合同不可同一批次申请，请确认！');
return; return;
} }
//暂时去掉 //暂时去掉
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ d05524c1
...@@ -496,7 +496,8 @@ ...@@ -496,7 +496,8 @@
var param={}; var param={};
param['function_code']= 'CSH531F3'; param['function_code']= 'CSH531F3';
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'MODIFY';
param['url_title']='控制茂甲保证金校验'; // param['url_title']='控制茂甲保证金校验';
param['url_title']='控制二手机业务保证金校验';
hls_doc_get_layout_code('hls_get_layout_code_link_id',param,'csh_margin_check_id'); hls_doc_get_layout_code('hls_get_layout_code_link_id',param,'csh_margin_check_id');
} }
function agricultural_bank() { function agricultural_bank() {
...@@ -741,7 +742,8 @@ ...@@ -741,7 +742,8 @@
<a:gridButton click="csh510_csh_trx_bank_apply_new" text="提交复核" id="csh510_csh_trx_bank_apply_new"/> <a:gridButton click="csh510_csh_trx_bank_apply_new" text="提交复核" id="csh510_csh_trx_bank_apply_new"/>
<!-- <a:gridButton click="csh510_csh_trx_bank_drop" text="CSH510.CSH_TRANSACTION.DROP_BTN" id="csh510_csh_trx_bank_drop"/>--> <!-- <a:gridButton click="csh510_csh_trx_bank_drop" text="CSH510.CSH_TRANSACTION.DROP_BTN" id="csh510_csh_trx_bank_drop"/>-->
<a:gridButton click="csh510_receipt_reset" text="HLS.RESET"/> <a:gridButton click="csh510_receipt_reset" text="HLS.RESET"/>
<a:gridButton id="csh531_margin_check_id" click="csh531_margin_check" text="茂甲保证金校验"/> <!-- <a:gridButton id="csh531_margin_check_id" click="csh531_margin_check" text="茂甲保证金校验"/>-->
<a:gridButton id="csh531_margin_check_id" click="csh531_margin_check" text="二手机业务保证金校验"/>
<a:gridButton id="Ocr_Bank_id" click="agricultural_bank" text="农行回单"/> <a:gridButton id="Ocr_Bank_id" click="agricultural_bank" text="农行回单"/>
<!-- <a:gridButton click="csh510_csh_transaction_batch_update" text="批量过账"/>--> <!-- <a:gridButton click="csh510_csh_transaction_batch_update" text="批量过账"/>-->
<!-- <a:gridButton click="csh510_receipt" text="财务认领"/> --> <!-- <a:gridButton click="csh510_receipt" text="财务认领"/> -->
......
src/main/webapp/modules/csh/CSH531F/csh_bank_recoi_margin_check.lview
View file @ d05524c1
...@@ -56,12 +56,14 @@ ...@@ -56,12 +56,14 @@
var marAfterStatus= params.mar_after_status; var marAfterStatus= params.mar_after_status;
var beforStatus=params.mar_before_status; var beforStatus=params.mar_before_status;
if(Ext.isEmpty(marAfterStatus)){ if(Ext.isEmpty(marAfterStatus)){
Leaf.showErrorMessage('提示', '修改后茂甲保证金校验状态不能为空!'); // Leaf.showErrorMessage('提示', '修改后茂甲保证金校验状态不能为空!');
Leaf.showErrorMessage('提示', '修改后二手机业务保证金校验状态不能为空!');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false; return false;
} }
if (marAfterStatus == '${/model/wfl_status/record/@mar_status}' || marAfterStatus == beforStatus) { if (marAfterStatus == '${/model/wfl_status/record/@mar_status}' || marAfterStatus == beforStatus) {
Leaf.showErrorMessage('提示', '请选择与修改前茂甲保证金校验不同的状态'); // Leaf.showErrorMessage('提示', '请选择与修改前茂甲保证金校验不同的状态');
Leaf.showErrorMessage('提示', '请选择与修改前二手机业务保证金校验不同的状态');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false; return false;
} }
......
src/main/webapp/modules/hls/HLS303/bp_agent_modify.lview
View file @ d05524c1
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
record.getField('agent_bs_area_level').setPropertity('validator', 'hls303_record_field_validator'); record.getField('agent_bs_area_level').setPropertity('validator', 'hls303_record_field_validator');
record.getField('validity_period_from').setPropertity('validator', 'hls303_record_field_validator'); record.getField('validity_period_from').setPropertity('validator', 'hls303_record_field_validator');
record.getField('validity_period_to').setPropertity('validator', 'hls303_record_field_validator'); record.getField('validity_period_to').setPropertity('validator', 'hls303_record_field_validator');
if(record.get('extra_nam')=='茂甲'||record.get('extra_nam')=='铁甲'){ if(record.get('extra_nam')=='茂甲'||record.get('extra_nam')=='铁甲' ||record.get('extra_nam')=='河南融投'){
record.getField('agent_phone').setRequired(true); record.getField('agent_phone').setRequired(true);
} }
} }
......
src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview
View file @ d05524c1
...@@ -63,7 +63,8 @@ ...@@ -63,7 +63,8 @@
var req_ln_records = req_ln_ds.getSelected(); var req_ln_records = req_ln_ds.getSelected();
var con_records = con_ds.getSelected(); var con_records = con_ds.getSelected();
if (req_ln_records.length == 0 || con_records.length > 0) { if (req_ln_records.length == 0 || con_records.length > 0) {
Leaf.showMessage('${l:PROMPT}', '只能勾选铁甲付款单数据！'); // Leaf.showMessage('${l:PROMPT}', '只能勾选铁甲付款单数据！');
Leaf.showMessage('${l:PROMPT}', '只能勾选二手机业务付款单数据！');
return; return;
} }
new Leaf.Window({ new Leaf.Window({
...@@ -90,7 +91,8 @@ ...@@ -90,7 +91,8 @@
var req_ln_records = req_ln_ds.getSelected(); var req_ln_records = req_ln_ds.getSelected();
var con_records = con_ds.getSelected(); var con_records = con_ds.getSelected();
if (req_ln_records.length == 0 || con_records.length > 0) { if (req_ln_records.length == 0 || con_records.length > 0) {
Leaf.showMessage('${l:PROMPT}', '只能勾选铁甲付款单数据！'); //Leaf.showMessage('${l:PROMPT}', '只能勾选铁甲付款单数据！');
Leaf.showMessage('${l:PROMPT}', '只能勾选二手机业务付款单数据！');
return; return;
} }
new Leaf.Window({ new Leaf.Window({
......
src/main/webapp/modules/hsbc/HSBC110/hsbc_paying_batch_modify.lview
View file @ d05524c1
...@@ -44,7 +44,8 @@ ...@@ -44,7 +44,8 @@
var r_records = r_batch_ds.getSelected(); var r_records = r_batch_ds.getSelected();
if (records.length != 0 && r_records.length != 0) { if (records.length != 0 && r_records.length != 0) {
Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！'); // Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！');
Leaf.showMessage('${l:PROMPT}', '不能同时选择二手机业务付款单和退款付款单！');
return; return;
} }
...@@ -118,7 +119,8 @@ ...@@ -118,7 +119,8 @@
var bank_item; var bank_item;
if (records.length != 0 && r_records.length != 0) { if (records.length != 0 && r_records.length != 0) {
Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！'); // Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！');
Leaf.showMessage('${l:PROMPT}', '不能同时选择二手机业务付款单和退款付款单！');
return; return;
} }
...@@ -177,7 +179,8 @@ ...@@ -177,7 +179,8 @@
var r_records = r_batch_ds.getSelected(); var r_records = r_batch_ds.getSelected();
if (records.length != 0 && r_records.length != 0) { if (records.length != 0 && r_records.length != 0) {
Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！'); //Leaf.showMessage('${l:PROMPT}', '不能同时选择铁甲付款单和退款付款单！');
Leaf.showMessage('${l:PROMPT}', '不能同时选择二手机业务付款单和退款付款单！');
return; return;
} }
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
View file @ d05524c1
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
var record = $(ds_id).getCurrentRecord(); var record = $(ds_id).getCurrentRecord();
if(record.data.division=='70'&&record.data.business_type!='LEASEBACK'){ if(record.data.division=='70'&&record.data.business_type!='LEASEBACK'){
debugger; debugger;
$L.showErrorMessage("提示", '租赁物为铁甲业务的业务类型只能是售后回租！'); // $L.showErrorMessage("提示", '租赁物为铁甲业务的业务类型只能是售后回租！');
$L.showErrorMessage("提示", '租赁物为二手机业务的业务类型只能是售后回租！');
return false; return false;
} }
if(record.data.division=='92'&&record.data.business_type!='LEASEBACK'){ if(record.data.division=='92'&&record.data.business_type!='LEASEBACK'){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment