Skip to content

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

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

parents 3bef08a2 a51e902d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 524 additions and 58 deletions
pom.xml
View file @ 7932723b
......@@ -173,6 +173,14 @@
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/gson-2.6.2.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sigar</groupId>
<artifactId>sys-sigar</artifactId>
<version>1.6.4</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/sigar-1.6.4.jar</systemPath>
</dependency>
<!--end -->
......
src/main/java/com/hand/hls/hlcm/hlinteface/controllers/JYCInterfaceController.java
View file @ 7932723b
......@@ -76,20 +76,21 @@ public class JYCInterfaceController extends BaseController {
//BusinessModelService bms = dsf.getModelService(BM_PATH, context);
List<Map> result = jYCInterfaceMapper.selectJycList(equNo);
if (result != null) {
Map map = result.get(0);
if (!ObjectUtils.isEmpty(map)) {
if(result.size() > 0) {
Map map = result.get(0);
if (!ObjectUtils.isEmpty(map)) {
existsFlag = true;
JSONObject JYCResponseBody= new JSONObject();
JYCResponseBody.put("equNm",map.get("EQUNM"));
JYCResponseBody.put("brandName",map.get("BRANDNAME"));
JYCResponseBody.put("equMdl",map.get("EQUMDL"));
JYCResponseBody.put("vinNo",map.get("VINNO"));
JYCResponseBody.put("machineNo",map.get("MACHINENO"));
JYCResponseBody.put("status",map.get("STATUS"));
JYCResponseBody.put("platform",WJFL_FIELD);
resultjson.put("JYCResponseBody",JYCResponseBody);
resultjson.put("ResponseCode","01");
resultjson.put("ResponseMsg","交易正常");
JSONObject JYCResponseBody = new JSONObject();
JYCResponseBody.put("equNm", map.get("EQUNM"));
JYCResponseBody.put("brandName", map.get("BRANDNAME"));
JYCResponseBody.put("equMdl", map.get("EQUMDL"));
JYCResponseBody.put("vinNo", map.get("VINNO"));
JYCResponseBody.put("machineNo", map.get("MACHINENO"));
JYCResponseBody.put("status", map.get("STATUS"));
JYCResponseBody.put("platform", WJFL_FIELD);
resultjson.put("JYCResponseBody", JYCResponseBody);
resultjson.put("ResponseCode", "01");
resultjson.put("ResponseMsg", "交易正常");
/*for (CompositeMap child : valueList) {3
existsFlag = true;
if (child == null) {
......@@ -100,6 +101,7 @@ public class JYCInterfaceController extends BaseController {
}
}*/
}
}
}
if (!existsFlag) {
......
src/main/resources/com/hand/hls/hlcm/hlinteface/mapper/JYCInterfaceMapper.xml
View file @ 7932723b
......@@ -9,7 +9,10 @@
select nvl(t2.equnm,'') equnm,
nvl(t2.brandname,'')brandname,
nvl(t2.equmdl,'')equmdl,
nvl(t2.vinno,'')vinno,
(case when length(t2.vinno) >7 then
nvl(SUBSTR(t2.vinno,1,3)||TRIM( LPAD(' ', LENGTH( TRIM(t2.vinno))-6,'*') )||SUBSTR(t2.vinno,LENGTH( TRIM(t2.vinno)) - 3),'')
else
t2.vinno end) vinno,
nvl(t2.machineno,'')machineno,
t2.status
from (select t1.*
......
src/main/webapp/WEB-INF/classes/tst/sys_function_query.lwm 0 → 100644
View file @ 7932723b
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: Administrator
$Date: 2019-7-26 下午1:50:02
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" accessControlMode="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[select count(*) count from sys_function]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="count"/>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/wx/WX100/con_ele_file_size_check.lwm 0 → 100644
View file @ 7932723b
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:fields>
<bm:field name="attachment_id"/>
<bm:field name="source_pk_value"/>
<bm:field name="file_path"/>
<bm:field name="file_size"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select F.ATTACHMENT_ID,
F.SOURCE_PK_VALUE,
f.source_type_code,
F.FILE_PATH,
F.FILE_SIZE,
f.creation_date,
f.file_name,
F.rowid
from fnd_atm_attachment f
where f.creation_date between to_date('2021-04-24','yyyy-mm-dd') and to_date('2024-05-31','yyyy-mm-dd')
and f.File_Path like ${@ele_con_file_path}||'%' and f.if_same is null and rownum<501
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
UPDATE fnd_atm_attachment f
set f.if_same = ${@if_same},
f.new_file_size = ${@new_file_size},
f.last_update_date=sysdate,
f.last_updated_by= nvl(${/session/@user_id},1)
where f.attachment_id=${@attachment_id}
and f.source_pk_value=${@source_pk_value};
COMMIT;
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lwm
View file @ 7932723b
......@@ -56,7 +56,7 @@
</bm:query-fields>
<bm:data-filters>
<!--<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;,&apos;DEPOSIT_RETURN&apos;,&apos;WFL_FEE_REMIT&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-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;,&apos;DEPOSIT_RETURN&apos;,&apos;WFL_FEE_REMIT&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0013')) and t1.workflow_code in (&apos;HLS_JOURNAL_WFL&apos;, &apos;HLS_JOURNAL_REVERSE_WFL&apos;))or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0017','HAND')) and t1.workflow_code not in (&apos;HLS_JOURNAL_WFL&apos;, &apos;HLS_JOURNAL_REVERSE_WFL&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014','0017','HAND')) and 1 = 1)
<bm:data-filter name="query" expression="((${/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;,&apos;DEPOSIT_RETURN&apos;,&apos;WFL_FEE_REMIT&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0013')) and t1.workflow_code in (&apos;HLS_JOURNAL_WFL&apos;, &apos;HLS_JOURNAL_REVERSE_WFL&apos;))or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0017','HAND')) and t1.workflow_code not in (&apos;HLS_JOURNAL_WFL&apos;, &apos;HLS_JOURNAL_REVERSE_WFL&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0008', '0012', '0013', '0014','0017','HAND')) and 1 = 1)
or( ((t1.SUBMITTED_BY = ${/session/@user_id}) or (
(${/session/@user_id}
in (Select t.user_id
......
src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL5110/zj_wfl_approve_refuse_batch.lwm 0 → 100644
View file @ 7932723b
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
declare
v_node_action_id number;
begin
select
t.node_action_id
into v_node_action_id
from ZJ_WFL_WORKFLOW_NODE_ACTION t where t.node_id = ${@node_id} and t.action_type = 3;
${@result_num} := zj_wfl_core_pkg.workflow_approve(p_rcpt_record_id => ${@record_id},
p_node_action_id => v_node_action_id,
p_comment => ${@comment_text_out},
p_comment_text_out => ${@comment_text_out},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="result_num" dataType="java.lang.Long" input="false" output="true" outputPath="@result_num"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_workflow.lwm
View file @ 7932723b
......@@ -19,7 +19,7 @@
<bm:field name="show_approve_history_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SHOW_APPROVE_HISTORY_FLAG" prompt="ZJ_WFL_WORKFLOW.SHOW_APPROVE_HISTORY_FLAG"/>
<bm:field name="show_all_approve_ht_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SHOW_ALL_APPROVE_HT_FLAG" prompt="ZJ_WFL_WORKFLOW.SHOW_ALL_APPROVE_HT_FLAG"/>
<bm:field name="serial_number" databaseType="NUMBER" datatype="java.lang.Long" physicalName="SERIAL_NUMBER" prompt="序号"/>
<bm:field name="is_archive" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="IS_ARCHIVE" />
<bm:field name="is_archive" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="IS_ARCHIVE" />
<bm:field name="is_archive_desc" forInsert="false" forUpdate="false"/>
<bm:field name="archive_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ARCHIVE_TYPE" />
<bm:field name="archive_type_desc" forInsert="false" forUpdate="false"/>
......@@ -45,11 +45,11 @@
t1.display_service_name,
t1.show_approve_history_flag,
t1.show_all_approve_ht_flag,
t1.serial_number,
t1.is_archive,
t1.archive_type,
t1.is_archive_desc,
t1.archive_type_desc
t1.is_archive,
t1.archive_type,
t1.is_archive_desc,
t1.archive_type_desc,
t1.serial_number
from zj_wfl_workflow_v t1
#WHERE_CLAUSE#
order by t1.serial_number,t1.workflow_type_code,t1.workflow_code
......@@ -60,7 +60,7 @@
begin
zj_wfl_workflow_pkg.delete_wfl_workflow
(
p_workflow_id => ${@workflow_id},
p_workflow_id => ${@workflow_id},
p_user_id => ${/session/@user_id}
);
end;
......@@ -84,11 +84,11 @@
p_display_service_id => ${@display_service_id},
p_show_approve_history_flag => ${@show_approve_history_flag},
p_show_all_approve_ht_flag => ${@show_all_approve_ht_flag},
p_serial_number => ${@serial_number},
p_is_archive => ${@is_archive},
p_is_archive => ${@is_archive},
p_archive_type => ${@archive_type},
p_user_id => ${/session/@user_id});
p_serial_number => ${@serial_number},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
......@@ -107,11 +107,11 @@
p_display_service_id => ${@display_service_id},
p_show_approve_history_flag => ${@show_approve_history_flag},
p_show_all_approve_ht_flag => ${@show_all_approve_ht_flag},
p_serial_number => ${@serial_number},
p_is_archive => ${@is_archive},
p_is_archive => ${@is_archive},
p_archive_type => ${@archive_type},
p_user_id => ${/session/@user_id});
p_serial_number => ${@serial_number},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
......@@ -123,6 +123,8 @@
<bm:query-field field="workflow_desc" queryOperator="like"/>
<bm:query-field field="sub_category" queryOperator="="/>
<bm:query-field field="enabled_flag" queryOperator="="/>
<bm:query-field field="is_archive_desc" queryOperator="="/>
<bm:query-field field="archive_type_desc" queryOperator="="/>
</bm:query-fields>
<!-- <bm:data-filters>
<bm:data-filter enforceOperations="query" expression="exists (select 1 from zj_wfl_workflow_node t,zj_wfl_workflow_assign_rule r,exp_emp_assign_e_v ex where t.workflow_id=t1.WORKFLOW_ID and r.assign_source_id=t.node_id and r.company_id=${/session/@company_id} and r.approval_rule=&apos;APPOINTED_COM_POS&apos; and ex.user_id=${/session/@user_id} )"/>
......
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_g_result_queryfields.js
View file @ 7932723b
......@@ -9,7 +9,7 @@
},
{
name : 'if_history',
queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
queryexpression : "((${@if_history} ='N' and t1.if_history = 'N') or (${@if_history} ='Y' and t1.if_history in ('N','Y')))"
}
];
......
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_m_result_queryfields.js
View file @ 7932723b
......@@ -9,7 +9,7 @@
},
{
name : 'if_history',
queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
queryexpression : "((${@if_history} ='N' and t1.if_history = 'N') or (${@if_history} ='Y' and t1.if_history in ('N','Y')))"
}
];
......
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_r_result_queryfields.js
View file @ 7932723b
......@@ -17,7 +17,7 @@
},
{
name : 'if_history',
queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
queryexpression : "((${@if_history} ='N' and t1.if_history = 'N') or (${@if_history} ='Y' and t1.if_history in ('N','Y')))"
}
];
......
src/main/webapp/modules/cont/CON505/con_contract_modify.lview
View file @ 7932723b
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ 7932723b
......@@ -928,7 +928,7 @@
</a:fields>
</a:dataSet>
<a:dataSet id="csh_write_off_interface_ds" autoQuery="true" fetchAll="true"
<a:dataSet id="csh_write_off_interface_ds" pageSize="10" autoQuery="true"
model="csh.CSH531N.csh_write_off_interface"
queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.csh_write_off_interface/query?trx_interface_id=${/parameter/@transaction_id}&amp;trx_transaction_type=${/parameter/@transaction_type}&amp;transaction_date=${/parameter/@transaction_date}"
selectable="true">
......@@ -989,8 +989,8 @@
<a:event name="add" handler="csh531_add_fun"/>
</a:events>
</a:dataSet>
<a:dataSet id="csh_transaction_deposit_ds" model="csh.CSH531N.csh_transaction_plan_query" fetchAll="true"
autoQuery="true"
<a:dataSet id="csh_transaction_deposit_ds" model="csh.CSH531N.csh_transaction_plan_query"
autoQuery="true" pageSize="10"
queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.csh_transaction_plan_query/query?transaction_id=${/parameter/@transaction_id}&amp;write_off_type=RECEIPT_DEPOSIT_POOL"
selectable="true">
<a:fields>
......@@ -1024,7 +1024,7 @@
defaultValue="${/model/sys_default_time/record/@now_date}"/>
</a:fields>
</a:dataSet>
<a:dataSet id="csh_transaction_advanced_ds" model="csh.CSH531N.csh_transaction_plan_query" fetchAll="true"
<a:dataSet id="csh_transaction_advanced_ds" model="csh.CSH531N.csh_transaction_plan_query" pageSize="10"
autoQuery="true"
queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.csh_transaction_plan_query/query?transaction_id=${/parameter/@transaction_id}&amp;write_off_type=RECEIPT_ADVANCE_RECEIPT"
selectable="true">
......@@ -1049,7 +1049,7 @@
defaultValue="${/model/sys_default_time/record/@now_date}"/>
</a:fields>
</a:dataSet>
<a:dataSet id="csh_transaction_operat_ds" model="csh.CSH531N.csh_transaction_plan_query" fetchAll="true"
<a:dataSet id="csh_transaction_operat_ds" model="csh.CSH531N.csh_transaction_plan_query" pageSize="10"
autoQuery="true"
queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.csh_transaction_plan_query/query?transaction_id=${/parameter/@transaction_id}&amp;write_off_type=OPERAT_COMBINED"
selectable="true">
......
src/main/webapp/modules/tst/check_sys_cpu.lsc 0 → 100644
View file @ 7932723b
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script"
trace="true">
<a:init-procedure>
<s:server-script><![CDATA[
main();
function main() {
var cpu_rate = new String();
for (var j = 0;j < 10;j++) {
try {
java.lang.Thread.sleep(1000);
cpu_rate = cpu_rate + "," + cpu();
} catch (e) {
println(e);
}
}
$ctx.parameter.cpu_rate = cpu_rate.substring(1);
}
function cpu() {
var sigar = new org.hyperic.sigar.Sigar();
var infos = sigar.getCpuInfoList();
var cpuList = null;
cpuList = sigar.getCpuPercList();
var total = 0;
for (var i = 0;i < infos.length;i++) { // 不管是单块CPU还是多CPU都适用
var info = infos[i];
total = cpuList[i].getCombined() + total;
}
total = Math.round(1000 * total / infos.length) / 1000;
total = total*100;
total = total.toFixed(2);
return total+'%';
}
]]></s:server-script>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
src/main/webapp/modules/tst/check_sys_status.lsc 0 → 100644
View file @ 7932723b
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script"
trace="true">
<a:init-procedure>
<s:server-script><![CDATA[
function main() {
var data = $bm('tst.sys_function_query').queryAsMap().getChildren();
$ctx.parameter.count = data[0].count;
}
main();
]]></s:server-script>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
src/main/webapp/modules/wx/WX100/con_ele_file_file_size_fix_check.lsc 0 → 100644
View file @ 7932723b
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:s="leaf.plugin.script" xmlns:a="http://www.leaf-framework.org/application" trace="true">
<a:init-procedure>
<s:server-script><![CDATA[
importPackage(java.io);
//系统参数获取
function info_query(parameter_code) {
var info = new Object();
var data = null;
var parameter_map = $bm('wx.WX100.sys_parameter_value').queryAsMap({
parameter_code:parameter_code
});
var data = parameter_map.getChildren();
info.code_value = data[0].code_value;
return info;
}
var ele_con_file_path = info_query('HL_ELE_FILE_PATH').code_value;
function fileSizeCheck() {
var parameter_map = $bm('wx.WX100.con_ele_file_size_check').queryAsMap({
ele_con_file_path: 'Z:/project/hl_leasing/cmfile/APP'
});
var data = parameter_map.getChildren();
var fixed_size_bm = $bm('wx.WX100.con_ele_file_size_check');
for (var i = 0; i < data.length; i++) {
var file_path = data[i].file_path;
var file_size =data[i].file_size;
var now_file_size=get_file_length(file_path);
if(file_size!=now_file_size){
fixed_size_bm.update({
if_same: 'N',
new_file_size: now_file_size,
attachment_id: data[i].attachment_id,
source_pk_value: data[i].source_pk_value
})
}else {
fixed_size_bm.update({
if_same: 'Y',
new_file_size: now_file_size,
attachment_id: data[i].attachment_id,
source_pk_value: data[i].source_pk_value
})
}
}
}
//获取文件长度
function get_file_length(path){
var file=new File(String(path));
if (file.exists() && file.isFile()){
length=file.length();
return length;
} else{
return 0;
}
}
fileSizeCheck();
]]></s:server-script>
</a:init-procedure>
<a:service-output/>
</a:service>
\ No newline at end of file
src/main/webapp/modules/wx/WX100/wx_ele_verify_operator.lsc
View file @ 7932723b
......@@ -28,15 +28,16 @@
}
//依据合同文本签署人定义存储签署人信息
if ($ctx.parameter.esign_type == 'CE'){
var ele_contract_signer_bm = $bm('wx.WX100.con_ele_contract_signer_save');
ele_contract_signer_bm.update({
contract_id: $ctx.parameter.contract_id
});
//第一步生成合同文本
$bm('cont.CON505.con_ele_contract_create_content').update({
contract_id: $ctx.parameter.contract_id,
content_type: 'NORMAL'
});
var ele_contract_signer_bm = $bm('wx.WX100.con_ele_contract_signer_save');
ele_contract_signer_bm.update({
contract_id: $ctx.parameter.contract_id
});
}else if($ctx.parameter.esign_type == 'ET'){
//依据提前结清合同文本签署人定义存储签署人信息
var ele_contract_signer_bm = $bm('wx.WX100.con_et_contract_signer_save');
......
src/main/webapp/modules/zjwfl/WFL5120/zj_wfl_to_do_list_batch.lview
View file @ 7932723b
......@@ -5,17 +5,25 @@
<a:model-query model="zjwfl.ZJWFL5110.zj_wfl_to_do_list_count" rootpath="to_do_list_count"/>
<a:model-query model="zjwfl.ZJWFL5110.zj_wfl_to_do_title_count" rootPath="to_do_list_count_rp"/>
<a:model-query model="zjwfl.ZJWFL5110.zj_wfl_to_do_list_others_count" rootpath="other_list_count"/>
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
</a:init-procedure>
<a:view>
<a:link id="get_document_info_link" model="zjwfl.ZJWFL5110.zj_wfl_get_document_info" modelaction="query"/>
<a:link id="pageLink_zjwfl5110_wfl_approve" url="${/request/@context_path}/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview"/>
<a:link id="wfl5120_batch_approve_link" model="zjwfl.ZJWFL5110.zj_wfl_approve_agree_batch" modelaction="batch_update"/>
<a:link id="wfl5120_batch_refuse_link" model="zjwfl.ZJWFL5110.zj_wfl_approve_refuse_batch" modelaction="batch_update"/>
<script type="text/javascript"><![CDATA[
//建设机械部部长可操作批量退回按钮
Leaf.onReady(function() {
if ('${/model/role_info/record/@role_code}'!='0003') {
$('batch_refused_id').hide();
}
});
function query_zjwfl5110_toDoDs() {
//$("zjwfl5110_toDoDs").query();
$("zjwfl5110_toDoDs").query();
window.parent.location.reload();
// window.parent.location.reload();
}
function winOpen_zjwfl5110_wfl_approve(instance_id, node_id, record_id, workflow_id, record_type) {
......@@ -160,6 +168,10 @@
Leaf.showMessage('提示','请至少选择一条待办进行审批');
return false;
}
if(params.length > 50){
Leaf.showMessage('提示','请选择小于50条数据');
return false;
}
if(!comment_test){
$L.showErrorMessage("提示",'请输入审批意见！');
return;
......@@ -191,34 +203,45 @@
function batch_refused() {
var records = $('zjwfl5110_toDoDs').getAll();
var comment_test = $('comment_text_cmp').value;
var records = $('zjwfl5110_toDoDs').getAll();
var comment_test = $('comment_text_cmp').value;
var workflow_code;
var workflow_desc ;
if(!comment_test){
$L.showErrorMessage("提示",'请输入审批意见!');
return;
}
var params = [];
for(var i=0;i<records.length;i++){
if (records[i].get('checked') =='Y'&&records[i].get('record_id')){
if(records[i].get('workflow_code')!='PROJECT_WFL'){
Leaf.showMessage('提示','仅报单工作流可使用退回按钮！');
return ;
}
params.push({
'node_id':records[i].get('node_id'),
'comment_text_out':comment_test,
'record_id':records[i].get('record_id'),
'action_type':2,
'action_type':3,
'_status':'update'
});
}
}
}
if (params.length < 1) {
Leaf.showMessage('提示','请至少选择一条待办进行审批');
return false;
}
if(!comment_test){
$L.showErrorMessage("提示",'请输入审批意见！');
return;
if(params.length > 50){
Leaf.showMessage('提示','请选择小于50条数据');
return false;
}
var detail_mask = Ext.getBody();
Leaf.showConfirm('提示','是否确认审批拒绝',function(){
Leaf.showConfirm('提示','您确定退回以下单据的申请吗?',function(){
Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
Leaf.request({
url: $('wfl5120_batch_approve_link').getUrl(),
url: $('wfl5120_batch_refuse_link').getUrl(),
para: params,
success: function() {
Leaf.SideBar.show({
......@@ -226,8 +249,8 @@
duration: 2000
});
Leaf.Masker.unmask(detail_mask);
query_zjwfl5110_toDoDs();
},
query_zjwfl5110_toDoDs();
},
failure: function() {
Leaf.Masker.unmask(detail_mask);
},
......@@ -324,7 +347,7 @@
</a:fieldSet>
<a:hBox>
<a:button click="batch_approved" text="同意"/>
<!-- <a:button click="batch_refused" text="拒绝"/> -->
<a:button id="batch_refused_id" click="batch_refused" text="退回"/>
</a:hBox>
</div>
<div style="margin-left:10px;">
......@@ -365,6 +388,7 @@
treegrid.setColumnSize('submitted_by_name', Math.round(screen_width * 0.18));
treegrid.setColumnSize('document_info', Math.round(screen_width * 0.21));
treegrid.setColumnSize('times', Math.round(screen_width * 0.05));
treegrid.setColumnSize('down_payment_ratio', Math.round(screen_width * 0.05));
treegrid.setColumnSize('credit_flag', Math.round(screen_width * 0.05));
//treegrid.setColumnSize('division', Math.round(screen_width * 0.05));
......
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