Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r38120 -r38228 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 38120) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 38228) @@ -858,6 +858,9 @@ if (tousseDefinition.printBOMwhenPrintLabel == '') { top.Ext.getCmp('printBOMwhenPrintLabel').setValue('否'); } + if(sstsConfig.showTousseNoteOnClickTousse && tousseDefinition.showTousseNote == ''){ + top.Ext.getCmp('showTousseNote').setValue('是'); + } //ZSWY-206:显示或隐藏灭菌包装类型和灭菌标签纸类型 var tousseType = top.Ext.getCmp('tousseType').getValue(); setPackageTypeAndPaperTypeBox(tousseType,tousseDefinition.isSterile); @@ -3292,6 +3295,31 @@ anchor: '100%' }] }, { + columnWidth: colWidth, + layout: 'form', + labelWidth: 120, + hidden: !sstsConfig.showTousseNoteOnClickTousse, + labelAlign: "right", + items: [{ + xtype: 'combo', + fieldLabel: '配包注意事项提醒', + id: 'showTousseNote', + name: 'showTousseNote', + valueField: 'value', + displayField: 'value', + store: new Ext.data.SimpleStore({ + fields: ['value'], + data: [['是'], ['否']] + }), + editable: false, + forceSelection: true, + allowBlank: false, + value: '是', + mode: 'local', + triggerAction: 'all', + anchor: '100%' + }] + }, { xtype:'hidden', id:'hiddenNoteValue' }] Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js =================================================================== diff -u -r38133 -r38228 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js (.../tousseBatchModify.js) (revision 38133) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js (.../tousseBatchModify.js) (revision 38228) @@ -481,6 +481,31 @@ anchor: '100%' }] },{ + columnWidth: colWidth, + layout: 'form', + labelWidth: fontSize == 12 ? 120 : 150, + labelAlign: "right", + hidden: !sstsConfig.showTousseNoteOnClickTousse, + items: [{ + xtype: 'combo', + fieldLabel: '配包注意事项提醒', + id: 'showTousseNote', + name: 'showTousseNote', + valueField: 'value', + displayField: 'value', + store: new Ext.data.SimpleStore({ + fields: ['value'], + data: [['是'], ['否']] + }), + editable: false, + forceSelection: true, + allowBlank: true, + value: '', + mode: 'local', + triggerAction: 'all', + anchor: '100%' + }] + },{ columnWidth: 1, layout: 'form', labelWidth: fontSize == 12 ? 90 : 120, @@ -763,6 +788,13 @@ needBatchModify.optionalSterilizationIds = optionalSterilizationIds; } + //ZJYY-153:批量修改新增字段“配包注意事项提醒” + var showTousseNote = top.Ext.getCmp('showTousseNote').getValue(); + if (!isUndefinedOrNullOrEmpty(showTousseNote)) { + message += "配包注意事项提醒:(" + showTousseNote + ");"; + needBatchModify.showTousseNote = showTousseNote; + } + top.Ext.MessageBox.confirm("请确认", message,function (button, text) { if ("yes" == button) { submintNeedBatchModify(needBatchModify);