Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/cardInfoMaintain.js =================================================================== diff -u -r29846 -r29863 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/cardInfoMaintain.js (.../cardInfoMaintain.js) (revision 29846) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/cardInfoMaintain.js (.../cardInfoMaintain.js) (revision 29863) @@ -364,7 +364,7 @@ } /** - * + * 获取标识牌区域的数据 * @param {标识牌id} idCardDefinitionId * @param {表格id} panelID * idCardQuestionRegist:问题登记;idCardQuestionStop:问题停用;idCardRemarkRegist:备注登记;idCardRemarkStop:备注停用 @@ -375,26 +375,31 @@ var type = ''; var tbar = []; var text = ''; + var hidden = false; if (panelID == 'idCardQuestionRegist') { title = '标识牌问题登记区'; status = '启用'; type = 'IDCardQuestionMaintain'; text = '问题'; + hidden = true; } else if (panelID == 'idCardQuestionStop') { title = '标识牌问题停用区'; status = '停用'; type = 'IDCardQuestionMaintain'; text = '问题'; + hidden = false; } else if (panelID == 'idCardRemarkRegist') { title = '标识牌备注登记区'; status = '启用'; type = 'IDCardRemarkMaintain'; text = '备注'; + hidden = true; } else if (panelID == 'idCardRemarkStop') { title = '标识牌备注停用区'; status = '停用'; type = 'IDCardRemarkMaintain'; text = '备注' + hidden = false; } var columns = [ @@ -411,7 +416,8 @@ } }, { text: '登记人', dataIndex: 'registUser', width: 60 }, - { text: '发现人', dataIndex: 'discoverUser', width: 60 } + { text: '发现人', dataIndex: 'discoverUser', width: 60 }, + { text: '处理人', dataIndex: 'operator', width: 60,hidden:hidden } ]; if (panelID == 'idCardQuestionRegist' || panelID == 'idCardRemarkRegist') { @@ -465,6 +471,7 @@ { name: 'registTime', mapping: 'registTime' }, { name: 'registUser', mapping: 'registUser' }, { name: 'serialNumber', mapping: 'serialNumber' }, + { name: 'operator', mapping: 'operator' }, { name: 'status', mapping: 'status' } ] }) Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js =================================================================== diff -u -r29846 -r29863 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js (.../idCardForm.js) (revision 29846) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js (.../idCardForm.js) (revision 29863) @@ -800,7 +800,7 @@ var res = Ext.util.JSON.decode(response.responseText); var html = ''; for(var i=0;i