Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r33539 -r33780 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 33539) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 33780) @@ -192,6 +192,7 @@ top.Ext4.getCmp('operationTime').setValue(resultTime); } top.Ext4.getCmp('operationRoom').setValue(patientInfo.opRoomId); + top.Ext4.getCmp('operationPart').setValue(patientInfo.operationPart || ''); top.Ext4.getCmp('ascriptionDepartment').setValue(patientInfo.ascriptionDepartment); top.Ext4.getCmp('remark').setValue(patientInfo.remark); } @@ -2506,6 +2507,7 @@ var sterilizationTimeName = configureObj.sterilizationTime; var dryTimeName = configureObj.dryTime; var explainName = configureObj.explain; + var operationPartName = configureObj.operationPart; var doctorName = configureObj.doctor; var surgeryName = configureObj.surgery; var returnManName = configureObj.returnMan; @@ -3255,6 +3257,22 @@ }] },{ layout : 'form', + labelWidth :70, + columnWidth :.33, + height:heightVal, + id : "operationPartWrapper", + hidden:true, + items : [{ + xtype : 'textfield', + fieldLabel : operationPartName, + allowBlank : true, + hideTrigger:true, + name : 'operationPart', + id : 'operationPart', + flex : 1 + }] + },{ + layout : 'form', columnWidth : 1, labelWidth :70, hidden : sstsConfig.hiddenFieldsOnForeignTousseInfoPage && sstsConfig.hiddenFieldsOnForeignTousseInfoPage.indexOf('remark') >= 0, Index: ssts-web/src/main/webapp/disinfectsystem/config/blxrmyy/config.js =================================================================== diff -u -r27538 -r33780 --- ssts-web/src/main/webapp/disinfectsystem/config/blxrmyy/config.js (.../config.js) (revision 27538) +++ ssts-web/src/main/webapp/disinfectsystem/config/blxrmyy/config.js (.../config.js) (revision 33780) @@ -100,5 +100,8 @@ //是否允许回收数量减小的部分超过待装配数量 allowDecreaseRecyclingAmountGreatUnPackingAmount : true, //禁用基数限制 - disableCardinalNumLimit:true + disableCardinalNumLimit:true, + //外来器械申请单的扩展字段 + expandFieldsOfForeignTousseApplicationForm : ["operationPartWrapper"] + } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r31720 -r33780 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 31720) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 33780) @@ -459,6 +459,10 @@ propName: 'packageNumber', displayName: '拆分小包的序号', textForPreview: '1' + }),new ObjectDataSourceProperty({ + propName: 'operationPart', + displayName: '手术部分', + textForPreview: '手术部分' })] }); objectDataSourceManager.registerDataSource(foreignTousseDataSource); Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r33498 -r33780 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 33498) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 33780) @@ -363,7 +363,7 @@ 'implantAmount':implantAmount,'supplierName':foreignTousseAppInfo.supplierName,'splitPackagesAmount':foreignTousseAppInfo.splitPackagesAmount,'patientArea':foreignTousseAppInfo.patientArea, 'bedNumber':foreignTousseAppInfo.bedNumber,'hospitalNumber': foreignTousseAppInfo.hospitalNumber,'clinicNumber': foreignTousseAppInfo.clinicNumber,'ascriptionDepartment':foreignTousseAppInfo.ascriptionDepartment, 'packageTypeAbbreviation':packageTypeAbbreviation,'applicationItemTotal':foreignTousseAppInfo.applicationItemTotal,'operationRoom':foreignTousseAppInfo.operationRoom, - 'remark':foreignTousseAppInfo.remark, + 'remark':foreignTousseAppInfo.remark,'operationPart':foreignTousseAppInfo.operationPart || '', 'storageLocationCode':storageLocationCode,'simpleName':simpleName,'operationDate':operationDate,'inspectorName':inspectorName }; printSummaryObj.washOperator = tousseObj.washOperator; Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r33771 -r33780 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 33771) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 33780) @@ -3147,6 +3147,7 @@ sterilizationTime: '灭菌时间(分钟)', dryTime: '干燥时间(分钟)', explain: '清洗消毒的特别要求和说明', + operationPart: '手术部分', remark: '备注', returneeOfSupplier: '厂家归还人', returnMan: '供应室归还人'