Skip to content

L
leaf-hlcm
Commit 85f71476 authored by 25484's avatar 25484
Browse files
Options

Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into feature/ap_invoice_import

parents 31566d90 13167d94
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 625 additions and 57 deletions
pom.xml
View file @ 85f71476
......@@ -139,6 +139,17 @@
<artifactId>jaxen</artifactId>
<version>1.1.6</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.0.2</version>
</dependency>
</dependencies>
<build>
<finalName>hlcm</finalName>
......
src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_CREDIT_STATUS.sql
View file @ 85f71476
......@@ -7,6 +7,7 @@ set feedback off
set define off
<!--授信状态字段-->
BEGIN
sys_code_pkg.delete_sys_code('CREDIT_STATUS');
......@@ -14,6 +15,7 @@ sys_code_pkg.insert_sys_code('CREDIT_STATUS', '授信状态', '授信状态', '
sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','ENABLE','启用','ZHS','');
sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','FREZZING','审批冻结','ZHS','');
sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','DISABLE','停用','ZHS','');
sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','REFUSE','审批拒绝','ZHS','');
END;
/
......
src/main/webapp/WEB-INF/classes/csh/CSH515/csh_transaction_receipt_return_query.lwm
View file @ 85f71476
......@@ -89,7 +89,7 @@
<bm:field name="opposite_band_na"/>
<bm:field name="banka"/>
<bm:field name="purpose"/>
<bm:field name="can_returned_amount" expression="(select transaction_amount-nvl(returned_amount,0) from dual)"/>
<bm:field name="can_returned_amount" expression="(select transaction_amount-nvl(returned_amount,0)-nvl(write_off_amount,0) from dual)"/>
<bm:field name="this_return_amount" expression="nvl((sELECT r.this_return_amount from csh_transaction_return r WHERE status='APPROVING' AND r.transaction_id=t1.transaction_id),0)"/>
<bm:field name="gsber"/>
<bm:field name="sus_belnr"/>
......@@ -109,7 +109,7 @@
</bm:primary-key>
<bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} and t1.posted_flag=&apos;Y&apos; and t1.reversed_flag=&apos;N&apos; and write_off_flag&lt;&gt; &apos;FULL&apos; and returned_flag not in ( &apos;FULL&apos;,&apos;RETURN&apos;) and t1.transaction_type in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;) and (nvl(t1.returned_amount, 0)+nvl(t1.write_off_amount, 0)&lt;t1.transaction_amount)) "/>
<bm:data-filter name="query" expression="(t1.confirmed_flag=&apos;ACCAUDITED&apos; and t1.write_off_flag in(&apos;NOT&apos;,&apos;PARTIAL&apos;))"/>
<bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;) and t1.write_off_flag in(&apos;NOT&apos;,&apos;PARTIAL&apos;))"/>
</bm:data-filters>
<bm:query-fields>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm
View file @ 85f71476
......@@ -18,7 +18,7 @@
AND sc.code_value = t1.contract_status) contract_status_desc
from con_contract t1
where
t1.contract_status in ('INCEPT','ET')
t1.contract_status in ('INCEPT','ET','NEW')
and t1.data_class = 'NORMAL'
and t1.company_id in ((
select company_id
......@@ -29,7 +29,8 @@ union
select t.parent_company_id company_id
from fnd_companies t
where t.parent_company_id is not null
and (t.company_id = ${/session/@company_id} or t.parent_company_id = ${/session/@company_id})))) t
and (t.company_id = ${/session/@company_id} or t.parent_company_id = ${/session/@company_id})))
) t
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
......@@ -53,7 +54,8 @@ select t.parent_company_id company_id
queryExpression="due_date &lt;= to_date(${@due_date_to},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field field="dd_bank_account_num" queryOperator="="/>
<bm:query-field field="dd_bank_account_name" queryOperator="="/>
<bm:query-field name="bp_id" queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id})"/>
<bm:query-field name="bp_id"
queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id} or ((select bp_category from hls_bp_master where bp_id = ${@bp_id}) = 'VENDER'))"/>
<bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/SYS405/exp_employees_mail.lwm 0 → 100644
View file @ 85f71476
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: DJ
$Date: 2014-1-8 下午3:44:11
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select t1.*
from (select null employee_id,
null employee_code,
null email,
-1 * cv.company_id unit_id,
cv.company_code unit_code,
cv.company_short_name unit_name,
null name,
null parent_unit_id,
null position_code,
rpad(cv.company_code, 10, '0') || rpad('0', 10, '0') as seq
from fnd_companies_vl cv
where cv.enabled_flag = 'Y'
union all
SELECT null employee_id,
null employee_code,
null email,
u.unit_id,
u.unit_code,
u.unit_name,
null name,
-1 * u.company_id parent_unit_id,
null position_code,
rpad(u.unit_code, 10, '0') || rpad('0', 10, '0') as seq
FROM exp_org_unit_v u
WHERE u.enabled_flag = 'Y'
union all
select e.employee_id,
e.employee_code,
e.email,
null unit_id,
d.unit_code,
null unit_name,
e.name,
d.unit_id parent_unit_id,
c.position_code,
rpad(d.unit_code, 10, '0') || rpad(c.position_code, 10, '0')||e.employee_code as seq
from exp_employees e,
exp_employee_assigns b,
exp_org_position c,
exp_org_unit_v d
WHERE e.employee_id = b.employee_id
AND b.position_id = c.position_id(+)
AND c.unit_id = d.unit_id(+)
AND b.enabled_flag = 'Y'
AND c.enabled_flag(+) = 'Y'
AND d.enabled_flag(+) = 'Y') t1
START WITH parent_unit_id is null
connect by t1.parent_unit_id = prior t1.unit_id
ORDER BY t1.seq
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/SYS405/get_attach_file_name.lwm 0 → 100644
View file @ 85f71476
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: zhangxing5129
$Date: 2014-7-24 下午07:21:28
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
SELECT zj_sys_mail_pkg.get_mail_filename(p_table_pk_value => ${@mail_list_id},
p_table_name => 'ZJ_SYS_MAILING_LIST',
p_user_id => ${/session/@user_id} )
into ${@file_name} FROM dual ;
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="file_name" output="true" outputPath="/parameter/@file_name"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/SYS405/get_zj_sys_mailing_list_id.lwm 0 → 100644
View file @ 85f71476
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: zhangxing5129
$Date: 2014-9-1 下午02:08:43
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select zj_sys_mailing_list_s.nextval mail_list_id from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/SYS405/hls_bp_contact_mail.lwm 0 → 100644
View file @ 85f71476
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: DJ
$Date: 2014-1-8 下午4:01:48
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select t1.contact_person as person, t1.cell_phone as mobile
from hls_bp_master_contact_info t1
where t1.ref_v01 = 'Y'
order by person
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/SYS405/sys_get_mail_server.lwm 0 → 100644
View file @ 85f71476
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: zhangyu
$Date: 2019-3-5 上午9:14:12
$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
sms.mail_smtp_host,
sms.mail_protocol,
sms.mail_port_number,
sms.mail_address,
sms.mail_username,
sms.mail_password,
sms.attch_directory
FROM
sys_mail_server sms
WHERE
sms.enabled_flag = 'Y' and sms.DEFAULT_FLAG = 'Y'
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="mail_smtp_host"/>
<bm:field name="mail_protocol"/>
<bm:field name="mail_port_number"/>
<bm:field name="mail_address"/>
<bm:field name="mail_username"/>
<bm:field name="mail_password"/>
<bm:field name="attch_directory"/>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/SYS405/sys_mail_list.lwm 0 → 100644
View file @ 85f71476
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: DJ
$Date: 2014-1-15 上午10:50:46
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
update zj_sys_mailing_list m
set m.sent_flag = 'N',
m.error_times = 0,
m.creation_date = sysdate
where m.mailing_list_id = ${@mailing_list_id};
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
zj_sys_mail_pkg.insert_mailing_list(p_mail_list_id =>${@mail_list_id},
p_mail_to => ${@mail_to},
p_mail_cc => ${@mail_cc},
p_subject => ${@subject},
p_body => ${@body},
p_user_id => ${/session/@user_id},
p_content_type => 'text/html');
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/SYS405/zj_sys_mailing_file.lwm 0 → 100644
View file @ 85f71476
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: zhangyu
$Date: 2019-3-8 下午2:34:18
$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_path
FROM
fnd_atm_attachment faa,
fnd_atm_attachment_multi faam
WHERE
faa.attachment_id = faam.attachment_id AND
faa.source_type_code = 'fnd_atm_attachment_multi' AND
faa.source_pk_value = faam.record_id AND
faam.table_name = 'ZJ_SYS_MAILING_LIST'
and faam.table_pk_value = ${@mailing_list_id}
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="file_name"/>
<bm:field name="file_path"/>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/SYS405/zj_sys_mailing_list.lwm 0 → 100644
View file @ 85f71476
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: zhangyu
$Date: 2019-3-5 上午9:59:57
$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
mailing_list_id,
mail_to,
mail_cc,
subject,
body,
content_type
FROM
zj_sys_mailing_list
WHERE
sent_flag = 'N' AND
error_times <= 3 AND
(
sysdate - creation_date
)
< 3
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
DECLARE
v_mailing_list_id NUMBER;
v_notify_record_id NUMBER;
v_mail_to VARCHAR2(4000);
v_mail_cc VARCHAR2(4000);
v_subject VARCHAR2(2000);
v_attch_file_name VARCHAR2(2000);
v_created_by NUMBER;
v_creation_date DATE;
v_last_updated_by NUMBER;
v_last_update_date DATE;
v_body Long;
BEGIN
UPDATE
zj_sys_notify_record r
SET r.status = 'SENT',
r.send_time = sysdate,
r.last_update_date = sysdate
WHERE r.record_id =
(SELECT l.notify_record_id
FROM zj_sys_mailing_list l
WHERE l.mailing_list_id = ${@mailing_list_id}
);
SELECT t.mailing_list_id,
t.notify_record_id,
t.mail_to,
t.mail_cc,
t.subject,
t.created_by,
t.creation_date,
t.last_updated_by,
t.last_update_date,
t.body,
t.attch_file_name
INTO
v_mailing_list_id,
v_notify_record_id,
v_mail_to,
v_mail_cc,
v_subject,
v_created_by,
v_creation_date,
v_last_updated_by,
v_last_update_date,
v_body,
v_attch_file_name
FROM zj_sys_mailing_list t
WHERE t.mailing_list_id = ${@mailing_list_id};
INSERT
INTO zj_sys_mailing_list_ht
(mailing_list_id,
notify_record_id,
mail_to,
mail_cc,
subject,
Body,
note,
sent_flag,
sent_date,
attch_file_name,
created_by,
creation_date,
last_updated_by,
last_update_date)
VALUES (v_mailing_list_id,
v_notify_record_id,
v_mail_to,
v_mail_cc,
v_subject,
v_body,
'',
'Y',
Sysdate,
v_attch_file_name,
v_created_by,
v_creation_date,
v_last_updated_by,
v_last_update_date);
DELETE FROM zj_sys_mailing_list WHERE mailing_list_id = ${@mailing_list_id};
END;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
BEGIN
UPDATE
zj_sys_mailing_list
SET note = '发送失败',
error_times = error_times + 1,
last_update_date = sysdate
WHERE mailing_list_id = ${@mailing_list_id};
UPDATE
zj_sys_notify_record r
SET r.status = 'ERROR',
r.last_update_date = sysdate
WHERE r.record_id =
(SELECT l.notify_record_id
FROM zj_sys_mailing_list l
WHERE l.mailing_list_id = ${@mailing_list_id}
);
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="mail_to"/>
<bm:field name="mailing_list_id"/>
<bm:field name="mail_cc"/>
<bm:field name="subject"/>
<bm:field name="body"/>
<bm:field name="content_type"/>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/server-script/layoutconfig/project_modify_entrance_g_project_result_queryfields.js
View file @ 85f71476
......@@ -65,7 +65,7 @@ var override_queryfields = [
//},
{
name:'project_status',
queryexpression : "t1.project_status in ('NEW','APPROVING','APPROVED_RETURN','REJECT','APPROVED','CONTRACT_CREATED')"
queryexpression : "t1.project_status in ('NEW','APPROVING','APPROVED_RETURN','REJECT','APPROVED','CONTRACT_CREATED','CLOSED')"
}
......
src/main/webapp/leafresource/leaf.ui.std/hap/base/Leaf-all-min.js
View file @ 85f71476
......@@ -7771,8 +7771,11 @@ $L.ComboBox = Ext.extend($L.TriggerField, {
'select');
var self = this;
Ext.get(document.body)['on']("mousewheel", function(){
self.collapse();
if(self.popup) {
self.collapse();
}
}, self);
},
// onTriggerClick : function() {
// this.doQuery();
......
src/main/webapp/modules/cont/CON1250/receipts_details_write.lview
View file @ 85f71476
......@@ -133,7 +133,7 @@
<a:column name="transaction_date" prompt="收款日期" width="100" renderer="Leaf.formatDate"/>
<a:column name="cf_item_n" prompt="核销现金流" />
<a:column name="times" prompt="核销期数" width="80"/>
<a:column name="write_off_classification_n" prompt="核销分类" width="100" footerRenderer="summaryRenderer"/>
<!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100" footerRenderer="summaryRenderer"/>-->
<a:column name="write_off_due_amount" prompt="核销金额" width="100" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"/>
<a:column name="write_off_principal" prompt="核销本金" width="100" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"/>
<a:column name="write_off_interest" prompt="核销利息" width="100" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"/>
......
src/main/webapp/modules/cont/CON302N/con_cashflow_wirte_off_detail.lview
View file @ 85f71476
......@@ -29,7 +29,7 @@ $Purpose:
<a:grid marginHeight="300" marginWidth="30" bindtarget="con302n_con_cashflow_write_off_ds" id="con302n_con_cashflow_write_off_grid">
<a:columns>
<a:column name="write_off_type_desc" prompt="核销类型" width="120"/>
<a:column name="write_off_classification_desc" prompt="核销分类" width="120"/>
<!-- <a:column name="write_off_classification_desc" prompt="核销分类" width="120"/>-->
<a:column name="journal_date" prompt="核销日期" renderer="Leaf.formatDate" width="120"/>
<a:column name="write_off_due_amount" prompt="核销金额" renderer="Leaf.formatMoney" width="120"/>
<a:column name="transaction_num" prompt="收款编号" width="120"/>
......
src/main/webapp/modules/cont/CON311/con_re_print_entrance.lview
View file @ 85f71476
......@@ -15,6 +15,8 @@
url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<a:link id="car_modify_special_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.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"/>
<a:link id="con_lease_org_print_link"
url="${/request/@context_path}/modules/cont/CON620/create_content_for_collection.lsc"/>
<script type="text/javascript"><![CDATA[
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
......@@ -150,6 +152,24 @@
});
}
window['${/parameter/@layout_code}_user_button2_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];
if(record.get('sign_contract_status')=='SIGN'){
var contract_id = record.get('contract_id');
var templet_code = 'SIGN_SUGGESTION';
var url=$('con_lease_org_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
window.open(url, '_self');
}else{
Leaf.showMessage('${l:PROMPT}','签约未完成，不可打印！');
return;
}
};
]]></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"/>
......
src/main/webapp/modules/cont/CON505/hls_bp_master_query.lview
View file @ 85f71476
......@@ -7,6 +7,8 @@
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:view>
<a:link id="hls303_cdd_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="hls303_cdd_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<script type="text/javascript"><![CDATA[
function prj_check_bp_id(record) {
var bp_id;
......@@ -19,6 +21,71 @@
}
return bp_id;
}
function hls215n_upload_file(id, name, query_only) {
//
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
if (record.get('check_id')) {
var url;
if (query_only == 'Y' ||'${/parameter/@download}'=='Y') {
url = $('hls303_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
} else {
url = $('hls303_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
}
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: 'prj500_cdd_uploadFile_screen_id',
width: 850,
height: 400
});
win.on('close', function() {
record.ds.query();
});
} else {
Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
}
}
//超链接渲染
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
//
window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'attachment') {
link_function = 'upload_file';
if (record.get('attach_count') == 0 || !record.get('attach_count')) {
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
} else {
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '(' + record.get('attach_count') + ')' + '</a>';
}
} else if (name == 'attach_file_name') {
if (value != null) {
var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
var str = value.split(';;');
var url = '';
for (var i = 0; i < str.length; i++) {
var temp = str[i].split('--');
if (!Leaf.isEmpty(temp[0])) {
var file_name = temp[0].toUpperCase();
var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
if (file_name.indexOf('.PDF') >= 0) {
url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
} else if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
} else {
url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
}
}
}
return url;
}
} else if(name =='atm_attachment'){
link_function = 'hls215n_upload_file';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
}
};
//财务报表模板导入
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
......
src/main/webapp/modules/csh/CSH1000/csh_agent_deposit_source.lview
View file @ 85f71476
......@@ -61,7 +61,7 @@
<a:grid id="source_to_grid" bindTarget="source_to_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100">
<a:columns>
<a:column name="write_off_type" prompt="核销类型" width="200"/>
<a:column name="write_off_classification_n" prompt="核销分类" width="100"/>
<!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100"/>-->
<a:column name="write_off_date" prompt="日期" align="center" renderer="Leaf.formatDate"/>
<a:column name="write_off_due_amount" align="right" prompt="金额" width="150" renderer="Leaf.formatMoney"/>
<a:column name="bp_name" prompt="退款/核销对象" width="250"/>
......@@ -76,7 +76,7 @@
<a:grid id="source_from_grid" bindTarget="source_from_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100">
<a:columns>
<a:column name="write_off_type_n" prompt="核销类型" width="100"/>
<a:column name="write_off_classification_n" prompt="核销分类" width="100"/>
<!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100"/>-->
<a:column name="write_off_date" prompt="核销日期" align="center" renderer="Leaf.formatDate"/>
<a:column name="write_off_due_amount" align="right" prompt="核销金额" width="150" renderer="Leaf.formatMoney"/>
<a:column name="contract_number" prompt="合同号" width="150"/>
......
src/main/webapp/modules/csh/CSH1000/csh_deposit_pool_source.lview
View file @ 85f71476
......@@ -60,7 +60,7 @@
<a:grid id="source_to_grid" bindTarget="source_to_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100">
<a:columns>
<a:column name="write_off_type" prompt="核销类型" width="200"/>
<a:column name="write_off_classification_n" prompt="核销分类" width="100"/>
<!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100"/>-->
<a:column name="write_off_date" prompt="日期" align="center" renderer="Leaf.formatDate"/>
<a:column name="write_off_due_amount" align="right" prompt="金额" width="150" renderer="Leaf.formatMoney"/>
<a:column name="bp_name" prompt="退款/核销对象" width="250"/>
......
src/main/webapp/modules/csh/CSH1000/csh_deposit_source.lview
View file @ 85f71476
......@@ -61,7 +61,7 @@
<a:grid id="source_to_grid" bindTarget="source_to_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100">
<a:columns>
<a:column name="write_off_type" prompt="核销类型" width="200"/>
<a:column name="write_off_classification_n" prompt="核销分类" width="100"/>
<!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100"/>-->
<a:column name="write_off_date" prompt="日期" align="center" renderer="Leaf.formatDate"/>
<a:column name="write_off_due_amount" align="right" prompt="金额" width="150" renderer="Leaf.formatMoney"/>
<a:column name="bp_name" prompt="退款/核销对象" width="250"/>
......@@ -76,7 +76,7 @@
<a:grid id="source_from_grid" bindTarget="source_from_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100">
<a:columns>
<a:column name="write_off_type_n" prompt="核销类型" width="100"/>
<a:column name="write_off_classification_n" prompt="核销分类" width="100"/>
<!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100"/>-->
<a:column name="write_off_date" prompt="核销日期" align="center" renderer="Leaf.formatDate"/>
<a:column name="write_off_due_amount" align="right" prompt="核销金额" width="150" renderer="Leaf.formatMoney"/>
<a:column name="contract_number" prompt="合同号" width="150"/>
......
src/main/webapp/modules/csh/CSH301/csh_transaction_write_off_detail_query1.lview
View file @ 85f71476
......@@ -60,7 +60,7 @@
<a:column name="contract_number" prompt="HLS.CONTRACT_NUMBER" width="110"/>
<a:column name="project_name" prompt="PRJ501.PRJ_PROJECT.PROJECT_NAME" width="180"/>
<a:column name="bp_name" prompt="CSH513.BP_TENANT" width="180"/>
<a:column name="write_off_classification_desc" prompt="核销分类" width="120"/>
<!-- <a:column name="write_off_classification_desc" prompt="核销分类" width="120"/>-->
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview
View file @ 85f71476
......@@ -79,7 +79,7 @@
} else {
var saveData = [];
var transaction_type = '${/parameter/transaction_type}';
var transaction_type = '${/parameter/@transaction_type}';
// if (receipt_type == 'WITHHOLD') { //划扣
// if (all.length != records.length) {
// Leaf.showInfoMessage("提示", "该现金事务不支付部分反冲");
......@@ -96,35 +96,43 @@
Leaf.showInfoMessage("提示", "该现金事务不支付部分反冲");
return;
}
}
var gld_batch_id = records[0].get('gld_batch_id');
for (var i = 0; i < records.length; i++) {
if (records[i].get('gld_batch_id') != gld_batch_id) {
Leaf.showInfoMessage("提示", "请选择同一批次号的记录反冲！");
return;
for (var i = 0; i < records.length; i++) {
records[i].set('reversed_date', head_record.get('reversed_date'));
records[i].set('description', head_record.get('description'));
records[i].set('_status', 'update');
saveData.push(records[i].data);
}
records[i].set('reversed_date', head_record.get('reversed_date'));
records[i].set('description', head_record.get('description'));
records[i].set('_status', 'update');
saveData.push(records[i].data);
}
//同批次未勾选的
var allR = $('csh_transaction_receipt_write_off_reverse_detail_result_ds').getAll();
var unR = [];
for (var i = 0; i < allR.length; i++) {
if (records.indexOf(allR[i]) === -1) {
unR.push(allR[i]);
} else {
var gld_batch_id = records[0].get('gld_batch_id');
for (var i = 0; i < records.length; i++) {
if (records[i].get('gld_batch_id') != gld_batch_id) {
Leaf.showInfoMessage("提示", "请选择同一批次号的记录反冲！");
return;
}
records[i].set('reversed_date', head_record.get('reversed_date'));
records[i].set('description', head_record.get('description'));
records[i].set('_status', 'update');
saveData.push(records[i].data);
}
}
for (var i = 0; i < unR.length; i++) {
if(unR[i].get('gld_batch_id') == gld_batch_id){
Leaf.showInfoMessage("提示", "请选择全部同一批次号的记录反冲！");
return;
//同批次未勾选的
var allR = $('csh_transaction_receipt_write_off_reverse_detail_result_ds').getAll();
var unR = [];
for (var i = 0; i < allR.length; i++) {
if (records.indexOf(allR[i]) === -1) {
unR.push(allR[i]);
}
}
for (var i = 0; i < unR.length; i++) {
if (unR[i].get('gld_batch_id') == gld_batch_id) {
Leaf.showInfoMessage("提示", "请选择全部同一批次号的记录反冲！");
return;
}
}
}
//排序
saveData.sort(function(a,b){
saveData.sort(function (a, b) {
return b.write_off_id - a.write_off_id;
});
......@@ -163,8 +171,8 @@
return;
}, null, null);
}
}
}
function csh514_write_off_reverse_return() {
......@@ -278,7 +286,7 @@
<a:column name="contract_number" prompt="HLS.CONTRACT_NUMBER" width="150"/>
<!-- <a:column name="project_name" prompt="PRJ501.PRJ_PROJECT.PROJECT_NAME"/> -->
<a:column name="bp_name" prompt="CSH513.BP_TENANT"/>
<a:column name="write_off_classification_desc" prompt="核销分类"/>
<!-- <a:column name="write_off_classification_desc" prompt="核销分类"/>-->
<a:column name="gld_batch_id" prompt="核销批次号"/>
</a:columns>
</a:grid>
......
src/main/webapp/modules/csh/CSH515/csh_transaction_receipt_return_maintain.lview
View file @ 85f71476
......@@ -434,6 +434,8 @@
<a:datePicker name="transaction_date_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_TO"/>
<a:numberField name="transaction_amount_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM" align="right"/>
<a:numberField name="transaction_amount_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_TO" align="right"/>
<a:textField name="transaction_num_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_NUM_FROM"/>
<a:textField name="transaction_num_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_NUM_TO"/>
<!--我方账户户名-->
<!-- <a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>-->
<!-- <a:lov name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>-->
......
src/main/webapp/modules/csh/CSH532N/csh_write_off_assigns.lview
View file @ 85f71476
......@@ -443,7 +443,7 @@
<!--<a:map from="bp_name" to="write_off_bp_name"/>-->
<!--</a:mapping>-->
<!--</a:field>-->
<a:field name="write_off_classification_desc" prompt="核销分类" options="ds_csh_write_off_classification_ds" returnField="write_off_classification" valueField="code_value" displayField="code_value_name"/>
<!-- <a:field name="write_off_classification_desc" prompt="核销分类" options="ds_csh_write_off_classification_ds" returnField="write_off_classification" valueField="code_value" displayField="code_value_name"/>-->
<a:field name="write_off_cf_item" readOnly="true"/>
<a:field name="write_off_cf_item_desc" displayField="cf_item_desc" options="write_off_cf_item_ds" returnField="write_off_cf_item" valueField="cf_item"/>
</a:fields>
......@@ -507,7 +507,7 @@
<!--<a:column name="left_amount" align="right" footerRenderer="summaryRenderer" prompt="剩余金额" renderer="Leaf.formatMoney" width="120"/>-->
<!--&lt;!&ndash;<a:column name="left_principal" align="right" footerRenderer="summaryRenderer" prompt="剩余本金" renderer="Leaf.formatMoney" width="120"/>&ndash;&gt;-->
<!--<a:column name="left_interest" align="right" footerRenderer="summaryRenderer" prompt="剩余利息" renderer="Leaf.formatMoney" width="120"/>-->
<a:column name="write_off_classification_desc" editorFunction="csh_edit_function" prompt="核销分类" />
<!-- <a:column name="write_off_classification_desc" editorFunction="csh_edit_function" prompt="核销分类" />-->
<a:column name="write_off_date" align="center" editorFunction="csh_edit_function" renderer="Leaf.formatDate" prompt="核销基准日期" width="120"/>
<a:column name="write_off_amount" align="right" editorFunction="csh_edit_function" footerRenderer="summaryRenderer" prompt="CSH531.AMOUNT" renderer="Leaf.formatMoney" width="120"/>
<!--<a:column name="write_off_principal" align="right" prompt="分配本金" renderer="Leaf.formatMoney" width="120"/>-->
......@@ -537,7 +537,7 @@
<a:column name="left_amount" align="right" footerRenderer="summaryRenderer" prompt="剩余金额" renderer="Leaf.formatMoney" width="120"/>
<!--<a:column name="left_principal" align="right" footerRenderer="summaryRenderer" prompt="剩余本金" renderer="Leaf.formatMoney" width="120"/>-->
<!--<a:column name="left_interest" align="right" footerRenderer="summaryRenderer" prompt="剩余利息" renderer="Leaf.formatMoney" width="120"/>-->
<a:column name="write_off_classification_desc" editorFunction="csh_edit_function" prompt="核销分类"/>
<!-- <a:column name="write_off_classification_desc" editorFunction="csh_edit_function" prompt="核销分类"/>-->
<a:column name="write_off_date" align="center" editorFunction="csh_edit_function" renderer="Leaf.formatDate" prompt="核销基准日" width="120"/>
<a:column name="write_off_amount" align="right" editorFunction="csh_edit_function" footerRenderer="summaryRenderer" prompt="CSH531.AMOUNT" renderer="Leaf.formatMoney" width="120"/>
<!--<a:column name="write_off_principal" align="right" prompt="分配本金" renderer="Leaf.formatMoney" width="120"/>-->
......
src/main/webapp/modules/hls/HLS215N/hls_bp_master_query.lview
View file @ 85f71476
......@@ -26,11 +26,11 @@
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
if (record.get('check_id')) {
var url;
//if (query_only == 'Y') {
if (query_only == 'Y') {
url = $('hls303_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
// } else {
// url = $('hls303_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
// }
} else {
url = $('hls303_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
}
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
......@@ -55,7 +55,6 @@
if (name == 'attachment') {
link_function = 'hls215n_upload_file';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
} else if (name == 'attach_file_name') {
if (value != null) {
var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
......
src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview
View file @ 85f71476
......@@ -80,13 +80,13 @@ $Purpose: 商业伙伴授信维护
}
//启用和审批冻结判断
var credit_status=datas[0].data.credit_status;
if(credit_status!='ENABLE'&&credit_status!='DISABLE'){
$L.showInfoMessage("提示",'请选择状态为启用和停用的数据！',null,null)
if(credit_status!='ENABLE'&&credit_status!='DISABLE'&&credit_status!='REFUSE'){
$L.showInfoMessage("提示",'请选择状态为启用,停用和审批拒绝的数据！',null,null)
return;
}
//角色判断 00215 营业内勤
//00213 营业担当
if(user_code==''||user_code==undefined){
if(user_code==''||user_code==undefined){
$L.showInfoMessage("提示",'只有营业内勤和营业担当才能操作数据！');
return;
}
......
src/main/webapp/modules/hls/HLS362N/hls_bp_master_credit_confirm.lview
View file @ 85f71476
......@@ -57,7 +57,7 @@ $Purpose: 商业伙伴授信维护
return;
}
//角色判断
// 002 营业本部长
//002 营业本部长
if(user_code==''||user_code==undefined){
$L.showInfoMessage("提示",'只有营业本部长才能操作数据！');
return;
......
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @ 85f71476
......@@ -1264,6 +1264,11 @@
calc_session_id: '${/parameter/@calc_session_id}'
},
success: function() {
if('${/parameter/@document_category}'=='PROJECT'){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_ds').query();
}else if('${/parameter/@document_category}'=='CONTRACT'){
$('CONTRACT_CREATE_INC_G_CASHFLOW_1_con_contract_cashflow_ds').query();
}
open_after_save_execute();
},
......@@ -1280,14 +1285,17 @@
function hls_hls500_user_button2() {
flag = 'Y';
lock_calc_current_window();
Leaf.request({
url: $('hls_fin_calc_single_variable_manual_link_id').getUrl(),
para: {
calc_session_id: '${/parameter/@calc_session_id}'
},
success: function() {
if('${/parameter/@document_category}'=='PROJECT'){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_ds').query();
}else if('${/parameter/@document_category}'=='CONTRACT'){
$('CONTRACT_CREATE_INC_G_CASHFLOW_1_con_contract_cashflow_ds').query();
}
open_after_save_execute();
},
failure: function() {
......
src/main/webapp/modules/prj/PRJ501N/prj_project_modify_entrance.lview
View file @ 85f71476
......@@ -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'||record.get('project_status') == 'CONTRACT_CREATED') {
if (record.get('project_status') == 'APPROVED' ||record.get('project_status') == 'APPROVING'||record.get('project_status') == 'CONTRACT_CREATED' || record.get('project_status') == 'CLOSED') {
maintain_type = 'READONLY';
param = record.data;
param['bp_id_tenant'] = record.get('bp_id_tenant');
......
src/main/webapp/modules/sys/SYS405/sys_mail_send_by_java.lsc 0 → 100644
View file @ 85f71476
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:s="leaf.plugin.script" xmlns:msg="leaf.application.features.msg"
xmlns:a="http://www.leaf-framework.org/application" xmlns:dr="leaf.plugin.excelreport"
xmlns:excel="leaf.application.task.excel" xmlns:t="uncertain.composite.transform"
xmlns:mail="leaf.plugin.mail" xmlns:p="uncertain.proc" trace="true">
<a:init-procedure>
<s:server-script><![CDATA[
importPackage(java.io);
importPackage(Packages.hl.mail);
try {
var mail_server_bm = $bm('sys.SYS405.sys_get_mail_server');
var mail_server_result = mail_server_bm.queryAsMap().getChildren();
var mail_list_bm = $bm('sys.SYS405.zj_sys_mailing_list');
var mail_list_result = mail_list_bm.queryAsMap().getChildren();
println('###############' + mail_list_result.length + '###############');
for (var i = 0; i < mail_list_result.length; i++) {
var mb = new HlMailBean();
mb.setHost(mail_server_result[0].mail_smtp_host); // 设置SMTP主机(163)，若用126，则设为：smtp.126.com
mb.setPort(mail_server_result[0].mail_port_number); //设置端口号
mb.setUsername(mail_server_result[0].mail_username); // 设置发件人邮箱的用户名
mb.setPassword(mail_server_result[0].mail_password); // 设置发件人邮箱的密码，需将*号改成正确的密码
mb.setFrom(mail_server_result[0].mail_address); // 设置发件人的邮箱
mb.setTo(mail_list_result[i].mail_to); // 设置收件人的邮箱
println(mail_list_result[i].mail_to);
if (mail_list_result[i].mail_cc) {
mb.setCc(mail_list_result[i].mail_cc); // 设置抄送人的邮箱
} else {
mb.setCc(mail_list_result[i].mail_to);
}
mb.setSubject(mail_list_result[i].subject); // 设置邮件的主题
mb.setContent(mail_list_result[i].body); // 设置邮件的正文
//mb.setContent(mail_list_result[i].content_type); // 设置邮件的格式 text/html为html，text/plain为纯文本
//设置附件
//mb.attachFile("D:\\abc.xlsx"); // 往邮件中添加附件
var mail_file_bm = $bm('sys.SYS405.zj_sys_mailing_file');
var mail_file_result = mail_file_bm.queryAsMap({
mailing_list_id: mail_list_result[i].mailing_list_id
}).getChildren();
for (var j = 0; j < mail_file_result.length; j++) {
mb.attachFile(mail_file_result[j].file_path);
}
var sm = new HlSendMail();
if (mail_list_result[i].content_type == "text/html") {
println(mail_list_result[i].mailing_list_id);
if (sm.sendHtmlMail(mb)) {
$bm('sys.SYS405.zj_sys_mailing_list').update({
mailing_list_id: mail_list_result[i].mailing_list_id
});
} else {
$bm('sys.SYS405.zj_sys_mailing_list').execute({
mailing_list_id: mail_list_result[i].mailing_list_id
});
}
} else {
if (sm.sendMail(mb)) {
$bm('sys.SYS405.zj_sys_mailing_list').update({
mailing_list_id: mail_list_result[i].mailing_list_id
});
} else {
$bm('sys.SYS405.zj_sys_mailing_list').execute({
mailing_list_id: mail_list_result[i].mailing_list_id
});
}
}
}
} catch (e) {
raise_app_error(e);
}
]]></s:server-script>
</a:init-procedure>
<a:service-output/>
</a:service>
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