Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js =================================================================== diff -u -r33128 -r33134 --- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js (.../instrumentRepairManagementForm.js) (revision 33128) +++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js (.../instrumentRepairManagementForm.js) (revision 33134) @@ -222,7 +222,7 @@ top.Ext4.getCmp('engineer').setValue(item.engineer); top.Ext4.getCmp('repairType').setValue({ value: item.repairType }); top.Ext4.getCmp('uniqueTousse').setValue({ value: item.uniqueTousse }); - top.Ext4.getCmp('repairDateTime').setValue(getTime(item.registerDateTime)); + top.Ext4.getCmp('repairDateTime').setValue(getTime(item.repairDateTime)); top.Ext4.getCmp('infected').setValue({ value: item.infected }); if (item.infected == '是') { if (item.infectDisease !== '') { @@ -258,23 +258,30 @@ //更改维修状态 function changeRepairStatusStore(status, timeObj) { + var id = top.Ext4.getCmp('id').getValue() || ''; if (!timeObj.outHandoverUserNameIsHidden) { top.Ext4.getCmp('outHandoverUserName').allowBlank = true; } if (!timeObj.outHandoverDateTimeIsHidden) { top.Ext4.getCmp('outHandoverDateTime').allowBlank = true; - top.Ext4.getCmp('outHandoverDateTime').setValue(''); + if (id == '') { + top.Ext4.getCmp('outHandoverDateTime').setValue(''); + } } if (!timeObj.returnHandoverUserNameIsHidden) { top.Ext4.getCmp('returnHandoverUserName').allowBlank = true; } if (!timeObj.returnHandoverDateTimeIsHidden) { top.Ext4.getCmp('returnHandoverDateTime').allowBlank = true; - top.Ext4.getCmp('returnHandoverDateTime').setValue(''); + if (id == '') { + top.Ext4.getCmp('returnHandoverDateTime').setValue(''); + } } if (!timeObj.discardDateTimeIsHidden) { top.Ext4.getCmp('discardDateTime').allowBlank = true; - top.Ext4.getCmp('discardDateTime').setValue(''); + if (id == '') { + top.Ext4.getCmp('discardDateTime').setValue(''); + } } if (status == '维修中') { @@ -283,20 +290,26 @@ } if (!timeObj.outHandoverDateTimeIsHidden) { top.Ext4.getCmp('outHandoverDateTime').allowBlank = false; - top.Ext4.getCmp('outHandoverDateTime').setValue(new Date(newDate)); + if (top.Ext4.getCmp('outHandoverDateTime').getRawValue() == '') { + top.Ext4.getCmp('outHandoverDateTime').setValue(new Date(newDate)); + } } } else if (status == '已维修') { if (!timeObj.returnHandoverUserNameIsHidden) { top.Ext4.getCmp('returnHandoverUserName').allowBlank = false; } if (!timeObj.returnHandoverDateTimeIsHidden) { top.Ext4.getCmp('returnHandoverDateTime').allowBlank = false; - top.Ext4.getCmp('returnHandoverDateTime').setValue(new Date(newDate)); + if (top.Ext4.getCmp('returnHandoverDateTime').getRawValue() == '') { + top.Ext4.getCmp('returnHandoverDateTime').setValue(new Date(newDate)); + } } } else if (status == '报废') { if (!timeObj.discardDateTimeIsHidden) { top.Ext4.getCmp('discardDateTime').allowBlank = false; - top.Ext4.getCmp('discardDateTime').setValue(new Date(newDate)); + if (top.Ext4.getCmp('discardDateTime').getRawValue() == '') { + top.Ext4.getCmp('discardDateTime').setValue(new Date(newDate)); + } } } } @@ -443,11 +456,11 @@ //删除器械包块 function delTousseItems(index) { - top.Ext4.getCmp('itemBox1_' + index).hide(); - top.Ext4.getCmp('itemBox2_' + index).hide(); - top.Ext4.getCmp('itemBox3_' + index).hide(); - top.Ext4.getCmp('itemBox4_' + index).hide(); - top.Ext4.getCmp('itemBox5_' + index).hide(); + top.Ext4.getCmp('tousseItem').remove(top.Ext4.getCmp('itemBox1_' + index)); + top.Ext4.getCmp('tousseItem').remove(top.Ext4.getCmp('itemBox2_' + index)); + top.Ext4.getCmp('tousseItem').remove(top.Ext4.getCmp('itemBox3_' + index)); + top.Ext4.getCmp('tousseItem').remove(top.Ext4.getCmp('itemBox4_' + index)); + top.Ext4.getCmp('tousseItem').remove(top.Ext4.getCmp('itemBox5_' + index)); var resultArr = []; for (var i = 0; i < tousseArray.length; i++) { if (tousseArray[i] !== index) {