Index: ssts-web/src/main/webapp/systemmanage/workFlow/approvalRecord.js =================================================================== diff -u -r22083 -r22102 --- ssts-web/src/main/webapp/systemmanage/workFlow/approvalRecord.js (.../approvalRecord.js) (revision 22083) +++ ssts-web/src/main/webapp/systemmanage/workFlow/approvalRecord.js (.../approvalRecord.js) (revision 22102) @@ -47,16 +47,10 @@ } } - var fields3 = [ { + var recordFields = [ { name : 'id', mapping : 'id' }, { - name : 'formId', - mapping : 'formId' - }, { - name : 'formType', - mapping : 'formType' - }, { name : 'title', mapping : 'title' }, { @@ -66,51 +60,34 @@ name : 'taskName', mapping : 'taskName' },{ - name : 'handlerId', - mapping : 'handlerId' - }, { name : 'handler', mapping : 'handler' }, { name : 'handleTime', mapping : 'handleTime' }, { - name : 'status', - mapping : 'status' - }, { name : 'handleOpinion', mapping : 'handleOpinion' }, { name : 'approvalResult', mapping : 'approvalResult' - }, { - name : 'roleId', - mapping : 'roleId' - }, { - name : 'userId', - mapping : 'userId' - }, { - name : 'fullName', - mapping : 'fullName' - }, { - name : 'roleName', - mapping : 'roleName' - } ]; - var columns3 = [{ + } + ]; + var recordColumns = [{ header : "标题", dataIndex : 'title', - width : 150, - minWidth : 150, - maxWidth : 150, + width : 220, + minWidth : 220, + maxWidth : 220, filterable : true, filter : { type : 'string' } }, { header : "任务名字", dataIndex : 'taskName', - width : 120, - minWidth : 120, + width : 220, + minWidth : 220, filterable : true, filter : { type : 'string' @@ -146,8 +123,8 @@ } , { header : "处理时间", dataIndex : 'handleTime', - width : 140, - minWidth : 140, + width : 200, + minWidth : 200, filterable : true, filter : { type : 'date' @@ -156,8 +133,8 @@ }, { header : "创建任务时间", dataIndex : 'createTaskTime', - width : 140, - minWidth : 140, + width : 200, + minWidth : 200, filterable : true, filter : { type : 'date' @@ -175,42 +152,34 @@ renderer : rendererResponseTime }]; - var approvalRecordGrid = Ext4.create('ExtJs.forgon4.Grid', { - title : entityName3, - dataUrl : WWWROOT - + '/disinfectSystem/workFlowApprovalTaskAction!loadWorkFlowApprovalTaskRecordList.do', - fields : fields3, - columns : columns3, + + var workFlowApprovalTaskRecordListStore = Ext4.create('Ext.data.Store',{ + fields : recordFields, + autoLoad : true, sorters : { property : 'createTaskTime', direction : 'ASC' }, - extraParams : {formId:formId}, - showRightClick : false, - tbar : [] + proxy : { + type : 'ajax', + extraParams : {formId:formId}, + url : WWWROOT+ '/disinfectSystem/workFlowApprovalTaskAction!loadWorkFlowApprovalTaskRecordList.do', + reader : { + root : "rows" + } + } }); - - recordFormObj = Ext4.create('Ext4.form.Panel', { - //layout : 'vbox', - layout : 'fit', - frame : true, - border : 0, - labelSeparator : ': ', - //bodyPadding : '5 5 0', - autoScroll : true, - buttonAlign : 'center', - buttons : [], - items : [ { - xtype : 'container', - flex : 1, - width : '100%', - layout : 'fit', - items : approvalRecordGrid - }] - }); - + var approvalRecordGrid= Ext4.create('Ext.grid.Panel', { + title: entityName3, + layout : 'fit', + store: workFlowApprovalTaskRecordListStore, + /* dataUrl : WWWROOT + + '/disinfectSystem/workFlowApprovalTaskAction!loadWorkFlowApprovalTaskRecordList.do',*/ + columns : recordColumns + }); + recordWindowObj = Ext4.create('Ext4.window.Window', { layout : 'fit', title : '审批记录信息', @@ -221,7 +190,7 @@ border : false, plain : true, //items : viewport - items : recordFormObj + items :approvalRecordGrid// recordFormObj }); recordWindowObj.show(); Index: forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java =================================================================== diff -u -r22060 -r22102 --- forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java (.../WorkFlowApprovalTaskAction.java) (revision 22060) +++ forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java (.../WorkFlowApprovalTaskAction.java) (revision 22102) @@ -76,7 +76,7 @@ Long userId= userData.getUserId(); //2、获取当前用户对应的待办任务 ：与userid匹配；当前用户所在role与roleid匹配 StringBuilder select=new StringBuilder(); - select.append("select w.id,w.formId,w.formType,w.title,w.createTaskTime,w.taskName,w.handlerId,w.handler,w.handleTime,w.nodeDefinition_id,w.status,w.handleOpinion,w.approvalResult,w.roleId,w.userId,u.fullName userName,r.descn roleName"); + select.append("select w.id,w.formId,w.formType,w.title,w.createTaskTime,w.taskName,w.serialNumber,w.handlerId,w.handler,w.handleTime,w.nodeDefinition_id,w.status,w.handleOpinion,w.approvalResult,w.roleId,w.userId,u.fullName userName,r.descn roleName"); select.append(" from WorkFlowApprovalTask w left join SS_USERS u on w.userId=u.id left join SS_ROLES r on r.id=w.roleId"); //2.1状态为未处理 2.2当前用户存在于userid 或者 记录存储的角色id存在于当前用户对应角色列表 String where = " where 1=1 and w.status =0 and ( w.userId = "+userId+" or w.roleId in ( select s.ROLE_ID from SS_USER_ROLE s where s.USER_ID="+userId+" ))"; @@ -142,6 +142,8 @@ Map map=new HashMap(); map.put("allowDisagree", false); map.put("allowRollback", false); + map.put("allowNoticeFormMan", false); + map.put("allowChanges", false); list.add(map); jsonObject.put("rows", list); jsonObject.put("total", 1); @@ -160,15 +162,8 @@ */ public void loadWorkFlowApprovalTaskRecordList(){ String formId = StrutsParamUtils.getPraramValue("formId", "");//获取单号id - StringBuilder select=new StringBuilder(); - select.append("select w.id,w.formId,w.formType,w.approvalResult,w.title,w.createTaskTime,w.taskName,w.handlerId,w.handler,w.handleTime,w.status,w.handleOpinion,w.roleId,w.userId,u.fullName userName,r.descn roleName "); - select.append(" from WorkFlowApprovalTask w left join SS_USERS u on w.userId=u.id left join SS_ROLES r on r.id=w.roleId"); - String where = " where 1=1 "; - if(!StringUtils.isBlank(formId)) - where+=" and w.formId= "+formId; - ExtJsEntity entity = ExtJsUtil.buildSQLEntity(select.toString(), where, ""); - JSONObject result = extGridUtils.getPagedResult(entity); - StrutsResponseUtils.output(result); + JSONArray jSONArray=workFlowApprovalTaskManager.loadWorkFlowApprovalTaskRecordList(formId); + StrutsResponseUtils.output(jSONArray); } public void setWorkFlowManager(WorkFlowManager workFlowManager) { Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java =================================================================== diff -u -r22083 -r22102 --- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java (.../WorkFlowApprovalTaskManagerImpl.java) (revision 22083) +++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java (.../WorkFlowApprovalTaskManagerImpl.java) (revision 22102) @@ -3,6 +3,9 @@ import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -49,6 +52,32 @@ } @Override + public JSONArray loadWorkFlowApprovalTaskRecordList(String formId){ + JSONArray jSONArray=new JSONArray(); + List workFlowApprovalTaskList=new ArrayList(); + if(StringUtils.isNotBlank(formId)){ + workFlowApprovalTaskList=objectDao.findByProperty(WorkFlowApprovalTask.class.getSimpleName(), "formId", formId); + if(workFlowApprovalTaskList.size()>0){ + JSONObject jSONObject=new JSONObject(); + for(WorkFlowApprovalTask workFlowApprovalTask:workFlowApprovalTaskList){ + jSONObject=new JSONObject(); + jSONObject.put("id", workFlowApprovalTask.getId()); + jSONObject.put("title", workFlowApprovalTask.getTitle()); + jSONObject.put("createTaskTime", workFlowApprovalTask.getCreateTaskTime()); + jSONObject.put("taskName", workFlowApprovalTask.getTaskName()); + jSONObject.put("handler", workFlowApprovalTask.getHandler()); + jSONObject.put("handleTime", workFlowApprovalTask.getHandleTime()); + jSONObject.put("handleOpinion", workFlowApprovalTask.getHandleOpinion()); + jSONObject.put("approvalResult", workFlowApprovalTask.getApprovalResult()); + jSONArray.add(jSONObject); + } + } + } + return jSONArray; + } + + + @Override //public Boolean confirmNoticeWorkFlowApprovalTask(WorkFlowApprovalTaskVO workFlowApprovalTaskVO) { public void confirmNoticeWorkFlowApprovalTask(WorkFlowApprovalTaskVO workFlowApprovalTaskVO) { WorkFlowApprovalTask workFlowApprovalTask = getWorkFlowApprovalTask(workFlowApprovalTaskVO.getWorkFlowApprovalTaskId()); @@ -78,6 +107,8 @@ if(nextNodeDefinition.getAllowNoticeFormMan()){ User user= getUserByFormId(workFlowApprovalTask.getFormId());//获取起单人，并设置为userid + if(user==null) + throw new RuntimeException("没有查询到起单人"); Long userId=user.getId(); nextWorkFlowApprovalTask.setUserId(userId); }else{ @@ -134,6 +165,8 @@ if(nextNodeDefinition.getAllowNoticeFormMan()){ User user= getUserByFormId(workFlowApprovalTask.getFormId());//获取起单人，并设置为userid + if(user==null) + throw new RuntimeException("没有查询到起单人"); Long userId=user.getId(); nextWorkFlowApprovalTask.setUserId(userId); nextWorkFlowApprovalTask.setApprovalResult(workFlowApprovalTask.APPROVALRESULT_NOTICE); @@ -160,7 +193,7 @@ */ @Override public User getUserByFormId(Long formId) { - String sql=" where po.name in (select i.applicantCode from InvoicePlan i where i.id="+formId+")";//InvoicePlan是类名 + String sql=" where po.name = (select i.applicantCode from InvoicePlan i where i.id="+formId+")";//InvoicePlan是类名 User user=(User) objectDao.getBySql(User.class.getSimpleName(),sql); return user; } @@ -223,6 +256,8 @@ } if(nextNodeDefinition.getAllowNoticeFormMan()){ User user= getUserByFormId(formId);//获取起单人，并设置为userid + if(user==null) + throw new RuntimeException("没有查询到起单人"); JSONObject jSONObject=new JSONObject(); jSONObject = new JSONObject(); jSONObject.put("userId", user.getId()); @@ -305,8 +340,9 @@ //提醒起草人 WorkFlowApprovalTask workFlowApprovalTaskFail=new WorkFlowApprovalTask(); workFlowApprovalTaskFail.setFormId(workFlowApprovalTask.getFormId()); + workFlowApprovalTaskFail.setSerialNumber(workFlowApprovalTask.getSerialNumber()); workFlowApprovalTaskFail.setFormType(workFlowApprovalTask.getFormType()); - workFlowApprovalTaskFail.setTitle(workFlowApprovalTask.getFormId()+workFlowApprovalTask.getFormType()); + workFlowApprovalTaskFail.setTitle(workFlowApprovalTask.getFormId()+workFlowApprovalTask.getSerialNumber()); workFlowApprovalTaskFail.setNodeDefinition(workFlowApprovalTask.getNodeDefinition()); workFlowApprovalTaskFail.setTaskName(workFlowApprovalTask.getTaskName()); workFlowApprovalTaskFail.setCreateTaskTime(new Date()); @@ -343,12 +379,13 @@ newWorkFlowApprovalTask.setNodeDefinition(lastNodeDefinition); newWorkFlowApprovalTask.setFormId(lastWorkFlowApprovalTask.getFormId()); newWorkFlowApprovalTask.setFormType(lastWorkFlowApprovalTask.getFormType()); - newWorkFlowApprovalTask.setTitle(lastWorkFlowApprovalTask.getFormId()+lastWorkFlowApprovalTask.getFormType()); newWorkFlowApprovalTask.setSerialNumber(lastWorkFlowApprovalTask.getSerialNumber()); newWorkFlowApprovalTask.setTitle(String.format("%s-%s", workFlowApprovalTaskVO.getFormType(), lastWorkFlowApprovalTask.getSerialNumber())); newWorkFlowApprovalTask.setCreateTaskTime(new Date()); if(lastNodeDefinition.getAllowNoticeFormMan()){ User user= getUserByFormId(lastWorkFlowApprovalTask.getFormId()); + if(user==null) + throw new RuntimeException("没有查询到起单人"); newWorkFlowApprovalTask.setUserId(user.getId()); newWorkFlowApprovalTask.setApprovalResult(workFlowApprovalTask.APPROVALRESULT_NOTICE); }else{ @@ -358,10 +395,13 @@ }else{//节点为空，返回申请人---前台调用家的修改单流程状态 //根据工号获取工单申请人id User user= getUserByFormId(workFlowApprovalTask.getFormId()); + if(user==null) + throw new RuntimeException("没有查询到起单人"); newWorkFlowApprovalTask.setTaskName("申请人修改工单"); newWorkFlowApprovalTask.setFormId(workFlowApprovalTask.getFormId()); newWorkFlowApprovalTask.setFormType(workFlowApprovalTask.getFormType()); - newWorkFlowApprovalTask.setTitle(workFlowApprovalTask.getFormId()+workFlowApprovalTask.getFormType()); + newWorkFlowApprovalTask.setSerialNumber(workFlowApprovalTask.getSerialNumber()); + newWorkFlowApprovalTask.setTitle(String.format("%s-%s", workFlowApprovalTask.getFormType(), workFlowApprovalTask.getSerialNumber())); newWorkFlowApprovalTask.setCreateTaskTime(new Date()); if(user!=null) newWorkFlowApprovalTask.setUserId(user.getId()); @@ -395,6 +435,7 @@ WorkFlowApprovalTaskVO workFlowApprovalTaskVO) { WorkFlowApprovalTask workFlowApprovalTask=getWorkFlowApprovalTask(workFlowApprovalTaskVO.getWorkFlowApprovalTaskId()); workFlowApprovalTask.setStatus(1); + workFlowApprovalTask.setApprovalResult(2); objectDao.save(workFlowApprovalTask); } @@ -412,4 +453,5 @@ } } + } Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js =================================================================== diff -u -r22083 -r22102 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22083) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22102) @@ -70,49 +70,51 @@ var result = passSaveHandleOpinionFlag(nodeDefinition_id,taskName,workFlowApprovalTaskId,1,handleOpinion,userID,formId,formType); if(result.success){ - showResult(result.message); grid.reloadData(); + //grid.loadData(); + showResult(result.message); passWindowObj.close(); approvalWindowObj.close(); }else{ showResult(result.message); } } - + + function updateHandleOpinion(){ - var approvalResult = 0; - var handleOpinion = Ext4.getCmp('failFormObj').getForm().findField('failHandleOpinion').getValue(); - var result =failHandleOpinionFlag(workFlowApprovalTaskId,formId,approvalResult,handleOpinion); - if(result.success){ - showResult("审批成功"); - grid.reloadData(); - failWindowObj.close(); - approvalWindowObj.close(); - }else{ - showResult(result.message); - } - } + var approvalResult = 0; + var handleOpinion = Ext4.getCmp('failFormObj').getForm().findField('failHandleOpinion').getValue(); + var result =failHandleOpinionFlag(workFlowApprovalTaskId,formId,approvalResult,handleOpinion); + if(result.success){ + grid.reloadData(); + showResult("审批成功"); + failWindowObj.close(); + approvalWindowObj.close(); + }else{ + showResult(result.message); + } + } - function rollBackHandleOpinion(){ - var approvalResult = 0; - var handleOpinion = Ext4.getCmp('rollBackformObj').getForm().findField('rollBackHandleOpinion').getValue(); - var result =callbackSaveHandleOpinionFlag(nodeDefinition_id,workFlowApprovalTaskId,4,handleOpinion); - if(result.success){ - showResult("审批成功"); - grid.reloadData(); - rollBackWindowObj.close(); - approvalWindowObj.close(); - }else{ - showResult("审批失败"); - } - } + function rollBackHandleOpinion(){ + var approvalResult = 0; + var handleOpinion = Ext4.getCmp('rollBackformObj').getForm().findField('rollBackHandleOpinion').getValue(); + var result =callbackSaveHandleOpinionFlag(nodeDefinition_id,workFlowApprovalTaskId,4,handleOpinion); + if(result.success){ + grid.reloadData(); + showResult("审批成功"); + rollBackWindowObj.close(); + approvalWindowObj.close(); + }else{ + showResult("审批失败"); + } + } function submit(){ //弹出警示框 var result =submitSaveHandleOpinionFlag(workFlowApprovalTaskId,formId,formType); if(result.success){ - showResult("提交成功"); grid.reloadData(); + showResult("提交成功"); approvalWindowObj.close(); }else{ showResult("提交失败"); @@ -130,8 +132,8 @@ if(approvalResult==APPROVALRESULT_NOTICE){ var result =confirmNoticeSaveHandleOpinionFlag(workFlowApprovalTaskVO); if(result.success){ - showResult("确认成功"); grid.reloadData(); + showResult("确认成功"); approvalWindowObj.close(); }else{ showResult("确认失败"); @@ -146,8 +148,8 @@ success : function(response, options) { result = Ext4.JSON.decode(response.responseText); if(result.success){ + grid.reloadData(); showResult("确认成功"); - grid.reloadData(); approvalWindowObj.close(); }else{ showResult("确认失败"); @@ -158,10 +160,9 @@ }); } } - - function Fail(){ - failFormObj= Ext4.create('Ext4.form.Panel', { - id:'failFormObj', + function RollBack(){ + rollBackformObj= Ext4.create('Ext4.form.Panel', { + id:'rollBackformObj', layout : 'column', frame : true, border : 0, @@ -170,82 +171,60 @@ autoScroll : true, buttonAlign : 'center', buttons : [ { - //id : 'save', name : 'save', text : '保存', handler : function() { - updateHandleOpinion(); + rollBackHandleOpinion(); } }, { text : '取消', handler : function() { - failWindowObj.close(); + rollBackWindowObj.close(); } } ], fieldDefaults : { labelAlign : 'right', labelWidth : 100 }, renderTo: document.body, - items: [ - /*{ - xtype: 'hiddenfield', - name: 'id', - value: workFlowApprovalTaskId - },{ - xtype: 'hiddenfield', - name: 'nodeDefinition_id', - value: nodeDefinition_id - }, { - xtype: 'hiddenfield', - name: 'approvalResult', - value: 0 - }, { - xtype: 'hiddenfield', - name: 'formType', - value: formType - }, { - xtype: 'hiddenfield', - name: 'formId', - value: formId - }, */ + items: [ { xtype : 'textfield', border : 0, fieldLabel : '任务名称', - name : "failTaskName", - value :taskName, - allowBlank : false, + name : "rollBackTaskName", + value : taskName, readOnly : true, - fieldCls : 'fieldReadOnlyNoRemoveAndTop', flex: 1 }, { xtype : 'textareafield', border: 0, fieldLabel : '处理意见', - name : "failHandleOpinion", + name : "rollBackHandleOpinion", flex: 1 }] }); - failWindowObj = Ext4.create('Ext4.window.Window', { + rollBackWindowObj = new top.Ext4.create('Ext4.window.Window', { layout : 'fit', - title : '处理待办任务信息', + title : '处理回滚信息', width : 320, height : 280, resizable : false, modal : true, border : false, plain : true, - items : failFormObj + items : rollBackformObj }); - failWindowObj.show(); + rollBackWindowObj.show(); } - - function Pass(){ - passFormObj= Ext4.create('Ext4.form.Panel', { - id:'passFormObj', + + + + function Fail(){ + failFormObj= Ext4.create('Ext4.form.Panel', { + id:'failFormObj', layout : 'column', frame : true, border : 0, @@ -258,75 +237,41 @@ name : 'save', text : '保存', handler : function() { - saveHandleOpinion(); + updateHandleOpinion(); } }, { text : '取消', handler : function() { - passWindowObj.close(); + failWindowObj.close(); } } ], fieldDefaults : { labelAlign : 'right', labelWidth : 100 }, renderTo: document.body, - items: [ - /* { - xtype: 'hiddenfield', - name: 'id', - value: workFlowApprovalTaskId - },{ - xtype: 'hiddenfield', - name: 'nodeDefinition_id', - value: nodeDefinition_id - }, { - xtype: 'hiddenfield', - name: 'approvalResult', - value: 1 - }, { - xtype: 'hiddenfield', - name: 'formType', - value: formType - }, { - xtype: 'hiddenfield', - name: 'formId', - value: formId - } - , */ + items: [ { xtype : 'textfield', border : 0, fieldLabel : '任务名称', - name : "passTaskName", - value : taskName, + name : "failTaskName", + value :taskName, + allowBlank : false, readOnly : true, + fieldCls : 'fieldReadOnlyNoRemoveAndTop', flex: 1 }, { xtype : 'textareafield', - border: 0, + border: 0, fieldLabel : '处理意见', - name : "passHandleOpinion", + name : "failHandleOpinion", flex: 1 - },{ - xtype : 'combo', - fieldLabel: '下一个执行人', - displayField: 'fullName', - valueField : 'userId', - labelWidth: 100, - store: taskUserStore, - queryMode: 'local', - name : "userID", //name属性适合form submit() - typeAhead: true, - hidden:taskUserStore.getCount()==0?true:false, - flex: 1 - } - ] + }] }); - passWindowObj = Ext4.create('Ext4.window.Window', { - id:'passObj', + failWindowObj = Ext4.create('Ext4.window.Window', { layout : 'fit', title : '处理待办任务信息', width : 320, @@ -335,13 +280,13 @@ modal : true, border : false, plain : true, - items : passFormObj + items : failFormObj }); - passWindowObj.show(); + failWindowObj.show(); } - function RollBack(){ - rollBackformObj= Ext4.create('Ext4.form.Panel', { - id:'rollBackformObj', + function Pass(){ + passFormObj= Ext4.create('Ext4.form.Panel', { + id:'passFormObj', layout : 'column', frame : true, border : 0, @@ -350,75 +295,67 @@ autoScroll : true, buttonAlign : 'center', buttons : [ { - //id : 'save', name : 'save', text : '保存', handler : function() { - rollBackHandleOpinion(); + saveHandleOpinion(); } }, { text : '取消', handler : function() { - rollBackWindowObj.close(); + passWindowObj.close(); } } ], fieldDefaults : { labelAlign : 'right', labelWidth : 100 }, renderTo: document.body, - items: [ - /* { - xtype: 'hiddenfield', - name: 'id', - value: workFlowApprovalTaskId - },{ - xtype: 'hiddenfield', - name: 'nodeDefinition_id', - value: nodeDefinition_id - }, { - xtype: 'hiddenfield', - name: 'approvalResult', - value: 0 - }, { - xtype: 'hiddenfield', - name: 'formType', - value: formType - }, { - xtype: 'hiddenfield', - name: 'formId', - value: formId - }, */ + items: [ { xtype : 'textfield', border : 0, fieldLabel : '任务名称', - name : "rollBackTaskName", + name : "passTaskName", value : taskName, readOnly : true, flex: 1 }, { xtype : 'textareafield', - border: 0, + border: 0, fieldLabel : '处理意见', - name : "rollBackHandleOpinion", + name : "passHandleOpinion", flex: 1 - }] + },{ + xtype : 'combo', + fieldLabel: '下一个执行人', + displayField: 'fullName', + valueField : 'userId', + labelWidth: 100, + store: taskUserStore, + queryMode: 'local', + name : "userID", //name属性适合form submit() + typeAhead: true, + hidden:taskUserStore.getCount()==0?true:false, + flex: 1 + } + ] }); - rollBackWindowObj = new top.Ext4.create('Ext4.window.Window', { + passWindowObj = Ext4.create('Ext4.window.Window', { + id:'passObj', layout : 'fit', - title : '处理回滚信息', + title : '处理待办任务信息', width : 320, height : 280, resizable : false, modal : true, border : false, plain : true, - items : rollBackformObj + items : passFormObj }); - rollBackWindowObj.show(); + passWindowObj.show(); } approvalFormObj = Ext4.create('Ext4.form.Panel', { @@ -430,53 +367,41 @@ autoScroll : true, buttonAlign : 'center', buttons : [{ - name:'allowNoticeFormManBtn', - //id:'allowNoticeFormManBtn', text : '确认', iconCls : 'btn_ext_application_edit', hidden: allowStore.getAt(0).get('allowNoticeFormMan')||approvalResult==APPROVALRESULT_NOTICEFAIL?false:true, handler : function() { confirmNotice(); } },{ - name:'submitBtn', - //id:'submitBtn', text : '提交', iconCls : 'btn_ext_application_edit', hidden: nodeDefinition_id==null?false:true, handler : function() { submit(); } },{ - name:'passBtn', - //id:'passBtn', text : '审核通过', iconCls : 'btn_ext_application_edit', hidden: allowStore.getAt(0).get('allowNoticeFormMan')||approvalResult==APPROVALRESULT_NOTICEFAIL||(!allowStore.getAt(0).get('allowNoticeFormMan')&&nodeDefinition_id==null)?true:false, handler : function() { Pass(); } },{ - name:'failBtn', - //id:'failBtn', text : '审核不通过', iconCls : 'btn_ext_application_edit', hidden: (allowStore.getAt(0).get('allowNoticeFormMan'))||approvalResult==APPROVALRESULT_NOTICEFAIL||(!allowStore.getAt(0).get('allowNoticeFormMan')&&!allowStore.getAt(0).get('allowDisagree'))?true:false, handler : function() { Fail(); } }, { - name:'rollBackBtn', - //id:'rollBackBtn', text : '回退', iconCls : 'btn_ext_application_edit', hidden:(allowStore.getAt(0).get('allowNoticeFormMan'))||approvalResult==APPROVALRESULT_NOTICEFAIL||(!allowStore.getAt(0).get('allowNoticeFormMan')&&!allowStore.getAt(0).get('allowRollback'))?true:false, handler : function() { RollBack(); } }, { - name:'approvalRecordBtn', - //id:'approvalRecordBtn', text : '查看审批记录', iconCls : 'btn_ext_application_edit', handler : function() { @@ -502,11 +427,10 @@ }); approvalWindowObj = Ext4.create('Ext4.window.Window', { - id:'approvalWindowObj', layout : 'fit', title : '审批信息', width : 1000, - height : 515, + height : 505, resizable : false, modal : true, border : false, @@ -523,27 +447,6 @@ return sub.updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO); } -/*//待加载完毕，再把按钮设置可用 -function setBtnAbled(){ - alert(1); - Ext4.getCmp('submitBtn').setDisabled(true); - Ext4.getCmp('passBtn').setDisabled( true); - Ext4.getCmp('failBtn').setDisabled(true); - Ext4.getCmp('rollBackBtn').setDisabled(true); - Ext4.getCmp('approvalRecordBtn').setDisabled(true); -} - -//待加载完毕，再把按钮设置不可用 -function setBtnDisabled(){ - alert(0); - Ext4.getCmp('submitBtn').setDisabled(false); - Ext4.getCmp('passBtn').setDisabled(false); - Ext4.getCmp('failBtn').setDisabled(false); - Ext4.getCmp('rollBackBtn').setDisabled(false); - Ext4.getCmp('approvalRecordBtn').setDisabled(false); -} -*/ - function submitSaveHandleOpinionFlag(workFlowApprovalTaskId,formId,formType){ var sub = document.getElementById("formIframe").contentWindow; if(!sub) return false; Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js =================================================================== diff -u -r22060 -r22102 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js (.../workFlowApprovalTaskView.js) (revision 22060) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js (.../workFlowApprovalTaskView.js) (revision 22102) @@ -27,7 +27,6 @@ var formType = records[0].data['formType']; var taskName = records[0].data['taskName']; var approvalResult = records[0].data['approvalResult'] - //var approvalResult = records[0].data['approvalResult']==true?1:0; addAndEditWorkFlowApprovalTask(id,nodeDefinition_id,taskName,formId,formType,approvalResult); grid.getSelectionModel().deselectAll();// grid reload() 后，getSelectionModel()不变 } @@ -55,6 +54,9 @@ name : 'taskName', mapping : 'taskName' }, { + name : 'serialNumber', + mapping : 'serialNumber' + }, { name : 'createTaskTime', mapping : 'createTaskTime' }, { @@ -71,7 +73,8 @@ mapping : 'userId' }]; - var columns = [ { + var columns = [ + /* { header : "工单号", dataIndex : 'formId', width : 150, @@ -81,7 +84,19 @@ filter : { type : 'string' } - },{ + },*/ + { + header : "流水号", + dataIndex : 'serialNumber', + width : 150, + minWidth : 150, + maxWidth : 150, + filterable : true, + filter : { + type : 'string' + } + }, + { header : "工单类型", dataIndex : 'formType', width : 300, @@ -133,8 +148,8 @@ }, { header : "任务生成时间", dataIndex : 'createTaskTime', - width : 150, - minWidth : 150, + width : 200, + minWidth : 200, filterable : true, filter : { type : 'date' @@ -143,6 +158,7 @@ } ]; grid = Ext4.create('ExtJs.forgon4.Grid', { + id: 'abc1', title : entityName, dataUrl : WWWROOT+ '/disinfectSystem/workFlowApprovalTaskAction!loadWorkFlowApprovalTaskList.do', fields : fields, Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java =================================================================== diff -u -r22060 -r22102 --- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java (.../WorkFlowApprovalTaskManager.java) (revision 22060) +++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java (.../WorkFlowApprovalTaskManager.java) (revision 22102) @@ -107,4 +107,7 @@ public void confirmNoticeWorkFlowApprovalTask(WorkFlowApprovalTaskVO workFlowApprovalTaskVO); + public JSONArray loadWorkFlowApprovalTaskRecordList(String formId); + + }