Skip to content

L
leaf-hlcm
Commit 97e4ffca authored by Darming's avatar Darming
Browse files
Options

[fix]评分-排除第三方信用度

parent c6d6ef11
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 68 deletions
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ 97e4ffca
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
if (bp_tenant_detail_r && ds.id == prj_project_ds_id) { if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
for (var key in bp_tenant_detail_r.data) { for (var key in bp_tenant_detail_r.data) {
if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id') { if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n') {
if(!bp_tenant_detail_r.get(key)){ if(!bp_tenant_detail_r.get(key)){
Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！"); Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！");
bp_rate_flag = false; bp_rate_flag = false;
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 97e4ffca
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="prj.PRJ500D.sys_user_lv" <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="prj.PRJ500D.sys_user_lv"
rootPath="user_name_path"/> rootPath="user_name_path"/>
<s:server-script import="contract_print_path.js"><![CDATA[ <s:server-script import="contract_print_path.js"><![CDATA[
$ctx.parameter.file_path = con_print_path['con_print_path']; $ctx.parameter.file_path = con_print_path['con_print_path'];
$ctx.parameter.tomcat_source = con_print_path['tomcat_source']; $ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
]]> ]]>
</s:server-script> </s:server-script>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
...@@ -387,28 +387,28 @@ ...@@ -387,28 +387,28 @@
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>'; return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
} else if (name == 'attach_file_name') { } else if (name == 'attach_file_name') {
/* if (value != null) { /* if (value != null) {
var link = '${/request/@context_path}/atm_download.lsc?attachment_id='; var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
var str = value.split(';;'); var str = value.split(';;');
var url = ''; var url = '';
for (var i = 0; i < str.length; i++) { for (var i = 0; i < str.length; i++) {
// //
var temp = str[i].split('--'); var temp = str[i].split('--');
if (!Leaf.isEmpty(temp[0])) { if (!Leaf.isEmpty(temp[0])) {
var file_name = temp[0].toUpperCase(); var file_name = temp[0].toUpperCase();
var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase(); var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
if (file_name.indexOf('.PDF') >= 0) { if (file_name.indexOf('.PDF') >= 0) {
url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ','; url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
} else if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') { } else if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ','; url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
} else { } else {
url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ','; url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
} }
} }
} }
return url; return url;
}*/ }*/
if (value != null) { if (value != null) {
var link = '${/request/@context_path}/atm_download.lsc?attachment_id='; var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
var str = value.split(';;'); var str = value.split(';;');
...@@ -421,7 +421,7 @@ ...@@ -421,7 +421,7 @@
var file_name = temp[0].toUpperCase(); var file_name = temp[0].toUpperCase();
var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase(); var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
if (file_name.indexOf('.BMP') >= 0 || file_name.indexOf('.JPG') >= 0 || file_name.indexOf('.JPEG') >= 0 || file_name.indexOf('.PNG') >= 0 || file_name.indexOf('.GIF') >= 0) { if (file_name.indexOf('.BMP') >= 0 || file_name.indexOf('.JPG') >= 0 || file_name.indexOf('.JPEG') >= 0 || file_name.indexOf('.PNG') >= 0 || file_name.indexOf('.GIF') >= 0) {
url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ','; url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
} else { } else {
url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ','; url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
...@@ -534,28 +534,28 @@ ...@@ -534,28 +534,28 @@
var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail'); var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
//选择承租人带出开票信息 //选择承租人带出开票信息
if(prj_project_ds_id==ds.id &&prj_project_ds_id){ if (prj_project_ds_id == ds.id && prj_project_ds_id) {
if(name=="bp_id_tenant_n" && value){ if (name == "bp_id_tenant_n" && value) {
var bp_id_tenant = record.get('bp_id_tenant'); var bp_id_tenant = record.get('bp_id_tenant');
Leaf.Masker.mask(Ext.getBody()); Leaf.Masker.mask(Ext.getBody());
Leaf.request({ Leaf.request({
url: $('hls_bp_master_billing_link').getUrl(), url: $('hls_bp_master_billing_link').getUrl(),
para: { para: {
bp_id:bp_id_tenant bp_id: bp_id_tenant
}, },
success: function(res) { success: function (res) {
var billing_into=res.result.record; var billing_into = res.result.record;
var prj_project_bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_bp'); var prj_project_bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_bp');
$(prj_project_bp_ds_id).getAt(0).set('taxpayer_type_n',billing_into.taxpayer_type_n); $(prj_project_bp_ds_id).getAt(0).set('taxpayer_type_n', billing_into.taxpayer_type_n);
$(prj_project_bp_ds_id).getAt(0).set('taxpayer_type',billing_into.taxpayer_type); $(prj_project_bp_ds_id).getAt(0).set('taxpayer_type', billing_into.taxpayer_type);
$(prj_project_bp_ds_id).getAt(0).set('invoice_title',billing_into.invoice_title); $(prj_project_bp_ds_id).getAt(0).set('invoice_title', billing_into.invoice_title);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_address',billing_into.invoice_bp_address); $(prj_project_bp_ds_id).getAt(0).set('invoice_bp_address', billing_into.invoice_bp_address);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_phone_num',billing_into.invoice_bp_phone_num); $(prj_project_bp_ds_id).getAt(0).set('invoice_bp_phone_num', billing_into.invoice_bp_phone_num);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_bank',billing_into.invoice_bp_bank); $(prj_project_bp_ds_id).getAt(0).set('invoice_bp_bank', billing_into.invoice_bp_bank);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_bank_account',billing_into.invoice_bp_bank_account); $(prj_project_bp_ds_id).getAt(0).set('invoice_bp_bank_account', billing_into.invoice_bp_bank_account);
$(prj_project_bp_ds_id).getAt(0).set('tax_registry_num',billing_into.tax_registry_num); $(prj_project_bp_ds_id).getAt(0).set('tax_registry_num', billing_into.tax_registry_num);
$(prj_project_bp_ds_id).getAt(0).set('ref_v07',billing_into.ref_v07); $(prj_project_bp_ds_id).getAt(0).set('ref_v07', billing_into.ref_v07);
//record.set(); //record.set();
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
...@@ -570,7 +570,7 @@ ...@@ -570,7 +570,7 @@
}); });
//根据承租人查找该承租人的历史合同信息 //根据承租人查找该承租人的历史合同信息
$(prj_project_history_ds_id).setQueryUrl('${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query'); $(prj_project_history_ds_id).setQueryUrl('${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query');
$(prj_project_history_ds_id).setQueryParameter("bp_id",bp_id_tenant); $(prj_project_history_ds_id).setQueryParameter("bp_id", bp_id_tenant);
$(prj_project_history_ds_id).query(); $(prj_project_history_ds_id).query();
Leaf.Masker.mask(Ext.getBody()); Leaf.Masker.mask(Ext.getBody());
...@@ -609,7 +609,7 @@ ...@@ -609,7 +609,7 @@
scope: this scope: this
}); });
} }
if(name == 'legal_person' && value){ if (name == 'legal_person' && value) {
$(score_ds_id).getCurrentRecord().set('score_name', value); $(score_ds_id).getCurrentRecord().set('score_name', value);
} }
if (name == 'pay_method') { if (name == 'pay_method') {
...@@ -629,19 +629,19 @@ ...@@ -629,19 +629,19 @@
record.getField('bank_account_id_n').setRequired(false); record.getField('bank_account_id_n').setRequired(false);
} }
}
if(name=='payment_deduction') {
var quoation_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var quoation_record = $(quoation_ds_id).getCurrentRecord();
var down_payment = quoation_record.get('down_payment') || 0;
var calc_session_id= quoation_record.get('calc_session_id');
var other_payment2;
if (value &&calc_session_id&& value == 'NO_DEDUCTION') {
other_payment2 = 0;
} else if (value &&calc_session_id&& value != 'NO_DEDUCTION'){
other_payment2=down_payment;
} }
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); if (name == 'payment_deduction') {
var quoation_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var quoation_record = $(quoation_ds_id).getCurrentRecord();
var down_payment = quoation_record.get('down_payment') || 0;
var calc_session_id = quoation_record.get('calc_session_id');
var other_payment2;
if (value && calc_session_id && value == 'NO_DEDUCTION') {
other_payment2 = 0;
} else if (value && calc_session_id && value != 'NO_DEDUCTION') {
other_payment2 = down_payment;
}
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({ Leaf.request({
url: $('${/parameter/@layout_code}_prj_project_update_status_link_id').getUrl(), url: $('${/parameter/@layout_code}_prj_project_update_status_link_id').getUrl(),
para: { para: {
...@@ -661,12 +661,12 @@ ...@@ -661,12 +661,12 @@
}); });
} }
if(name == 'bp_id_tenant'){ if (name == 'bp_id_tenant') {
if(!value){ if (!value) {
var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord(); var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
if (bp_tenant_detail_r) { if (bp_tenant_detail_r) {
for (var key in bp_tenant_detail_r.data) { for (var key in bp_tenant_detail_r.data) {
bp_tenant_detail_r.set(key,''); bp_tenant_detail_r.set(key, '');
} }
} }
} }
...@@ -865,7 +865,7 @@ ...@@ -865,7 +865,7 @@
fullScreen: true, fullScreen: true,
draggable: true draggable: true
}); });
win.on('close',function(){ win.on('close', function () {
$(ds_id).query(); $(ds_id).query();
}); });
} }
...@@ -890,9 +890,9 @@ ...@@ -890,9 +890,9 @@
var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord(); var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
if (bp_tenant_detail_r) { if (bp_tenant_detail_r) {
for (var key in bp_tenant_detail_r.data) { for (var key in bp_tenant_detail_r.data) {
if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id') { if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n') {
if(!bp_tenant_detail_r.get(key)){ if (!bp_tenant_detail_r.get(key)) {
Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！"); Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！");
return; return;
} }
} }
...@@ -950,19 +950,18 @@ ...@@ -950,19 +950,18 @@
if (bp_tenant_detail_r && ds.id == prj_project_ds_id) { if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
for (var key in bp_tenant_detail_r.data) { for (var key in bp_tenant_detail_r.data) {
if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id') { if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n') {
debugger; if (!bp_tenant_detail_r.get(key)) {
if(!bp_tenant_detail_r.get(key)){ Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！");
Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！");
bp_rate_flag = false; bp_rate_flag = false;
break; break;
}else{ } else {
bp_rate_flag = true; bp_rate_flag = true;
} }
} }
} }
} }
if(!bp_rate_flag){ if (!bp_rate_flag) {
return false; return false;
} }
......
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