Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.js =================================================================== diff -u -r34048 -r34064 --- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.js (.../view.js) (revision 34048) +++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.js (.../view.js) (revision 34064) @@ -101,7 +101,7 @@ allowBlank: false, editable: false, anchor: '95%', - value: new Date(startDate) + value: isIE()?startDate:new Date(startDate) }] }, { layout: 'form', @@ -117,7 +117,7 @@ allowBlank: false, editable: false, anchor: '95%', - value: new Date(startDate) + value: isIE()?startDate:new Date(startDate) }] }, { layout: 'form', @@ -196,7 +196,7 @@ name: "washDisinfectRecordSerialNum", id: "washDisinfectRecordSerialNum" }] - }], + }] }], buttons: [{ text: '查询', Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.js =================================================================== diff -u -r34048 -r34064 --- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.js (.../view.js) (revision 34048) +++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.js (.../view.js) (revision 34064) @@ -97,7 +97,7 @@ allowBlank: false, editable: false, anchor: '95%', - value: new Date(startDate) + value: isIE()?startDate:new Date(startDate) }] }, { layout: 'form', @@ -113,7 +113,7 @@ allowBlank: false, editable: false, anchor: '95%', - value: new Date(startDate) + value: isIE()?startDate:new Date(startDate) }] }, { layout: 'form', @@ -180,7 +180,7 @@ typeAhead: false, allowBlank: true }] - }], + }] }], buttons: [{ text: '查询', Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js =================================================================== diff -u -r34061 -r34064 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 34061) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 34064) @@ -24,6 +24,8 @@ //待清洗篮筐 var pendingWashAndDisinfectWidth = 400; var pendingWashAndDisinfectHeight = 575; +var oldRinserName = ''; +var oldDisinfectProgram = ''; var materialDefinitionStore = new Ext.data.Store({ pageSize: 100, @@ -781,8 +783,6 @@ }) } -var oldRinserName = ''; -var oldDisinfectProgram = ''; var washBasketTreePanelTitle = '清洗篮筐'; function addAndEditWashAndDisinfectRecord(id, isWashAgain) { oldRinserName = ''; @@ -1992,12 +1992,12 @@ if (sstsConfig.enableValidationOfDisinfectProgram && !isStopSave) { validateDisinfectProgram = '是'; } - + Ext.getCmp('washSaveSubmitResult').setValue("0"); top.Ext.getCmp("disinfectProgram").setValue(disinfectProgram); formObj.form.submit({ url: WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!saveWashAndDisinfectRecord.do', - params: { conCurrent: conCurrent, orgWashStartTime: orgWashStartTime, orgWashEndTime: orgWashEndTime, washPersonInCharge: washPersonInCharge, washPersonInChargeCode: washPersonInChargeCode, validateDisinfectProgram: validateDisinfectProgram, oldrinserName: oldrinserName, oldDisinfectProgram: oldDisinfectProgram }, + params: { conCurrent: conCurrent, orgWashStartTime: orgWashStartTime, orgWashEndTime: orgWashEndTime, washPersonInCharge: washPersonInCharge, washPersonInChargeCode: washPersonInChargeCode, validateDisinfectProgram: validateDisinfectProgram, oldRinserName: oldRinserName, oldDisinfectProgram: oldDisinfectProgram }, method: 'POST', waitMsg: '正在保存数据,请稍候', waitTitle: '提交表单',