Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r33865 -r33887 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 33865) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 33887) @@ -2502,33 +2502,6 @@ layout: 'form', labelWidth: fontSize == 12 ? 90 : 100, labelAlign: "right", - hidden: SSTS_TousseInstanceType_list, - items: [{ - //用于保存时:传递所属种类id - xtype: 'hidden', - id: 'instrumentSetType', - name: 'instrumentSetType' - }, { - xtype: 'trigger', - fieldLabel: "所属种类", - allowBlank: true, - name: "instrumentSetTypeName", - id: "instrumentSetTypeName", - msgTarget: 'side', - readOnly: true, - onTriggerClick: function () { - var ids = top.Ext.getCmp('instrumentSetType').getValue(); - var names = top.Ext.getCmp('instrumentSetTypeName').getValue(); - setInstrumentSetType('instrumentSetType', 'instrumentSetTypeName', ids, names); - }, - triggerClass: 'x-form-search-trigger', - anchor: '100%' - }] - }, { - columnWidth: 1, - layout: 'form', - labelWidth: fontSize == 12 ? 90 : 100, - labelAlign: "right", hidden: !sstsConfig.enableInstrumentSetTypeSetting, items: [{ //用于保存时:传递器械包种类id @@ -3020,17 +2993,6 @@ } var ids = []; var names = []; - if (tousseDefinition.instrumentSetTypeJSONArray && tousseDefinition.instrumentSetTypeJSONArray.length > 0) { - for (var i = 0; i < tousseDefinition.instrumentSetTypeJSONArray.length; i++) { - ids[i] = tousseDefinition.instrumentSetTypeJSONArray[i].id; - names[i] = tousseDefinition.instrumentSetTypeJSONArray[i].name; - } - top.Ext.getCmp('instrumentSetType').setValue(ids.join(';')); - top.Ext.getCmp('instrumentSetTypeName').setValue(names.join(';')); - } else { - top.Ext.getCmp('instrumentSetType').setValue(''); - top.Ext.getCmp('instrumentSetTypeName').setValue(''); - } if (tousseDefinition.tousseSetTypeJSONArray && tousseDefinition.tousseSetTypeJSONArray.length > 0) { for (var i = 0; i < tousseDefinition.tousseSetTypeJSONArray.length; i++) { ids[i] = tousseDefinition.tousseSetTypeJSONArray[i].id; @@ -3139,8 +3101,6 @@ var rowIndex = configGridStore.getCount();//grid的行数 //所属科室编码s var belongOrgUnitCodes = top.Ext.getCmp('belongDepartCodes').getValue(); - //所属种类 - var instrumentSetType = top.Ext.getCmp('instrumentSetType').getValue(); //器械包种类 var tousseSetType = top.Ext.getCmp('tousseSetType').getValue(); var materials = []; @@ -3217,7 +3177,6 @@ params: { materialDefinitionConfigResult: JSON.stringify(materials), belongOrgUnitCodes: belongOrgUnitCodes, - instrumentSetTypeIds: instrumentSetType, tousseSetTypeIds: tousseSetType, belongOrgUnit: JSON.stringify(belongOrgUnit), expendTousseImg: expendTousseImg,