Skip to content

L
leaf-hlcm
Commit b4753d44 authored by lijingjing's avatar lijingjing
Browse files
Options

Merge branch 'contract' into develop

parents 0da55362 60007618
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 21 deletions
src/main/webapp/WEB-INF/classes/prj/PRJ501N/check_prj_project_lease_item.lwm 0 → 100644
View file @ b4753d44
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: shenyamin
$Date: 2018-11_03 上午11:00:06
$Revision: 3.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
prj_project_check_pkg.check_prj_lease_item(
p_machine_number =>${@machine_number},
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/prj/PRJ501N/project_approval.lwm
View file @ b4753d44
......@@ -14,6 +14,17 @@
p_project_id =>${@project_id},
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
prj_project_check_pkg.check_prj_lease_item(
p_machine_number =>${@machine_number},
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
......
src/main/webapp/modules/cont/CON311/con_re_print_entrance.lview
View file @ b4753d44
......@@ -18,11 +18,17 @@
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
param['function_code'] = 'CON301';
param['function_usage'] = 'QUERY';
param['maintain_type'] = 'QUERY';
if(record.get('contract_status')=='NEW' || record.get('contract_status')=='REJECT'){
param['function_code'] = 'CON301MM';
param['function_usage'] = 'MODIFY';
}
else{
param['function_code'] = 'CON301';
param['function_usage'] = 'QUERY';
}
param['winid'] = 'con_contract_modify_win_id';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', null);
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id);
}
function open_project_Window(record_id, ds_id) {
......@@ -30,8 +36,8 @@
var param = record.data;
param['company_id'] = record.get('company_id');
param['project_id'] = record.get('project_id');
param['function_code'] = 'PRJ501Q';
param['function_usage'] = 'QUERY';
param['function_code'] = 'PRJ501_WFL';
param['bp_class'] = record.get('bp_class');
param['maintain_type'] = 'QUERY';
/* param['window_open_flag'] = 'Y';
......@@ -41,7 +47,6 @@
}
function open_bs_Window(record_id, ds_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
param['function_code'] = 'CON301BS';
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ b4753d44
......@@ -38,7 +38,10 @@
<a:link id="${/parameter/@layout_code}_hls_fin_calc_get_base_rate_link_id"
model="hls.HLS500.hls_fin_calc_get_base_rate" modelaction="update"/>
<a:link id="get_if_self_definition" model="db.prj_project_pkg.get_if_self_definition" modelaction="execute"/>
<a:link id="prj_approval_link_id" model="prj.PRJ501N.project_approval" modelaction="update"/>
<a:link id="check_prj_lease_item_link_id" model="prj.PRJ501N.project_approval" modelaction="execute"/>
<script type="text/javascript"><![CDATA[
alert('${/parameter/@division}')
//add by zhuxianfei
window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () {
......@@ -296,9 +299,12 @@
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
sync: true,
scope: this
......@@ -406,7 +412,7 @@
//选择事件(grid,attach,gridbox,table)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_select'] = function(ds, record, bp_seq) {
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_bp','G_BP');
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_BP', 'prj_project_bp');
if (bp_ds_id == ds.id && bp_ds_id) {
if (record.get('bp_category') == 'TENANT') {
//实际为不选中
......@@ -424,12 +430,32 @@
};
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
/* var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_lease_item');
if (ds_id == ds.id) {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var record = $(ds_id).getCurrentRecord();
Leaf.request({
url: $('check_prj_lease_item_link_id').getUrl(),
para: {
'machine_number': record.get('machine_number')
},
success: function(res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function() {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function() {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
});
}*/
};
//加载时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, record, config_records, bp_seq) {
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_BP', 'prj_project_bp');
if (bp_ds_id == ds.id && bp_ds_id) {
if (record.get('bp_category') == 'TENANT') {
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
View file @ b4753d44
......@@ -28,15 +28,11 @@
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var record = $(ds_id).getCurrentRecord();
if ($(ds_id).validate()) {
record.set('function_code', 'PRJ500D');
record.set('function_usage', 'CREATE');
record.set('document_category', 'PROJECT');
record.set('default_value_dsid', ds_id);
record.data['url_title'] = '租赁申请创建';
var division=record.get('division');
record.set('division',division);
var param = record.data;
record.set('winid', 'prj_porject_create_win_id');
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_special.lview
View file @ b4753d44
......@@ -48,8 +48,9 @@
//hongquan.dai 20180125
var check_isload = setInterval(function() {
if (isLoaded == 'N') {
var ids = $('${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_ds');
var idsRecord = ids.getAll();
// var ids = $('${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_ds');
var ids = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
var idsRecord = $(ids).getAll();
for (var i = 0;i < idsRecord.length;i++) {
var rowData = idsRecord[i];
var important_flag = rowData.get('important_flag');
......
src/main/webapp/modules/prj/PRJ501N/prj_project_create.lview
View file @ b4753d44
......@@ -62,8 +62,9 @@
//hongquan.dai 20180125
var check_isload = setInterval(function() {
if (isLoaded == 'N') {
var ids = $('${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_ds');
var idsRecord = ids.getAll();
// var ids = $('${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_ds');
var ids = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
var idsRecord = $(ids).getAll();
for (var i = 0;i < idsRecord.length;i++) {
var rowData = idsRecord[i];
var important_flag = rowData.get('important_flag');
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ b4753d44
......@@ -50,6 +50,7 @@
<a:link id="${/parameter/@layout_code}_prj_project_create_contract_link_id"
model="prj.PRJ505.prj_project_create_contract" modelaction="update"/>
<a:link id="prj_approval_link_id" model="prj.PRJ501N.project_approval" modelaction="update"/>
<a:link id="check_prj_lease_item_link_id" model="prj.PRJ501N.project_approval" modelaction="execute"/>
<!--<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
<script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>-->
......@@ -455,7 +456,7 @@ function prj501n_contract_number_renderer(id, name, query_only){
//选择事件(grid,attach,gridbox,table)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_select'] = function(ds, record, bp_seq) {
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_BP', 'prj_project_bp');
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_BP', 'prj_project_bp');
if (bp_ds_id == ds.id && bp_ds_id) {
if (record.get('bp_category') == 'TENANT') {
//实际为不选中
......@@ -473,7 +474,27 @@ function prj501n_contract_number_renderer(id, name, query_only){
};
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
/* var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_lease_item');
if (ds_id == ds.id) {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var record = $(ds_id).getCurrentRecord();
Leaf.request({
url: $('check_prj_lease_item_link_id').getUrl(),
para: {
'machine_number': record.get('machine_number')
},
success: function(res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function() {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function() {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
});
}*/
};
//加载时调用(grid,table,gridBox)
......
src/main/webapp/modules/prj/PRJ501N/prj_project_modify_entrance.lview
View file @ b4753d44
......@@ -44,7 +44,7 @@
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'prj_project_modify_link', ds_id);
} else if (record.get('document_type') == 'CARLS') {
if (record.get('project_status') == 'APPROVED' ||record.get('project_status') == 'APPROVING') {
if (record.get('project_status') == 'APPROVED' ||record.get('project_status') == 'APPROVING'||record.get('project_status') == 'CONTRACT_CREATED') {
maintain_type = 'READONLY';
param = record.data;
param['bp_id_tenant'] = record.get('bp_id_tenant');
......
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