Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js =================================================================== diff -u -r33210 -r33218 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js (.../proxyDisinfectionForm.js) (revision 33210) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js (.../proxyDisinfectionForm.js) (revision 33218) @@ -1,4 +1,3 @@ -var liststatus = ''; function addAndEditProxyDisinfection(id, selectedRecords) { if (selectedRecords) { var isHasTran = false; @@ -78,8 +77,8 @@ value: currentDepartCoding }, { xtype: 'hidden', - name: 'deliverStatus', - id: 'deliverStatus' + name: 'receiveStatus', + id: 'receiveStatus' }, { columnWidth: .5, layout: 'form', @@ -488,7 +487,8 @@ showResult('接收物品时才能入筐!'); return } else { - if (!isFirstRoomPeople && (liststatus == '待接收' || liststatus == '部分接收')) { + var receiveStatus = top.Ext.getCmp('receiveStatus').getValue(); + if (!isFirstRoomPeople && (receiveStatus == '待接收' || receiveStatus == '部分接收')) { showResult('接收物品时才能入筐!'); return } @@ -777,10 +777,7 @@ waitMsg: '正在加载数据,请稍候', success: function (form, action) { top.Ext.getCmp('applicationTime').setValue(formatDateYear(action.result.data.applicationTime)); - var status = action.result.data.deliverStatus; var receiveStatus = action.result.data.receiveStatus || ''; - var editMode = action.result.editMode; - liststatus = receiveStatus; if(receiveStatus == '已终止'){ top.Ext.getCmp('saveBtn').disable(); top.Ext.getCmp('saveBtn2').disable(); @@ -823,7 +820,7 @@ var handleDepartCoding = action.result.data.handleDepartCoding; top.Ext.getCmp('currentDepartName').setValue(handleDepart); top.Ext.getCmp('currentDepartCoding').setValue(handleDepartCoding); - top.Ext.getCmp('deliverStatus').setValue(status); + top.Ext.getCmp('receiveStatus').setValue(receiveStatus); }, failure: function (form, action) { }, @@ -949,8 +946,8 @@ basketNode = pNode; } else if (pNode.attributes.type == '器械包') { var id = top.Ext.getCmp('id').getValue(); - var deliverStatus = top.Ext.getCmp('deliverStatus').getValue(); - if(!id || deliverStatus == '待发货'){ + var receiveStatus = top.Ext.getCmp('receiveStatus').getValue(); + if(!id || receiveStatus == '已接收'){ tousseNodes.push(pNode); }else { if (pNode.attributes.hasReceived == '是' || pNode.attributes.receiveTousse == true) {