Index: ssts-web/src/main/webapp/systemmanage/workFlow/finishedApprovalTaskRecordView.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/systemmanage/workFlow/finishedApprovalTaskRecordView.js (revision 0)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/finishedApprovalTaskRecordView.js (revision 22243)
@@ -0,0 +1,283 @@
+var recordFormObj;
+var recordWindowObj;
+var approvalRecordGrid;
+var entityName3 = '我的已办审批任务';
+
+function rendererTransitionTime(value, metaData, record, rowIndex, colIndex,
+ store, view) {
+ if (value) {
+ return Ext4.Date.format(new Date(value.time), 'Y-m-d H:i:s');
+ } else {
+ return '';
+ }
+}
+
+//会重复执行两次
+function rendererResponseTime(value, metaData, record, rowIndex, colIndex,
+ store, view) {
+ var cTime=record.data['createTaskTime'].time;
+ var hTime=0;
+ if(record.data['handleTime']!=null) //得判断，不然少cell
+ hTime=record.data['handleTime'].time;
+
+ if((typeof(hTime)!="undefined" && hTime!=0)&&(typeof(cTime)!="undefined" && cTime!=0)){
+ var responseTimeMinutes= Math.floor(parseInt(hTime - cTime) / 1000 / 60);
+ var responseTimeHours=Math.floor(parseInt(hTime - cTime) / 1000 / 60 / 60);
+ var responseTimeDays=Math.floor(parseInt(hTime - cTime) / 1000 / 60 / 60/24);
+ if(responseTimeDays>0){
+ return responseTimeDays+'天'+Math.floor((parseInt(hTime - cTime)-responseTimeDays*1000*60*60*24)/ 1000 / 60 / 60)+'小时';
+ }
+ if(responseTimeHours>0){
+ return responseTimeHours+'小时'+Math.floor((parseInt(hTime - cTime)-responseTimeHours*1000*60*60)/ 1000 / 60)+'分钟';
+ }
+ if(responseTimeMinutes==0)
+ return '1分钟';
+ return responseTimeMinutes+'分钟';
+ }else
+ return '';
+}
+
+//1(待处理-默认值) 2(通过) 3(不通过) 4(回退) 5(提交) 6（通知起单人）
+function renderApprovalResult(value, metaData, record, rowIndex, colIndex, store, view) {
+ if (value == 1) {
+ return '待处理';
+ } else if(value == 2) {
+ return '通过';
+ }else if(value==3){
+ return '不通过';
+ }else if(value==4){
+ return "回退";
+ }else if(value==5){
+ return "提交";
+ }else if(value==6){
+ return "通知起单人";
+ }else if(value==7){
+ return "通知起单人";
+ }
+}
+
+function renderTitle(v, p, record) {
+ var str = "" + v + "";
+ return str;
+}
+
+
+var recordFields = [ {
+ name : 'id',
+ mapping : 'id'
+}, {
+ name : 'formId',
+ mapping : 'formId'
+}, {
+ name : 'formType',
+ mapping : 'formType'
+}, {
+ name : 'nodeDefinition_id',
+ mapping : 'nodeDefinition_id'
+}, {
+ name : 'title',
+ mapping : 'title'
+}, {
+ name : 'createTaskTime',
+ mapping : 'createTaskTime'
+}, {
+ name : 'taskName',
+ mapping : 'taskName'
+},{
+ name : 'handler',
+ mapping : 'handler'
+}, {
+ name : 'handleTime',
+ mapping : 'handleTime'
+}, {
+ name : 'handleOpinion',
+ mapping : 'handleOpinion'
+}, {
+ name : 'approvalResult',
+ mapping : 'approvalResult'
+}
+ ];
+var recordColumns = [{
+ header : "标题",
+ dataIndex : 'title',
+ width : 170,
+ minWidth : 170,
+ maxWidth : 220,
+ filterable : true,
+ filter : {
+ type : 'string'
+ },
+ renderer : renderTitle
+}, {
+ header : "任务名字",
+ dataIndex : 'taskName',
+ width : 170,
+ minWidth : 170,
+ maxWidth : 220,
+ filterable : true,
+ filter : {
+ type : 'string'
+ }
+}, {
+ header : "处理结果",
+ dataIndex : 'approvalResult',
+ width : 80,
+ minWidth : 80,
+ filterable : true,
+ filter : {
+ type : 'string'
+ },
+ renderer : renderApprovalResult
+}, {
+ header : "处理意见",
+ dataIndex : 'handleOpinion',
+ width : 120,
+ minWidth : 120,
+ maxWidth : 200,
+ filterable : true,
+ filter : {
+ type : 'string'
+ }
+} , {
+ header : "处理时间",
+ dataIndex : 'handleTime',
+ width : 140,
+ filterable : true,
+ filter : {
+ type : 'date'
+ },
+ renderer : rendererTransitionTime
+}, {
+ header : "创建任务时间",
+ dataIndex : 'createTaskTime',
+ width : 140,
+ filterable : true,
+ filter : {
+ type : 'date'
+ },
+ renderer : rendererTransitionTime
+}
+, {
+ header : "响应时间",
+ id : "responseTime",
+ dataIndex : '',
+ width : 84,
+ filterable : true,
+ filter : {
+ type : 'string'
+ },
+ renderer : rendererResponseTime
+}
+];
+
+
+function reloadGrid(){
+ var startDateSearch = Ext4.getCmp('startDateSearch').getValue();
+ var endDateSearch = Ext4.getCmp('endDateSearch').getValue();
+ if(startDateSearch || endDateSearch){
+ if(!startDateSearch){
+ showResult("请录入开始时间");
+ return false;
+ }else if(!endDateSearch){
+ showResult("请录入结束时间");
+ return false;
+ }else if(!compareDate(startDateSearch,endDateSearch)){
+ showResult("开始时间不能大于结束时间");
+ return false;
+ }
+ }
+ var approvalResult = Ext4.getCmp('approvalResultCombo').getValue();
+ approvalRecordGrid.extraParams.startDateSearch = startDateSearch;
+ approvalRecordGrid.extraParams.endDateSearch = endDateSearch;
+ approvalRecordGrid.extraParams.approvalResult = approvalResult;
+ Ext4.getCmp('forgonPagingToolBar').moveFirst(); //从第一页开始
+ Ext4.getCmp('startDateSearch').setValue('');
+ Ext4.getCmp('endDateSearch').setValue('');
+ Ext4.getCmp('approvalResultCombo').setValue('');
+}
+
+
+var dt = new Date();
+var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
+
+Ext4.onReady(function() {
+ approvalRecordGrid= Ext4.create('ExtJs.forgon4.Grid', {
+ title: entityName3,
+ dataUrl : WWWROOT + '/disinfectSystem/workFlowApprovalTaskAction!loadFinishedApprovalTaskRecordList.do',
+ sorters : {
+ property : 'createTaskTime',
+ direction : 'ASC'
+ },
+ extraParams : {}, //如果你要自定义参数，这里一定要先给一个空的对象，要不然会报空异常
+ fields : recordFields,
+ columns : recordColumns,
+ features: Ext4.create('Ext.ux.grid.feature.Searching',{
+ extend: 'Ext.grid.feature.Feature',
+ searchText:'查询',
+ width: 150,
+ //禁止那些列参与查询
+ disableIndexes:["responseTime"]
+ }),
+ tbar : [{
+ xtype : 'label',
+ text : '创建任务日期：'
+ },{
+ xtype : 'datefield',
+ id : 'startDateSearch',
+ name : 'startDateSearch',
+ altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+ readOnly : false,
+ width : 130,
+ format : 'Y-m-d',
+ value : new Date(startDayofMonth)
+ },{
+ xtype : 'label',
+ text : '至：'
+ },{
+ xtype : 'datefield',
+ id : 'endDateSearch',
+ name : 'endDateSearch',
+ altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+ readOnly : false,
+ width : 130,
+ value : new Date(),
+ format : 'Y-m-d'
+ },'-',
+ {
+ xtype : 'label',
+ text : '处理状态：'
+ }
+ ,{
+ xtype : 'combo',
+ id : 'approvalResultCombo',
+ name : 'approvalResultCombo',
+ valueField : 'value',
+ displayField : 'name',
+ store : new top.Ext4.data.SimpleStore({
+ fields : [ 'value','name'],
+ data : [[2,'通过'],[3,'不通过'],[4,'回退'],[5,'提交'],[6,'通知起单人']] //因为6和7都是通知起单人，所以这里的6，可查询出处理结果为6和7的结果
+ }),
+ forceSelection : false,
+ triggerAction : 'all'
+ },'-',
+ {
+ text : '查询',
+ iconCls : 'icon-search',
+ handler : function() {
+ reloadGrid();
+ }
+ }]
+ });
+
+
+ var viewport = Ext4.create('Ext4.Viewport', {
+ layout : 'fit',
+ items : approvalRecordGrid
+ });
+})
Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp
===================================================================
diff -u -r22166 -r22243
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp (.../workFlowApprovalTaskRecord.jsp) (revision 22166)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp (.../workFlowApprovalTaskRecord.jsp) (revision 22243)
@@ -21,6 +21,6 @@
审批日志
-
+