Skip to content

L
leaf-hlcm
Commit 4530c395 authored by liyuan.chen's avatar liyuan.chen
Browse files
Options

[Feat]回购文本

parent ce92281d
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 21 deletions
src/main/webapp/WEB-INF/classes/cont/CON7000/rent_trans_penalty_submit.lwm
View file @ 4530c395
......@@ -27,7 +27,8 @@
BEGIN
cus_rent_trans_pently_pkg.check_rent_trans_pently(p_contract_id=>${@contract_id},
p_user_id=>${/session/@user_id},
p_record_id=>${@record_id});
p_record_id=>${@record_id},
p_description => ${@description});
END;
]]>
</bm:update-sql>
......
src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lwm
View file @ 4530c395
......@@ -55,6 +55,6 @@
<bm:query-field name="approve_user_code" queryExpression="t1.approve_user_code like ${@approve_user_code}"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query" expression="( (${/session/@role_id} = 2306 and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (2314, 2313, 2312) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} = 2305 and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = 2308 and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;)) or (${/session/@role_id} not in (2306, 2314, 2313, 2312, 2305, 2308) and 1 = 1))"/>
<bm:data-filter name="query" expression="( (${/session/@role_id} = (select role_id from sys_role where role_code = '0006') and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0012', '0013', '0014')) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;, &apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0005') and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0008') and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014')) and 1 = 1))"/>
</bm:data-filters>
</bm:model>
src/main/webapp/modules/acr/ACR515/hls_acr_vat_import_upload.lview
View file @ 4530c395
......@@ -7,6 +7,7 @@
if (document.getElementById('importFile').value) {
var fileName = document.getElementById('importFile').value;
var fileType = fileName.substr(fileName.lastIndexOf("."));
fileType = fileType.toLowerCase();
if (fileType != '.xls'&&fileType != '.xlsx') {
alert('请选择正确的导入文件！请使用xls或者xlsx后缀的文件');
} else {
......
src/main/webapp/modules/cont/CON7000/con_rent_trans_penalty_create_detail.lview
View file @ 4530c395
......@@ -21,7 +21,6 @@
}
function con7000_save() {
debugger;
var hd_record = $('con_rent_trans_penalty_hd_ds').getAt(0),
business_sum_penalty = hd_record.get('business_sum_penalty'),
account_sum_penalty = hd_record.get('account_sum_penalty');
......@@ -30,6 +29,7 @@
var saveData = [];
param['contract_id'] = hd_record.get('contract_id');
param['record_id'] = hd_record.get('record_id');
param['description'] = hd_record.get('description');
if (csh_recordAll.length < 1) {
Leaf.showMessage('提示', '请勾选营业核销记录');
return;
......@@ -78,12 +78,12 @@
received_amount = v.get('received_amount')||0;
csh_recordAll.forEach(function (v1, i1) {
uns_received_amount = v1.get('received_amount')||0;
if(received_amount > 0 && received_amount == uns_received_amount && v1.get(trans_pently_flag) == 'N'){
if(received_amount > 0 && received_amount == uns_received_amount && v1.get('trans_pently_flag') == 'N'){
count = count + 1;
}
});
if(count > 0){
msg = msg + '营业核销' + received_amount + '元的违约金有' + count + '条记录，';
msg = msg + '营业核销' + received_amount + '元的违约金有' + count + '条记录；';
}
count = 0;
});
......
src/main/webapp/modules/cont/CON7000/con_rent_trans_penalty_create_detail_readonly.lview
View file @ 4530c395
......@@ -10,8 +10,20 @@
</a:init-procedure>
<a:view>
<script type="text/javascript"><![CDATA[
Leaf.onReady(function(){
var winId = '${/parameter/@winId}';
if(!winId){
/*Ext.fly('con7000_back_id').setStyle({
display: 'none'
});*/
$('con7000_back_id').hide();
}
});
function con7000_back() {
$('${/parameter/@winId}').close();
if('${/parameter/@winId}'){
$('${/parameter/@winId}').close();
}
}
function con7000_csh_write_off_ds_load(ds) {
var records = ds.getAll();
......
src/main/webapp/modules/cont/CON_REPO003/con_ccr_repo_modify_entrance.lview
View file @ 4530c395
......@@ -10,6 +10,7 @@
<a:link id="con_contract_repo_modify_link" url="${/request/@context_path}/modules/cont/CON501N/con_contract_modify.lview"/>
<a:link id="con_contract_repo_change_link" url="${/request/@context_path}/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview"/>
<a:link id="con_grant_deduct_print_link" url="${/request/@context_path}/modules/cont/CON732/hls_ccr_modify_assignment_agreement_print.lsc"/>
<a:link id="con_crr_query_print_link_id" url="${/request/@context_path}/modules/cont/CON732/hls_crr_query_print_word_detail.lview"/>
<script type="text/javascript"><![CDATA[
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
......@@ -72,21 +73,49 @@
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_repo_change_link', ds_id);
};
// //回购解除协议打印
// 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 prj_project_result_ds = $(ds_id);
// var records = prj_project_result_ds.getSelected();
// if (records.length != 1) {
// Leaf.showMessage('${l:PROMPT}', '${l:HLS.SELECT_RECORD}');
// return false;
// }
// var record = records[0];
// var contract_id = record.get('contract_id');
// var templet_code = 'CON_GRANT_DEDUCT';
// var url = $('con_grant_deduct_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
// window.open(url, '_self');
// };
//回购解除协议打印
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 prj_project_result_ds = $(ds_id);
var records = prj_project_result_ds.getSelected();
if (records.length != 1) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.SELECT_RECORD}');
return false;
}
var record = records[0];
var contract_id = record.get('contract_id');
var templet_code = 'CON_GRANT_DEDUCT';
var url = $('con_grant_deduct_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
window.open(url, '_self');*/
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var prj_project_result_ds = $(ds_id);
var records = prj_project_result_ds.getSelected();
if (records.length != 1) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.SELECT_RECORD}');
return false;
}
var record = records[0];
var ccr_document_type = 'REPURCHASE';
//var req_status = record.get('req_status');
var contract_id = record.get('change_req_id');
new Leaf.Window({
id: 'open_print_detail_win',
params: {
contract_id: contract_id,
ccr_document_type: ccr_document_type,
document_category: record.get('document_category'),
business_type : record.get('business_type'),
content_type : 'NORMAL',
winid: 'open_print_detail_win'
},
url: $('con_crr_query_print_link_id').getUrl(),
title: '合同文本打印',
width: 1000,
height: 450
});
};
window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) { //查询权限
......
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