Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp
===================================================================
diff -u -r22316 -r22361
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp (.../workFlowApprovalTask.jsp) (revision 22316)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp (.../workFlowApprovalTask.jsp) (revision 22361)
@@ -26,6 +26,11 @@
var FormType = '${FormType}'; //高值耗材申请单类型
+
+ <%-- 申请单的历史审批记录 --%>
+
+ <%-- 高值耗材申请单 --%>
+
<%-- 引入本身的js --%>
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r22337 -r22361
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 22337)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 22361)
@@ -346,7 +346,7 @@
{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材结算管理",href:WWWROOT+'/disinfectsystem/reportforms/stocktakeView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_ExpensiveGoodsBill_Hidden_Menu,text:"高值耗材发票管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_ExpensiveGoodsAuthorization_Hidden_Menu,text:"高值耗材授权管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFlowApprovalTask_Hidden_Manager,text:"我的待办任务",href:WWWROOT+'/systemmanage/workFlow/workFlowApprovalTask.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFlowApprovalTask_Hidden_Manager,text:"我的待办任务",href:encodeURI(WWWROOT+'/systemmanage/workFlow/workFlowApprovalTask.jsp?FormType=高值耗材申请单'),hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFlowFinishedApprovalTask_Hidden_Manager,text:"我的已办任务",href:WWWROOT+'/systemmanage/workFlow/workFlowFinishedApprovalTask.jsp',hrefTarget:linkTarget,leaf:true}
]
},{
Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java
===================================================================
diff -u -r22307 -r22361
--- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java (.../WorkFlowManagerImpl.java) (revision 22307)
+++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java (.../WorkFlowManagerImpl.java) (revision 22361)
@@ -84,8 +84,9 @@
sql=" where po.invoicePlanType='"+formType+"'";
}
WorkFlow workFlow =(WorkFlow) objectDao.getBySql(WorkFlow.class.getSimpleName(), sql);
- if(workFlow!=null)
+ if(workFlow!=null){
return true;
+ }
return false;
}
@@ -114,8 +115,9 @@
sql=" where po.workFlowName='"+workFlowName+"'";
}
WorkFlow workFlow =(WorkFlow) objectDao.getBySql(WorkFlow.class.getSimpleName(), sql);
- if(workFlow!=null)
+ if(workFlow!=null){
throw new RuntimeException("流程名称已经存在，请重新填写！");
+ }
return false;
}
@@ -126,10 +128,11 @@
Matcher m = pat.matcher(spe);
String searchMode = AcegiHelper.getLoginUser().getSearchMode();
if (spe.trim().length() > 0) {
- if(StringUtils.isBlank(spell))
+ if(StringUtils.isBlank(spell)){
hql += m.find() ? " " : SqlUtils.getSearchSQL(searchMode, spe);
- else
+ }else{
hql += m.find() ? " and po.fullName like '%" + spell + "%'" : SqlUtils.getSearchSQL(searchMode, spe);
+ }
}
return objectDao.countObjectBySql(User.class.getSimpleName(),hql);
}
@@ -143,10 +146,11 @@
Matcher m = pat.matcher(spe);
String searchMode = AcegiHelper.getLoginUser().getSearchMode();
if (spe.trim().length() > 0) {
- if(StringUtils.isBlank(spell))
+ if(StringUtils.isBlank(spell)){
hql += m.find() ? " " : SqlUtils.getSearchSQL(searchMode, spe);
- else
+ }else{
hql += m.find() ? " and po.fullName like '%" + spell + "%'" : SqlUtils.getSearchSQL(searchMode, spe);
+ }
}
//初始时，start 为0 和 page为1 和 limit为50
@@ -240,8 +244,9 @@
NodeDefinition nodeDefinition=new NodeDefinition();
String NodeDefinitionId=String.valueOf(item.opt("nodeDefinitionId"));
long nodeDefinitionId=0;
- if(StringUtils.isNotBlank(NodeDefinitionId))
+ if(StringUtils.isNotBlank(NodeDefinitionId)){
nodeDefinitionId=Integer.parseInt(NodeDefinitionId);
+ }
if(DatabaseUtil.isPoIdValid(nodeDefinitionId)){
nodeDefinition=(NodeDefinition) objectDao.getByID_ForUpdate(NodeDefinition.class.getSimpleName(), nodeDefinitionId);
}
@@ -273,8 +278,9 @@
NodeApproval nodeApproval=new NodeApproval();
String NodeApprovalId=String.valueOf(item.opt("nodeApprovalId"));
long nodeApprovalId=0;
- if(StringUtils.isNotBlank(NodeApprovalId))
+ if(StringUtils.isNotBlank(NodeApprovalId)){
nodeApprovalId=Integer.parseInt(NodeApprovalId);
+ }
if(DatabaseUtil.isPoIdValid(nodeApprovalId)){
nodeApproval.setId(nodeApprovalId);
}
@@ -287,17 +293,19 @@
if(StringUtils.isNotBlank(roleName)){
if(!StringUtils.isNumeric(roleName)){
role=(Role) objectDao.getByProperty(Role.class.getSimpleName(), "descn", roleName);
- if(role != null)
+ if(role != null){
RoleId = role.getId();
- else
+ }else{
throw new RuntimeException("沒有匹配到角色,请重新选择！");
+ }
}
else if(StringUtils.isNumeric(roleName)){
role=(Role) objectDao.getByProperty(Role.class.getSimpleName(), "id", Integer.valueOf(""+item.opt("roleName")));
- if(role != null)
+ if(role != null){
RoleId = role.getId();
- else
+ }else{
throw new RuntimeException("沒有匹配到角色,请重新选择！");
+ }
}
}
nodeApproval.setRoleId(RoleId);
@@ -307,10 +315,11 @@
User user = null;
if(StringUtils.isNotBlank(userName)){
user = (User)objectDao.getByProperty(User.class.getSimpleName(), "fullName", userName);
- if(user != null)
+ if(user != null){
UserId = user.getId();
- else
+ }else{
throw new RuntimeException("沒有匹配到用户");
+ }
}
nodeApproval.setUserId(UserId);
}
Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
===================================================================
diff -u -r22253 -r22361
--- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java (.../WorkFlowApprovalTaskManagerImpl.java) (revision 22253)
+++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java (.../WorkFlowApprovalTaskManagerImpl.java) (revision 22361)
@@ -156,8 +156,9 @@
if(nextNodeDefinition.getAllowNoticeFormMan()){
User user= getUserByFormId(workFlowApprovalTask.getFormId());//获取起单人，并设置为userid
- if(user==null)
+ if(user==null){
throw new RuntimeException("没有查询到起单人");
+ }
Long userId=user.getId();
nextWorkFlowApprovalTask.setUserId(userId);
}else{
@@ -205,8 +206,9 @@
if(nextNodeDefinition.getAllowNoticeFormMan()){
User user= getUserByFormId(workFlowApprovalTask.getFormId());//获取起单人，并设置为userid
- if(user==null)
+ if(user==null){
throw new RuntimeException("没有查询到起单人");
+ }
Long userId=user.getId();
nextWorkFlowApprovalTask.setUserId(userId);
nextWorkFlowApprovalTask.setApprovalResult(workFlowApprovalTask.APPROVALRESULT_NOTICE);
@@ -258,11 +260,13 @@
while (rs.next()) {
workFlowApprovalTask=new WorkFlowApprovalTask();
workFlowApprovalTask.setId(rs.getLong("id"));
- if(rs.getDate("createTaskTime") != null)
+ if(rs.getDate("createTaskTime") != null){
workFlowApprovalTask.setCreateTaskTime(rs.getDate("createTaskTime"));
+ }
workFlowApprovalTask.setHandleOpinion(rs.getString("handleOpinion"));
- if(rs.getDate("handleTime") != null)
+ if(rs.getDate("handleTime") != null){
workFlowApprovalTask.setHandleTime(rs.getDate("handleTime"));
+ }
workFlowApprovalTask.setHandler(rs.getString("handler"));
workFlowApprovalTask.setRoleId(rs.getLong("roleId"));
workFlowApprovalTask.setStatus(rs.getInt("status"));
@@ -345,8 +349,9 @@
}
if(nextNodeDefinition.getAllowNoticeFormMan()){
User user= getUserByFormId(formId);//获取起单人，并设置为userid
- if(user==null)
+ if(user==null){
throw new RuntimeException("没有查询到起单人");
+ }
JSONObject jSONObject=new JSONObject();
jSONObject = new JSONObject();
jSONObject.put("userId", user.getId());
@@ -375,13 +380,14 @@
workFlowApprovalTaskFail.setFormType(workFlowApprovalTask.getFormType());
workFlowApprovalTaskFail.setTitle(String.format("%s-%s", workFlowApprovalTask.getFormType(), workFlowApprovalTask.getSerialNumber()));
workFlowApprovalTaskFail.setNodeDefinition(workFlowApprovalTask.getNodeDefinition());
- workFlowApprovalTaskFail.setTaskName(workFlowApprovalTask.getTaskName());
+ workFlowApprovalTaskFail.setTaskName("通知起单人");
workFlowApprovalTaskFail.setCreateTaskTime(new Date());
workFlowApprovalTaskFail.setStatus(0);
workFlowApprovalTaskFail.setApprovalResult(workFlowApprovalTask.APPROVALRESULT_NOTICEFAIL);
User user= getUserByFormId(workFlowApprovalTask.getFormId());//获取起单人，并设置为userid
- if(user==null)
+ if(user==null){
throw new RuntimeException("没有查询到起单人");
+ }
workFlowApprovalTaskFail.setUserId(user.getId());
save(workFlowApprovalTaskFail);
}else{
@@ -415,8 +421,9 @@
newWorkFlowApprovalTask.setCreateTaskTime(new Date());
if(lastNodeDefinition.getAllowNoticeFormMan()){
User user= getUserByFormId(lastWorkFlowApprovalTask.getFormId());
- if(user==null)
+ if(user==null){
throw new RuntimeException("没有查询到起单人");
+ }
newWorkFlowApprovalTask.setUserId(user.getId());
newWorkFlowApprovalTask.setApprovalResult(workFlowApprovalTask.APPROVALRESULT_NOTICE);
}else{
@@ -426,10 +433,11 @@
}else{//节点为空，返回申请人---前台调用家的修改单流程状态
//根据工号获取工单申请人id
User user= getUserByFormId(workFlowApprovalTask.getFormId());
- if(user==null)
+ if(user==null){
throw new RuntimeException("没有查询到起单人");
- else
+ }else{
newWorkFlowApprovalTask.setUserId(user.getId());
+ }
newWorkFlowApprovalTask.setTaskName("申请人修改工单");
newWorkFlowApprovalTask.setFormId(workFlowApprovalTask.getFormId());
newWorkFlowApprovalTask.setFormType(workFlowApprovalTask.getFormType());
@@ -462,8 +470,9 @@
workFlowApprovalTask.setApprovalResult(WorkFlowApprovalTask.APPROVALRESULT_SUBMIT);
workFlowApprovalTask.setHandleTime(new Date());
User user= getUserByFormId(workFlowApprovalTask.getFormId());
- if(user==null)
+ if(user==null){
throw new RuntimeException("没有查询到起单人");
+ }
workFlowApprovalTask.setHandlerId(user.getId());
workFlowApprovalTask.setHandler(user.getFullName());
objectDao.save(workFlowApprovalTask);
@@ -493,7 +502,7 @@
Long userId= userData.getUserId();
//2、获取当前用户对应的已办任务 ：与handlerId匹配；
- String select = " select * from WorkFlowApprovalTask po ";
+ String select = " select po.id,po.formId,po.formType,po.title,po.createTaskTime,po.taskName,po.handleOpinion,po.handleTime,po.approvalResult,po.nodeDefinition_id from WorkFlowApprovalTask po ";
String where =" where po.status = 1 and po.handlerId ="+userId;
//转化为起始时间的00:00:00，到截止时间的最后一秒23：59：59
@@ -538,12 +547,13 @@
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.handleDepart,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("select w.id,w.formId,w.formType,w.title,w.createTaskTime,w.taskName,w.handleDepart,w.serialNumber,w.approvalResult,w.nodeDefinition_id,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+" ))";
- if(StringUtils.isNotBlank(formType))
+ if(StringUtils.isNotBlank(formType)){
where += " and w.formType='"+formType+"'";
+ }
ExtJsEntity entity = ExtJsUtil.buildSQLEntity(select.toString(), where, "");
JSONObject result = extGridUtils.getPagedResult(entity);
return result;
Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
===================================================================
diff -u -r22316 -r22361
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22316)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22361)
@@ -40,18 +40,6 @@
{name:'allowChanges', type:'boolean'}
]
});
-
- var formTypeJsp;
- if(formType=="高值耗材申请单")
- formTypeJsp=WWWROOT+'/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationFormForApproval.jsp?expensiveGoodsApplicationId='+formId+'&allowChanges='+allowStore.getAt(0).get('allowChanges');
- /*var formIframe = Ext4.create('Ext.Component',{
- html : ''
- });*/
- var workFlowApprovalTaskRecordJsp=WWWROOT+'/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp?formId='+formId;
-/* var workFlowApprovalTaskRecordIframe = Ext4.create('Ext.Component',{
- html : ''
- });*/
-
//绑定该有的值到passFormObj中
function saveHandleOpinion(){
var handleOpinion = Ext4.getCmp('passFormObj').getForm().findField('passHandleOpinion').getValue();
@@ -60,70 +48,102 @@
showResult("请选择下一个执行用户！");
return false;
}
- var result = passSaveHandleOpinionFlag(nodeDefinition_id,taskName,workFlowApprovalTaskId,1,handleOpinion,userID,formId,formType);
+ var workFlowApprovalTaskVO = {
+ nodeDefinitionId: nodeDefinition_id,
+ nodeDefinitionName: taskName,
+ workFlowApprovalTaskId: workFlowApprovalTaskId,
+ approvalResult: APPROVALRESULT_PASS,
+ handleOpinion: handleOpinion,
+ userId: userID,
+ formId: formId,
+ formType: formType
+ };
+ var result = updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO);
if(result && result.success){
grid.reloadData();
grid.getSelectionModel().deselectAll();
showResult(result.message);
passWindowObj.close();
approvalWindowObj.close();
}else{
- if(result && result.message)
+ if(result && result.message){
showResult(result.message);
- else
+ }else{
showResult("保存失败！");
+ }
}
}
function updateHandleOpinion(){
var approvalResult = 0;
var handleOpinion = Ext4.getCmp('failFormObj').getForm().findField('failHandleOpinion').getValue();
- var result =failHandleOpinionFlag(workFlowApprovalTaskId,formId,approvalResult,handleOpinion);
+ var workFlowApprovalTaskVO = {
+ workFlowApprovalTaskId: workFlowApprovalTaskId,
+ formId: formId,
+ approvalResult: APPROVALRESULT_FAIL,
+ handleOpinion: handleOpinion
+ };
+ var result =updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO);
if(result && result.success){
grid.reloadData();
grid.getSelectionModel().deselectAll();
showResult("审批成功");
failWindowObj.close();
approvalWindowObj.close();
}else{
- if(result && result.message)
+ if(result && result.message){
showResult(result.message);
- else
+ }else{
showResult("审批失败！");
+ }
}
}
function rollBackHandleOpinion(){
var approvalResult = 0;
var handleOpinion = Ext4.getCmp('rollBackformObj').getForm().findField('rollBackHandleOpinion').getValue();
- var result =callbackSaveHandleOpinionFlag(nodeDefinition_id,workFlowApprovalTaskId,4,handleOpinion);
+ var workFlowApprovalTaskVO = {
+ nodeDefinitionId: nodeDefinition_id,
+ workFlowApprovalTaskId: workFlowApprovalTaskId,
+ approvalResult: APPROVALRESULT_CALLBACK,
+ handleOpinion: handleOpinion
+ };
+ var result =updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO);
if(result && result.success){
grid.reloadData();
grid.getSelectionModel().deselectAll();
showResult("审批成功");
rollBackWindowObj.close();
approvalWindowObj.close();
}else{
- if(result && result.message)
+ if(result && result.message){
showResult(result.message);
- else
+ }else{
showResult("审批失败！");
+ }
}
}
function submit(){
//弹出警示框
- var result =submitSaveHandleOpinionFlag(workFlowApprovalTaskId,formId,formType);
+ var workFlowApprovalTaskVO = {
+ workFlowApprovalTaskId: workFlowApprovalTaskId,
+ approvalResult: APPROVALRESULT_SUBMIT,
+ formId: formId,
+ formType: formType
+ };
+ var result =updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO);
if(result && result.success){
grid.reloadData();
grid.getSelectionModel().deselectAll();
showResult("提交成功");
approvalWindowObj.close();
}else{
- if(result && result.message)
+ if(result && result.message){
showResult(result.message);
- else
+ }else{
showResult("提交失败！");
+ }
}
}
@@ -144,10 +164,11 @@
showResult("确认成功");
approvalWindowObj.close();
}else{
- if(result && result.message)
+ if(result && result.message){
showResult(result.message);
- else
+ }else{
showResult("确认失败！");
+ }
}
}else{
Ext4.Ajax.request({
@@ -169,10 +190,11 @@
},
failure : function(response, options) {
result = Ext4.JSON.decode(response.responseText);
- if(result && result.message)
+ if(result && result.message){
showResult(result.message);
- else
+ }else{
showResult("确认失败！");
+ }
}
});
}
@@ -299,26 +321,34 @@
failWindowObj.show();
}
-
function Pass(nodeDefinition_id,formId){
- var tUserStore=null;//速度太慢，考虑放在打开的瞬间传过来
- Ext4.Ajax.request({
- async:false,
- params : {nodeDefinition_id:nodeDefinition_id,formId:formId},
- url : WWWROOT+ '/disinfectSystem/workFlowApprovalTaskAction!getAllUserByNodeDefinitionId.do',
- success : function(response, options) {
- var result = Ext4.decode(response.responseText, true); // 此处返回的有可能不是json字符串，因为注销之后，会被acegi拦截，返回html
- if(result && result.total > 0){
- tUserStore=result.rows;
- }
- }
- });
-
- taskUserStore=new Ext4.data.JsonStore({
- data:tUserStore,
- fields : [ 'fullName', 'userId' ]
+ var taskUserStore = new Ext4.data.Store({
+ autoLoad: true,
+ proxy : {
+ type : 'ajax',
+ url : WWWROOT+ '/disinfectSystem/workFlowApprovalTaskAction!getAllUserByNodeDefinitionId.do',
+ reader : {
+ type : 'json',
+ totalProperty : 'total',
+ root : 'rows'
+ }
+ },
+ fields : [
+ {name : 'fullName',mapping : 'fullName'},
+ {name : 'userId',mapping : 'userId'}
+ ],
+ listeners:{
+ beforeload : function(store, operation, eOpts){
+ store.proxy.extraParams.nodeDefinition_id =nodeDefinition_id;
+ store.proxy.extraParams.formId =formId;
+ },
+ load : function(thiz, records, successful, eOpts){
+ if (records && records.length == 1) {
+ Ext4.getCmp('userID').setValue(records[0].data.userId);
+ }
+ }
+ }
});
-
passFormObj= Ext4.create('Ext4.form.Panel', {
id:'passFormObj',
width : 320,
@@ -370,18 +400,17 @@
valueField : 'userId',
width: 280,
store: taskUserStore,
- queryMode: 'local',
- name : "userID", //name属性适合form submit()
- typeAhead: true,
- hidden:taskUserStore.getCount()==0?true:false,
- flex: 1,
- listeners: { //监听
- render : function(combo) {//渲染
- var taskUserStoreCount = taskUserStore.getCount();
- if(taskUserStoreCount > 0 && taskUserStoreCount == 1)
- combo.setValue(taskUserStore.getAt(0).data['userId']);//第一个值
- }
- }
+ id : 'userID',
+ name : 'userID', //name属性适合form submit()
+ queryParam : 'spell',
+ minChars : 0,
+ forceSelection : true,
+ lazyInit : true,
+ triggerAction : 'all',
+ hideTrigger : true,
+ typeAhead : false,
+ matchFieldWidth: false,
+ flex: 1
}
]
});
@@ -455,11 +484,7 @@
width: '100%',
height: 600,
layout: 'fit',
- items : new Ext4.Panel({
- fitToFrame: true,
- html: ''
- })
- // formIframe
+ items : eidtExpensiveGoodsApplicationForApproval(formId,allowStore.getAt(0).get('allowChanges'))
}]
});
@@ -469,96 +494,12 @@
autoScroll:true,
title : '审批信息',
width : 1030,
- height : 600,
+ height : 660,
resizable : false,
modal : true,
border : false,
plain : true,
items : approvalFormObj
});
approvalWindowObj.show();
-}
-
-function confirmNoticeSaveHandleOpinionFlag(workFlowApprovalTaskVO){
- var sub = document.getElementById("formIframe").contentWindow;
- if(!sub) return false;
- return sub.updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO);
-}
-
-
-function submitSaveHandleOpinionFlag(workFlowApprovalTaskId,formId,formType){
- var sub = document.getElementById("formIframe").contentWindow;
- if(!sub) return false;
- var workFlowApprovalTaskVO = {
- workFlowApprovalTaskId: workFlowApprovalTaskId,
- approvalResult: APPROVALRESULT_SUBMIT,
- formId: formId,
- formType: formType
- };
- return sub.updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO);
-}
-
-/**
- * 审批通过
- * @param nodeDefinitionId 当前节点id
- * @param nodeDefinitionName 当前节点名称
- * @param workFlowApprovalTaskId审批记录id
- * @param approvalResult 审批结果
- * @param handleOpinion 处理意见
- * @param userId 指定处理下一个审批节点的用户id
- * @param formId 表单id
- * @param formType 表单类型
- */
-function passSaveHandleOpinionFlag(nodeDefinitionId, nodeDefinitionName, workFlowApprovalTaskId, approvalResult, handleOpinion, userId, formId, formType) {
- var sub = document.getElementById("formIframe").contentWindow;
- if(!sub) return false;
- var workFlowApprovalTaskVO = {
- nodeDefinitionId: nodeDefinitionId,
- nodeDefinitionName: nodeDefinitionName,
- workFlowApprovalTaskId: workFlowApprovalTaskId,
- approvalResult: APPROVALRESULT_PASS,
- handleOpinion: handleOpinion,
- userId: userId,
- formId: formId,
- formType: formType
- };
- return sub.updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO);
-}
-
-/**
- * 审批不通过
- * @param id 当前待办任务id
- * @param approvalResult 审批结果
- * @param handleOpinion 处理意见
- * @returns
- */
-function failHandleOpinionFlag(id,formId,approvalResult,handleOpinion){
- var sub = document.getElementById("formIframe").contentWindow;
- if(!sub) return false;
- var workFlowApprovalTaskVO = {
- workFlowApprovalTaskId: id,
- formId: formId,
- approvalResult: APPROVALRESULT_FAIL,
- handleOpinion: handleOpinion
- };
- return sub.updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO);
-}
-
-/**
- * 审批回退
- * @param id 当前待办任务id
- * @param approvalResult 审批结果
- * @param handleOpinion 处理意见
- * @returns
- */
-function callbackSaveHandleOpinionFlag(nodeDefinitionId,id,approvalResult,handleOpinion){
- var sub = document.getElementById("formIframe").contentWindow;
- if(!sub) return false;
- var workFlowApprovalTaskVO = {
- nodeDefinitionId: nodeDefinitionId,
- workFlowApprovalTaskId: id,
- approvalResult: APPROVALRESULT_CALLBACK,
- handleOpinion: handleOpinion
- };
- return sub.updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO);
}
\ No newline at end of file
Index: forgon-core/src/main/java/com/forgon/workflow/service/NodeDefinitionManagerImpl.java
===================================================================
diff -u -r22243 -r22361
--- forgon-core/src/main/java/com/forgon/workflow/service/NodeDefinitionManagerImpl.java (.../NodeDefinitionManagerImpl.java) (revision 22243)
+++ forgon-core/src/main/java/com/forgon/workflow/service/NodeDefinitionManagerImpl.java (.../NodeDefinitionManagerImpl.java) (revision 22361)
@@ -77,8 +77,9 @@
sql=" where po.name="+nodeDefinitionName;
}
NodeDefinition nodeDefinition =(NodeDefinition) objectDao.getBySql(NodeDefinition.class.getSimpleName(), sql);
- if(nodeDefinition!=null)
+ if(nodeDefinition!=null){
return true;
+ }
return false;
}
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js
===================================================================
diff -u -r22331 -r22361
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js (.../expensiveGoodsApplicationForm.js) (revision 22331)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js (.../expensiveGoodsApplicationForm.js) (revision 22361)
@@ -13,7 +13,7 @@
showResult('高值耗材申请单id不能为空！');
return false;
}
- addOrEidtExpensiveGoodsApplication(id, !allowChanges, true);
+ return addOrEidtExpensiveGoodsApplication(id, !allowChanges, true);
}
/**
@@ -677,7 +677,7 @@
displayField : 'model',
matchFieldWidth: false,
width : 130,
- listConfig: {width : 250},
+ listConfig: {width : 280},
store : expensiveGoodsModelStore,
forceSelection : true,
lazyInit : true,
@@ -823,6 +823,7 @@
setSettleAccountsDepartmentByApplyDepartment(settleAccountsDepartmentStore, currentOrgUnitCode, currentOrgUnitName);
handleDepartmentStore.load();
}
+ return formObj;
}
/**