Skip to content

L
leaf-hlcm
Commit 65c31198 authored by 21471731's avatar 21471731
Browse files
Options

租赁物导入调整22

parent cd76f771
Show whitespace changes
Inline Side-by-side
Showing with 145 additions and 35 deletions
src/main/resources/profiles/dev/config.properties
View file @ 65c31198
...@@ -19,7 +19,7 @@ redis.db=10 ...@@ -19,7 +19,7 @@ redis.db=10
db.type=oracle db.type=oracle
db.driverClassName=oracle.jdbc.driver.OracleDriver db.driverClassName=oracle.jdbc.driver.OracleDriver
db.url=jdbc:oracle:thin:@10.200.17.70:1521/HLS.orcl db.url=jdbc:oracle:thin:@10.200.17.180:1521/HLCMTEST
db.username=hl_cm_dev db.username=hl_cm_dev
db.password=hl_cm_dev db.password=hl_cm_dev
db.maxPoolSize=100 db.maxPoolSize=100
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ 65c31198
...@@ -107,6 +107,19 @@ ...@@ -107,6 +107,19 @@
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
//首次插入 //首次插入
if (!record.get('calc_session_id')) { if (!record.get('calc_session_id')) {
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('${l:HLS.PROMPT}', '租赁物台数与查看明细中台数不一致，请重新维护！');
return;
}
}
record.set('to_doc_table', 'HLS_FIN_CALCULATOR_HD'); record.set('to_doc_table', 'HLS_FIN_CALCULATOR_HD');
var calc_recreate_L_formula; var calc_recreate_L_formula;
calc_recreate_L_formula = 'Y'; calc_recreate_L_formula = 'Y';
...@@ -168,6 +181,18 @@ ...@@ -168,6 +181,18 @@
}); });
} else { } else {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('${l:HLS.PROMPT}', '租赁物台数与查看明细中台数不一致，请重新维护！');
return;
}
}
var cal_hd_price_list = record.get('cal_hd_price_list'); var cal_hd_price_list = record.get('cal_hd_price_list');
var price_list = record.get('price_list'); var price_list = record.get('price_list');
if (cal_hd_price_list == price_list) { if (cal_hd_price_list == price_list) {
...@@ -369,23 +394,6 @@ ...@@ -369,23 +394,6 @@
hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}contract_number_query_link', record.ds.id, '${/parameter/@layout_code}'); hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}contract_number_query_link', record.ds.id, '${/parameter/@layout_code}');
} }
function prj501n_lease_number_renderer(record_id, ds_id){
var record = $(ds_id).findById(record_id);
var param = {};
param['project_status'] = 'NEW';
param['division'] = record.get('division');
param['project_lease_item_id'] = record.get('project_lease_item_id');
param['lease_item_id'] = record.get('lease_item_id');
param['set_number'] = record.get('set_number');
param['document_id'] = record.get('project_id');
param['function_code'] = 'PRJ501INC';
param['function_usage'] = 'UPDATE';
param['winid'] = '${/parameter/@layout_code}_project_create_win_id';
param['url_title'] = '租赁物清单';
hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}lease_prj_create_query_link', record.ds.id, null);
}
var bp_rate_flag; var bp_rate_flag;
/*保存前调用，生成项目编号*/ /*保存前调用，生成项目编号*/
window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) { window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
...@@ -484,6 +492,23 @@ ...@@ -484,6 +492,23 @@
}; };
function prj501n_lease_number_renderer(record_id, ds_id){
var prj_quotation_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
var record = $(ds_id).findById(record_id);
var param = {};
param['project_status'] = 'NEW';
param['division'] = record.get('division');
param['project_lease_item_id'] = record.get('project_lease_item_id');
param['lease_item_id'] = record.get('lease_item_id');
param['set_number'] = record.get('set_number');
param['document_id'] = record.get('project_id');
param['function_code'] = 'PRJ501INC';
param['function_usage'] = 'UPDATE';
param['winid'] = '${/parameter/@layout_code}_project_create_win_id';
param['url_title'] = '租赁物清单';
hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}lease_prj_create_query_link', prj_quotation_ds, null);
}
//超链接渲染 //超链接渲染
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) { window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
var link_function = ''; var link_function = '';
...@@ -551,6 +576,10 @@ ...@@ -551,6 +576,10 @@
$(prj_project_lease_item_ds_id).query(); $(prj_project_lease_item_ds_id).query();
$(prj_quotation_ds_id).query(); $(prj_quotation_ds_id).query();
} }
if (prj_project_lease_item_ds_id==ds.id){
$(prj_quotation_ds_id).query();
}
var record = $(ds_id).getCurrentRecord(); var record = $(ds_id).getCurrentRecord();
var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=' + record.get('bp_id_tenant'); var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=' + record.get('bp_id_tenant');
$(tenant_ds_id).setQueryUrl(url); $(tenant_ds_id).setQueryUrl(url);
...@@ -1082,6 +1111,9 @@ ...@@ -1082,6 +1111,9 @@
var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item'); var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(lease_item_ds_id == ds.id &&lease_item_ds_id){ if(lease_item_ds_id == ds.id &&lease_item_ds_id){
var gridId= ds.bindname+'_layout_grid_id'; var gridId= ds.bindname+'_layout_grid_id';
if(division!='30' && division!='50'){
$(gridId).hideColumn('machine_number_n');
}
if(division=='70'){ if(division=='70'){
if(record!=''){ if(record!=''){
record.getField('lease_name_n').setRequired(true); record.getField('lease_name_n').setRequired(true);
...@@ -1285,6 +1317,32 @@ ...@@ -1285,6 +1317,32 @@
if ($(ds_id).validate()) { if ($(ds_id).validate()) {
Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () { Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () {
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(division=='30'||division=='50'){
var record=$(lease_ds_id).getCurrentRecord();
var records=$(ds_id).getCurrentRecord();
var set_number=records.get('set_number');
var total_number=records.get('total_number');
var total_price=records.get('total_price');
var lease_item_amount=record.get('lease_item_amount');
var residual_value=record.get('residual_value');
var q_value=records.get('q_value');
if(total_price!=lease_item_amount &&total_price!=null){
Leaf.showMessage('${l:PROMPT}', '支付计划页面“设备价格”字段值与租赁物明细“设备单价（总）”合计不相等，无法进行提交!');
return;
}else if(q_value!=residual_value){
Leaf.showMessage('${l:PROMPT}', '支付计划中留购价与报价计算不一致，无法提交审批!');
return;
}else if(total_number!=0 && set_number!=total_number){
Leaf.showMessage('${l:HLS.PROMPT}', '租赁物台数与查看明细中台数不一致，请重新维护！');
return;
}
}
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({ Leaf.request({
url: $('prj_approval_link_id').getUrl(), url: $('prj_approval_link_id').getUrl(),
...@@ -1319,6 +1377,31 @@ ...@@ -1319,6 +1377,31 @@
}else { }else {
if ($(ds_id).validate()) { if ($(ds_id).validate()) {
Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () { Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () {
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if(division=='30'||division=='50'){
var record=$(lease_ds_id).getCurrentRecord();
var records=$(ds_id).getCurrentRecord();
var set_number=records.get('set_number');
var total_number=records.get('total_number');
var total_price=records.get('total_price');
var lease_item_amount=record.get('lease_item_amount');
var residual_value=record.get('residual_value');
var q_value=records.get('q_value');
if(total_price!=lease_item_amount &&total_price!=null){
Leaf.showMessage('${l:PROMPT}', '支付计划页面“设备价格”字段值与租赁物明细“设备单价（总）”合计不相等，无法进行提交!');
return;
}else if(q_value!=residual_value){
Leaf.showMessage('${l:PROMPT}', '支付计划中留购价与报价计算不一致，无法提交审批!');
return;
}else if(total_number!=0 && set_number!=total_number){
Leaf.showMessage('${l:HLS.PROMPT}', '租赁物台数与查看明细中台数不一致，请重新维护！');
return;
}
}
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({ Leaf.request({
url: $('prj_approval_link_id').getUrl(), url: $('prj_approval_link_id').getUrl(),
......
src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import_details.lview
View file @ 65c31198
...@@ -49,11 +49,21 @@ ...@@ -49,11 +49,21 @@
record.getField('seq').setReadOnly(true); record.getField('seq').setReadOnly(true);
record.getField('asset_num').setReadOnly(true); record.getField('asset_num').setReadOnly(true);
record.getField('asset_type').setReadOnly(true); record.getField('asset_type').setReadOnly(true);
record.getField('asset_type_n').setReadOnly(true);
record.getField('asset_name').setReadOnly(true);
record.getField('asset_name_n').setReadOnly(true); record.getField('asset_name_n').setReadOnly(true);
record.getField('specification').setReadOnly(true); record.getField('specification').setReadOnly(true);
record.getField('posted_date').setReadOnly(true); record.getField('posted_date').setReadOnly(true);
record.getField('price').setReadOnly(true); record.getField('price').setReadOnly(true);
record.getField('manufacturer').setReadOnly(true); record.getField('manufacturer').setReadOnly(true);
}else if('${/parameter/@project_status}'=='NEW' && record!=''){
record.getField('asset_num').setRequired(true);
record.getField('asset_type').setRequired(true);
record.getField('asset_name').setRequired(true);
record.getField('specification').setRequired(true);
record.getField('posted_date').setRequired(true);
record.getField('price').setRequired(true);
record.getField('manufacturer').setRequired(true);
} }
} }
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 65c31198
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
model="zjwfl.sys_role_flag" rootPath="role_flag_path"/> model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
<a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/> <a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/>
<a:model-query fetchAll="true" model="prj.PRJ500D.prj_project_get_description" rootPath="description"/> <a:model-query fetchAll="true" model="prj.PRJ500D.prj_project_get_description" rootPath="description"/>
<a:model-query fetchAll="true" model="prj.PRJ500D.prj_project_residual_value" rootPath="residual_value"/>
<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'];
...@@ -166,6 +166,19 @@ ...@@ -166,6 +166,19 @@
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
//首次插入 //首次插入
if (!record.get('calc_session_id')) { if (!record.get('calc_session_id')) {
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
var current_red= $(ds_id).getCurrentRecord();
if(division=='30' || division=='50'){
var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('${l:HLS.PROMPT}', '租赁物台数与查看明细中台数不一致，请重新维护！');
return;
}
}
record.set('to_doc_table', 'HLS_FIN_CALCULATOR_HD'); record.set('to_doc_table', 'HLS_FIN_CALCULATOR_HD');
var calc_recreate_L_formula; var calc_recreate_L_formula;
calc_recreate_L_formula = 'Y'; calc_recreate_L_formula = 'Y';
...@@ -236,6 +249,7 @@ ...@@ -236,6 +249,7 @@
var set_number=current_red.get('set_number'); var set_number=current_red.get('set_number');
var total_number=current_red.get('total_number'); var total_number=current_red.get('total_number');
if(total_number!=0 && set_number!=total_number){ if(total_number!=0 && set_number!=total_number){
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('${l:HLS.PROMPT}', '租赁物台数与查看明细中台数不一致，请重新维护！'); Leaf.showMessage('${l:HLS.PROMPT}', '租赁物台数与查看明细中台数不一致，请重新维护！');
return; return;
} }
...@@ -569,6 +583,9 @@ ...@@ -569,6 +583,9 @@
$(prj_quotation_ds_id).query(); $(prj_quotation_ds_id).query();
$(score_ds_id).query(); $(score_ds_id).query();
} }
if (prj_project_lease_item_ds_id==ds.id){
$(prj_quotation_ds_id).query();
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}; };
...@@ -1598,8 +1615,8 @@ ...@@ -1598,8 +1615,8 @@
var total_price=records.get('total_price'); var total_price=records.get('total_price');
var lease_item_amount=record.get('lease_item_amount'); var lease_item_amount=record.get('lease_item_amount');
var residual_value=record.get('residual_value'); var residual_value=record.get('residual_value');
debugger;
var q_value='${/model/residual_value/record/@residual_value}'; var q_value=records.get('q_value');
if(total_price!=lease_item_amount &&total_price!=null){ if(total_price!=lease_item_amount &&total_price!=null){
Leaf.showMessage('${l:PROMPT}', '支付计划页面“设备价格”字段值与租赁物明细“设备单价（总）”合计不相等，无法进行提交!'); Leaf.showMessage('${l:PROMPT}', '支付计划页面“设备价格”字段值与租赁物明细“设备单价（总）”合计不相等，无法进行提交!');
return; return;
...@@ -1658,8 +1675,8 @@ ...@@ -1658,8 +1675,8 @@
var total_price=records.get('total_price'); var total_price=records.get('total_price');
var lease_item_amount=record.get('lease_item_amount'); var lease_item_amount=record.get('lease_item_amount');
var residual_value=record.get('residual_value'); var residual_value=record.get('residual_value');
var q_value='${/model/residual_value/record/@residual_value}'; var q_value=records.get('q_value');
debugger;
if(total_price!=lease_item_amount &&total_price!=null){ if(total_price!=lease_item_amount &&total_price!=null){
Leaf.showMessage('${l:PROMPT}', '支付计划页面“设备价格”字段值与租赁物明细“设备单价（总）”合计不相等，无法进行提交!'); Leaf.showMessage('${l:PROMPT}', '支付计划页面“设备价格”字段值与租赁物明细“设备单价（总）”合计不相等，无法进行提交!');
return; return;
......
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