Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r29010 -r29846 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 29010) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 29846) @@ -583,6 +583,10 @@ propName: 'idCardDefinitionDescription', displayName: '标识牌定义描述', textForPreview: '注意事项' + }),new ObjectDataSourceProperty({ + propName: 'idCardQuestionList', + displayName: '标识牌问题列表', + textForPreview: '2020-01-01 问题1 张三/李四\n2020-01-02 问题2 张三/李四\n2020-01-03 问题3 张三/李四' })] }); objectDataSourceManager.registerDataSource(idCardDataSource); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js =================================================================== diff -u -r28305 -r29846 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js (.../idCardForm.js) (revision 28305) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js (.../idCardForm.js) (revision 29846) @@ -219,7 +219,6 @@ hidden:forSupplement, handler : function() { var records = idCardInstancesGridPanel.getSelectionModel().getSelections(); - if (records.length == 0) { showResult('请选择要打印的标识牌实例!'); return; @@ -230,7 +229,7 @@ return; } top.Ext.MessageBox.progress('打印中', '请稍候...'); - printIDCardInstanceByID(records[0].data.id); + printIDCardInstanceByID(records[0].data.id,records[0].data.idCardDefinitionID); } }, { text : '转换', @@ -468,6 +467,23 @@ } },{ xtype:'button', + text:'信息维护', + id : 'maintain', + hidden:!sstsConfig.enableIdCardInfoMaintain, + handler : function(){ + //ZSRY-5新增:cardInfoMaintain.js + var idCardsRecords = getGridSelectionsRecords(gridPanel); + if(idCardsRecords.length == 0){ + showResult("请选择要维护的标识牌实例!"); + return; + }else if(idCardsRecords.length > 1){ + showResult("只能选择一条标识牌实例进行维护!"); + return; + } + cardInfoMaintain(idCardsRecords[0].data.id); + } + },{ + xtype:'button', text:'丢失打印', hidden:false, id : 'printNewBtn', @@ -753,7 +769,7 @@ printIDCardInstance(idCardInstance); } - function printIDCardInstanceByID(idCardInstanceID){ + function printIDCardInstanceByID(idCardInstanceID,idCardDefinitionID){ var id = idCardInstanceID; var printResult = false; DWREngine.setAsync(false); @@ -772,16 +788,40 @@ obj.barcode = result.idCardInstance.barcode; obj.configKey = result.idCardInstance.configKey; obj.tousseDefinition = result.idCardInstance.tousseDefinition; - printIDCardInstanceObj(obj); - reloadIDCardInstances(); - // 刷新标识牌实例 - hideMessageBox(true); + if(sstsConfig.enableIdCardInfoMaintain && idCardDefinitionID){ + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/idCardInfoMaintainAction!getIDCardInfoMaintainListByIDCardDefinitionId.do', + params:{ + idCardDefinitionId: idCardDefinitionID, + status: '启用', + type: 'IDCardQuestionMaintain' + }, + success : function(response, options){ + var res = Ext.util.JSON.decode(response.responseText); + var html = ''; + for(var i=0;i" + v + ""; + } else { + return v + } + } + }, + { text: '登记人', dataIndex: 'registUser', width: 60 }, + { text: '发现人', dataIndex: 'discoverUser', width: 60 } + ]; + + if (panelID == 'idCardQuestionRegist' || panelID == 'idCardRemarkRegist') { + tbar = [{ + text: '添加', + iconCls: 'btn_ext_application_add', + handler: function () { + addOrUpdateQuestionRegist(panelID); + } + }, { + text: '处理', + iconCls: 'btn_ext_application_edit', + handler: function () { + dealQuestionRegist(panelID, '停用'); + } + }, { + text: '删除', + iconCls: 'btn_ext_application_del', + handler: function () { + deleteQuestionRegist(panelID); + } + }] + } else if (panelID == 'idCardQuestionStop' || panelID == 'idCardRemarkStop') { + tbar = [{ + text: '启用', + iconCls: 'btn_ext_application_add', + handler: function () { + dealQuestionRegist(panelID, '启用'); + } + }, { + text: '删除', + iconCls: 'btn_ext_application_del', + handler: function () { + deleteQuestionRegist(panelID); + } + }] + } + + var storeData = new Ext4.data.Store({ + proxy: { + type: 'ajax', + url: WWWROOT + '/disinfectSystem/idCardInfoMaintainAction!getIDCardInfoMaintainListByIDCardDefinitionId.do', + reader: { + root: 'data' + } + }, + fields: [ + { name: 'id', mapping: 'id' }, + { name: 'discoverUser', mapping: 'discoverUser' }, + { name: 'question', mapping: 'question' }, + { name: 'registTime', mapping: 'registTime' }, + { name: 'registUser', mapping: 'registUser' }, + { name: 'serialNumber', mapping: 'serialNumber' }, + { name: 'status', mapping: 'status' } + ] + }) + + storeData.load({ + params: { + idCardDefinitionId: idCardDefinitionId, + status: status, + type: type + } + }) + + var gridPagnel = new top.Ext4.grid.Panel({ + title: title, + id: panelID, + store: storeData, + width: 250, + height: 250, + columns: columns, + frame: false, + bodyStyle: 'border:1px solid #afd7af', + viewConfig: { + autoFill: true + }, + selModel: new Ext4.selection.CheckboxModel(), + tbar: tbar + }) + + return gridPagnel; +} + +/** + * 弹窗标识牌信息维护的窗口 + * @param {标识牌ID} id + */ +function cardInfoMaintain(id) { + var tmpWindow = new top.Ext4.window.Window({ + title: '标识牌信息维护', + height: 600, + width: 1000, + resizable: false, + modal: true, + border: false, + plain: true, + layout: 'fit', + items: [{ + layout: 'column', + columnWidth: 1, + items: [{ + xtype: 'hidden', + id: 'idCardDefinitionId', + name: 'idCardDefinitionId', + value: id + }, { + height: 280, + columnWidth: .5, + layout: 'fit', + items: [idCardInfoMaintain(id, 'idCardQuestionRegist')] + }, { + height: 280, + columnWidth: .5, + layout: 'fit', + items: [idCardInfoMaintain(id, 'idCardRemarkRegist')] + }, { + height: 285, + columnWidth: .5, + layout: 'fit', + items: [idCardInfoMaintain(id, 'idCardQuestionStop')] + }, { + height: 285, + columnWidth: .5, + layout: 'fit', + items: [idCardInfoMaintain(id, 'idCardRemarkStop')] + }] + }] + }); + tmpWindow.show(); +} \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp =================================================================== diff -u -r29513 -r29846 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 29513) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 29846) @@ -157,6 +157,8 @@ + +