Index: ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js =================================================================== diff -u -r41593 -r41607 --- ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js (.../orgUnitExtView.js) (revision 41593) +++ ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js (.../orgUnitExtView.js) (revision 41607) @@ -339,6 +339,7 @@ { id: 'barcode', header: '条码', width: 120, dataIndex: 'barcode', sortable: false }, { header: "部门编码", width: 120, dataIndex: 'orgUnitCoding', sortable: false, menuDisabled: true, hidden: sstsConfig.enableThirdPartyDepartmentCoding }, { header: "部门编码", width: 120, dataIndex: 'orgForeignKey', sortable: false, menuDisabled: true, hidden: !sstsConfig.enableThirdPartyDepartmentCoding }, + { header: "HIS编码", width: 120, dataIndex: 'hisOrgCode', sortable: false, menuDisabled: true, hidden: !sstsConfig.enableHISOrgCode }, { header: "CHAS 管控标识", width: 120, dataIndex: 'chasControlTag', sortable: false, menuDisabled: true, hidden: !sstsConfig.enableChasSystemTagPush }, { header: "CHAS 管控科室名称", width: 120, dataIndex: 'chasDeptName', sortable: false, menuDisabled: true, hidden: !sstsConfig.enableChasSystemTagPush }, { header: "CHAS 管控科室编码", width: 120, dataIndex: 'chasDeptCode', sortable: false, menuDisabled: true, hidden: !sstsConfig.enableChasSystemTagPush }, @@ -357,6 +358,7 @@ { name: 'parentId' }, { name: 'name' }, { name: 'barcode' }, + { name: 'hisOrgCode' }, { name: 'orgUnitCoding' }, { name: 'chasControlTag' }, { name: 'chasDeptName' }, Index: ssts-web/src/main/webapp/systemmanage/orgUnitExt.js =================================================================== diff -u -r41593 -r41607 --- ssts-web/src/main/webapp/systemmanage/orgUnitExt.js (.../orgUnitExt.js) (revision 41593) +++ ssts-web/src/main/webapp/systemmanage/orgUnitExt.js (.../orgUnitExt.js) (revision 41607) @@ -282,7 +282,23 @@ readOnly: true, allowBlank: true }] - } + }, { + columnWidth: .5, + layout: 'form', + defaultType: 'textfield', + labelWidth: 80, + labelSeparator: ':', + hidden: !sstsConfig.enableHISOrgCode, + items: [{ + xtype: 'textfield', + fieldLabel: 'HIS编码', + name: 'hisOrgCode', + id: 'hisOrgCode', + width: 150, + readOnly: true, + allowBlank: true + }] + } ] }, { layout: 'column', @@ -594,6 +610,10 @@ FormUtils.setSpecificElReadOnly(formObj.form.el.dom, ['wbCode', 'spelling'], true); FormUtils.setSpecificElReadOnly(formObj.form.el.dom, ['barcode', 'nodePath'], true); FormUtils.setSpecificElReadOnly(formObj.form.el.dom, ['chasDeptCode'], true); + if(sstsConfig.enableHISOrgCode){ + FormUtils.setSpecificElReadOnly(formObj.form.el.dom, ['hisOrgCode'], true); + Ext.getCmp('hisOrgCode').addClass('fieldReadOnlyNoRemove'); + } Ext.getCmp('wbCode').addClass('fieldReadOnlyNoRemove'); Ext.getCmp('spelling').addClass('fieldReadOnlyNoRemove');