Skip to content

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

[fix]bugs

parent 3101ca32
Hide whitespace changes
Inline Side-by-side
Showing with 346 additions and 41 deletions
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm
View file @ a522364c
......@@ -112,6 +112,7 @@
</bm:data-filters>
<bm:query-fields>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
<bm:query-field field="bp_bank_account_num" queryOperator="like"/>
<bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
<bm:query-field field="bp_bank_account_name" queryOperator="like"/>
<bm:query-field field="receipt_type" queryOperator="="/>
......
src/main/webapp/WEB-INF/classes/prj/PRJ501N/create_content_for_prj_quotation.lwm 0 → 100644
View file @ a522364c
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: niminmin
$Date: 2019-10-24 上午09:52:30
$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_content_pkg.prj_quotation_content_create(
p_project_id =>${@project_id},
p_user_id =>${/session/@user_id},
p_templet_code=>${@templet_code}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/prj/PRJ501N/prj_doc_file_templet_get_atm.lwm 0 → 100644
View file @ a522364c
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2015-6-10 下午03:17:55
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT
faa.file_name,
faa.file_type_code,
faa.file_path,
pp.content_id,
(SELECT
'Y'
FROM
fnd_atm_attachment_multi m1
WHERE
m1.table_name = 'PRJ_PROJECT_CONTENT' AND
m1.table_pk_value = pp.content_id
) file_exists_flag,
p.project_number || '-' || pp.content_number to_file_name
FROM
fnd_atm_attachment faa,
fnd_atm_attachment_multi m,
hls_doc_file_templet lt,
con_clause_templet t,
prj_project_content pp,
prj_project p
WHERE
faa.attachment_id = m.attachment_id AND
m.table_name = 'HLS_DOC_FILE_TEMPLET' AND
m.table_pk_value = lt.templet_id AND
lt.templet_id = t.doc_template_id AND
t.doc_plugin_flag = 'Y' AND
pp.project_id = p.project_id AND
t.templet_id = pp.templet_id AND
(pp.content_id =${/parameter/@content_id} OR
(
pp.project_id =${/parameter/@project_id} AND
${/parameter/@batch_flag}='Y'
)
)
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="content_id"/>
<bm:field name="file_type_code"/>
<bm:field name="file_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="FILE_NAME"/>
<bm:field name="file_path" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="FILE_PATH"/>
<bm:field name="file_exists_flag" databaseType="VARCHAR2" datatype="java.lang.String"
physicalName="FILE_EXISTS_FLAG"/>
<bm:field name="to_file_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TO_FILE_NAME"/>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/prj/PRJ501N/prj_file_content_copy_update.lwm 0 → 100644
View file @ a522364c
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
hls_doc_file_templet_pkg.office_insert_fnd_atm(
p_record_id =>${@record_id},
p_table_name =>${@table_name},
p_table_pk_value =>${@content_id},
p_file_name =>${@file_name},
p_file_path =>${@file_path},
p_source_type =>${@source_type},
p_user_id =>${/session/@user_id}
);
END;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="record_id" dataType="java.lang.Double" output="true" outputPath="/parameter/@record_id"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/prj/PRJ702N/prj_doc_file_get_bookmark_value.lwm
View file @ a522364c
......@@ -11,15 +11,18 @@
<bm:query-sql><![CDATA[
SELECT
p.bookmark,
hls_doc_file_templet_pkg.get_doc_bookmark_value_new(${/session/@session_id},cc.content_id, p.bookmark, ${/session/@user_id},'PROJECT') bookmark_value,
NVL(p.bookmark_type,'TEXT') bookmark_type
hls_doc_file_templet_pkg.get_doc_bookmark_value_new(nvl(${/session/@session_id},${/parameter/@session_id}),cc.content_id, p.bookmark, nvl(${/session/@user_id},${/parameter/@user_id}),'PROJECT') bookmark_value,
NVL(p.bookmark_type,'TEXT') bookmark_type,
NVL(NVL(l.font_family,p.font_family),'微软雅黑') font_family,
NVL(NVL(l.font_size,p.font_size),'15') font_size,
NVL(l.underline,p.underline) underline
FROM
prj_project_content cc,
con_clause_templet t,
hls_doc_file_tmp_para_link l,
hls_doc_file_templet_para p
WHERE
cc.content_id = ${/parameter/@content_id} AND
cc.content_id = nvl(${/parameter/@content_id},${@content_id}) AND
cc.templet_id = t.templet_id AND
t.doc_template_id = l.templet_id AND
t.doc_plugin_flag = 'Y' AND
......@@ -33,5 +36,8 @@
<bm:field name="bookmark" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BOOKMARK"/>
<bm:field name="bookmark_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BOOKMARK_TYPE"/>
<bm:field name="bookmark_value" databaseType="CLOB" datatype="java.sql.Clob" physicalName="BOOKMARK_VALUE"/>
<bm:field name="font_family"/>
<bm:field name="font_size"/>
<bm:field name="underline"/>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/prj/PRJ702N/prj_doc_file_get_table_list.lwm
View file @ a522364c
......@@ -20,7 +20,9 @@
<bm:features>
<s:bm-script><![CDATA[
var model = $this.getObjectContext();
var para = $ctx.current_parameter || $ctx.parameter;
// var para = $ctx.current_parameter || $ctx.parameter;
var para = $ctx.parameter;
println(JSON.stringify(para));
var validation_sql;
function get_validation_sql() {
......@@ -30,7 +32,7 @@
if (config_map_detail.length != 0) {
validation_sql = config_map_detail[0].sql_content;
}
validation_sql = validation_sql.replace(/\{\$([^{}$]*)\$\}/g, function(a, b) {
return "'" + (para[b.toLowerCase()] || '') + "'";
});
......
src/main/webapp/WEB-INF/classes/prj/PRJ702N/prj_doc_file_para_table_column.lwm
View file @ a522364c
......@@ -12,7 +12,14 @@
SELECT
p.bookmark,
pa.column_name,
pa.column_num
pa.column_num,
pa.column_width,
pa.alignment,
pa.column_desc,
NVL(p.table_width,0) table_width,
NVL(p.ind_width,0) ind_width,
NVL(p.font_family,'宋体') font_family,
NVL(p.font_size,'15') font_size
FROM
prj_project_content cc,
con_clause_templet t,
......@@ -20,7 +27,7 @@
hls_doc_file_templet_para p,
hls_doc_file_para_table pa
WHERE
cc.content_id = ${/parameter/@content_id} AND
cc.content_id = nvl(${/parameter/@content_id},${@content_id}) AND
cc.templet_id = t.templet_id AND
t.doc_template_id = l.templet_id AND
t.doc_plugin_flag = 'Y' AND
......@@ -36,6 +43,13 @@
<bm:fields>
<bm:field name="bookmark" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BOOKMARK" required="true"/>
<bm:field name="column_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_NAME"/>
<bm:field name="column_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_DESC"/>
<bm:field name="alignment" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ALIGNMENT"/>
<bm:field name="column_num" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COLUMN_NUM"/>
<bm:field name="table_width" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TABLE_WIDTH"/>
<bm:field name="ind_width" databaseType="NUMBER" datatype="java.lang.Long" physicalName="IND_WIDTH"/>
<bm:field name="column_width" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COLUMN_WIDTH"/>
<bm:field name="font_family" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="FONT_FAMILY"/>
<bm:field name="font_size" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="FONT_SIZE"/>
</bm:fields>
</bm:model>
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ a522364c
......@@ -716,11 +716,11 @@
<!--银行流水号-->
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<!--对方账户户名-->
<a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<!--对方银行名称-->
<a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<!--对方账户账号-->
<a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField style="display:none"/>
<a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/>
<a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="单据审批状态"/>
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ a522364c
......@@ -744,7 +744,7 @@
<a:fields>
<a:field name="company_id" defaultValue="${/parameter/@company_id}"/>
<a:field name="write_off_date" validator="write_off_date_validator" required="true"
defaultValue="${/parameter/@transaction_date}"/>
defaultValue="${/model/sys_default_time/record/@now_date}"/>
<a:field name="journal_date" required="true"
defaultValue="${/model/sys_default_time/record/@now_date}"/>
<a:field name="write_off_period_name" defaultValue="${/parameter/@period_name}"/>
......@@ -814,7 +814,7 @@
<a:field name="company_id" defaultValue="${/session/@company_id}"/>
<a:field name="write_off_amount"/>
<a:field name="write_off_date" validator="write_off_date_validator" required="true"
defaultValue="${/parameter/@transaction_date}"/>
defaultValue="${/model/sys_default_time/record/@now_date}"/>
</a:fields>
</a:dataSet>
<a:dataSet id="csh_transaction_advanced_ds" model="csh.CSH531N.csh_transaction_plan_query" fetchAll="true"
......@@ -839,7 +839,7 @@
<a:field name="write_off_amount"/>
<a:field name="create_wf_flag" defaultValue="N"/>
<a:field name="write_off_date" validator="write_off_date_validator" required="true"
defaultValue="${/parameter/@transaction_date}"/>
defaultValue="${/model/sys_default_time/record/@now_date}"/>
</a:fields>
</a:dataSet>
</a:dataSets>
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ a522364c
......@@ -361,32 +361,34 @@
// };
//保存submitsuccess调用
window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function(ds, record, res, bp_seq) {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var head_record = $(ds_id).getCurrentRecord();
Leaf.request({
url: $('get_special_fields_link_id').getUrl(),
para: {
bp_id:head_record.get('bp_id')
},
success: function (res) {
var document_number = res.result.document_number;
head_record.set('bp_code',document_number);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
sync: true,
scope: this
});
};
window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function(ds, record, res, bp_seq) {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var head_record = $(ds_id).getCurrentRecord();
if(!head_record.get('bp_code')){
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('get_special_fields_link_id').getUrl(),
para: {
bp_id:head_record.get('bp_id')
},
success: function (res) {
var document_number = res.result.document_number;
head_record.set('bp_code',document_number);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
sync: true,
scope: this
});
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
};
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
var f_bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
......@@ -438,12 +440,26 @@
if (!checkCard(value)) {
Leaf.showMessage('${l:HLS.PROMPT}', '个人身份证号错误!');
return false;
}else{
if (value.length == 18) {
record.set('date_of_birth', new Date(value.substr(6, 4) + '/' + value.substr(10, 2) + '/' + value.substr(12, 2)));
record.set('age', new Date().getFullYear() - value.substr(6, 4));
if (value.substr(16, 1) % 2 == 1) {
record.set('gender', 'MALE');
record.set('gender_n', '男');
} else if (value.substr(16, 1) % 2 == 0) {
record.set('gender', 'FEMALE');
record.set('gender_n', '女');
}
}
}
}
// ds.fields.id_card_no.pro.validator = id_card_no_validate;
//自动带出籍贯
record.set('resident_addres', get_native_place(value))
// record.set('resident_addres', get_native_place(value))
}
if (name == 'id_no_sp') {
if (!value) {
......@@ -453,10 +469,14 @@
if (!checkCard(value)) {
Leaf.showMessage('${l:HLS.PROMPT}', '配偶身份证号错误!');
return false;
}else{
if (value.length == 18) {
record.set('date_of_birth_sp', new Date(value.substr(6, 4) + '/' + value.substr(10, 2) + '/' + value.substr(12, 2)));
}
}
}
// ds.fields.id_no_sp.pro.validator = id_card_no_validate;
record.set('resident_addres_sp', get_native_place(value))
// record.set('resident_addres_sp', get_native_place(value))
}
}
......
src/main/webapp/modules/prj/PRJ501N/create_content_for_prj_quotation.lsc 0 → 100644
View file @ a522364c
<?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:init-procedure>
<s:server-script import="con_print_path.js"><![CDATA[
importPackage(java.io);
importPackage(Packages.hls.plugin.docx4j)
importPackage(Packages.org.apache.commons.io);
function RandomString(length) {
var str = '';
for (; str.length < length; str += Math.random().toString(36).substr(2)) ;
return str.substr(0, length);
}
//删除文件
function deleteFile(filePath) {
var file = new File(filePath);
if (file.exists()) {
file.delete();
}
}
function copyFile(fOld, fNew) {
var fis = new java.io.FileInputStream(fOld);
var fos = new java.io.FileOutputStream(fNew);
var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 4);
var len = -1;
while ((len = fis.read(b)) != -1) {
fos.write(b, 0, len);
}
fis.close();
fos.close();
}
//按日期创建目录
function getDatePath() {
set_parameter_file_path();
var file_path = $ctx.parameter.file_path; //file_path = c:/hls_test_files/content_files/
var now = new Date()
y = now.getFullYear()
m = now.getMonth() + 1
m = m < 10 ? "0" + m : m
var datePath = file_path + y + "/" + m + "/";
return datePath; //datePath = d:/hls_test_files/fileupload/2018/04/
}
function write_os_to_file(file, os) {
var fis = new FileInputStream(file);
var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
var len = -1;
while ((len = fis.read(b)) != -1) {
os.write(b, 0, len);
}
fis.close();
}
function download_file(file_path, file_name) {
$ctx["__request_type__"] = 'file';
var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
resp.setHeader("Pragma", "No-cache");
resp.setHeader("Cache-Control", "no-cache, must-revalidate");
resp.setHeader("Content-disposition", "attachment; filename=" + encodeURI(file_name, 'utf-8'));
resp.setDateHeader("Expires", 0);
resp.setContentType("application/x-msdownload");
try {
var os = resp.getOutputStream();
write_os_to_file(file_path, os);
//write_os_to_file(file_path+file_name, os);
os.flush();
} catch (e) {
$logger("server-script").severe(e.message);
}
}
function collection_create_content() {
try {
//第一步生成合同文本
$bm('prj.PRJ501N.create_content_for_prj_quotation').update({
project_id: $ctx.parameter.project_id,
templet_code: $ctx.parameter.templet_code
});
//获取日期目录
set_parameter_file_path();
var datePath = getDatePath();
$ctx.parameter.batch_flag = 'Y';
FileUtils.forceMkdir(new File(datePath)); //根据日期创建目录
var from_file_data_map = $bm('prj.PRJ501N.prj_doc_file_templet_get_atm').queryAsMap({
project_id_id: $ctx.parameter.project_id,
batch_flag: $ctx.parameter.batch_flag,
});
var from_file_data = from_file_data_map.getChildren();
for (var i = 0; i < from_file_data.length; i++) {
var to_file_path = $ctx.parameter.file_path;
var record_data = from_file_data[i];
if (record_data.file_exists_flag != 'Y') {
var to_file_name = record_data.to_file_name + '.' + record_data.file_type_code || 'doc';
var from_file_path = record_data.file_path;
var guid_file_name_path = $bm('cont.CON500.con_contract_get_guid_file_name').queryAsMap();
var guid_file_name_tables = guid_file_name_path.getChildren();
to_file_path = datePath + guid_file_name_tables[0].guid_file_name + 'con' + record_data.content_id;
copyFile(from_file_path, to_file_path);
try {
var brwt = new BookmarksReplaceWithText($instance('leaf.database.service.IDatabaseServiceFactory'), $instance('uncertain.ocm.IObjectRegistry'), $ctx.getData());
brwt.replaceBookmarkFromContent(to_file_path.toString(), record_data.content_id,'PROJECT');
} catch (e) {
raise_app_error(e);
}
$bm('prj.PRJ501N.prj_file_content_copy_update').update({
table_name: 'PRJ_PROJECT_CONTENT',
content_id: record_data.content_id,
file_name: to_file_name.toString(),
file_path: to_file_path.toString(),
source_type: 'PROJECT'
});
var test = new File(to_file_path);
var test1 = new File('D:' + to_file_path);
download_file(to_file_path.toString(), to_file_name.toString());
}
}
$ctx.parameter.return_status = 'S';
$ctx.parameter.return_message = '执行成功';
} catch (e) {
$ctx.success = "true";
$ctx.parameter.return_status = 'E';
$ctx.parameter.return_message = $ctx.get('/error/@message') || String(e);
raise_app_error(e);
}
var result = {
result: $ctx.parameter.return_status,
message: $ctx.parameter.return_message
};
$ctx.parameter.json = JSON.stringify(result);
}
if ($ctx.parameter.return_status != 'E' && $ctx.parameter.return_status != 'TIMEOUT') {
collection_create_content();
}
]]></s:server-script>
</a:init-procedure>
<a:service-output/>
</a:service>
src/main/webapp/modules/prj/PRJ501N/prj_project_modify_entrance.lview
View file @ a522364c
......@@ -22,6 +22,7 @@
<a:link id="prj_project_modify_special_link"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain_special.lview"/>
<a:link id="prj_project_close_link_id" model="prj.PRJ501.prj_project_close" modelaction="update"/>
<a:link id="prj_quotation_print_link" url="${/request/@context_path}/modules/prj/PRJ501N/create_content_for_prj_quotation.lsc"/>
<!-- <link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
<script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>-->
<script type="text/javascript"><![CDATA[
......@@ -150,6 +151,15 @@
prj_project_result_ds.query(prj_project_result_ds.currentPage);
});
};
//报价单打印
window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function () {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var project_id = $(ds_id).getSelected()[0].get('project_id');
var templet_code = 'PROJECT_QUOTATION';
var url=$('prj_quotation_print_link').getUrl() + '?project_id=' + project_id + '&templet_code=' + templet_code;
window.open(url, '_self');
};
window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function (ds, qpara, bp_seq) {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
......
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