Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r29587 -r29743 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 29587) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 29743) @@ -677,7 +677,6 @@ top.Ext4.getCmp('doctor').focus(); return false; }*/ - //当外来器械未归还时能否申请 var canApplyForForeignTousseNotReturn = getObjValueFromJs('sstsConfig.canApplyForForeignTousseNotReturn',true); if(!canApplyForForeignTousseNotReturn){ @@ -713,12 +712,13 @@ * @param needPrint 提交成功后是否需要打印 */ function submitForm(actionType, needPrint){ + var oldVersion = top.Ext4.getCmp('oldVersion').getValue() || 0; foreignTousseForm.form.submit({ url : WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!saveForeignTousseApplication.do', method : 'POST', waitMsg : '正在保存数据,请稍候', waitTitle : '提交表单', - params : {actionType : actionType}, + params : {actionType : actionType,oldVersion:oldVersion}, success : function(form, action) { if (needPrint) { top.Ext4.getCmp('id').setValue(action.result.id); @@ -2898,6 +2898,7 @@ columnWidth :1, items:[ {xtype : 'hidden',name : 'id',id : 'id'}, + {xtype : 'hidden',name : 'oldVersion',id : 'oldVersion'}, {xtype : 'hidden',fieldLabel : '科室编号 ',name : 'departCoding',id : 'departCoding'}, {xtype : 'hidden',fieldLabel : '结算科室编号',name : 'settleAccountsDepartCoding',id : 'settleAccountsDepartCoding'}, //simon-add @@ -3825,6 +3826,9 @@ processTypeComp.forceSelection = false; processTypeComp.setValue(processType); processTypeComp.forceSelection = true; + + var oldVersion = action.result.data.version; + top.Ext4.getCmp("oldVersion").setValue(oldVersion); //设置手术间 top.Ext4.getCmp("operationRoom").setValue(action.result.data.operationRoom);