Index: ssts-web/src/main/webapp/systemmanage/orgUnitExt.js
===================================================================
diff -u -r30924 -r38878
--- ssts-web/src/main/webapp/systemmanage/orgUnitExt.js	(.../orgUnitExt.js)	(revision 30924)
+++ ssts-web/src/main/webapp/systemmanage/orgUnitExt.js	(.../orgUnitExt.js)	(revision 38878)
@@ -129,6 +129,7 @@
                 defaultType: 'textfield',
                 labelWidth:80,
                 labelSeparator:'：',
+                hidden: sstsConfig.enableThirdPartyDepartmentCoding,
                 items: [{			
         			xtype: 'textfield',
                     fieldLabel: '部门编码',
@@ -148,6 +149,32 @@
                   		}
                 	}
         		}]
+            },{
+                columnWidth:.5,
+                layout: 'form',
+                defaultType: 'textfield',
+                labelWidth:80,
+                labelSeparator:'：',
+                hidden: !sstsConfig.enableThirdPartyDepartmentCoding,
+                items: [{			
+        			xtype: 'textfield',
+                    fieldLabel: '部门编码',
+                    name: 'orgForeignKey',
+                    id: 'orgForeignKey',
+                    width: 130,
+                    allowBlank:false,
+                    blankText:'',
+                    invalidText:'部门编码不能为空！',
+                    msgTarget:'side',
+                    disabled:(enableEditBtn && !enableSaveBtn),
+                    listeners: {
+                    	'render': function(c) {
+                    		c.getEl().on('keyup', function(key) {
+                    			screenSpecialKeyByExt(key,"orgForeignKey");
+                    		}, c);
+                  		}
+                	}
+        		}]
             }]
         },{
             layout:'column',//
@@ -461,8 +488,13 @@
     	Ext.getCmp('saveAndNewBtn').setVisible(true);
     	Ext.getCmp('saveAndPrint').setVisible(true);
     	FormUtils.setReadOnly(formObj.form.el.dom, false);
-        Ext.getCmp('orgUnitCoding').addClass('fieldReadOnlyNoRemove');
-        Ext.getCmp('orgUnitCoding').disable();
+        if(sstsConfig.enableThirdPartyDepartmentCoding){
+            Ext.getCmp('orgForeignKey').addClass('fieldReadOnlyNoRemove');
+            Ext.getCmp('orgForeignKey').disable();
+        }else {
+            Ext.getCmp('orgUnitCoding').addClass('fieldReadOnlyNoRemove');
+            Ext.getCmp('orgUnitCoding').disable();
+        }
         Ext.getCmp('name').enable();
     	FormUtils.setSpecificElReadOnly(formObj.form.el.dom,['userNames'], true);
     	FormUtils.setSpecificElReadOnly(formObj.form.el.dom,['principal','subLeadName'], true);
@@ -477,7 +509,11 @@
     function validateOrgCode(){
         if(StringUtils.isBlank(id)){  //新添加的操作，验证部门编码即可
         	DWREngine.setAsync(false);
-	        OrgUnitTableManager.isRepeatCoding(Ext.getCmp('orgUnitCoding').getValue().Trim(),setIsRepeatCoding);
+            if(sstsConfig.enableThirdPartyDepartmentCoding){
+                OrgUnitTableManager.isRepeatCoding(Ext.getCmp('orgForeignKey').getValue().Trim(),setIsRepeatCoding);
+            }else {
+                OrgUnitTableManager.isRepeatCoding(Ext.getCmp('orgUnitCoding').getValue().Trim(),setIsRepeatCoding);
+            }
 	        DWREngine.setAsync(true);
         } 
         
Index: ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
===================================================================
diff -u -r32115 -r38878
--- ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js	(.../orgUnitExtView.js)	(revision 32115)
+++ ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js	(.../orgUnitExtView.js)	(revision 38878)
@@ -337,7 +337,8 @@
     var columns = [
         {id:'operationDescription', header: "名称", width: 150, dataIndex: 'name', renderer : gotoPage, sortable: false},
         {id :'barcode',header : '条码',width: 120, dataIndex: 'barcode', sortable: false},
-        {header: "部门编码", width: 120, dataIndex: 'orgUnitCoding', sortable: false, menuDisabled: true},
+        {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: "负责人", width: 120, dataIndex: 'principal', sortable: false, menuDisabled: true},
         {header: "分管领导", width: 120, dataIndex: 'subLeadName', sortable: false, menuDisabled: true},
         {header: "拼音码", width: 120, dataIndex: 'spelling', sortable: false, menuDisabled: true},
@@ -354,6 +355,7 @@
         {name: 'name'},
         {name: 'barcode'},
         {name: 'orgUnitCoding'},
+        {name: 'orgForeignKey'},
         {name: 'principal'},
         {name: 'spelling'},
         {name: 'wbCode'},