Skip to content

L
leaf-hlcm
Commit 4a21dcb5 authored by niminmin's avatar niminmin
Browse files
Options

[feat]变更功能开发

parent 15233c0c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1433 additions and 84 deletions
pom.xml
View file @ 4a21dcb5
......@@ -123,6 +123,44 @@
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>com.jacob</groupId>
<artifactId>sys-jacob</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/jacob.jar</systemPath>
</dependency>
<dependency>
<groupId>com.aspose.cells</groupId>
<artifactId>sys-aspose-cells</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/aspose-cells-8.5.2.jar</systemPath>
</dependency>
<dependency>
<groupId>com.aspose.slides</groupId>
<artifactId>sys-aspose-slides</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/aspose.slides-15.9.0.jar</systemPath>
</dependency>
<dependency>
<groupId>com.aspose.words</groupId>
<artifactId>sys-aspose-words</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/aspose-words-16.8.0-jdk16.jar</systemPath>
</dependency>
<dependency>
<groupId>com.artofsolving.jodconverter</groupId>
<artifactId>sys-artofsolving-jodconverter</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/jodconverter-2.2.2.jar</systemPath>
</dependency>
<!--end -->
<dependency>
......
src/main/webapp/WEB-INF/classes/cont/CON701/hls_bp_master_v_all_lov.lwm
View file @ 4a21dcb5
......@@ -5,7 +5,7 @@
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features">
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" xmlns:s="leaf.plugin.script">
<bm:fields>
<bm:field name="bp_id" prompt="HLS_BP_MASTER_V.BP_ID"/>
<bm:field name="bp_code" displayWidth="242" forDisplay="true" forQuery="true" prompt="HLS.BP_CODE"/>
......@@ -39,6 +39,17 @@
<bm:query-field field="bp_name" queryExpression="t1.bp_name like &apos;%&apos; || ${@bp_name} || &apos;%&apos;"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query" expression="t1.bp_category = ${@bp_category}"/>
<bm:data-filter name="query" expression="t1.bp_category = ${@bp_category} and exists
(select 1
from aut_trx_user_authorize a1, aut_owner_user_authorize a2
where a1.trx_category = 'BP'
and a1.trx_id = t1.bp_id
and trunc(sysdate) between a1.start_date and
nvl(a1.end_date, trunc(sysdate))
and a1.user_id = a2.owner_user_id
and a1.trx_category = a2.trx_category
and a2.authorized_user_id = ${/session/@user_id}
and trunc(sysdate) between a2.start_date and
nvl(a2.end_date, trunc(sysdate))) "/>
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON_ET001/con_early_termination_query.lwm
View file @ 4a21dcb5
......@@ -180,7 +180,7 @@
<bm:query-field name="lease_execution_date_from" queryexpression="to_char(t1.lease_execution_date,'YYYY-MM-DD') &gt;= ${@lease_execution_date_from}"/>
<bm:query-field name="lease_execution_date_to" queryexpression="to_char(t1.lease_execution_date,'YYYY-MM-DD') &lt;= ${@lease_execution_date_to}"/>
</bm:query-fields>
<!-- <bm:features>-->
<bm:features>
<!-- EXISTS-->
<!-- (SELECT-->
<!-- 1-->
......@@ -191,10 +191,10 @@
<!-- u.user_id =${/session/@user_id}-->
<!-- ) AND-->
<!-- AND t.owner_user_id = ${/session/@user_id}-->
<!-- <s:bm-script><![CDATA[-->
<!-- var cx = Packages.leaf.javascript.Context.getCurrentContext();-->
<!-- Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");-->
<!-- ]]></s:bm-script>-->
<!-- </bm:features>-->
<s:bm-script><![CDATA[
var cx = Packages.leaf.javascript.Context.getCurrentContext();
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
]]></s:bm-script>
</bm:features>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON_ET003/con_early_termination_modify_query.lwm
View file @ 4a21dcb5
......@@ -197,7 +197,7 @@
<bm:query-field name="req_employee_n" datatype="java.lang.String" queryexpression="t1.req_employee_n like &apos;%&apos; || ${@req_employee_n} || &apos;%&apos;"/>
<bm:query-field name="req_status" queryExpression="t1.req_status = ${@req_status}"/>
</bm:query-fields>
<!-- <bm:features>-->
<bm:features>
<!-- EXISTS-->
<!-- (SELECT-->
<!-- 1-->
......@@ -208,10 +208,10 @@
<!-- u.user_id =${/session/@user_id}-->
<!-- ) AND-->
<!-- AND t.owner_user_id = ${/session/@user_id}-->
<!-- <s:bm-script><![CDATA[-->
<!-- var cx = Packages.leaf.javascript.Context.getCurrentContext();-->
<!-- Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");-->
<!-- ]]></s:bm-script>-->
<!-- </bm:features>-->
<s:bm-script><![CDATA[
var cx = Packages.leaf.javascript.Context.getCurrentContext();
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
]]></s:bm-script>
</bm:features>
</bm:model>
src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_csh_result_query.lwm
View file @ 4a21dcb5
......@@ -64,22 +64,25 @@
from con_contract_cashflow ccc,con_contract t,con_contract_lease_item ccli
WHERE ccc.contract_id=t.contract_id
AND ccli.contract_id(+)=t.contract_id
AND ccc.cf_item IN (1,8,200)
AND ((t.contract_status ='INCEPT'
AND ((TRUNC(ccc.due_date)<=TRUNC(to_date(${@before_end},'yyyy-mm-dd'))
AND ccc.due_amount > NVL((SELECT SUM(cwo.write_off_due_amount) FROM csh_transaction t,csh_write_off cwo
WHERE cwo.cashflow_id=ccc.cashflow_id
AND t.transaction_id=cwo.csh_transaction_id
AND NVL(cwo.reversed_flag,'N')='N'
AND TRUNC(T.transaction_date) <=TRUNC(to_date(${@before_end},'yyyy-mm-dd'))),0)
)
OR(
TRUNC(ccc.due_date)<=TRUNC(to_date(${@cur_end},'yyyy-mm-dd')) AND TRUNC(ccc.due_date) > TRUNC(to_date(${@before_end},'yyyy-mm-dd'))
))) or( t.contract_status ='TERMINATE' and exists (select 1 from csh_transaction t,csh_write_off cwo WHERE cwo.cashflow_id=ccc.cashflow_id
AND t.transaction_id=cwo.csh_transaction_id
AND NVL(cwo.reversed_flag,'N')='N'
and TRUNC(T.transaction_date) > TRUNC(to_date(${@before_end},'yyyy-mm-dd')))))
AND ccc.cf_item IN (1, 8, 200, 250)
AND ccc.cf_status = 'RELEASE'
AND t.data_class = 'NORMAL'
AND trunc(ccc.due_date) <=
trunc(to_date(${@cur_end}, 'yyyy-mm-dd'))
AND ((trunc(t.lease_start_date) <=
trunc(to_date(${@cur_end}, 'yyyy-mm-dd')) AND
t.contract_status = 'INCEPT') OR
( trunc(t.et_date) >= trunc(to_date(${@cur_begin}, 'yyyy-mm-dd')) AND
t.contract_status = 'TERMINATE'))
AND ccc.due_amount >
nvl((SELECT SUM(cwo.write_off_due_amount)
FROM csh_transaction t, csh_write_off cwo
WHERE cwo.cashflow_id = ccc.cashflow_id
AND t.transaction_id = cwo.csh_transaction_id
AND nvl(cwo.reversed_flag, 'N') = 'N'
AND trunc(t.transaction_date) <
trunc(to_date(${@cur_begin}, 'yyyy-mm-dd'))),
0)
order by t.contract_id
) v
......
src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_result_query.lwm
View file @ 4a21dcb5
......@@ -139,6 +139,7 @@
to_char(ct.et_date, 'yyyy-mm-dd') terminate_date
from con_contract ct
where ct.contract_status not in ('CANCEL')
and ct.data_class='NORMAL'
order by ct.bp_id_agent_level1
......
src/main/webapp/WEB-INF/classes/sys/change_image.lwm 0 → 100644
View file @ 4a21dcb5
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2013-9-27 上午11:03:38
$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
sys_user_pkg.change_avatar_by_owner(p_avatar_id => ${@avatar_id},
p_user_id => ${/session/@user_id},
p_new_avatar => ${@avatar});
END;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="avatar_id" dataType="java.lang.Long" output="true" outputPath="@avatar_id"/>
</bm:parameters>
</bm:operation>
<bm:operation name="query">
<bm:update-sql><![CDATA[
SELECT avatar
FROM sys_user_avatar
WHERE user_id = ${/session/@user_id}
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="avatar"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/sys_user.lwm
View file @ 4a21dcb5
......@@ -13,6 +13,7 @@
<ns1:field name="password_lifespan_days" databaseType="BIGINT" datatype="java.lang.Long"/>
<ns1:field name="password_lifespan_access" databaseType="BIGINT" datatype="java.lang.Long"/>
<ns1:field name="employee_id" databaseType="BIGINT" datatype="java.lang.Long"/>
<ns1:field name="avatar" expression="(select avatar from sys_user_avatar where user_id = fc.user_id and rownum=1)" forInsert="false" forUpdate="false" />
<ns1:field name="frozen_flag" databaseType="VARCHAR" datatype="java.lang.String" prompt="SYS_USER.FROZEN_FLAG"/>
<ns1:field name="frozen_flag_display" databaseType="VARCHAR" datatype="java.lang.String" expression="decode(fc.frozen_flag,&apos;Y&apos;,&apos;已冻结&apos;,&apos;N&apos;,&apos;未冻结&apos;)" forInsert="false" forUpdate="false" prompt="SYS_USER.IS_FROZEN"/>
<ns1:field name="frozen_date" databaseType="DATE" datatype="java.sql.Date" forInsert="true" forUpdate="true" prompt="SYS_USER.FROZEN_DATE"/>
......
src/main/webapp/main.lview
View file @ 4a21dcb5
......@@ -41,8 +41,6 @@
$session.subject = 'HAP';
}
$ctx.parameter.global_tab_flag='Y';
]]>
</s:server-script>
</a:init-procedure>
......@@ -61,16 +59,11 @@
<a:link id="theme_select_link" url="${/request/@context_path}/theme_select.lview"/>
<a:link id="gloabl_tab_iframe_link" url="${/request/@context_path}/global_tab_iframe.lview"/>
<a:link id="fast_btn_config" url="${/request/@context_path}/fast_btn_config.lview"/>
<a:link id="login_timeout_id" url="${/request/@context_path}/login_timeout.lview"/>
<a:link id="my_profile_config" url="${/request/@context_path}/sys_user_config.lview"/>
<a:link id="bmLink_sys_function_v_query" model="home.sys_function_group_item_vl" modelaction="query"/>
<a:link id="bmLink_sys_page_menu_query" model="home.sys_page_menu" modelaction="query"/>
<a:link id="bmLink_sys_function_query" model="sys.SYS860.sys_function" modelaction="query"/>
<a:link id="bmLink_sys_notice_msg" model="sys.SYS100.sys_notice_msg" modelaction="query"/>
<a:link id="bmLink_wfl_instance_node" model="zjwfl.ZJWFL5110.sdic_wfl_instance_node_recipient"
modelaction="query"/>
......@@ -105,6 +98,7 @@
type="text/javascript"></script>
<a:link id="BmLink_sys_user_query" model="sys.sys_employees" modelaction="query"/>
<a:link id="BmLink_sys_user_update" model="sys.sys_employees" modelaction="update"/>
<a:link id="img_upload_link" url="${/request/@context_path}/uploadImg.lview"/>
<style type="text/css">
.custTree .clip-minusTop, .custTree .clip-minusBottom, .custTree .clip-minus {
......@@ -1065,6 +1059,39 @@
}
function showImgWin() {
var img_upload_window = new Leaf.Window({
id: 'img_upload_window',
url: $('img_upload_link').getUrl(),
title: '上传头像',
closeable: true,
draggable: true,
params: {
user_id:${/session/@user_id},
win_id: 'img_upload_window'
},
height: 468,
width: 650
});
img_upload_window.on('close', function () {
Leaf.Masker.mask(document.getElementById("user-info"), '正在加载');
Leaf.request({
url: "${/request/@context_path}/autocrud/sys.sys_user/query",
para: {
user_id: '${/session/@user_id}'
},
scope: this,
success: function (res) {
if (res.success) {
Leaf.Masker.unmask(document.getElementById("user-info"));
var userImg = res.result.record.avatar;
if (!!userImg) jQuery('.user-avatar').attr('src', userImg);
}
}
})
});
}
function saveInfo() {
var infoContent = $jq(top.document.getElementById("info-content-id"));
var passwordContent = $jq(top.document.getElementById("password-content-id"));
......@@ -1424,8 +1451,26 @@
userDs.forEach(function (value) {
value.data.userId == ${/session/@user_id} ? userName = value.data.user_name : userName = '';
});
setUserName();
}
function setUserName() {
Leaf.request({
url: "${/request/@context_path}/autocrud/sys.sys_user/query?user_id=${/session/@user_id}",
para: {},
scope: this,
success: function (res) {
var userName;
if (res.success) {
var userImg = res.result.record.avatar;
userName = res.result.record.description;
document.getElementById('userName').innerHTML = userName;
if (!!userImg) jQuery('.user-avatar').attr('src', userImg);
document.getElementById('row-user-name-id').innerHTML = userName;
}
}
})
}
/**
* 显示个人信息
* */
......@@ -1985,7 +2030,8 @@
</div>
<div class="row-user-info">
<div class="row-user-name" id="row-user-name-id">hand</div>
<!--<div class="row-user-button">编辑图片</div>-->
<!-- <div class="row-user-button">编辑图片</div>-->
<div class="row-user-button" onclick="showImgWin()">更改头像</div>
<!--登录信息-->
<div class="add-name">登录ip：${/model/login_info/record/@ip}</div>
<div class="add-name">登录时间：${/model/login_info/record/@login_time}</div>
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
View file @ 4a21dcb5
......@@ -11,7 +11,22 @@
<a:link id="con_et001_calc_cashflow_link" model="cont.CON_ET001.calc_cashflow" modelaction="execute"/>
<a:link id="con_et001_calc_cashflow_link1" model="cont.CON_ET001.insert_calc_cashflow" modelaction="execute"/>
<a:link id="con_et001_calc_et_date_amount_link" model="cont.CON_ET001.calc_et_date_amount" modelaction="execute"/>
<a:link id="con731_cancel_link" model="cont.CON731.cancel_change_req" modelaction="execute"/>
<a:link id="${/parameter/@layout_code}_prj500_cdd_uploadFile_id"
url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="${/parameter/@layout_code}_prj500_cdd_downloadFile_id"
url="${/request/@context_path}/downloadFile.lview"/>
<script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>
<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript"><![CDATA[
Ext.ux.Lightbox.register('a[ref=img]', true);
Leaf.onReady(function () {
var ds_con_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_01', 'con_contract');
if ($(ds_con_id)) {
$(ds_con_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
$(ds_con_id).query();
}
});
var calc_flag='Y';
//新增和加载时调用form
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
......@@ -25,6 +40,12 @@
}
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
if (ds == $(ds_id)) {
if (name == 'et_fee') {
var et_total_amount=record.get('et_total_amount')||0;
var old_et_fee=old_value||0;
record.set('et_total_amount', plus(minus(et_total_amount,old_et_fee),value||0));
}
if (name == 'termination_date'&&value) {
// 根据结清日计算结清相关金额字段
Leaf.request({
......@@ -33,7 +54,7 @@
change_req_id:record.get('change_req_id'),
contract_id: record.get('contract_id'),
termination_date: value,
et_fee:record.get('et_fee'),
et_fee:record.get('et_fee')||0,
et_interest_rate:record.get('et_interest_rate'),
residual_value:record.get('residual_value')
},
......@@ -266,6 +287,62 @@
}
}
};
//附件上传
function con_et_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/@function_usage}' == 'QUERY') {
url = $('${/parameter/@layout_code}${/parameter/@pre_layout}_prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
} else {
url = $('${/parameter/@layout_code}${/parameter/@pre_layout}_prj500_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) {
var link_function = '';
window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'attachment') {
link_function = 'con_et_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=';
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('.BMP') >= 0 || file_name.indexOf('.JPG') >= 0 || file_name.indexOf('.JPEG') >= 0 || file_name.indexOf('.PNG') >= 0 || file_name.indexOf('.GIF') >= 0) {
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;
}
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_query.lview
View file @ 4a21dcb5
......@@ -132,11 +132,11 @@
<a:textField name="contract_number" bindTarget="contractQueryScreen_paraDs" prompt="合同编号"/>
<a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/>
<a:lov name="bp_name" bindTarget="contractQueryScreen_paraDs" prompt="承租人名称"/>
<a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>
<!-- <a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>-->
<a:comboBox name="division_n" bindTarget="contractQueryScreen_paraDs" prompt="租赁物"/>
<!-- <a:textField name="received_times" bindTarget="contractQueryScreen_paraDs" prompt="已还款期数"/>-->
<!-- <a:comboBox name="contract_status_desc" bindTarget="contractQueryScreen_paraDs" prompt="合同状态"/>-->
<a:comboBox name="overdue_status_desc" bindTarget="contractQueryScreen_paraDs" prompt="是否逾期"/>
<!-- <a:comboBox name="overdue_status_desc" bindTarget="contractQueryScreen_paraDs" prompt="是否逾期"/>-->
</a:form>
<a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="230" marginWidth="40" navBar="true">
<a:columns>
......@@ -145,9 +145,9 @@
<a:column name="bp_name" prompt="承租人名称" width="200" align="left"/>
<a:column name="bp_agent" prompt="代理店" width="200" align="left"/>
<a:column name="division_n" prompt="租赁物" width="120" align="left"/>
<a:column name="received_times" prompt="已还款期数" width="80" align="right"/>
<!-- <a:column name="received_times" prompt="已还款期数" width="80" align="right"/>-->
<a:column name="status_desc" prompt="合同状态" width="120" align="center"/>
<a:column name="overdue_status" prompt="是否逾期" width="100" align="center"/>
<!-- <a:column name="overdue_status" prompt="是否逾期" width="100" align="center"/>-->
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/cont/CON_ET003/con_early_termination_modify_query.lview
View file @ 4a21dcb5
......@@ -144,18 +144,18 @@
<!--<a:gridButton click="con_gur_np_pint" text="提前结清补充协议"/>-->
</a:screenTopToolbar>
<a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
<a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="合同变更编号"/>
<a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="变更申请编号"/>
<a:textField name="contract_number" bindTarget="contractQueryScreen_paraDs" prompt="合同编号"/>
<a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/>
<a:lov name="bp_name" bindTarget="contractQueryScreen_paraDs" prompt="承租人名称"/>
<a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>
<!-- <a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>-->
<a:comboBox name="division_n" bindTarget="contractQueryScreen_paraDs" prompt="租赁物"/>
<a:textField name="req_employee_n" bindTarget="contractQueryScreen_paraDs" prompt="申请人"/>
<a:comboBox name="req_status_n" bindTarget="contractQueryScreen_paraDs" prompt="变更审批状态"/>
</a:form>
<a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="230" marginWidth="40" navBar="true">
<a:columns>
<a:column name="change_req_number" prompt="合同变更编号" width="120" align="left" renderer="open_change_req"/>
<a:column name="change_req_number" prompt="变更申请编号" width="120" align="left" renderer="open_change_req"/>
<a:column name="contract_number" prompt="合同编号" width="120" align="left"/>
<a:column name="contract_name" prompt="合同名称" width="120" align="left"/>
<a:column name="bp_name" prompt="承租人名称" width="200" align="left"/>
......
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @ 4a21dcb5
......@@ -1418,14 +1418,14 @@ debugger;
}
}
}
if(calc_temp==count){
Leaf.showMessage('${l:PROMPT}', '请保证一期以上的的调整租金为空！');
return false;
}
// if(last_null_calc_count==1&&zero_calc_count==count-1){
// Leaf.showMessage('${l:PROMPT}', '系统暂不支持所有租金集中在最后一期支付！');
// if(calc_temp==count){
// Leaf.showMessage('${l:PROMPT}', '请保证一期以上的的调整租金为空！');
// return false;
// }
if(last_null_calc_count==1&&zero_calc_count==count-1){
Leaf.showMessage('${l:PROMPT}', '系统暂不支持所有租金集中在最后一期支付！');
return false;
}
// if(null_calc_count==1&&zero_calc_count==count-1){
// Leaf.showMessage('${l:PROMPT}', '目前不支持只有一期租金的报价！');
// return false;
......
src/main/webapp/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview
View file @ 4a21dcb5
......@@ -79,7 +79,7 @@
<a:link id="pageLink_transfer" url="${/request/@context_path}/modules/zjwfl/ZJWFL5110/zj_wfl_approve_transfer.lview"/>
<a:link id="pageLink_add_approver" url="${/request/@context_path}/modules/zjwfl/ZJWFL5110/zj_wfl_approve_add_approver.lview"/>
<a:link id="pageLink_view_graphics" url="${/request/@context_path}/modules/zjwfl/zj_wfl_graphics.lview"/>
<a:link id="zj_wfl_approve_upload_link_id" url="${/request/@context_path}/atm_upload.lview"/>
<a:link id="zj_wfl_approve_upload_link_id" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="zjwfl5110_notice_link" model="zjwfl.ZJWFL5110.zj_wfl_approve_agree" modelaction="execute"/>
<script><![CDATA[
......@@ -116,7 +116,10 @@
return true;
} else if (type == 'add_approver') {
return true;
} else {
}else if (type == 'upload_attach') {
return true;
}
else{
return false;
}
}
......@@ -154,16 +157,33 @@
}
function zjwfl5110_uploadAttach() {
/* var rcpt_record_id = '${/parameter/@record_id}'; */
var rcpt_record_id = '${/parameter/@instance_id}';
new Leaf.Window({
debugger;
var rcpt_record_id = '${/parameter/@record_id}';
//var rcpt_record_id = '${/parameter/@instance_id}';
// new Leaf.Window({
// id: 'zj_wfl_approve_history_downloadfile_win',
// //url: $('zj_wfl_approve_upload_link_id').getUrl() + '?table_name=ZJ_WFL_APPROVE_RECORD&header_id=' + rcpt_record_id,
// // url: $('zj_wfl_approve_upload_link_id').getUrl() + '?document_table=ZJ_WFL_APPROVE_RECORD&document_id=' + rcpt_record_id + '&showflag=N',
// url: $('zj_wfl_approve_upload_link_id').getUrl() + '?table_name=ZJ_WFL_APPROVE_RECORD&header_id=' +rcpt_record_id,
// title: '附件查看',
// width: 850,
// height: 400
// });
var url= $('zj_wfl_approve_upload_link_id').getUrl() + '?table_name=ZJ_WFL_INSTANCE_NODE_RECIPIENT&header_id=' +rcpt_record_id;
var win = new Leaf.Window({
url: url,
title: '附件上传',
id: 'zj_wfl_approve_history_downloadfile_win',
//url: $('zj_wfl_approve_upload_link_id').getUrl() + '?table_name=ZJ_WFL_APPROVE_RECORD&header_id=' + rcpt_record_id,
url: $('zj_wfl_approve_upload_link_id').getUrl() + '?document_table=ZJ_WFL_APPROVE_RECORD&document_id=' + rcpt_record_id + '&showflag=N',
title: '附件查看',
width: 1250,
height: 350
width: 850,
height: 400
});
win.on('close', function() {
zjwfl5110_approvePage_noMask();
});
}
function zjwfl5110_approvePage_close() {
......@@ -478,7 +498,12 @@
} else if (action_type == 5) {
checkActionType = 'view_page';
zjwfl5110_onViewPage(record, combobox_ds_id, wfl_node_action_id, wfl_node_action_prompt, action_type);
} else {
}
else if (action_type == 7) {
checkActionType = 'upload_attach';
zjwfl5110_approvePage_noMask();
zjwfl5110_uploadAttach();
}else {
zjwfl5110_approvePage_noMask();
return;
}
......@@ -487,11 +512,13 @@
zjwfl5110_approvePage_noMask();
return;
}
if (action_type !== 7){
if (!$('comment_text_ds').validate()) {
zjwfl5110_approvePage_noMask();
return;
}
}
var record_id = '${/parameter/@record_id}';
var comment_text = $('comment_text_id').getValue();
var confirm_execute_flag = 'N';
......@@ -500,7 +527,7 @@
var params;
//add by wangwei5743
//查看页面类型，不需要弹出提示
if (action_type != 5) {
if (action_type != 5&&action_type != 7) {
var win = Leaf.showConfirm('是否确认', node_action_prompt, function() {
confirm_execute_flag = 'Y';
if (action_type == 1) {
......
src/main/webapp/modules/zjwfl/zj_wfl_approve_history.lview
View file @ 4a21dcb5
......@@ -116,7 +116,7 @@
</a:dataSets>
<a:screenBody>
<a:form marginWidth="30" padding="0">
<a:grid id="zj_wfl_approve_history_table_id" bindTarget="approveHistoryDs" marginWidth="30" marginHeight="250">
<a:grid id="zj_wfl_approve_history_table_id" bindTarget="approveHistoryDs" marginWidth="30" marginHeight="300">
<a:columns>
<a:column name="create_date_fmt" prompt="审批时间" width="150"/>
<a:column name="action_type_desc" prompt="审批操作" renderer="render_action_type_desc" width="150"/>
......@@ -125,7 +125,7 @@
<a:column name="node_desc" prompt="审批节点" width="200"/>
<a:column name="approver" prompt="审批人" renderer="check_agent_renderer" width="140" />
<a:placeHolder id="dynamicLineColumn_id"/>
<!--<a:column name="attachement" align="center" prompt="附件查看" renderer="attachement_renderer" width="80"/>-->
<a:column name="attachement" align="center" prompt="附件查看" renderer="attachement_renderer" width="80"/>
</a:columns>
<a:editors>
<a:textArea id="textArea_e" readOnly="true" height="100"/>
......
src/main/webapp/uploadImg.lview 0 → 100644
View file @ 4a21dcb5
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: zsy
$Date: 2018/12/18
$Revision:
$Purpose: 头像上传
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application">
<a:init-procedure>
<a:model-query model="sys.sys_user" rootPath="enable_image_system_flag"/>
</a:init-procedure>
<a:view package="leaf.ui.std" template="default">
<script src="${/request/@context_path}/leafresource/js/cropper.min.js"
type="text/javascript"></script>
<link href="${/request/@context_path}/leafresource/css/cropper.min.css" rel="stylesheet"
type="text/css"/>
<style>
#userImg {
width: 300px;
height: 300px;
}
#preview {
width: 200px;
height: 200px;
overflow: hidden;
}
#saveImg {
cursor: pointer;
float: right;
width: 108px;
height: 38px;
background-color: rgba(90, 127, 255, 1);
font-size: 14px;
color: #FFFFFF;
text-align: center;
line-height: 38px;
}
</style>
<script><![CDATA[
var options = {
aspectRatio: 1 / 1,
preview: "#preview",
viewMode: 1
};
var cropper;
var $image = document.getElementById('userImg');
$L.onReady(function () {
Leaf.Masker.mask($('${/parameter/@win_id}').wrap, '正在加载头像...');
Leaf.request({
url: "${/request/@context_path}/autocrud/sys.sys_user/query",
para: {
user_id: "${/session/@user_id}"
},
scope: this,
success: function (res) {
if (res.success) {
var userImg = '';
if (!!res.result.record.avatar) {
userImg = res.result.record["avatar"];
} else {
userImg = "${/request/@context_path}/lib/assets/layouts/layout4/img/avatar_default.png";
}
document.getElementById('userImg').src = userImg;
}
cropper = new Cropper($image, options);
Leaf.Masker.unmask($('${/parameter/@win_id}').wrap);
}
});
jQuery("#selectImg").on("change", function (e) {
var selectImg = e.currentTarget;
var file = selectImg.files[0];
if (/(.jpg)|(.jpeg)|(.png)|(.gif)|(.svg)$/.test(file.name)) {
// if(window.File && window.FileList && window.FileReader && window.Blob) {
if (window.FileReader) {
var fileReader = new window.FileReader();
fileReader.readAsDataURL(file);
fileReader.onload = function (e) {
$image.src = this.result;
cropper.destroy();
cropper = new Cropper($image, options);
};
}
} else {
$L.showErrorMessage("提示", "仅支持gif,jpeg,jpg,png,svg类型的图片", null, 200, 100);
}
});
jQuery("#saveImg").on("click", function () {
Leaf.Masker.mask($('${/parameter/@win_id}').wrap, '正在上传');
var result = cropper.getCroppedCanvas();
var avatar = result.toDataURL("image/jpeg");
Leaf.request({
url: "${/request/@context_path}/autocrud/sys.change_image/update",
para: {
user_id: "${/session/@user_id}",
avatar: avatar
},
scope: this,
success: function (res) {
if (res.success) {
Leaf.Masker.unmask($('${/parameter/@win_id}').wrap);
$L.showInfoMessage("提示", "头像上传成功", function () {
$('${/parameter/@win_id}').close();
}, 200, 100);
}
}
});
});
});
]]></script>
<a:screenBody>
<a:hBox>
<lable for="selectImg" class="imgTitle">选择图片</lable>
<input type="file" id="selectImg" accept="image/gif,image/jpeg,image/jpg,image/png,image/svg"/>
</a:hBox>
<a:hBox>
<img id="userImg"/>
<a:vBox>
<div id="preview"></div>
<div id="saveImg">保存</div>
</a:vBox>
</a:hBox>
</a:screenBody>
</a:view>
</a:screen>
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