Skip to content

L
leaf-hlcm
Commit 95fe9a83 authored by gzj34291's avatar gzj34291
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 16933bb4 d14f555b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 999 additions and 33 deletions
src/main/webapp/WEB-INF/classes/cont/CON3200/get_user_employee_type.lwm 0 → 100644
View file @ 95fe9a83
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select nvl((select ep.employee_type_code
from exp_employees e, exp_employee_types_vl ep
where e.employee_id = su.employee_id
and e.employee_type_id = ep.employee_type_id),'NULL') employee_type_code
from sys_user su
where su.user_id = ${/session/@user_id}
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON3200/receipt_detail_insert_atm.lwm 0 → 100644
View file @ 95fe9a83
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
con_contract_workflow_pkg.insert_into_attachment_bmp(
p_file_path =>${@p_file_path},
p_file_name =>${@p_file_name},
p_file_size =>${@p_file_size},
p_user_id =>${@p_user_id},
p_check_id =>${@p_check_id}
);
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531F/csh_transaction_recoi_submit.lwm 0 → 100644
View file @ 95fe9a83
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sc
$Date: 2022年12月2日11:26:37
$Revision: 1.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
cm_sh_transaction_reverse_pkg.csh_bank_recoin_submit(
p_transaction_id =>${@transaction_id},
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
cm_sh_transaction_reverse_pkg.csh_check_reverse(
p_transaction_id =>${@transaction_id},
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/prj/PRJ500N/prj_project_lease_import_list.lwm
View file @ 95fe9a83
......@@ -73,7 +73,7 @@
begin
prj_project_lease_import_pkg.prj_lease_item_import_check(p_header_id => ${/model/header/record/@header_id},
p_user_id => ${/session/@user_id},
p_set_number=>${/parameter/@set_number});
p_project_lease_item_id=>${/parameter/@project_lease_item_id});
end;
]]></bm:update-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/prj/PRJ500N/prj_project_lease_import_temp.lwm
View file @ 95fe9a83
......@@ -23,8 +23,6 @@
<bm:update-sql><![CDATA[
begin
prj_project_lease_import_pkg.insert_lease_item_list(
p_session_id=>${/session/@session_id},
p_user_id=>${/session/@user_id},
p_project_lease_item_id=>${@project_lease_item_id});
end;
]]></bm:update-sql>
......
src/main/webapp/WEB-INF/classes/prj/PRJ500N/prj_project_lease_item_delete.lwm 0 → 100644
View file @ 95fe9a83
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: SC
$Date: 2022年12月6日19:08:18
$Revision: 1.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_lease_import_pkg.delete_lease_success_after(
p_project_lease_item_id=>${@project_lease_item_id},
p_count =>${@count}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/server-script/layoutconfig/layout_config.js
View file @ 95fe9a83
......@@ -328,5 +328,7 @@ var enableLayoutConfig = {
'modules/hsbc/HSBC120/hsbc_paying_batch_query.lview':true,
'modules/hsbc/HSBC130/pingan_account_hisbalance_query.lview':true,
'modules/prj/PRJ501N/prj_project_lease_import_details.lview':true,
'modules/prj/PRJ501N/prj_project_lease_import.lview:':true
'modules/prj/PRJ501N/prj_project_lease_import.lview:':true,
'modules/csh/CSH531F/csh_bank_recoi_processing.lview':true,
'modules/csh/CSH531F/csh_bank_recoi_processing_workflow.lview':true
};
\ No newline at end of file
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ 95fe9a83
......@@ -9,6 +9,7 @@
dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
<a:model-query model="cont.CON3200.get_user_employee_type" rootPath="employee_info"/>
<a:model-query fetchAll="true" model="cont.CON500.con_contract_get_guid_file_name" rootPath="file_name_path"/>
<s:server-script import="contract_print_path.js"><![CDATA[
$ctx.parameter.file_path = con_print_path['con_print_path'];
......@@ -761,5 +762,15 @@
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<script type="text/javascript"><![CDATA[
Leaf.onReady(init);
function init() {
//用户对应员工不是员工 就不显示该附件组件
if("${/model/employee_info/record/@employee_type_code}" != 'STAFF'){
document.getElementById('${/parameter/@layout_code}_C_ATTCH_2_con_contract_grid_id_wrap').style.display = 'none';
}
}
]]></script>
</a:view>
</a:screen>
src/main/webapp/modules/cont/CON3200/con_receipt_detail_atm.lsc 0 → 100644
View file @ 95fe9a83
<?xml version="1.0" encoding="UTF-8"?>
<!--<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">-->
<a:service xmlns:ns1="leaf.application.action" xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
<a:init-procedure>
<s:server-script ><![CDATA[
importPackage(Packages.java.util);
importPackage(Packages.java.lang);
importPackage(Packages.com.hand.hl);
importPackage(Packages.java.io);
importPackage(java.io);
try{
var sys_url_bm=$bm('cont.CON4000.get_sys_url');
var parameter_code='HLS_SYSTEM_URL';
var SysurlQuery = sys_url_bm.queryAsMap({
parameter_code: parameter_code
});
var sys_url = SysurlQuery.getChildren()[0].parameter_value;
var down_url =sys_url+'modules/cont/CON3200/contract_receipt_detail_print.lsc?template_name='+'aa.xls'
+ '&contract_id=' +$ctx.parameter.p_contract_id
+ '&file_name=' + encodeURI('应收明细表','utf-8');
var now = new Date();
y = now.getFullYear();
m = now.getMonth() + 1;
m = m < 10 ? "0" + m : m;
d = now.getDate();
d = d < 10 ? "0" + d : d;
var fileDir_bm=$bm('cont.CON4000.get_sys_url');
var parameter_code='HLCM_EMAIL_URL'; //存放文件路径 待修改
var fileDirQuery = fileDir_bm.queryAsMap({
parameter_code: parameter_code
});
var f_fileDir = fileDirQuery.getChildren()[0].parameter_value;
var filePath = (f_fileDir + y + "\\" + m + "\\").toString();
var tranfer_dir= new File(String(filePath));
if(!tranfer_dir.exists()){//如果文件夹不存在,创建文件夹
tranfer_dir.mkdirs();//创建文件夹
}
var contract_number = $ctx.parameter.p_contract_number;
var f_fileName = (contract_number+'应收明细表'+y+m+d+'.xlsx').toString();
var result_flag=DoloadFileByUrl.downloadFile(down_url, filePath, f_fileName);
file_size=get_file_length(filePath+f_fileName);
if(result_flag=true){
var business_daily_email=$bm('cont.CON3200.receipt_detail_insert_atm').update({
p_file_path :(filePath+f_fileName).toString(),
p_file_name :f_fileName,
p_file_size :file_size,
p_user_id :1,
p_check_id :$ctx.parameter.p_check_id
});
}
}catch(e){
raise_app_error(e.message);
}
function get_file_length(path){
var file=new File(String(path));
if(file.exists() && file.isFile()){
//println(f.length());
length=file.length();
return length;}
else{
return 0 ;}
}
]]></s:server-script>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
\ No newline at end of file
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ 95fe9a83
......@@ -5,6 +5,7 @@
<a:model-query fetchAll="true" model="csh.CSH531N.csh_transaction" rootPath="csh_transaction_path"/>
</a:init-procedure>
<a:view>
<a:link id="csh531n_submit_check_reverse_link_id" model="csh.CSH531F.csh_transaction_recoi_submit" modelaction="execute"/>
<a:link id="csh531n_csh_confirm_data_link" model="csh.CSH531N.csh_data_confirm" modelaction="update"/>
<a:link id="csh531n_submit_link_id" model="csh.CSH531N.csh_data_confirm" modelaction="execute"/>
<a:link id="transaction_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
......@@ -698,6 +699,24 @@
var createConfirm = Leaf.showConfirm('提示', '确认提交复核吗', function () {
$('csh531n_write_off_submit_btn_id').disable();
var transaction_id ='${/parameter/@transaction_id}';
Leaf.Masker.mask(Ext.getBody());
Leaf.request({
url: $('csh531n_submit_check_reverse_link_id').getUrl(),
para:{
transaction_id:transaction_id
},
success: function (res) {
Leaf.Masker.unmask(Ext.getBody());
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
csh511_save_all();
});
}
......
src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import.lview
View file @ 95fe9a83
......@@ -35,10 +35,10 @@
}
}
Leaf.showConfirm('提示', '确定要导入信息吗？', function() {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
Leaf.request({
url: $('import_prj_lease_item_list_link_id').getUrl(),
para: {
batch_id: '${/parameter/@batch_id}',
header_id: '${/model/header/record/@header_id}',
lease_item_id:'${/parameter/@lease_item_id}',
project_lease_item_id:'${/parameter/@project_lease_item_id}'
......@@ -50,6 +50,7 @@
msg: '操作成功',
duration: 2000
});
Leaf.Masker.unmask(Ext.getBody(), '${l:HLS.EXECUTING}');
import_exit();
}
});
......@@ -82,17 +83,17 @@
<a:gridButton click="import_exit" text="退出"/>
<a:gridButton click="import_btn" text="导入"/>
</a:screenTopToolbar>
<a:grid id="grid_ds_id" bindTarget="prj_lease_item_list_improt_ds" height="340" navBar="true" width="980">
<a:grid id="grid_ds_id" bindTarget="prj_lease_item_list_improt_ds" marginWidth="50" marginHeight="100" navBar="true">
<a:columns>
<a:column name="attribute_1" prompt="序号" width="80"/>
<a:column name="attribute_2" prompt="租赁物名称" width="80"/>
<a:column name="attribute_3" prompt="型号" width="80"/>
<a:column name="attribute_4" prompt="设备编号" width="80"/>
<a:column name="attribute_5" prompt="设备类型" width="80"/>
<a:column name="attribute_6" prompt="出厂日期" width="80"/>
<a:column name="attribute_7" prompt="设备单价(总)" width="80"/>
<a:column name="attribute_8" prompt="制造商(全称)" width="80"/>
<a:column name="error_message" editor="textArea_e" prompt="错误信息" width="120"/>
<a:column name="attribute_1" prompt="序号" width="120"/>
<a:column name="attribute_2" prompt="租赁物名称" width="160"/>
<a:column name="attribute_3" prompt="型号" width="160"/>
<a:column name="attribute_4" prompt="设备编号" width="160"/>
<a:column name="attribute_5" prompt="设备类型" width="160"/>
<a:column name="attribute_6" prompt="出厂日期" width="160"/>
<a:column name="attribute_7" prompt="设备单价(总)" width="160"/>
<a:column name="attribute_8" prompt="制造商(全称)" width="160"/>
<a:column name="error_message" editor="textArea_e" prompt="错误信息" width="200"/>
</a:columns>
<a:editors>
<a:textArea id="textArea_e" height="50" width="240"/>
......
src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import_details.lview
View file @ 95fe9a83
......@@ -7,13 +7,23 @@
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:view>
<a:link id="prj501N_lease_item_list_delete_link" model="prj.PRJ500N.prj_project_lease_item_delete" modelaction="update"/>
<a:link id="prj501N_lease_item_list_update_link" model="prj.PRJ500N.prj_project_lease_import_temp" modelaction="batch_update"/>
<a:link id="prj501N_lease_item_temp_batch_update_link" model="prj.PRJ500N.prj_project_lease_update_temp" modelaction="batch_update"/>
<a:link id="prj501N_lease_item_list_save_link" model="prj.PRJ500N.prj_project_lease_import_temp" modelaction="execute"/>
<a:link id="prj501N_lease_import_upload_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_lease_import_upload.lview"/>
<a:link id="prj501N_lease_exit_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/>
<script><![CDATA[
Leaf.onReady(function() {
var status='${/parameter/@project_status}';
if ('${/parameter/@hide_flag}' == 'Y' || status=='APPROVING' || status=='CLOSED' || status=='CONTRACT_CREATED') {
$('PROJECT_LEASE_IMPORT_user_button1').hide();
$('PROJECT_LEASE_IMPORT_user_button2').hide();
$('PROJECT_LEASE_IMPORT_user_button4').hide();
}
});
//导入
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'prj_project_lease_item_list');
......@@ -35,14 +45,15 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
if(record!=''){
record.getField('asset_num').setReadOnly(false);
record.getField('asset_type').setReadOnly(false);
record.getField('asset_name').setReadOnly(false);
record.getField('specification').setReadOnly(false);
record.getField('posted_date').setReadOnly(false);
record.getField('price').setReadOnly(false);
record.getField('manufacturer').setReadOnly(false);
if('${/parameter/@project_status}'!='NEW' && record!=''){
record.getField('seq').setReadOnly(true);
record.getField('asset_num').setReadOnly(true);
record.getField('asset_type').setReadOnly(true);
record.getField('asset_name_n').setReadOnly(true);
record.getField('specification').setReadOnly(true);
record.getField('posted_date').setReadOnly(true);
record.getField('price').setReadOnly(true);
record.getField('manufacturer').setReadOnly(true);
}
}
......@@ -57,7 +68,9 @@
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_lease_item_list');
var record = $(ds_id);
var records = record.getSelected();
var datas= record.getAll();
var len = records.length;
var lens = datas.length;
if (len == 0) {
Leaf.showMessage('${l:PROMPT}','请选择一条记录！');
return;
......@@ -78,7 +91,12 @@
msg: '操作成功',
duration: 2000
});
$(ds_id).query();
var count=(lens-len);
if(count==0){
success_delete_after(count);
}else{
success_delete_after(count);
}
},
error: function() {
},
......@@ -88,6 +106,25 @@
});
};
function success_delete_after(count){
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_lease_item_list');
Leaf.request({
url: $('prj501N_lease_item_list_delete_link').getUrl(),
para:{
project_lease_item_id:'${/parameter/@project_lease_item_id}',
count:count
},
success: function() {
$(ds_id).query();
},
error: function() {
},
failure: function() {},
scope: this
});
}
//保存
window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'prj_project_lease_item_list');
......@@ -144,14 +181,12 @@
function submit_success_lease(){
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'prj_project_lease_item_list');
var param = {};
param['session_id'] = '${/session/@session_id}';
param['user_id'] = '${/session/@user_id}';
param['project_lease_item_id']='${/parameter/@project_lease_item_id}';
if($(ds_id).validate()){
Leaf.request({
url: $('prj501N_lease_item_list_save_link').getUrl(),
para:param,
para:{
project_lease_item_id:'${/parameter/@project_lease_item_id}'
},
success: function() {
$(ds_id).query();
},
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 95fe9a83
......@@ -126,7 +126,7 @@
//add by zhuxianfei
window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () {
debugger;
var url;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
......@@ -444,8 +444,10 @@
}
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'] = '${/parameter/@project_status}';
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');
......@@ -454,7 +456,7 @@
param['function_usage'] = 'UPDATE';
param['winid'] = '${/parameter/@layout_code}_project_number_win_id';
param['url_title'] = '租赁物清单';
hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}lease_number_query_link','PROJECT_CREATE_NP_F_QUOTATION_N_prj_quotation_ds', '${/parameter/@layout_code}','${/parameter/@winid}','Y');
hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}lease_number_query_link',prj_quotation_ds, '${/parameter/@layout_code}','${/parameter/@winid}','Y');
}
//超链接渲染
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 95fe9a83
......@@ -38,6 +38,9 @@
url="${/request/@context_path}/modules/hls/HLS500/hls_fin_doc_quotation.lsc"/>
<a:link id="${/parameter/@layout_code}lease_number_query_link"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_lease_import_details.lview"/>
<a:link id="${/parameter/@layout_code}hls_bp_master_query_link"
url="${/request/@context_path}/modules/hls/HLS215N/hls_bp_master_query.lview"/>
......@@ -436,6 +439,21 @@
}
function prj501n_lease_number_renderer(record_id, ds_id){
debugger;
var record = $(ds_id).findById(record_id);
var param = {};
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['hide_flag'] ='Y';
param['function_code'] = 'PRJ501INC';
param['function_usage'] = 'QUERY';
param['winid'] = '${/parameter/@layout_code}_project_number_win_id';
param['url_title'] = '租赁物清单';
hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}lease_number_query_link', record.ds.id, '${/parameter/@layout_code}');
}
//超链接渲染
......@@ -507,6 +525,9 @@
} else if (name == 'contract_number') {
link_function = 'prj501n_contract_number_renderer';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + value + '</a>';
}else if(name=='machine_number_n' && record.get('project_lease_item_id')!=null){
link_function = 'prj501n_lease_number_renderer';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + record.ds.id + '\')">' + '查看明细' + '</a>';
}
};
......@@ -561,8 +582,10 @@
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){
var gridId= ds.bindname+'_layout_grid_id';
if(division!='30' && division!='50'){
$(gridId).hideColumn('machine_number_n');
}
if(division=='70'&&division!=''){
debugger;
if(record!=''){
record.getField('lease_name_n').setRequired(true);
record.getField('brand_value').setRequired(true);
......
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