Commit 79559852 authored by lijingjing's avatar lijingjing

[feat]合同文本生成

parent bfebc603
This diff is collapsed.
......@@ -50,7 +50,7 @@
<bm:field name="status" databaseType="VARCHAR2" datatype="java.lang.String" />
<bm:field name="status_desc" databaseType="VARCHAR2" datatype="java.lang.String" />
<bm:field name="download_flag" databaseType="VARCHAR2" datatype="java.lang.String" />
<bm:field name="print_date" databaseType="DATE" datatype="java.util.Date" />
<bm:field name="agent_content_flag" databaseType="VARCHAR2" datatype="java.lang.String" />
<bm:field name="agent_content_flag_name" databaseType="VARCHAR2" datatype="java.lang.String" />
<bm:field name="download_content_flag" databaseType="VARCHAR2" datatype="java.lang.String" />
......@@ -180,7 +180,8 @@
t1.agent_content_flag,
t1.download_content_flag,
t1.agent_content_flag_name,
t1.download_content_flag_name
t1.download_content_flag_name,
t1.print_date
FROM
CON_CONTRACT_CONTENT_V t1
WHERE
......@@ -296,7 +297,8 @@
t1.agent_content_flag,
t1.download_content_flag,
t1.agent_content_flag_name,
t1.download_content_flag_name
t1.download_content_flag_name,
t1.print_date
FROM
CON_CONTRACT_CONTENT_V t1
WHERE
......
......@@ -48,7 +48,7 @@
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
t.doc_plugin_flag = 'Y' AND
t.templet_id = cc.templet_id AND
(
cc.content_id =${/parameter/@content_id} OR
......
......@@ -10,9 +10,12 @@
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
con_contract_content_pkg.contract_content_create(
p_contract_id =>${@contract_id},
p_user_id =>${/session/@user_id}
hl_con_contract_content_pkg.contract_content_create(
p_contract_id =>${@contract_id},
p_content_id =>${@content_id},
p_user_id =>${/session/@user_id},
p_templet_usage =>${@templet_usage},
p_content_type =>${@content_type}
);
end;
......
......@@ -14,6 +14,7 @@
<a:link id="${/parameter/@layout_code}con_contract_query_link"
url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<a:link id="car_modify_special_link" url="${/request/@context_path}/modules/prj/PRJ500N/prj_project_create_special.lview"/>
<a:link id="con_contract_update_print_detail_link_id" url="${/request/@context_path}/modules/cont/CON311/con_contract_update_print_word_detail.lview"/>
<script type="text/javascript"><![CDATA[
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
......@@ -104,7 +105,7 @@
});
};
//合同文本打印
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
/* window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var records = $(ds_id).getSelected();
for (var i = 0;i < records.length;i++) {
......@@ -124,7 +125,31 @@
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_modify_link', ds_id);
}
};
};*/
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var records = $(ds_id).getSelected();
if (records.length != 1) {
Leaf.showMessage('${l:PROMPT}','${l:HLS.SELECT_RECORD}');
return;
}
var record=records[0];
new Leaf.Window({
id: 'con_contract_update_print_detail_winid',
params: {
contract_id: record.get('contract_id'),
document_category:record.get('document_category'),
business_type :record.get('business_type'),
winid: 'con_contract_update_print_detail_winid',
content_type : 'NORMAL'
},
url: $('con_contract_update_print_detail_link_id').getUrl(),
title: '${l:CON505.CON_CONTENT_PRINT}',
width:1000,
height:450
});
}
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CON501"/>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
......
......@@ -22,7 +22,7 @@
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;
......
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