|
@@ -834,6 +834,9 @@
|
|
return "<span title='"+ d.content +"'>" + d.content + "</span>";
|
|
return "<span title='"+ d.content +"'>" + d.content + "</span>";
|
|
}}
|
|
}}
|
|
,{align:'center',title: '提交人', width:80,templet:function(d){
|
|
,{align:'center',title: '提交人', width:80,templet:function(d){
|
|
|
|
+ return "<span title='"+ d.initiator +"'>" + d.initiator + "</span>";
|
|
|
|
+ }}
|
|
|
|
+ ,{align:'center',title: '审核人', width:80,templet:function(d){
|
|
return "<span title='"+ d.submit +"'>" + d.submit + "</span>";
|
|
return "<span title='"+ d.submit +"'>" + d.submit + "</span>";
|
|
}}
|
|
}}
|
|
,{field:'status1', align:'center',title: '审批状态',width:100}
|
|
,{field:'status1', align:'center',title: '审批状态',width:100}
|
|
@@ -856,6 +859,7 @@
|
|
,"step":"${workProjectNotify.notifyRole}"
|
|
,"step":"${workProjectNotify.notifyRole}"
|
|
,"title":"${workProjectNotify.title}"
|
|
,"title":"${workProjectNotify.title}"
|
|
,"content":"${workProjectNotify.content}"
|
|
,"content":"${workProjectNotify.content}"
|
|
|
|
+ ,"initiator":"${fns:getUserById(workProjectNotify.initiator).name}"
|
|
,"submit":"${fns:getUserById(workProjectNotify.createBy.id).name}"
|
|
,"submit":"${fns:getUserById(workProjectNotify.createBy.id).name}"
|
|
,"status":"${workProjectNotify.status}"
|
|
,"status":"${workProjectNotify.status}"
|
|
,"status1":"${fns:getDictLabel(workProjectNotify.status, 'project_notify_class', '')}"
|
|
,"status1":"${fns:getDictLabel(workProjectNotify.status, 'project_notify_class', '')}"
|