Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js
===================================================================
diff -u -r37471 -r38185
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js (.../idCardInstanceView.js) (revision 37471)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js (.../idCardInstanceView.js) (revision 38185)
@@ -9,6 +9,7 @@
var assetsBelongCode = Ext.getCmp('assetsBelongCode').getRawValue();
var tousseGroupID = Ext.getCmp('tousseGroupID').getValue();
var isDisable = Ext.getCmp('isDisable').getRawValue();
+ var IDCardBarcode = Ext.getCmp('IDCardBarcode').getValue();
if (queryMode == '精确查询') {
$Id('parm_s_tousseName').value = tousseName;
$Id('parm_s_tousseNameFuzzy').value = '';
@@ -45,6 +46,8 @@
$Id('parm_s_lastInvoiceDateEnd').value = Ext.getCmp('lastInvoiceDateEnd').getRawValue();
$Id('parm_s_instrumentSetTypeIds').value = Ext.getCmp('instrumentSetTypeIds').getValue();
$Id('parm_s_isDisable').value = isDisable;
+ //ZSRY-88：新增查询项”标识牌条码“
+ $Id('parm_s_IDCardBarcode').value = IDCardBarcode;
grid.dwrReload();
}
@@ -208,6 +211,23 @@
}
printIDCardInstanceByID(selections[0].data.id, selections[0].data.idCardDefinitionID);
}
+ }, '-', {
+ text: '信息维护',
+ hidden : !sstsConfig.enableIdCardInfoMaintain,
+ handler: function () {
+ var selectionModel = grid.getSelectionModel();
+ var selections = selectionModel.getSelections();
+ if (selections.length == 0) {
+ showResult('请选择标识牌实例!');
+ return;
+ }
+
+ if (selections.length > 1) {
+ showResult('信息维护功能不支持多选操作。');
+ return;
+ }
+ cardInfoMaintain(selections[0].data.idCardDefinitionID);
+ }
}];
grid = new Ext.ux.ForgonPageGrid({
@@ -570,6 +590,18 @@
triggerClass: 'x-form-search-trigger',
anchor: '95%'
}]
+ }, {
+ columnWidth: .25,
+ layout: 'form',
+ labelWidth: 80,
+ items: [{
+ xtype: 'textfield',
+ fieldLabel: '标识牌条码',
+ id: 'IDCardBarcode',
+ name: 'IDCardBarcode',
+ allowBlank: true,
+ anchor: '95%'
+ }]
}]
}],
buttons: [{
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp
===================================================================
diff -u -r37471 -r38185
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp (.../idCardInstanceView.jsp) (revision 37471)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp (.../idCardInstanceView.jsp) (revision 38185)
@@ -57,6 +57,8 @@
+
+
标识牌信息
@@ -101,6 +103,7 @@
+