From f71a02229c1ba00fbecaead19256593ffb052753 Mon Sep 17 00:00:00 2001
From: duan <dante@isaints.net>
Date: 星期三, 21 八月 2024 17:18:40 +0800
Subject: [PATCH] 1
---
src/DIXWeb.Web/Scripts/Workflow/WorkflowNDetail.js | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/DIXWeb.Web/Scripts/Workflow/WorkflowNDetail.js b/src/DIXWeb.Web/Scripts/Workflow/WorkflowNDetail.js
index 64edb1d..a123dad 100644
--- a/src/DIXWeb.Web/Scripts/Workflow/WorkflowNDetail.js
+++ b/src/DIXWeb.Web/Scripts/Workflow/WorkflowNDetail.js
@@ -101,15 +101,15 @@
pagePosition: 'bottom',
pageSize: 10,
pageNumber: 1,
- pageList: [2, 10, 15, 20, 30, 50],
+ pageList: [2, 10, 15, 20, 30, 50,100],
toolbar: '#searchWorkflowNDetailToolBar',
//鏁版嵁鏍煎紡
columns: [[
{ title: '搴忓彿', width: 35, field: 'Id', hidden: true, },
{ title: '鑺傜偣搴忓彿', width: 35, field: 'NodeId', hidden: true, },
- { title: '鑺傜偣鍚嶇О', width: 180, field: 'NodeName', },
+ { title: '鑺傜偣鍚嶇О', width: 230, field: 'NodeName', },
{ title: '缁勭粐绫诲瀷搴忓彿', width: 35, field: 'OrgTypeId', hidden: true, },
- { title: '缁勭粐绫诲瀷鍚嶇О', width: 180, field: 'OrgTypeName', },
+ //{ title: '缁勭粐绫诲瀷鍚嶇О', width: 180, field: 'OrgTypeName', },
{ title: '缁勭粐搴忓彿', width: 35, field: 'OrgId', hidden: true, },
{ title: '缁勭粐鍚嶇О', width: 180, field: 'OrgName', },
{ title: '瑙掕壊绫诲瀷搴忓彿', width: 35, field: 'RoleTypeId', hidden: true, },
@@ -117,13 +117,14 @@
{ title: '瑙掕壊搴忓彿', width: 35, field: 'RoleId', hidden: true, },
{ title: '瑙掕壊鍚嶇О', width: 180, field: 'RoleName', },
{ title: '鎵ц椤哄簭', width: 80, field: 'DetailLevel', },
+ { title: '婵�娲荤被鍨�', width: 120, field: 'ActiveType', },
{
title: '鍒涘缓鏃堕棿', width: 200, field: 'CreateTime', formatter: function (value, row, index) {
return toDateStr(value);
}
},
- { title: '鍒涘缓浜�', width: 100, field: 'CreateUserId', hidden: true, },
- { title: '鍒涘缓浜�', width: 100, field: 'CreateUserName', },
+ //{ title: '鍒涘缓浜�', width: 100, field: 'CreateUserId', hidden: true, },
+ //{ title: '鍒涘缓浜�', width: 100, field: 'CreateUserName', },
{
title: '鍙樻洿鏃堕棿', width: 200, field: 'ChangeTime', formatter: function (value, row, index) {
return toDateStr(value);
@@ -150,6 +151,7 @@
$('#dgWorkflowNDetailRoleId').val('');
$('#dgWorkflowNDetailRoleName').text('');
$('#dgWorkflowNDetailLevel').textbox('setValue', '');
+ $('#dgWorkflowNDetailActiveType').textbox('setValue', '');
$('.errorMsg').text('');
}
//鑾峰彇dialog涓殑鍊�
@@ -161,7 +163,8 @@
var roleTypeId = $('#dgWorkflowNDetailRoleType').combobox('getValue');
var roleId = $('#dgWorkflowNDetailRoleId').val();
var level = $('#dgWorkflowNDetailLevel').textbox('getValue');
- var param = { Id: id, OrgTypeId: orgTypeId, OrgId: orgId, RoleTypeId: roleTypeId, RoleId: roleId, DetailLevel: level, NodeId: nodeId };
+ var activeType = $('#dgWorkflowNDetailActiveType').textbox('getValue');
+ var param = { Id: id, OrgTypeId: orgTypeId, OrgId: orgId, RoleTypeId: roleTypeId, RoleId: roleId, DetailLevel: level, NodeId: nodeId, ActiveType: activeType };
console.info(param);
return param;
}
@@ -208,6 +211,7 @@
$('#dgWorkflowNDetailRoleId').val(data.rows.RoleId);
$('#dgWorkflowNDetailRoleName').text(data.rows.RoleName);
$('#dgWorkflowNDetailLevel').textbox('setValue', data.rows.DetailLevel);
+ $('#dgWorkflowNDetailActiveType').textbox('setValue', data.rows.ActiveType);
} else {
alert(data.rows);
}
--
Gitblit v1.8.0