Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecordView.js
===================================================================
diff -u -r22245 -r22249
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecordView.js (.../workFlowApprovalTaskRecordView.js) (revision 22245)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecordView.js (.../workFlowApprovalTaskRecordView.js) (revision 22249)
@@ -133,7 +133,7 @@
} , {
header : "处理时间",
dataIndex : 'handleTime',
- width : 140,
+ width : 200,
filterable : true,
filter : {
type : 'date'
@@ -142,7 +142,7 @@
}, {
header : "创建任务时间",
dataIndex : 'createTaskTime',
- width : 140,
+ width : 200,
filterable : true,
filter : {
type : 'date'
Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskChooseNextOneForm.js
===================================================================
diff -u -r22243 -r22249
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskChooseNextOneForm.js (.../workFlowApprovalTaskChooseNextOneForm.js) (revision 22243)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskChooseNextOneForm.js (.../workFlowApprovalTaskChooseNextOneForm.js) (revision 22249)
@@ -1,111 +1,101 @@
-
- function saveNextExecuteUser(){
- var userID1 = Ext4.getCmp('nextExecuteUserFormObj').getForm().findField('userID').getValue();
- if(userID1==""||userID1==null){
- showResult("请选择下一个执行用户！");
- return false;
- }
- }
-
- var fNodeDefinitionUserStore=null;
- Ext4.Ajax.request({
- async:false,
- url : WWWROOT + '/disinfectSystem/workFlowAction!getFirstNodeDefinitionUser.do',
- params : {formType : formType},
- success : function(response, options) {
- var result = Ext4.decode(response.responseText,true); // 此处返回的有可能不是json字符串，因为注销之后，会被acegi拦截，返回html
- if(result.success){
- fNodeDefinitionUserStore=result.rows;
- }else{
- showResult(result.message);
- }
- },
- failure : function(response, options) {
- result = Ext4.JSON.decode(response.responseText);
- showResult(result.message);
- }
- });
-
- var firstNodeDefinitionUserStore=new Ext4.data.JsonStore({
- fields : [
- {name:'fullName', type: 'string'},
- {name:'userId', type:'long'}
- ],
- data:fNodeDefinitionUserStore
- });
-
- var wAndFirstNodeDefinitionSore=null;
- Ext4.Ajax.request({
- async:false,
- url : WWWROOT + '/disinfectSystem/workFlowAction!getWorkFlowAndFirstNodeDefinition.do',
- params : {formType : formType},
- success : function(response, options) {
- var result = Ext4.decode(response.responseText,true); // 此处返回的有可能不是json字符串，因为注销之后，会被acegi拦截，返回html
- if(result.success){
- wAndFirstNodeDefinitionSore=result.rows;
- }else{
- showResult(result.message);
- }
- },
- failure : function(response, options) {
- result = Ext4.JSON.decode(response.responseText);
- showResult(result.message);
- }
- });
-
- var workFlowAndFirstNodeDefinitionStore=new Ext4.data.JsonStore({
- fields : [
- {name:'workFlowName', type: 'string'},
- {name:'nodeDefinitionName', type:'string'}
- ],
- data:wAndFirstNodeDefinitionSore
- });
+var fNodeDefinitionUserStore=null;
+Ext4.Ajax.request({
+ async:false,
+ url : WWWROOT + '/disinfectSystem/workFlowAction!getFirstNodeDefinitionUser.do',
+ params : {formType : formType},
+ success : function(response, options) {
+ var result = Ext4.decode(response.responseText,true); // 此处返回的有可能不是json字符串，因为注销之后，会被acegi拦截，返回html
+ if(result.success){
+ fNodeDefinitionUserStore=result.rows;
+ }else{
+ showResult(result.message);
+ }
+ },
+ failure : function(response, options) {
+ result = Ext4.decode(response.responseText);
+ showResult(result.message);
+ }
+ });
+
+var firstNodeDefinitionUserStore=new Ext4.data.JsonStore({
+ fields : [
+ {name:'fullName', type: 'string'},
+ {name:'userId', type:'long'}
+ ],
+ data:fNodeDefinitionUserStore
+});
- Ext4.onReady(function() {
- var nextExecuteUserFormObj= Ext4.create('Ext4.form.Panel', {
- id:'nextExecuteUserFormObj',
- height:130,
- layout : 'column',
- frame : true,
- buttons : [ ],
- fieldDefaults : {
- labelAlign : 'right',
- labelWidth : 100
- },
- renderTo: 'nextExecuteUserViewport',
- items: [
- /* {
- xtype : 'textfield',
- border : 0,
- fieldLabel : '流程名称',
- name : "workFlowName",
- value : workFlowAndFirstNodeDefinitionStore.getAt(0).data['workFlowName'],
- allowBlank : false,
- readOnly : true
- },*/
- {
- xtype : 'textfield',
- border : 0,
- fieldLabel : '节点名称',
- name : "nodeDefinitionName",
- value : workFlowAndFirstNodeDefinitionStore.getAt(0).data['nodeDefinitionName'],
- allowBlank : false,
- readOnly : true
- },{
- xtype : 'combo',
- fieldLabel: '下一个执行人',
- displayField: 'fullName',
- valueField : 'userId',
- queryMode: 'local',
- store: firstNodeDefinitionUserStore,
- name : "userID", //name属性适合form submit()
- listeners: { //监听
- render : function(combo) {//渲染
- if(firstNodeDefinitionUserStore.getCount()>0)
- combo.setValue(firstNodeDefinitionUserStore.getAt(0).data['userId']);//第一个值
- }
- }
- }]
- });
+var wAndFirstNodeDefinitionSore=null;
+Ext4.Ajax.request({
+ async:false,
+ url : WWWROOT + '/disinfectSystem/workFlowAction!getWorkFlowAndFirstNodeDefinition.do',
+ params : {formType : formType},
+ success : function(response, options) {
+ var result = Ext4.decode(response.responseText,true); // 此处返回的有可能不是json字符串，因为注销之后，会被acegi拦截，返回html
+ if(result.success){
+ wAndFirstNodeDefinitionSore=result.rows;
+ }else{
+ showResult(result.message);
+ }
+ },
+ failure : function(response, options) {
+ result = Ext4.JSON.decode(response.responseText);
+ showResult(result.message);
+ }
+ });
+
+var workFlowAndFirstNodeDefinitionStore=new Ext4.data.JsonStore({
+ fields : [
+ {name:'workFlowName', type: 'string'},
+ {name:'nodeDefinitionName', type:'string'}
+ ],
+ data:wAndFirstNodeDefinitionSore
+});
+
+Ext4.onReady(function() {
+ var nextExecuteUserFormObj= Ext4.create('Ext4.form.Panel', {
+ id:'nextExecuteUserFormObj',
+ height:150,
+ layout : 'column',
+ frame : true,
+ buttons : [ ],
+ fieldDefaults : {
+ labelAlign : 'right',
+ labelWidth : 100
+ },
+ renderTo: 'nextExecuteUserViewport',
+ items: [
+ /* {
+ xtype : 'textfield',
+ border : 0,
+ fieldLabel : '流程名称',
+ name : "workFlowName",
+ value : workFlowAndFirstNodeDefinitionStore.getAt(0).data['workFlowName'],
+ allowBlank : false,
+ readOnly : true
+ },*/
+ {
+ xtype : 'textfield',
+ border : 0,
+ fieldLabel : '节点名称',
+ name : "nodeDefinitionName",
+ value : workFlowAndFirstNodeDefinitionStore.getAt(0).data['nodeDefinitionName'],
+ allowBlank : false,
+ readOnly : true
+ },{
+ xtype : 'combo',
+ fieldLabel: '下一个执行人',
+ displayField: 'fullName',
+ valueField : 'userId',
+ queryMode: 'local',
+ store: firstNodeDefinitionUserStore,
+ name : "userID", //name属性适合form submit()
+ listeners: { //监听
+ render : function(combo) {//渲染
+ if(firstNodeDefinitionUserStore.getCount()>0)
+ combo.setValue(firstNodeDefinitionUserStore.getAt(0).data['userId']);//第一个值
+ }
+ }
+ }]
});
-
\ No newline at end of file
+});
Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
===================================================================
diff -u -r22243 -r22249
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22243)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22249)
@@ -15,8 +15,9 @@
return '';
}
}
+
//isFinished代表是否已办入口进入
-function addAndEditWorkFlowApprovalTask(workFlowApprovalTaskId, nodeDefinition_id,taskName,formId,formType,approvalResult,isFinished) {
+function addAndEditWorkFlowApprovalTask(workFlowApprovalTaskId, nodeDefinition_id,taskName,formId,formType,approvalResult,isFinished) {
var aStore=null;//速度太慢，考虑放在打开的瞬间传过来
Ext4.Ajax.request({
async:false,
@@ -43,16 +44,13 @@
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',{
+ /*var formIframe = Ext4.create('Ext.Component',{
html : ''
- //,height : 450
- });
-
+ });*/
var workFlowApprovalTaskRecordJsp=WWWROOT+'/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp?formId='+formId;
- var workFlowApprovalTaskRecordIframe = Ext4.create('Ext.Component',{
+/* var workFlowApprovalTaskRecordIframe = Ext4.create('Ext.Component',{
html : ''
- });
+ });*/
//绑定该有的值到passFormObj中
function saveHandleOpinion(){
@@ -74,7 +72,6 @@
}
}
-
function updateHandleOpinion(){
var approvalResult = 0;
var handleOpinion = Ext4.getCmp('failFormObj').getForm().findField('failHandleOpinion').getValue();
@@ -152,9 +149,12 @@
showResult("确认成功");
approvalWindowObj.close();
}else{
- showResult(result.message); }
+ showResult(result.message);
+ }
},
failure : function(response, options) {
+ result = Ext4.JSON.decode(response.responseText);
+ showResult(result.message);
}
});
}
@@ -302,8 +302,6 @@
fields : [ 'fullName', 'userId' ]
});
-
-
passFormObj= Ext4.create('Ext4.form.Panel', {
id:'passFormObj',
layout : 'column',
@@ -437,13 +435,23 @@
width: '100%',
height: 426,
layout: 'fit',
- items : formIframe
+ items :
+ new Ext4.Panel( {
+ fitToFrame: true,
+ html: ''
+ })
+ // formIframe
},{
xtype: 'container',
width: '100%',
height: 250,
layout: 'fit',
- items : workFlowApprovalTaskRecordIframe
+ items :
+ new Ext4.Panel( {
+ fitToFrame: true,
+ html: ''
+ })
+ //workFlowApprovalTaskRecordIframe
}]
});
@@ -460,7 +468,7 @@
plain : true,
items : approvalFormObj
});
- approvalWindowObj.show();
+ approvalWindowObj.show();
}
function confirmNoticeSaveHandleOpinionFlag(workFlowApprovalTaskVO){
Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp
===================================================================
diff -u -r22243 -r22249
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp (.../workFlowApprovalTaskRecord.jsp) (revision 22243)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp (.../workFlowApprovalTaskRecord.jsp) (revision 22249)
@@ -10,15 +10,11 @@
%>
- <%-- 引入common.js --%>
-
- <%-- 引入语音插件 --%>
-
- 审批日志
+ 审批日志
Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js
===================================================================
diff -u -r22245 -r22249
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js (.../workFlowApprovalTaskView.js) (revision 22245)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js (.../workFlowApprovalTaskView.js) (revision 22249)
@@ -26,7 +26,7 @@
var nodeDefinition_id = records[0].data['nodeDefinition_id'];
var formType = records[0].data['formType'];
var taskName = records[0].data['taskName'];
- var approvalResult = records[0].data['approvalResult']
+ var approvalResult = records[0].data['approvalResult'];
addAndEditWorkFlowApprovalTask(id,nodeDefinition_id,taskName,formId,formType,approvalResult,0);
grid.getSelectionModel().deselectAll();// grid reload() 后，getSelectionModel()不变
}
@@ -98,20 +98,7 @@
type : 'string'
},
renderer : renderSerialNumber
- },
-
- /*{
- header : "工单类型",
- dataIndex : 'formType',
- width : 300,
- minWidth : 300,
- maxWidth : 300,
- filterable : true,
- filter : {
- type : 'string'
- }
- }, */
- {
+ },{
header : "任务名称",
dataIndex : 'taskName',
width : 250,
Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js
===================================================================
diff -u -r22245 -r22249
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js (.../workFlowView.js) (revision 22245)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js (.../workFlowView.js) (revision 22249)
@@ -107,9 +107,9 @@
var columns = [ {
header : "流程名称",
dataIndex : 'workFlowName',
- width : 250,
- minWidth : 250,
- maxWidth : 350,
+ width : 350,
+ minWidth : 350,
+ maxWidth : 400,
filterable : true,
filter : {
type : 'string'