|
@@ -165,7 +165,7 @@ Ext.define('erp.view.common.DeskTop.FlowPortal',{
|
|
|
});
|
|
|
},
|
|
|
_alreadyDo:function(){
|
|
|
- var me=this,fields=['JP_NAME','JP_STATUS','JP_NODEID','JP_CODEVALUE','JN_NAME','JN_DEALRESULT','JN_DEALTIME','JN_NODEDESCRIPTION'];
|
|
|
+ var me=this,fields=['JP_NAME','JP_STATUS','JP_NODEID','JP_CODEVALUE','JN_NAME','JN_DEALRESULT','JN_DEALTIME','JN_NODEDESCRIPTION','JP_PROCESSNOTE'];
|
|
|
return Ext.widget('gridpanel',{
|
|
|
title:arguments[1],
|
|
|
layout:'fit',
|
|
@@ -181,11 +181,17 @@ Ext.define('erp.view.common.DeskTop.FlowPortal',{
|
|
|
description='';
|
|
|
}
|
|
|
else description='</br><font color="#777">'+description+'</font>';
|
|
|
- return Ext.String.format('<a class="x-btn-link" onclick="openTable({3},\'JProcess!Me\',\'任务流程\',\'jsps/common/flow.jsp?_do=1\',\'jp_nodeId\',null);" target="_blank">{0} {1}</a>{2}',
|
|
|
+ var note=record.get('JP_PROCESSNOTE');
|
|
|
+ if(note==null || note =='' || note=='null') {
|
|
|
+ note='';
|
|
|
+ }
|
|
|
+ else note='</br><font color="#777">'+note+'</font>';
|
|
|
+ return Ext.String.format('<a class="x-btn-link" onclick="openTable({3},\'JProcess!Me\',\'任务流程\',\'jsps/common/flow.jsp?_do=1\',\'jp_nodeId\',null);" target="_blank">{0} {1}</a>{2}{4}',
|
|
|
record.get('JP_NAME'),
|
|
|
record.get('JP_CODEVALUE'),
|
|
|
description,
|
|
|
- record.get('JP_NODEID')
|
|
|
+ record.get('JP_NODEID'),
|
|
|
+ note
|
|
|
);
|
|
|
}
|
|
|
},{
|
|
@@ -202,7 +208,7 @@ Ext.define('erp.view.common.DeskTop.FlowPortal',{
|
|
|
});
|
|
|
},
|
|
|
_alreadyLaunch:function(){
|
|
|
- var me=this,fields=['JP_STATUS','JP_NODEID','JP_NAME','JP_NODENAME','JP_NODEDEALMANNAME','JP_LAUNCHTIME','JP_LAUNCHERNAME','JP_CODEVALUE'];
|
|
|
+ var me=this,fields=['JP_STATUS','JP_NODEID','JP_NAME','JP_NODENAME','JP_NODEDEALMANNAME','JP_LAUNCHTIME','JP_LAUNCHERNAME','JP_CODEVALUE','JP_PROCESSNOTE'];
|
|
|
return Ext.widget('gridpanel',{
|
|
|
title:arguments[1],
|
|
|
columns:[{
|
|
@@ -217,11 +223,17 @@ Ext.define('erp.view.common.DeskTop.FlowPortal',{
|
|
|
description='';
|
|
|
}
|
|
|
else description='</br><font color="#777">'+description+'</font>';
|
|
|
- return Ext.String.format('<a class="x-btn-link" onclick="openTable({3},\'JProcess!Me\',\'任务流程\',\'jsps/common/flow.jsp?_do=1\',\'jp_nodeId\',null);" target="_blank">{0} {1}</a>{2}',
|
|
|
+ var note=record.get('JP_PROCESSNOTE');
|
|
|
+ if(note==null || note =='' || note=='null') {
|
|
|
+ note='';
|
|
|
+ }
|
|
|
+ else note='</br><font color="#777">'+note+'</font>';
|
|
|
+ return Ext.String.format('<a class="x-btn-link" onclick="openTable({3},\'JProcess!Me\',\'任务流程\',\'jsps/common/flow.jsp?_do=1\',\'jp_nodeId\',null);" target="_blank">{0} {1}</a>{2}{4}',
|
|
|
record.get('JP_NAME'),
|
|
|
record.get('JP_CODEVALUE'),
|
|
|
description,
|
|
|
- record.get('JP_NODEID')
|
|
|
+ record.get('JP_NODEID'),
|
|
|
+ note
|
|
|
);
|
|
|
}
|
|
|
},{
|