Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js =================================================================== diff -u -r22368 -r22409 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22368) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22409) @@ -10,7 +10,7 @@ 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'); + return top.Ext4.Date.format(new Date(value.time), 'Y-m-d H:i:s'); } else { return ''; } @@ -19,19 +19,19 @@ //isFinished代表是否已办入口进入 function addAndEditWorkFlowApprovalTask(workFlowApprovalTaskId, nodeDefinition_id,taskName,formId,formType,approvalResult,isFinished) { var aStore=null;//速度太慢，考虑放在打开的瞬间传过来 - Ext4.Ajax.request({ + top.Ext4.Ajax.request({ async:false, url : WWWROOT + '/disinfectSystem/workFlowApprovalTaskAction!loadNodeDefinitionById.do', params : {nodeDefinitionId : nodeDefinition_id}, success : function(response, options) { - var result = Ext4.decode(response.responseText, true); // 此处返回的有可能不是json字符串，因为注销之后，会被acegi拦截，返回html + var result = top.Ext4.decode(response.responseText, true); // 此处返回的有可能不是json字符串，因为注销之后，会被acegi拦截，返回html if(result && result.total > 0){ aStore=result.rows; } } }); - allowStore=new Ext4.data.JsonStore({ + allowStore=new top.Ext4.data.JsonStore({ data:aStore, fields : [ {name:'allowDisagree', type: 'boolean'}, @@ -171,14 +171,14 @@ } } }else{ - Ext4.Ajax.request({ + top.Ext4.Ajax.request({ url : WWWROOT + '/disinfectSystem/workFlowApprovalTaskAction!confirmNoticeWorkFlowApprovalTask.do', method : 'POST', params: { workFlowApprovalTaskVO: JSON.stringify(workFlowApprovalTaskVO) }, success : function(response, options) { - result = Ext4.JSON.decode(response.responseText); + result = top.Ext4.JSON.decode(response.responseText); if(result && result.success){ grid.reloadData(); grid.getSelectionModel().deselectAll(); @@ -189,7 +189,7 @@ } }, failure : function(response, options) { - result = Ext4.JSON.decode(response.responseText); + result = top.Ext4.JSON.decode(response.responseText); if(result && result.message){ showResult(result.message); }else{ @@ -245,7 +245,7 @@ }] }); - rollBackWindowObj = new Ext4.create('Ext4.window.Window', { + rollBackWindowObj = new top.Ext4.create('top.Ext4.window.Window', { layout : 'fit', title : '处理回滚信息', width : 320, @@ -307,7 +307,7 @@ }] }); - failWindowObj = Ext4.create('Ext4.window.Window', { + failWindowObj = top.Ext4.create('top.Ext4.window.Window', { layout : 'fit', title : '处理待办任务信息', width : 320, @@ -322,7 +322,7 @@ } function Pass(nodeDefinition_id,formId){ - var taskUserStore = new Ext4.data.Store({ + var taskUserStore = new top.Ext4.data.Store({ autoLoad: true, proxy : { type : 'ajax', @@ -349,6 +349,7 @@ } } }); + passFormObj= Ext4.create('Ext4.form.Panel', { id:'passFormObj', width : 320, @@ -415,7 +416,7 @@ ] }); - passWindowObj = Ext4.create('Ext4.window.Window', { + passWindowObj = top.Ext4.create('top.Ext4.window.Window', { id:'passObj', layout : 'fit', title : '处理待办任务信息', @@ -430,7 +431,7 @@ passWindowObj.show(); } - approvalFormObj = Ext4.create('Ext4.form.Panel', { + approvalFormObj = top.Ext4.create('Ext4.form.Panel', { frame : true, height: 600, border : 0, @@ -489,7 +490,7 @@ }); - approvalWindowObj = Ext4.create('Ext4.window.Window', { + approvalWindowObj = top.Ext4.create('top.Ext4.window.Window', { layout : 'fit', autoScroll:true, title : '审批信息', Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js =================================================================== diff -u -r22382 -r22409 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js (.../expensiveGoodsApplicationForm.js) (revision 22382) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js (.../expensiveGoodsApplicationForm.js) (revision 22409) @@ -1,6 +1,6 @@ //高值耗材的store var expensiveGoodsStore = null; -//高值耗材申请项Ext4.tree.Panel的数据仓库 +//高值耗材申请项top.Ext4.tree.Panel的数据仓库 var treePanelStore = null; /** @@ -34,7 +34,7 @@ /** * 申请科室的store */ - var applyDepartmentStore = new Ext4.data.Store({ + var applyDepartmentStore = new top.Ext4.data.Store({ pageSize: 100, proxy : { type : 'ajax', @@ -54,7 +54,7 @@ /** * 结算科室的store */ - var settleAccountsDepartmentStore = new Ext4.data.Store({ + var settleAccountsDepartmentStore = new top.Ext4.data.Store({ proxy : { type : 'ajax', url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do', @@ -73,7 +73,7 @@ /** * 处理科室的store */ - var handleDepartmentStore = new Ext4.data.Store({ + var handleDepartmentStore = new top.Ext4.data.Store({ proxy : { type : 'ajax', url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!searchExpensiveGoodsHandleDepartment.do', @@ -90,9 +90,9 @@ listeners: { load : function(thiz, records, successful, eOpts) { if (records.length > 0) { - Ext4.getCmp('handleDepart').setValue(records[0].data.departmentName); - Ext4.getCmp('handleDepartCoding').setValue(records[0].data.departmentCode); - Ext4.getCmp('handleDepartment').setValue(records[0].data.departmentCode); + top.Ext4.getCmp('handleDepart').setValue(records[0].data.departmentName); + top.Ext4.getCmp('handleDepartCoding').setValue(records[0].data.departmentCode); + top.Ext4.getCmp('handleDepartment').setValue(records[0].data.departmentCode); } } } @@ -101,8 +101,8 @@ /** * 申请的物品模型 */ - Ext4.define('ExpensiveGoodsModel', { - extend : 'Ext4.data.Model', + top.Ext4.define('ExpensiveGoodsModel', { + extend : 'top.Ext4.data.Model', idProperty: 'nodeId', //指定id属性 fields: [ {name : 'nodeId'}, //此节点的id（高值耗材的id-高值耗材型号id） @@ -118,7 +118,7 @@ {name : 'referencePrice'} //高值耗材的参考价 ]}); - expensiveGoodsStore = new Ext4.data.Store({ + expensiveGoodsStore = new top.Ext4.data.Store({ pageSize: 100, fields: [ {name : 'id'}, //高值耗材id @@ -138,8 +138,8 @@ }, listeners: { beforeload : function(store, operation, eOpts){ - var rawValue = Ext4.getCmp('expensiveGoodsSupplier').getRawValue(); - var value = Ext4.getCmp('expensiveGoodsSupplier').getValue(); + var rawValue = top.Ext4.getCmp('expensiveGoodsSupplier').getRawValue(); + var value = top.Ext4.getCmp('expensiveGoodsSupplier').getValue(); if (rawValue && value) { store.proxy.extraParams.supplierId = value; } else { @@ -154,7 +154,7 @@ /** * 型号的store */ - var expensiveGoodsModelStore = new Ext4.data.Store({ + var expensiveGoodsModelStore = new top.Ext4.data.Store({ pageSize: 100, fields: [ {name : 'id'}, //型号的id @@ -171,8 +171,8 @@ }, listeners: { beforeload : function(store, operation, eOpts){ - var rawValue = Ext4.getCmp('expensiveGoods').getRawValue(); - var value = Ext4.getCmp('expensiveGoods').getValue(); + var rawValue = top.Ext4.getCmp('expensiveGoods').getRawValue(); + var value = top.Ext4.getCmp('expensiveGoods').getValue(); if (rawValue && value) { store.proxy.extraParams.expensiveGoodsID = value; } else { @@ -184,7 +184,7 @@ }); //高值耗材生产厂家的store - var expensiveGoodsSupplierStore = new Ext4.data.Store({ + var expensiveGoodsSupplierStore = new top.Ext4.data.Store({ fields: [ {name : 'id'}, //高值耗材生产厂家的id {name : 'name'} //高值耗材生产厂家的名称 @@ -204,7 +204,7 @@ /** * 常用医生的store */ - var commonlyUsedDoctorJsonStore = new Ext4.data.Store({ + var commonlyUsedDoctorJsonStore = new top.Ext4.data.Store({ proxy : { type : 'ajax', url : WWWROOT + '/disinfectSystem/baseData/commonlyUsedDoctorAction!getDoctorBykeyWord.do', @@ -218,7 +218,7 @@ ] }); - treePanelStore = Ext4.create('Ext4.data.TreeStore', { + treePanelStore = top.Ext4.create('top.Ext4.data.TreeStore', { autoLoad : true, clearOnLoad : true, model : 'ExpensiveGoodsModel', @@ -232,10 +232,10 @@ }); /** - * 高值耗材申请项Ext4.tree.Panel + * 高值耗材申请项top.Ext4.tree.Panel */ - Ext4.define('expensiveGoodsApplicationTreeGrid', { - extend: 'Ext4.tree.Panel', + top.Ext4.define('expensiveGoodsApplicationTreeGrid', { + extend: 'top.Ext4.tree.Panel', xtype: 'tree-grid', useArrows: true, rootVisible: false, @@ -283,7 +283,7 @@ markDirty:false }, initComponent: function() { - this.cellEditing = new Ext4.grid.plugin.CellEditing({ + this.cellEditing = new top.Ext4.grid.plugin.CellEditing({ clicksToEdit: 2, listeners: { beforeedit: function(editor, context, eOpts){ @@ -292,20 +292,20 @@ edit:function(editor, context, eOpts){} } }); - Ext4.apply(this, { + top.Ext4.apply(this, { plugins: [this.cellEditing] }); this.superclass.initComponent.call(this); } }); var windowObj = null; - var formObj = Ext4.create('Ext4.form.Panel', { + var formObj = top.Ext4.create('top.Ext4.form.Panel', { id: 'expensiveGoodsApplicationForm', width : 990, height : 600, frame : true, - renderTo: Ext4.getBody(), + renderTo: top.Ext4.getBody(), border : 0, labelSeparator : '：', bodyPadding : '5 5 0', @@ -387,8 +387,8 @@ var departmentCode = record.data.departmentCode; //1、设置申请科室 - Ext4.getCmp('depart').setValue(departmentName); - Ext4.getCmp('departCoding').setValue(departmentCode); + top.Ext4.getCmp('depart').setValue(departmentName); + top.Ext4.getCmp('departCoding').setValue(departmentCode); //2、设置结算科室 setSettleAccountsDepartmentByApplyDepartment(settleAccountsDepartmentStore, departmentCode, departmentName); @@ -408,7 +408,7 @@ matchFieldWidth: false, listConfig: {width: 300}, forceSelection : true, - queryDelay: 1300, + queryDelay: 1300, //滞后1300ms发起请求 lazyInit : true, triggerAction : 'all', hideTrigger : true, @@ -420,8 +420,8 @@ }, select : function(_this, records, index) { var record = transformRecords(records); - Ext4.getCmp('settleAccountsDepart').setValue(record.data.departmentName); - Ext4.getCmp('settleAccountsDepartCoding').setValue(record.data.departmentCode); + top.Ext4.getCmp('settleAccountsDepart').setValue(record.data.departmentName); + top.Ext4.getCmp('settleAccountsDepartCoding').setValue(record.data.departmentCode); } }, readOnly: isApproval @@ -437,7 +437,7 @@ matchFieldWidth: false, listConfig: {width: 300}, forceSelection : true, - queryDelay: 1300, + queryDelay: 1300, //滞后1300ms发起请求 triggerAction : 'all', hideTrigger : true, allowBlank : false, @@ -447,8 +447,8 @@ }, select : function(_this, records, index) { var record = transformRecords(records) - Ext4.getCmp('handleDepart').setValue(record.data.departmentName); - Ext4.getCmp('handleDepartCoding').setValue(record.data.departmentCode); + top.Ext4.getCmp('handleDepart').setValue(record.data.departmentName); + top.Ext4.getCmp('handleDepartCoding').setValue(record.data.departmentCode); } }, readOnly: isApproval @@ -460,7 +460,7 @@ enableKeyEvents : true, listeners : { specialkey : function(field, ee) { - if (ee.getKey() == Ext4.EventObject.ENTER) { + if (ee.getKey() == top.Ext4.EventObject.ENTER) { var jsonStr = "{\"patientNum\":\"" + field.value + "\",\"numType\":\"hospitalNum\",\"sourcePage\":\"0\"}"; loadPatientInfoByValAndType(jsonStr); @@ -476,7 +476,7 @@ enableKeyEvents : true, listeners : { specialkey : function(field, ee) { - if (ee.getKey() == Ext4.EventObject.ENTER) { + if (ee.getKey() == top.Ext4.EventObject.ENTER) { var jsonStr = "{\"patientNum\":\"" + field.value + "\",\"numType\":\"treatmentNum\",\"sourcePage\":\"0\"}"; loadPatientInfoByValAndType(jsonStr); @@ -534,7 +534,7 @@ triggerAction : 'all', forceSelection : true, editable : false, - store : new Ext4.data.SimpleStore({ + store : new top.Ext4.data.SimpleStore({ fields : ['typeName'], data : [['男'],['女']] }), @@ -621,15 +621,15 @@ listConfig: {width : 300}, store : expensiveGoodsSupplierStore, forceSelection : true, - queryDelay: 1300, + queryDelay: 1300, //滞后1300ms发起请求 lazyInit : true, triggerAction : 'all', hideTrigger : true, typeAhead : false, listeners: { select: function(combo, records, index) { expensiveGoodsStore.load(); - Ext4.getCmp('expensiveGoods').setValue(''); + top.Ext4.getCmp('expensiveGoods').setValue(''); } }, hidden: notAllowChanges @@ -649,23 +649,22 @@ listConfig: {width : 300}, store : expensiveGoodsStore, forceSelection : true, - queryDelay: 1300, lazyInit : true, triggerAction : 'all', hideTrigger : true, typeAhead : false, pageSize:100, listeners: { focus: function(thiz, the, eOpts) { - var rawValue = Ext4.getCmp('expensiveGoodsSupplier').getRawValue(); + var rawValue = top.Ext4.getCmp('expensiveGoodsSupplier').getRawValue(); if (!rawValue) { showResult('请先选择生产厂家！'); - Ext4.getCmp('expensiveGoodsSupplier').focus(); + top.Ext4.getCmp('expensiveGoodsSupplier').focus(); } }, select: function(combo, records, index) { expensiveGoodsModelStore.load(); - Ext4.getCmp('expensiveGoodsModel').setValue(''); + top.Ext4.getCmp('expensiveGoodsModel').setValue(''); } }, hidden: notAllowChanges @@ -685,18 +684,17 @@ listConfig: {width : 280}, store : expensiveGoodsModelStore, forceSelection : true, - queryDelay: 1300, lazyInit : true, triggerAction : 'all', hideTrigger : true, typeAhead : false, pageSize:100, listeners: { focus: function(thiz, the, eOpts) { - var rawValue = Ext4.getCmp('expensiveGoods').getRawValue(); + var rawValue = top.Ext4.getCmp('expensiveGoods').getRawValue(); if (!rawValue) { showResult('请先选择物品！'); - Ext4.getCmp('expensiveGoods').focus(); + top.Ext4.getCmp('expensiveGoods').focus(); } } }, @@ -716,7 +714,7 @@ allowDecimals : false, listeners : { specialkey : function(field, ee) { - if (ee.getKey() == Ext4.EventObject.ENTER) { + if (ee.getKey() == top.Ext4.EventObject.ENTER) { addExpensiveGoods(); } } @@ -766,7 +764,7 @@ }); if (!isApproval) { - windowObj = new Ext4.window.Window({ + windowObj = new top.Ext4.window.Window({ id: 'expensiveGoodsApplicationWindow', autoShow: true, layout : 'fit', @@ -810,8 +808,8 @@ //3、已经提交则把隐藏“暂存”和“提交”两个按钮 if (committedStatus) { - Ext4.getCmp('temporarySave').hide(); - Ext4.getCmp('saveBtn').hide(); + top.Ext4.getCmp('temporarySave').hide(); + top.Ext4.getCmp('saveBtn').hide(); } }, params : { @@ -820,9 +818,9 @@ }); } else { //1、设置默认的“申请人”、“申请时间” - Ext4.getCmp('applicant').setValue(userName); - Ext4.getCmp('applicantCode').setValue(userCode); - getServerTime('yyyy-MM-dd HH:mm',Ext4,'applicationTimeStr'); + top.Ext4.getCmp('applicant').setValue(userName); + top.Ext4.getCmp('applicantCode').setValue(userCode); + getServerTime('yyyy-MM-dd HH:mm',top.Ext4,'applicationTimeStr'); //2、设置默认的“申请科室”、“结算科室”、“处理科室” setDepartment(applyDepartmentStore, currentOrgUnitCode, currentOrgUnitName); @@ -837,12 +835,12 @@ * @returns {Boolean} */ function addExpensiveGoods() { - var amount = Ext4.getCmp('amount').getValue(); - var id = Ext4.getCmp('expensiveGoods').getValue(); - var showName = Ext4.getCmp('expensiveGoods').getRawValue(); - var expensiveGoodsSupplier = Ext4.getCmp('expensiveGoodsSupplier').getRawValue(); - var expensiveGoodsModelId = Ext4.getCmp('expensiveGoodsModel').getValue(); //型号id - var expensiveGoodsModelName = Ext4.getCmp('expensiveGoodsModel').getRawValue(); //型号名称 + var amount = top.Ext4.getCmp('amount').getValue(); + var id = top.Ext4.getCmp('expensiveGoods').getValue(); + var showName = top.Ext4.getCmp('expensiveGoods').getRawValue(); + var expensiveGoodsSupplier = top.Ext4.getCmp('expensiveGoodsSupplier').getRawValue(); + var expensiveGoodsModelId = top.Ext4.getCmp('expensiveGoodsModel').getValue(); //型号id + var expensiveGoodsModelName = top.Ext4.getCmp('expensiveGoodsModel').getRawValue(); //型号名称 //1、先校验物品和数量 if (!id || !showName) { @@ -870,7 +868,7 @@ findNode.set('amount', amount); } else { var selectRecord = expensiveGoodsStore.findRecord('id', id); - var node = Ext4.create('ExpensiveGoodsModel', { + var node = top.Ext4.create('ExpensiveGoodsModel', { nodeId: nodeId, id : 0, amount: amount, @@ -885,10 +883,10 @@ }); treePanelStore.getRootNode().appendChild(node); } - Ext4.getCmp('expensiveGoodsSupplier').setValue(); - Ext4.getCmp('expensiveGoods').setValue(); - Ext4.getCmp('amount').setValue(); - Ext4.getCmp('expensiveGoodsModel').setValue(); + top.Ext4.getCmp('expensiveGoodsSupplier').setValue(); + top.Ext4.getCmp('expensiveGoods').setValue(); + top.Ext4.getCmp('amount').setValue(); + top.Ext4.getCmp('expensiveGoodsModel').setValue(); } } @@ -923,7 +921,7 @@ } if (items.length > 0) { - Ext4.getCmp('tousseItems').setValue(JSON.stringify(items)); + top.Ext4.getCmp('tousseItems').setValue(JSON.stringify(items)); return true; } else { return false; @@ -936,8 +934,8 @@ * @param commit 是否提交操作（为true则为提交操作，否则为暂存操作） */ function submitOrTemporarySave(commit) { - var windowObj = Ext4.getCmp('expensiveGoodsApplicationWindow'); - var formObj = Ext4.getCmp('expensiveGoodsApplicationForm'); + var windowObj = top.Ext4.getCmp('expensiveGoodsApplicationWindow'); + var formObj = top.Ext4.getCmp('expensiveGoodsApplicationForm'); if (!formObj.isValid()) { showResult('请正确填写表单各值！'); return false; @@ -951,7 +949,7 @@ /** * 下一个节点的处理人的store */ - var nextNodeHandlerStore = new Ext4.data.Store({ + var nextNodeHandlerStore = new top.Ext4.data.Store({ autoLoad: true, proxy : { type : 'ajax', @@ -972,18 +970,18 @@ }, load : function(thiz, records, successful, eOpts){ if (records && records.length == 1) { - Ext4.getCmp('nextNodeHandler').setValue(records[0].data.userId); + top.Ext4.getCmp('nextNodeHandler').setValue(records[0].data.userId); } } } }); - nextNodeHandlerForm = Ext4.create('Ext4.form.Panel', { + nextNodeHandlerForm = top.Ext4.create('top.Ext4.form.Panel', { id: 'nextNodeHandlerForm', width : 990, height : 600, frame : true, - renderTo: Ext4.getBody(), + renderTo: top.Ext4.getBody(), border : 0, labelSeparator : '：', bodyPadding : '5 5 0', @@ -1023,7 +1021,7 @@ id : 'nextNodeSaveBtn', text : '提交', handler : function() { - var nextNodeHandler = Ext4.getCmp('nextNodeHandler').getValue(); + var nextNodeHandler = top.Ext4.getCmp('nextNodeHandler').getValue(); if (!nextNodeHandler) { showResult('请选择流程起始执行人！'); return false; @@ -1039,7 +1037,7 @@ }] }); - nextNodeHandlerWindow = new Ext4.window.Window({ + nextNodeHandlerWindow = new top.Ext4.window.Window({ id: 'nextNodeHandlerWindow', autoShow: true, layout : 'fit', @@ -1054,13 +1052,13 @@ }); //获取第一个审批节点的名称 - Ext4.Ajax.request({ + top.Ext4.Ajax.request({ url : WWWROOT + '/disinfectSystem/workFlowAction!getFirstNodeDefinitionNameByFormType.do', params: {formType: '高值耗材申请单'}, success : function(response, options){ - var result = Ext4.decode(response.responseText); + var result = top.Ext4.decode(response.responseText); if(result.success){ - Ext4.getCmp('nextNodeName').setValue(result.message); + top.Ext4.getCmp('nextNodeName').setValue(result.message); } } }); @@ -1079,18 +1077,18 @@ * @param userId 下一个审批节点的指定的处理人 */ function submitOrTemporarySaveExpensiveGoodsApplication(commit, userId) { - var nextNodeHandlerWindow = Ext4.getCmp('nextNodeHandlerWindow'); - var windowObj = Ext4.getCmp('expensiveGoodsApplicationWindow'); - var formObj = Ext4.getCmp('expensiveGoodsApplicationForm'); - var msgBox = new Ext4.window.MessageBox(); + var nextNodeHandlerWindow = top.Ext4.getCmp('nextNodeHandlerWindow'); + var windowObj = top.Ext4.getCmp('expensiveGoodsApplicationWindow'); + var formObj = top.Ext4.getCmp('expensiveGoodsApplicationForm'); + var msgBox = new top.Ext4.window.MessageBox(); msgBox.confirm({ title: '温馨提示', padding: '0 10 10 10', msg: '确认提交吗？', fn: function(btn){ if (btn == 'yes'){ - Ext4.getCmp('temporarySave').disable(); - Ext4.getCmp('saveBtn').disable(); + top.Ext4.getCmp('temporarySave').disable(); + top.Ext4.getCmp('saveBtn').disable(); formObj.form.submit({ url : WWWROOT + '/disinfectSystem/expensivegoodsapplication/expensiveGoodsApplicationAction!saveOrUpdateExpensiveGoodsApplication.do', method : 'POST', @@ -1109,15 +1107,15 @@ showResult(action.result.message); }, failure : function(form, action) { - Ext4.getCmp('temporarySave').enable(); - Ext4.getCmp('saveBtn').enable(); + top.Ext4.getCmp('temporarySave').enable(); + top.Ext4.getCmp('saveBtn').enable(); showResult(action.result.message); } }); } }, - buttons: Ext4.Msg.YESNO, - icon: Ext4.Msg.QUESTION + buttons: top.Ext4.Msg.YESNO, + icon: top.Ext4.Msg.QUESTION }); } @@ -1128,40 +1126,40 @@ */ function updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO) { var result = {}; - if (!Ext4.getCmp('expensiveGoodsApplicationForm').isValid()) { + if (!top.Ext4.getCmp('expensiveGoodsApplicationForm').isValid()) { return {success:false,message:'请正确填写表单各值！'}; } //设置申请项信息 if (setApplyItems()) { - Ext4.Ajax.request({ + top.Ext4.Ajax.request({ async: false, url : WWWROOT + '/disinfectSystem/expensivegoodsapplication/expensiveGoodsApplicationAction!updateExpensiveGoodsApplicationForApproval.do', method : 'POST', params: { workFlowApprovalTaskVO: JSON.stringify(workFlowApprovalTaskVO), - id: Ext4.getCmp('id').getValue(), - hospitalNumber: Ext4.getCmp('hospitalNumber').getValue(), - clinicNumber: Ext4.getCmp('clinicNumber').getValue(), - patient: Ext4.getCmp('patient').getValue(), - patientArea: Ext4.getCmp('patientArea').getValue(), - roomNumber: Ext4.getCmp('roomNumber').getValue(), - bedNumber: Ext4.getCmp('bedNumber').getValue(), - patientAge: Ext4.getCmp('patientAge').getValue(), - patientSex: Ext4.getCmp('patientSex').getValue(), - ascriptionDepartment: Ext4.getCmp('ascriptionDepartment').getValue(), - surgery: Ext4.getCmp('surgery').getValue(), - operationTime: Ext4.getCmp('operationTime').getValue(), - doctor: Ext4.getCmp('doctor').getValue(), - operationRoom: Ext4.getCmp('operationRoom').getValue(), - foreignTousseName: Ext4.getCmp('foreignTousseName').getValue(), - remark: Ext4.getCmp('remark').getValue(), - tousseItems: Ext4.getCmp('tousseItems').getValue() + id: top.Ext4.getCmp('id').getValue(), + hospitalNumber: top.Ext4.getCmp('hospitalNumber').getValue(), + clinicNumber: top.Ext4.getCmp('clinicNumber').getValue(), + patient: top.Ext4.getCmp('patient').getValue(), + patientArea: top.Ext4.getCmp('patientArea').getValue(), + roomNumber: top.Ext4.getCmp('roomNumber').getValue(), + bedNumber: top.Ext4.getCmp('bedNumber').getValue(), + patientAge: top.Ext4.getCmp('patientAge').getValue(), + patientSex: top.Ext4.getCmp('patientSex').getValue(), + ascriptionDepartment: top.Ext4.getCmp('ascriptionDepartment').getValue(), + surgery: top.Ext4.getCmp('surgery').getValue(), + operationTime: top.Ext4.getCmp('operationTime').getValue(), + doctor: top.Ext4.getCmp('doctor').getValue(), + operationRoom: top.Ext4.getCmp('operationRoom').getValue(), + foreignTousseName: top.Ext4.getCmp('foreignTousseName').getValue(), + remark: top.Ext4.getCmp('remark').getValue(), + tousseItems: top.Ext4.getCmp('tousseItems').getValue() }, success : function(response, options) { - result = Ext4.JSON.decode(response.responseText); + result = top.Ext4.JSON.decode(response.responseText); }, failure : function(response, options) { - result = Ext4.JSON.decode(response.responseText); + result = top.Ext4.JSON.decode(response.responseText); //result = {success:false,message:'审批失败！'}; } }); @@ -1176,31 +1174,31 @@ * @param patientInfo */ function showPatientInfo(patientInfo){ - Ext4.getCmp('patient').setValue(patientInfo.patientName); - Ext4.getCmp('patientAge').setValue(patientInfo.patientAge); + top.Ext4.getCmp('patient').setValue(patientInfo.patientName); + top.Ext4.getCmp('patientAge').setValue(patientInfo.patientAge); if(patientInfo.patientSex == '男'){ - Ext4.getCmp('patientSex').setValue('男'); + top.Ext4.getCmp('patientSex').setValue('男'); }else if(patientInfo.patientSex == '女'){ - Ext4.getCmp('patientSex').setValue('女'); + top.Ext4.getCmp('patientSex').setValue('女'); }else{ - Ext4.getCmp('patientSex').setValue(''); + top.Ext4.getCmp('patientSex').setValue(''); } - Ext4.getCmp('patientArea').setValue(patientInfo.patientArea); - Ext4.getCmp('roomNumber').setValue(patientInfo.roomNumber); - Ext4.getCmp('bedNumber').setValue(patientInfo.bedNumber); - Ext4.getCmp('doctor').setValue(patientInfo.doctorName); - Ext4.getCmp('surgery').setValue(patientInfo.operation); + top.Ext4.getCmp('patientArea').setValue(patientInfo.patientArea); + top.Ext4.getCmp('roomNumber').setValue(patientInfo.roomNumber); + top.Ext4.getCmp('bedNumber').setValue(patientInfo.bedNumber); + top.Ext4.getCmp('doctor').setValue(patientInfo.doctorName); + top.Ext4.getCmp('surgery').setValue(patientInfo.operation); //手术时间需要特殊处理,需要将年和月之间的-符替换成/ if(patientInfo.operationTime){ try{ - Ext4.getCmp('operationTime').setValue(new Date(patientInfo.operationTime.replace("-","/"))); + top.Ext4.getCmp('operationTime').setValue(new Date(patientInfo.operationTime.replace("-","/"))); }catch(e){ } } - Ext4.getCmp('ascriptionDepartment').setValue(patientInfo.ascriptionDepartment); - Ext4.getCmp('operationRoom').setValue(patientInfo.opRoomId); - Ext4.getCmp('remark').setValue(patientInfo.remark); + top.Ext4.getCmp('ascriptionDepartment').setValue(patientInfo.ascriptionDepartment); + top.Ext4.getCmp('operationRoom').setValue(patientInfo.opRoomId); + top.Ext4.getCmp('remark').setValue(patientInfo.remark); } /** @@ -1214,9 +1212,9 @@ params: {spell: departmentName}, callback: function(records, operation, success) { if (records && records.length > 0 && records[0].data.departmentCode == departmentCode) { - Ext4.getCmp("depart").setValue(departmentName); //科室名称 - Ext4.getCmp("departCoding").setValue(departmentCode); //科室编码 - Ext4.getCmp('department').setValue(departmentCode); //科室的combo（主要用于显示） + top.Ext4.getCmp("depart").setValue(departmentName); //科室名称 + top.Ext4.getCmp("departCoding").setValue(departmentCode); //科室编码 + top.Ext4.getCmp('department').setValue(departmentCode); //科室的combo（主要用于显示） } } }); @@ -1233,9 +1231,9 @@ params: {spell: departmentName}, callback: function(records, operation, success) { if (records && records.length > 0 && records[0].data.departmentCode == departmentCode) { - Ext4.getCmp("settleAccountsDepart").setValue(departmentName); //科室名称 - Ext4.getCmp("settleAccountsDepartCoding").setValue(departmentCode); //科室编码 - Ext4.getCmp('settleAccountsDepartment').setValue(departmentCode); //科室的combo（主要用于显示） + top.Ext4.getCmp("settleAccountsDepart").setValue(departmentName); //科室名称 + top.Ext4.getCmp("settleAccountsDepartCoding").setValue(departmentCode); //科室编码 + top.Ext4.getCmp('settleAccountsDepartment').setValue(departmentCode); //科室的combo（主要用于显示） } } }); Index: forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java =================================================================== diff -u -r22243 -r22409 --- forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java (.../WorkFlowApprovalTaskAction.java) (revision 22243) +++ forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java (.../WorkFlowApprovalTaskAction.java) (revision 22409) @@ -159,11 +159,12 @@ JSONObject jsonObject = new JSONObject(); List> list=new ArrayList>(); Map map=new HashMap(); + //无节点，可能是回到起单人对表单进行修改 if(StringUtils.isBlank(nodeDefinitionId)){ map.put("allowDisagree", false); map.put("allowRollback", false); map.put("allowNoticeFormMan", false); - map.put("allowChanges", false); + map.put("allowChanges", true); }else{ NodeDefinition nodeDefinition= nodeDefinitionManager.get(Long.valueOf(nodeDefinitionId)); map.put("allowDisagree", nodeDefinition.getAllowDisagree()); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManager.java =================================================================== diff -u -r22347 -r22409 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManager.java (.../ExpensiveGoodsApplicationManager.java) (revision 22347) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManager.java (.../ExpensiveGoodsApplicationManager.java) (revision 22409) @@ -20,14 +20,6 @@ * @param expensiveGoodsApplication 高值耗材申请单对象 * @param commit 是否提交操作 * @param items 此次提交的申请项信息 - */ - public void saveOrUpdate(ExpensiveGoodsApplication expensiveGoodsApplication, boolean commit, JSONArray items); - - /** - * 保存或者修改高值耗材申请单. - * @param expensiveGoodsApplication 高值耗材申请单对象 - * @param commit 是否提交操作 - * @param items 此次提交的申请项信息 * @param userID 指定的第一个节点执行人 */ public void saveOrUpdate(ExpensiveGoodsApplication expensiveGoodsApplication, boolean commit, JSONArray items, Long userID); Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp =================================================================== diff -u -r22361 -r22409 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp (.../workFlowApprovalTask.jsp) (revision 22361) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp (.../workFlowApprovalTask.jsp) (revision 22409) @@ -16,6 +16,7 @@ <%-- 引入语音插件 --%> + <%-- 引入本身的js --%> - 待办任务列表 Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java =================================================================== diff -u -r22347 -r22409 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java (.../ExpensiveGoodsApplicationManagerImpl.java) (revision 22347) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java (.../ExpensiveGoodsApplicationManagerImpl.java) (revision 22409) @@ -96,11 +96,6 @@ public void setInvoicePlanManager(InvoicePlanManager invoicePlanManager) { this.invoicePlanManager = invoicePlanManager; } - - @Override - public void saveOrUpdate(ExpensiveGoodsApplication expensiveGoodsApplication, boolean commit, JSONArray items) { - saveOrUpdate(expensiveGoodsApplication,commit,items,null); - } @Override public void saveOrUpdate(ExpensiveGoodsApplication expensiveGoodsApplication, boolean commit, JSONArray items, Long userID) { Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.js =================================================================== diff -u -r22307 -r22409 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.js (.../workFlowApprovalTaskRecord.js) (revision 22307) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.js (.../workFlowApprovalTaskRecord.js) (revision 22409) @@ -11,7 +11,7 @@ */ 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'); + return top.Ext4.Date.format(new Date(value.time), 'Y-m-d H:i:s'); } else { return ''; } @@ -88,7 +88,7 @@ */ function createWorkFlowApprovalTaskGrid(formId) { //审批历史记录grid的store - var workFlowApprovalTaskRecordListStore = Ext4.create('Ext.data.Store',{ + var workFlowApprovalTaskRecordListStore = top.Ext4.create('top.Ext4.data.Store',{ autoLoad : true, fields: [{ name: 'id',mapping: 'id' @@ -121,7 +121,7 @@ } }); - var approvalRecordGrid= Ext4.create('Ext.grid.Panel', { + var approvalRecordGrid= top.Ext4.create('top.Ext4.grid.Panel', { // height: 250, autoScroll: true, title: '审批日志',