Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js =================================================================== diff -u -r25370 -r25579 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 25370) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 25579) @@ -1884,7 +1884,7 @@ top.Ext.getCmp('handover').setValue(tousseTransitionRecordInfo.handover); //预回收记录_临床科室确认人 } - + //申请记录 var invoicePlanJSON = result.invoicePlanJSON; if(invoicePlanJSON){ top.Ext.getCmp('invoice_applicationTime').setValue(invoicePlanJSON.invoice_applicationTime); //申请时间 @@ -1900,11 +1900,11 @@ //外来器械二次回收记录 var secondRecyclingRecordInfo = result.secondRecyclingRecordJSON; if(secondRecyclingRecordInfo){ - top.Ext.getCmp('recycling_operator').setValue(secondRecyclingRecordInfo.reOperator); - top.Ext.getCmp('recycling_recyclingUser').setValue(secondRecyclingRecordInfo.reUser); - top.Ext.getCmp('recycling_type').setValue(secondRecyclingRecordInfo.reType); - top.Ext.getCmp('recycling_time').setValue(secondRecyclingRecordInfo.reTime); - top.Ext.getCmp('recycling_dept').setValue(secondRecyclingRecordInfo.reDept); + top.Ext.getCmp('recycling_operator').setValue(secondRecyclingRecordInfo.reOperator); //外来器械二次回收_清点人 + top.Ext.getCmp('recycling_recyclingUser').setValue(secondRecyclingRecordInfo.reUser); //外来器械 二次回收_回收人 + top.Ext.getCmp('recycling_type').setValue(secondRecyclingRecordInfo.reType); //外来器械二次回收_回收类型 + top.Ext.getCmp('recycling_time').setValue(secondRecyclingRecordInfo.reTime); //外来器械二次回收_回收时间 + top.Ext.getCmp('recycling_dept').setValue(secondRecyclingRecordInfo.reDept); //外来器械二次回收_科室 } //二次清洗记录(外来器械) @@ -1928,10 +1928,10 @@ }else{ var recyclingItemJSON = result.recyclingItemJSON; if(recyclingItemJSON){ - top.Ext.getCmp('recycling_operator').setValue(recyclingItemJSON.recycling_operator); - top.Ext.getCmp('recycling_recyclingUser').setValue(recyclingItemJSON.recycling_recyclingUser); - top.Ext.getCmp('recycling_type').setValue(recyclingItemJSON.recycling_type); - top.Ext.getCmp('recycling_time').setValue(recyclingItemJSON.recycling_time); + top.Ext.getCmp('recycling_operator').setValue(recyclingItemJSON.recycling_operator); //二次回收_清点人 + top.Ext.getCmp('recycling_recyclingUser').setValue(recyclingItemJSON.recycling_recyclingUser);// 二次回收_回收人 + top.Ext.getCmp('recycling_type').setValue(recyclingItemJSON.recycling_type); //二次回收_回收类型 + top.Ext.getCmp('recycling_time').setValue(recyclingItemJSON.recycling_time); //二次回收_回收时间 } } } @@ -1989,11 +1989,11 @@ for(var j = 0;j < tousseOperationInfoArray.length ; j++){ var tousseOperationInfo = tousseOperationInfoArray[j]; var tousseOperationData = new Ext.data.Record({ - operator : tousseOperationInfo.operator, - operationTime : tousseOperationInfo.operationTime, - destLocation : tousseOperationInfo.destLocation, - destDepart : tousseOperationInfo.destDepart, - operation : tousseOperationInfo.operation + operator : tousseOperationInfo.operator, //流转记录_操作人 + operationTime : tousseOperationInfo.operationTime, //流转记录_操作时间 + destLocation : tousseOperationInfo.destLocation, //流转记录_操作位置 + destDepart : tousseOperationInfo.destDepart, //流转记录_操作科室 + operation : tousseOperationInfo.operation//流转记录_操作类型 }); top.Ext.getCmp('tousseOperation').getStore().add(tousseOperationData); } @@ -2056,17 +2056,17 @@ //质量记录 top.Ext.getCmp('inspectName').setValue(result.inspectName); //质量记录_监测项名称 - top.Ext.getCmp('createUserName').setValue(result.createUserName); //回收记录_登记人 - top.Ext.getCmp('createDate').setValue(result.createDate); //回收记录_登记时间 - top.Ext.getCmp('inspectRemark').setValue(result.remark); // 质量监测的备注信息 + top.Ext.getCmp('createUserName').setValue(result.createUserName); //质量记录_登记人 + top.Ext.getCmp('createDate').setValue(result.createDate); //质量记录_登记时间 + top.Ext.getCmp('inspectRemark').setValue(result.remark); // 质量记录_备注信息 } //装配记录 var packingRecord = result.packingRecordJSON; top.Ext.getCmp('operatorPerson').setValue(instance.operator); //装配记录_配包人 if(packingRecord){ - top.Ext.getCmp('wrapperPerson').setValue(packingRecord.wrapper); //装配记录_配包人 + top.Ext.getCmp('wrapperPerson').setValue(packingRecord.wrapper); //装配记录_包装人 } if(instance.operationTime!=null){ top.Ext.getCmp('packTime').setValue(Ext.util.Format.date(new Date(instance.operationTime.time),'Y-m-d H:i:s'));//装配记录_装配时间