Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r26815 -r29562 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 26815) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 29562) @@ -294,7 +294,6 @@ } function printLabel(tousseObj){ - var barcodes = tousseObj.barcodes; var virtualSeqNums = tousseObj.virtualSeqNums; var isTraceable = tousseObj.isTraceable; @@ -329,6 +328,7 @@ var simpleName = tousseObj.simpleName; var operationDate = tousseObj.operationDate; var inspectorName = tousseObj.inspectorName; + var remark = tousseObj.remark; //获取申请单需要打印的手术病人信息 var foreignTousseAppInfo = {}; if(tousseType == '外来器械包' || tousseType == '外来器械拆分小包'){ @@ -388,7 +388,7 @@ } var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':tousseObj.materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint,'sterilizationUser':sterilizationUserToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount, - 'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation,'storageLocationCode':storageLocationCode,'simpleName':simpleName,'operationDate':operationDate,'inspectorName':inspectorName}; + 'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation,'storageLocationCode':storageLocationCode,'simpleName':simpleName,'operationDate':operationDate,'inspectorName':inspectorName,'remark':remark}; obj.washOperator = tousseObj.washOperator; obj.tousseType = tousseObj.tousseType; Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r29106 -r29562 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 29106) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 29562) @@ -295,6 +295,7 @@ {name : 'isSterile'}, {name : 'printOrgSource'}, {name : 'department'}, + {name : 'remark'}, {name : 'applicant'}, {name : 'applicantCode'}, {name : 'maker'}, @@ -477,11 +478,9 @@ sortable : true, hidden :true },{ - header : '科室', - dataIndex : 'department', - width : 120, - sortable : true, - hidden :true + header : '备注', + dataIndex : 'remark', + width : 120 }]; var rePrintGrid = new top.Ext.grid.EditorGridPanel({ @@ -650,6 +649,7 @@ tousseObj.maker = (getPrintUserFullName == true)?records[i].data['maker']:records[i].data['makerCode']; tousseObj.assistant = (getPrintUserFullName == true)?records[i].data['assistant']:records[i].data['assistantCode']; tousseObj.applicantDepart = records[i].data['applicantDepart']; + tousseObj.remark = records[i].data['remark']; tousseObj.idCardDefinitionUseAmount = records[i].data['idCardDefinitionUseAmount']; //打印 // 必须先调用此代码,然后才能调用Ext.MessageBox.updateProgress Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js =================================================================== diff -u -r28064 -r29562 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js (.../modifyTousseInstances.js) (revision 28064) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js (.../modifyTousseInstances.js) (revision 29562) @@ -313,6 +313,18 @@ anchor : '100%', readOnly :true }] + },{ + columnWidth : 1, + layout : 'form', + cls:'edit-5char-labelwidth', + items : [{ + xtype : 'textfield', + fieldLabel : '备注', + id : 'remark', + name : 'remark', + anchor : '98%', + height : 25 + }] }], buttons : [{ text : '确定', @@ -326,6 +338,7 @@ var sterileStartTime2 = top.Ext.getCmp('sterileStartTime2').getRawValue(); var sterilizer2 = top.Ext.getCmp('sterilizer2').getValue(); var frequency2 = top.Ext.getCmp('frequency2').getValue(); + var remark = top.Ext.getCmp('remark').getValue(); var modificationInfo = { 'packer': packer2, @@ -336,9 +349,9 @@ 'packageType': packageType2, 'sterilizer': sterilizer2, 'frequency': frequency2, + 'remark':remark, 'sterileStartTime': sterileStartTime2 }; - var update = false; for(var mp in modificationInfo){ if(modificationInfo.hasOwnProperty(mp) && !isUndefinedOrNullOrEmpty(modificationInfo[mp])){ @@ -361,7 +374,7 @@ modal : true, border : false, width : 500, - height : 170, + height : 200, items : [resetForm] }); reSetWin.show();