Skip to content

L
leaf-hlcm
Commit eb988e01 authored by panhong18943's avatar panhong18943
Browse files
Options

Merge branch 'master' of https://hel.hand-china.com/hlcm/leaf-hlcm

parents 00c726ac 02e01bb4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4810 additions and 487 deletions
src/main/webapp/WEB-INF/classes/prj/PRJ501N/check_machine_number_repeat.lwm 0 → 100644
View file @ eb988e01
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: lz
$Date: 2024年05月14日 11:18:01
$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 p.project_id,
p.project_number,
--p.project_type,
p.division,
c.contract_id,
c.contract_number,
(select h.bp_name from hls_bp_master h where h.bp_id = p.bp_id_tenant) tenant_name,
(select h.bp_name
from hls_bp_master h
where h.bp_id = p.INVOICE_AGENT_ID) agent_name,
(SELECT v.code_value_name
FROM sys_code_values_v v
WHERE v.code = 'PRJ501_PRJ_STATUS'
AND v.code_value = p.project_status) project_status_n,
(SELECT v.code_value_name
FROM sys_code_values_v v
WHERE v.code = 'CON500_CONTRACT_STATUS'
AND v.code_value = c.contract_status) contract_status_n,
nvl(pi.machine_number, pi.machine_number_70) machine_number,
pi.project_lease_item_id
from prj_project p, prj_project_lease_item pi, con_contract c
where p.project_id = pi.project_id
and p.project_id = c.project_id(+)
and p.project_id <> ${@project_id}
and c.data_class(+) = 'NORMAL'
and c.contract_status(+) not in ('CANCEL', 'REPUR', 'ET', 'TERMINATE')
And p.project_status <> 'CLOSED'
And nvl(p.secondary_lease, 'NO') = 'NO'
and (nvl(pi.machine_number, pi.machine_number_70) in
(select nvl(ppl.asset_num,
nvl(ppi.machine_number, ppi.machine_number_70))
from prj_project pp,
prj_project_lease_item ppi,
prj_project_lease_item_list ppl
where pp.project_id = ppi.project_id
and instr(nvl(pi.machine_number, pi.machine_number_70), '附件') = 0
and pp.project_id = ${@project_id}
and ppi.project_lease_item_id = ppl.project_lease_item_id(+)) or
exists
(select 1
from con_contract_lease_item cl
where cl.contract_id = c.contract_id
and instr(nvl(cl.machine_number, cl.machine_number_70), '附件') = 0
and nvl(cl.machine_number, cl.machine_number_70) in
(select nvl(ppl.asset_num,
nvl(ppi.machine_number, ppi.machine_number_70))
from prj_project pp,
prj_project_lease_item ppi,
prj_project_lease_item_list ppl
where pp.project_id = ppi.project_id
and pp.project_id = ${@project_id}
and ppi.project_lease_item_id =
ppl.project_lease_item_id(+))) or exists
(select 1
from prj_project_lease_item_list ppl
where ppl.project_lease_item_id = pi.project_lease_item_id
and instr(ppl.asset_num, '附件') = 0
and ppl.asset_num in
(select nvl(ppl.asset_num,
nvl(ppi.machine_number, ppi.machine_number_70))
from prj_project pp,
prj_project_lease_item ppi,
prj_project_lease_item_list ppl
where pp.project_id = ppi.project_id
and pp.project_id = ${@project_id}
and ppi.project_lease_item_id =
ppl.project_lease_item_id(+))))
]]>
</bm:query-sql>
</bm:operation>
<bm:operation name="execute">
<bm:parameters>
<bm:parameter name="repeat_flag" dataType="java.lang.String" input="false" output="true"/>
<bm:parameter name="project_id" dataType="java.lang.Long" input="true" output="false" required="true"/>
</bm:parameters>
<bm:update-sql><![CDATA[
begin
${@repeat_flag} := prj_project_check_pkg.check_prj_machine_number(${@project_id});
end;]]>
</bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/prj/PRJ501N/project_approval.lwm
View file @ eb988e01
......@@ -9,23 +9,8 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT COUNT(1) v_count
FROM (SELECT p.project_id
FROM prj_project p, prj_project_lease_item v
WHERE p.project_id = v.project_id
AND (v.machine_number_70 = ${@machine_number} or v.machine_number = ${@machine_number})
AND p.project_status <> 'CLOSED'
AND nvl(p.secondary_lease, 'NO') = 'NO'
and p.project_id <> nvl(${@project_id},1)
UNION
SELECT c.project_id
FROM con_contract c, con_contract_lease_item h
WHERE c.contract_id = h.contract_id
AND (h.machine_number_70 = ${@machine_number} or h.machine_number = ${@machine_number})
AND c.contract_status <> 'CANCEL'
AND nvl(c.secondary_lease, 'NO') = 'NO'
AND c.data_class = 'NORMAL'
and c.project_id != nvl(${@project_id},1))
select 0 v_count from dual --20240510 取消机号重复校验
]]>
</bm:query-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lwm
View file @ eb988e01
......@@ -44,7 +44,7 @@
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="instance_id" queryExpression="t1.instance_id = ${@instance_id}"/>
<bm:query-field name="instance_id" queryExpression="to_char(t1.instance_id) like &apos;%&apos;||${@instance_id}||&apos;%&apos; "/>
<bm:query-field name="document_info" queryExpression="t1.document_info like &apos;%&apos;||${@document_info}||&apos;%&apos;"/>
<bm:query-field name="submitted_by" queryExpression="t1.submitted_by=${/session/@user_id}"/>
<bm:query-field name="instance_status" queryExpression="t1.instance_status = ${@instance_status}"/>
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_service_wait_to_do.lwm
View file @ eb988e01
......@@ -12,6 +12,21 @@
replace(t1.service_url,
'modules/csh/CSH501/csh_payment_req.lview',
'modules/csh/CSH501/csh_payment_op_req.lview') as service_url_operat_payment
,zj_wfl_core_pkg.get_parameter_value(p_instance_id => t1.instance_id,
p_parameter_name => 'PROJECT_ID') PROJECT_ID
,(select sp.parameter_value
from zj_wfl_workflow_service zs,
zj_wfl_workflow_service_para zp,
zj_wfl_workflow_node_svc_para sp
where zs.service_name =
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview'
and zp.service_id = zs.service_id
and sp.parameter_id = zp.service_para_id
and zp.parameter_code = 'show_project_history_flag'
and sp.source_type = 'DISPLAY'
and sp.node_id = t1.node_id
) show_project_history_flag
From (select zj_wfl_core_pkg.get_node_service_url(tt.record_id,
${/parameter/@url_type},
${/session/@user_id}) as service_url,tt.*
......
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ eb988e01
......@@ -844,35 +844,6 @@
}
}
if(!Leaf.isEmpty(secondary_lease) && secondary_lease!='YES') {
if (division == '92' && !Leaf.isEmpty(machine_number)) {
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id: project_id
},
scope: this,
success: function (res) {
machine_number_num = res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num > 0 && count == 0) {
count = count + 1;
$L.showErrorMessage('提示', '该机号已存在，请重新确认！');
return false;
} else if (machine_number_num > 0 && count != 0) {
count = 0;
return false;
}
}
}
......
src/main/webapp/modules/cont/CON505/con_contract_modify.lview
View file @ eb988e01
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/hls/HLS362N/hls_bp_master_credit_confirm.lview
View file @ eb988e01
......@@ -56,7 +56,7 @@ $Purpose: 商业伙伴授信维护
//002 营业本部长
for (var i = 0; i < datas.length; i++){
if(user_code==''||user_code==undefined){
$L.showInfoMessage("提示",'只有营业本部长才能操作数据！');
$L.showInfoMessage("提示",'只有建设机械部部长才能操作数据！');
return;
}else if (user_code =='9065' && datas[i].get('bp_category')!='RENTER' ){
$L.showInfoMessage("提示",'当前用户只能选择<font color="red">'+'租赁商'+'</font>类型进行授信操作');
......@@ -119,7 +119,7 @@ $Purpose: 商业伙伴授信维护
//002 营业本部长
for (var i = 0; i < datas.length; i++){
if(user_code==''||user_code==undefined){
$L.showInfoMessage("提示",'只有营业本部长才能操作数据！');
$L.showInfoMessage("提示",'只有建设机械部部长才能操作数据！');
return;
}else if (user_code =='9065' && datas[i].get('bp_category')!='RENTER' ){
$L.showInfoMessage("提示",'当前用户只能选择<font color="red">'+'租赁商'+'</font>类型进行授信操作');
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ eb988e01
......@@ -426,36 +426,6 @@
var project_id = project_record.get('project_id');
var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease !='YES'){
if(division == '92' && !Leaf.isEmpty(machine_number)){
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id :project_id
},
scope: this,
success: function (res) {
machine_number_num= res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num>0 && count == 0){
count = count+1;
$L.showErrorMessage('提示', '该机号已存在，请重新确认！');
return false;
}else if(machine_number_num>0 && count != 0){
count = 0;
return false;
}
}
var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
if (prj_project_ds_id == ds.id && prj_project_ds_id) {
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_constru.lview
View file @ eb988e01
......@@ -409,35 +409,6 @@
var project_id = project_record.get('project_id');
var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease !='YES'){
if(division == '92' && !Leaf.isEmpty(machine_number)){
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id :project_id
},
scope: this,
success: function (res) {
machine_number_num= res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num>0 && count == 0){
count = count+1;
$L.showErrorMessage('提示', '该机号已存在，请重新确认！');
return false;
}else if(machine_number_num>0 && count != 0){
count = 0;
return false;
}
}
var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
......
src/main/webapp/modules/prj/PRJ501N/prj501n_wfl_machine_number_detail.lview 0 → 100644
View file @ eb988e01
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wangwei5743
$Date: 2024-5-10 上午09:03:15
$Revision: 1.0
$Purpose: 机号比对展示明细页面
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<a:init-procedure/>
<a:view>
<a:link id="prj_project_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
modelaction="update"/>
<a:link id="prj_project_link_readonly"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/>
<a:link id="${/parameter/@layout_code}lease_number_query_link_prj501n"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_lease_import_details.lview"/>
<a:link id="${/parameter/@layout_code}con_contract_query_link"
url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_modify.lview"/>
<a:link id="${/parameter/@layout_code}con_contract_op_query_link"
url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_op_modify.lview"/>
<script type="text/javascript"><![CDATA[
function prj501n_machine_number_repeat_ds_query() {
$('prj501n_machine_number_repeat_ds').setQueryParameter('project_id', '${/parameter/@project_id}');
}
function prj501_open_project_detail(reocrd_id, project_id) {
var maintain_type = 'READONLY';
var record = $('prj501n_machine_number_repeat_ds').findById(reocrd_id);
var param = record.data;
param['function_code'] = 'PRJ501M';//'PRJ501Q';
param['document_id'] = project_id;
param['function_usage'] = 'QUERY';
param['maintain_type'] = maintain_type;
param['prj_report_read_flag'] = 'Y';
param['cond_para2'] = record.get('project_type');
param['url_title'] = '${l:PRJ505.PROJECT_DETAIL}';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'prj_project_link_readonly', 'prj501n_machine_number_repeat_ds');
}
function prj501_open_contract_detail(reocrd_id, contract_id) {
debugger
var maintain_type = 'READONLY';
var record = $('prj501n_machine_number_repeat_ds').findById(reocrd_id);
var param = record.data;
var division = param.division;
if (division != '95') {
param['function_usage'] = 'QUERY';
param['function_code'] = 'CON3200Q';
param['maintain_type'] = 'QUERY';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
var url = '${/parameter/@layout_code}con_contract_query_link';
} else {
param['function_usage'] = 'QUERY';
param['function_code'] = 'CON3200Q_OP';
param['maintain_type'] = 'QUERY';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
var url = '${/parameter/@layout_code}con_contract_op_query_link';
}
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, url, 'prj501n_machine_number_repeat_ds');
}
function prj501_open_machine_detail(reocrd_id, project_lease_item_id) {
var maintain_type = 'READONLY';
var record = $('prj501n_machine_number_repeat_ds').findById(reocrd_id);
var param = record.data;
param['function_code'] = 'PRJ501INC';
param['document_id'] = record.get('project_id');
param['project_lease_item_id'] = record.get('project_lease_item_id');
param['function_usage'] = 'QUERY';
param['maintain_type'] = maintain_type;
//param['cond_para2'] = record.get('project_type');
param['url_title'] = '${l:PRJ505.PROJECT_DETAIL}';
var url = '${/parameter/@layout_code}lease_number_query_link_prj501n';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, url, 'prj501n_machine_number_repeat_ds');
}
function prj501_render(value, record, name) {
if(name == 'project_number'){
return '<a href="javascript:prj501_open_project_detail(' + record.id + ',' + record.get('project_id') + ');">' + value + '</a>';
}else if(name == 'contract_number'){
if (!Ext.isEmpty(value)) {
return '<a href="javascript:prj501_open_contract_detail(' + record.id + ',' + record.get('contract_id') + ');">' + value + '</a>';
}
}else if(name == 'machine_detail'){
// 30高空作业车 50星邦高空作业车 80叉车 99工程机械 才有 租赁物清单
if(record.get('division') == '30' || record.get('division') == '50' || record.get('division') == '80' || record.get('division') == '99' ){
return '<a href="javascript:prj501_open_machine_detail(' + record.id + ',' + record.get('project_lease_item_id') + ');">' + '查看明细' + '</a>';
}
}
}
function win_quit() {
$('${/parameter/@winid}').close();
}
Leaf.onReady(function () {
$('confirm_btn_id').disable(); //让按钮失效
});
function prj501n_machine_number_confirm_ds_update(ds, record, name, value, oldVlaue) {
if (name == 'check_falg') {
if (value == 'Y') {
$('confirm_btn_id').enable();
}else if (value == 'N') {
$('confirm_btn_id').disable();
}
}
}
]]></script>
<a:dataSets>
<a:dataSet id="prj501n_label_ds" autoCreate="true">
<a:fields>
<!--<a:field name="label1" defaultValue="注意："/>-->
<!-- <a:field name="label2" defaultValue="1.当前页面仅机号存在重复风险会弹出，二次租赁情况下不弹出"/>-->
<!-- <a:field name="label3" defaultValue="2.如弹出该窗口以为该机号存在重复性风险，请核查机号重复实际情况"/>-->
<!-- <a:field name="label4" defaultValue="3.一但点击确认并正常审批流程代表您已完成风险核对"/>-->
<!-- <a:field name="label5" defaultValue="仔细阅读上述事项，并检查确认无误。请谨慎审批通过该笔单据！"/>-->
<a:field name="label5" defaultValue="以下单据与当前报单存在机号重复，请确认!"/>
</a:fields>
</a:dataSet>
<a:dataSet id="prj501n_machine_number_repeat_ds" autoPageSize="true" autoQuery="true"
model="prj.PRJ501N.check_machine_number_repeat">
<a:events>
<a:event name="query" handler="prj501n_machine_number_repeat_ds_query"/>
</a:events>
</a:dataSet>
<a:dataSet id="prj501n_machine_number_confirm_ds">
<a:events>
<a:event name="update" handler="prj501n_machine_number_confirm_ds_update"/>
</a:events>
</a:dataSet>
</a:dataSets>
<a:fieldSet style="margin-left:10px;margin-top:10px;font-weight:bold;" title="机号重复性检验提示" width="400">
<!--<a:label name="label1" bindTarget="prj501n_label_ds" width="380"/>-->
<!-- <a:label name="label2" bindTarget="prj501n_label_ds" style="margin-left:10px;" width="380"/>-->
<!-- <a:label name="label3" bindTarget="prj501n_label_ds" style="margin-left:10px;" width="380"/>-->
<!-- <a:label name="label4" bindTarget="prj501n_label_ds" style="margin-left:10px;" width="380"/>-->
<a:label name="label5" bindTarget="prj501n_label_ds"
style="color:red;font-weight:bold;margin-left:10px;"
width="380"/>
</a:fieldSet>
<a:grid id="prj501n_machine_number_repeat_ds_grid" bindTarget="prj501n_machine_number_repeat_ds" Height="300"
Width="1150" navBar="true">
<a:toolBar>
<a:button type="excel"/>
</a:toolBar>
<a:columns>
<a:column name="machine_number" prompt="机号" width="150"/>
<a:column name="machine_detail" prompt="查看明细" width="80" renderer="prj501_render"/>
<a:column name="project_number" prompt="报单编号" width="150" renderer="prj501_render"/>
<a:column name="contract_number" prompt="合同编号" width="150" renderer="prj501_render"/>
<a:column name="tenant_name" prompt="承租人" width="200"/>
<a:column name="project_status_n" prompt="报单状态" width="80"/>
<a:column name="contract_status_n" prompt="合同状态" width="80"/>
<a:column name="agent_name" prompt="所属代理店" width="200"/>
</a:columns>
</a:grid>
<a:form column="1" labelWidth="660">
<a:checkBox name="check_falg" bindTarget="prj501n_machine_number_confirm_ds" align="center" prompt="已确认机号重复性风险"/>
</a:form>
<a:screenTopToolbar>
<a:toolbarButton id="confirm_btn_id" click="win_quit" text="确认" style="position:absolute;left:580px;"/>
</a:screenTopToolbar>
</a:view>
</a:screen>
src/main/webapp/modules/prj/PRJ501N/prj_project_history.lview 0 → 100644
View file @ eb988e01
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: lz
$Date: 2024年6月3日10:54:19
$Revision: 1.0
$Purpose:
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application">
<a:view package="leaf.ui.std" template="default">
<a:link id="prj_project_get_layout_code_link_id_return" model="cont.CON500.con_contract_get_layout_code"
modelaction="update"/>
<!-- <a:link id="zj_wfl_approve_history_link"-->
<!-- url="${/request/@context_path}/modules/zjwfl/zj_wfl_approve_history.lview"/>-->
<a:link id="zj_wfl_approve_history_link"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_history_return.lview"/>
<a:link id="car_modify_link_readonly_return"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/>
<a:link id="${/parameter/@layout_code}con_contract_query_link_return"
url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_modify.lview"/>
<script type="text/javascript"><![CDATA[
function project_history_render(value, record, name) {
if (name == 'project_return_times') {
return '<a href="javascript:project_return_history(\'' + record.id + '\',\'' + record.ds.id + '\')">' + value + '</a>';
}
if (name == 'project_number' && value) {
return '<a href="javascript:open_project_modify_win(\'' + record.id + '\',\'' + record.ds.id + '\')">' + value + '</a>';
}
if (name == 'contract_number' && value) {
return '<a href="javascript:open_contract_win(\'' + record.id + '\',\'' + record.ds.id + '\')">' + value + '</a>';
}
return value;
}
function project_return_history(record_id, ds_id) {
debugger;
var readOnly_flag = 'N';
var url = $('zj_wfl_approve_history_link').getUrl();
var record = $(ds_id).findById(record_id);
var param = record.data;
param['winId'] = 'zj_wfl_approve_history_link_winid';
var win = new Leaf.Window({
id: 'acr_invoice_apply_detail_link_winid',
params: {
instance_id: record.get('wfl_instance_id'),
reader_type: 'ADMIN'
},
url: url,
title: '退回历史',
fullScreen: true
});
}
function open_project_modify_win(record_id, ds_id) {
debugger;
var record = $(ds_id).findById(record_id);
var url;
maintain_type = 'READONLY';
param = record.data;
param['document_id'] = record.get('project_id');
param['function_usage'] = 'QUERY';
param['bp_class'] = 'NP';
param['maintain_type'] = maintain_type;
param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
param['function_code'] = 'PRJ501Q_H';
//PRJ501Q 匹配的是PROJECT_WFL_NP 与工作流页面是同一个布局，会报很多id重复的错
url = 'car_modify_link_readonly_return';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id_return', param, url, ds_id);
}
function open_contract_win(record_id, ds_id) {
debugger;
var record = $(ds_id).findById(record_id);
var param = record.data;
param['function_usage'] = 'QUERY';
param['function_code'] = 'CON3200Q';
param['maintain_type'] = 'QUERY';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
var url = '${/parameter/@layout_code}con_contract_query_link_return';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id_return', param, url, ds_id);
}
]]></script>
<a:dataSets>
<a:dataSet id="project_historyDs" autoPageSize="true" autoQuery="true" selectable="true"
model="prj.PRJ501N.project_history_info"
queryUrl="${/request/@context_path}/autocrud/prj.PRJ501N.project_history_info/query?project_id=${/parameter/@project_id}"/>
</a:dataSets>
<a:screenBody>
<a:tabPanel height="450" marginWidth="30">
<a:tabs>
<a:tab prompt="历史报单记录" width="100">
<a:grid id="project_historyDs_grid" bindTarget="project_historyDs" height="360" marginWidth="30"
navBar="true">
<a:toolBar>
<a:button type="excel" text="导出"/>
</a:toolBar>
<a:columns>
<a:column name="match_type" prompt="当前报单匹配类型" width="120" align="center"/>
<a:column name="bp_name" prompt="商业伙伴名称" width="120" align="center"/>
<a:column name="id_no" prompt="证件号码/机号" width="120" align="center"/>
<a:column name="project_number" prompt="项目编号" width="120" align="center" renderer="project_history_render"/>
<a:column name="project_return_times" prompt="报单流程被退回次数" width="120" align="center"
renderer="project_history_render"/>
<a:column name="project_status_n" prompt="项目状态" width="120" align="center"/>
<a:column name="contract_number" prompt="合同编号" width="120" align="center" renderer="project_history_render"/>
<a:column name="contract_status_n" prompt="合同状态" width="120" align="center"/>
<a:column name="agent_extra_nam" prompt="所属代理店" width="120" align="center"/>
</a:columns>
</a:grid>
</a:tab>
</a:tabs>
</a:tabPanel>
</a:screenBody>
</a:view>
</a:screen>
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ eb988e01
......@@ -2147,48 +2147,6 @@
var project_id = project_record.get('project_id');
var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease!='YES'){
if(division == '92' && !Leaf.isEmpty(machine_number)){
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id : project_id
},
scope: this,
success: function (res) {
machine_number_num= res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num>0 && count == 0){
count = count+1;
$L.showErrorMessage('提示', '该机号已存在，请重新确认！');
return false;
}else if(machine_number_num>0 && count != 0){
count = 0;
return false;
}
}
//神钢建机,新报单的机号与关联的合同机号必须相同
if(division == '91'){
var machine_number1 = lease_item_record.get('machine_number');
var machine_number2 = project_record.get('machine_number');
if(typeof(machine_number1) != 'undefined' && typeof(machine_number2) != 'undefined'){
if( machine_number1 != machine_number2){
$L.showErrorMessage('提示', '新报单的机号与关联的合同机号必须相同！');
return false;
}
}
}
return true;
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_constru.lview
View file @ eb988e01
......@@ -1764,37 +1764,6 @@
var project_id = project_record.get('project_id');
var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease!='YES'){
if(division == '92' && !Leaf.isEmpty(machine_number)){
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id : project_id
},
scope: this,
success: function (res) {
machine_number_num= res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num>0 && count == 0){
count = count+1;
$L.showErrorMessage('提示', '该机号已存在，请重新确认！');
return false;
}else if(machine_number_num>0 && count != 0){
count = 0;
return false;
}
}
return true;
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview
View file @ eb988e01
......@@ -21,7 +21,7 @@
<a:view>
<a:link id="${/parameter/@layout_code}lease_number_query_link"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_lease_import_details.lview"/>
<a:link id="bp_tenant_detail_query_link" model="prj.PRJ500D.bp_tenant_old_r_query" modelaction="query"/>
<a:link id="prj501n_bp_tenant_detail_query_link" model="prj.PRJ500D.bp_tenant_old_r_query" modelaction="query"/>
<a:link id="${/parameter/@layout_code}_tenant_rate_query_link"
url="${/request/@context_path}/modules/prj/PRJ902/prj_project_score_result.lview"/>
<a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}get_special_fields_link_id"
......@@ -56,11 +56,13 @@
model="prj.PRJ505.prj_project_create_contract" modelaction="update"/>
<a:link id="${/parameter/@layout_code}_prj_project_update_status_link_id"
model="prj.PRJ505.prj_project_create_contract" modelaction="execute"/>
<a:link id="prj_approval_link_id" model="prj.PRJ501N.project_approval" modelaction="update"/>
<a:link id="check_machine_number_id" model="prj.PRJ501N.project_approval" modelaction="query"/>
<a:link id="prj501n_prj_approval_link_id" model="prj.PRJ501N.project_approval" modelaction="update"/>
<a:link id="prj501n_check_machine_number_id" model="prj.PRJ501N.project_approval" modelaction="query"/>
<a:link id="prj501n_check_machine_number_repeat_id" model="prj.PRJ501N.check_machine_number_repeat" modelaction="execute"/>
<a:link id="prj501n_wfl_machine_number_detail_link_id" url="${/request/@context_path}/modules/prj/PRJ501N/prj501n_wfl_machine_number_detail.lview"/>
<a:link id="get_atch_download_link" url="${/request/@context_path}/modules/batch_download/lease_atm_batch_dl.lsc"/>
<a:link id="prj501n_get_atch_download_link" url="${/request/@context_path}/modules/batch_download/lease_atm_batch_dl.lsc"/>
<link href="${/request/@context_path}/modules/viewerjs/viewer.css" rel="stylesheet"/>
<script src="${/request/@context_path}/modules/viewerjs/viewer.js"/>
<script src="${/request/@context_path}/modules/viewerjs/viewer_tool.js"/>
......@@ -376,35 +378,6 @@
var machine_number = lease_item_record.get('machine_number_70');
var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease !='YES') {
if (division == '92' && !Leaf.isEmpty(machine_number)) {
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id: project_id
},
scope: this,
success: function (res) {
machine_number_num = res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num > 0 && count == 0) {
count = count + 1;
$L.showErrorMessage('提示', '该机号已存在，请重新确认！');
return false;
} else if (machine_number_num > 0 && count != 0) {
count = 0;
return false;
}
}
if(!bp_rate_flag){
return false;
}
......@@ -721,6 +694,48 @@
Leaf.onReady(function () {
//机号弹窗校验
debugger;
if('${/parameter/@check_machine_number_flag}'=='Y'){
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('prj501n_check_machine_number_repeat_id').getUrl(),
para: {
project_id: '${/parameter/@project_id}'
},
scope: this,
success: function (res) {
var repeat_flag = res.result.repeat_flag;
if (repeat_flag == 'Y'){
var url_l = $('prj501n_wfl_machine_number_detail_link_id').getUrl();
var machine_number_win = new Leaf.Window({
id: 'prj501n_wfl_machine_number_detail_win',
url: url_l,
params: {
'winid': 'prj501n_wfl_machine_number_detail_win',
'session_id': '${/session/@session_id}',
'project_id': '${/parameter/@project_id}'
},
title: '机号重复性风险提示',
width: 1200,
height: 500,
closeable: false
});
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
});
}
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}';
$(bp_ds_id).setQueryUrl(url);
......@@ -820,7 +835,7 @@
Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗？', function () {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('prj_approval_link_id').getUrl(),
url: $('prj501n_prj_approval_link_id').getUrl(),
para: {
project_id: project_id
},
......@@ -1161,7 +1176,7 @@
//选择承租人带出开票信息
var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var prj_project_history_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
;
var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
......@@ -1224,7 +1239,7 @@
var bp_id_tenant = record.get('bp_id_tenant');
$(score_ds_id).getCurrentRecord().set('score_name', value);
Leaf.request({
url: $('bp_tenant_detail_query_link').getUrl(),
url: $('prj501n_bp_tenant_detail_query_link').getUrl(),
para: {
bp_id: bp_id_tenant
},
......@@ -1445,7 +1460,7 @@
var prj_project_record = $(prj_project_ds_id).getAt(0);
var project_id = prj_project_record.get('project_id');
var project_number = prj_project_record.get('project_number');
var url_l = $('get_atch_download_link').getUrl() + '?table_pk_value=' + project_id + '&table_name=PRJ_PROJECT'+ '&doc_code=' + project_number;
var url_l = $('prj501n_get_atch_download_link').getUrl() + '?table_pk_value=' + project_id + '&table_name=PRJ_PROJECT'+ '&doc_code=' + project_number;
window.open(href = url_l, target = "_self");
};
......
src/main/webapp/modules/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lview
View file @ eb988e01
......@@ -126,6 +126,7 @@
<a:textField name="approve_user_code" bindTarget="para_monitorDs" prompt="当前审批人代码"/>
<a:textField name="approve_user_name" bindTarget="para_monitorDs" prompt="当前审批人姓名"/>
<a:textField name="document_info" bindTarget="para_monitorDs" prompt="单据信息"/>
<a:textField name="instance_id" bindTarget="para_monitorDs" prompt="实例ID"/>
</a:form>
<a:hBox>
<a:button click="query_monitorDs" text="HAP_QUERY"/>
......
src/main/webapp/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview
View file @ eb988e01
......@@ -350,6 +350,13 @@
</a:case>
<a:case value="*">
<a:screen-include screen="${/model/node_service_record/record/@service_url}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/>
<a:switch test="/model/node_service_record/record/@show_project_history_flag">
<a:case value="Y">
<a:screen-include screen="modules/prj/PRJ501N/prj_project_history.lview?project_id=${/model/node_service_record/record/@project_id}"/>
</a:case>
</a:switch>
</a:case>
</a:switch>
</a:case>
......
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