项目人员管理列表增加启用禁用，增加组织范围过滤

addon/customer/web/js/project/memberManagementEdit.js

@@ -0,0 +1,58 @@
+shr.defineClass("shr.project.memberManagementEdit", shr.framework.Edit, {
+	/**
+	 * 描述:初始化操作
+	 *
+	 * @action
+	 */
+	initalizeDOM: function () {
+		var _self = this;
+		shr.project.memberManagementEdit.superClass.initalizeDOM.call(this);
+		var opse = this.getOperateState();
+
+		if ("VIEW" == opse) {
+			var MemberState = _self.initData.MemberState;
+			if (MemberState && '1' != MemberState) {
+				$("#edit").show();
+			}
+		} else if ("ADDNEW" == opse) {
+			var projectManagement = _self.initData.projectManagement;
+			if (projectManagement) {
+				$("#projectManagement").shrPromptBox("setValue", projectManagement);
+				$("#projectName").val(projectManagement.projectName);
+				$("#projectCode").val(projectManagement.number);
+			}
+		}
+
+
+		if ("VIEW" != opse) {
+			$("#projectManagement").shrPromptBox(
+				{
+					"onchange":
+						(e, data) => {
+							if (data && data.current) {
+								var current = data.current;
+								$("#projectName").val(current.projectName);
+								$("#projectCode").val(current.number);
+								var projectMa = $("#employee").shrPromptBox("getValue");
+								if (projectMa && projectMa.id) {
+									$("#number").val(projectMa.number + current.number);
+								}
+								var adminOrg = { id: current["adminOrg.id"],name: current["adminOrg.name"] };
+								$("#adminOrg").shrPromptBox("setValue", adminOrg);
+							}
+						}
+				});
+			$("#employee").shrPromptBox(
+				{
+					"onchange": (e, data) => {
+						if (data && data.current) {
+							var projectMa = $("#projectManagement").shrPromptBox("getValue");
+							if (projectMa && projectMa.id) {
+								$("#number").val(projectMa.number + "_" + data.current.number);
+							}
+						}
+					}
+				});
+		}
+	},
+});

addon/customer/web/js/project/memberManagementList.js

@@ -0,0 +1,47 @@
+shr.defineClass("shr.project.memberManagementList", shr.framework.List, {
+	/**
+	 * 描述:初始化操作
+	 *
+	 * @action
+	 */
+	initalizeDOM: function () {
+		var _self = this;
+		shr.project.memberManagementList.superClass.initalizeDOM.call(this);
+	},
+	/**
+	   * 查看
+	   */
+	viewAction: function (billId, rowid) {
+		// 编辑界面禁用，则直接返回
+		if (this.editViewDisable) {
+			return;
+		}
+		this.reloadPage({
+			uipk: this.getEditUIPK(),
+			billId: billId,
+			method: 'view'
+		});
+	},
+	/**
+		 * 新增
+		 */
+	addNewAction: function () {
+		var $treeNavigation = $('#treeNavigation');
+		var prijectId = '';
+		if ($treeNavigation.length > 0) {
+			var value = $treeNavigation.shrGridNavigation('getValue');
+			if (!value || !value.id) {
+				shr.showError({ message: $.shrI18n.framework.tips.getDataFailureMayReason });
+				return;
+			}
+			prijectId = value.id;
+		}
+
+
+		this.reloadPage({
+			uipk: this.getEditUIPK(),
+			prijectId: prijectId,
+			method: 'addNew'
+		});
+	},
+});

addon/customer/web/js/project/projectManagementEdit.js

@@ -0,0 +1,66 @@
+/**
+ * 项目管理
+ */
+shr.defineClass("shr.project.projectManagementEdit",shr.framework.Edit,{
+	initalizeDOM : function() {
+		shr.project.projectManagementEdit.superClass.initalizeDOM.call(this);
+		var _self = this;
+	},
+	/**
+	 * 启用
+	 */
+	enableAction : function(){
+		var that = this;
+		shr.showConfirm('是否现在启用？', function() {
+			top.Messenger().hideAll();
+			that.remoteCall({
+				method : "enablePorject",
+				param : {
+					billId : that.billId
+				},
+				success : function(data) {
+					if(data && data.state == "success"){
+						parent.location.reload();
+						shr.showSuccess({
+							message : "启用成功！"
+						});
+						$.block.hide();	
+					}else{
+						shr.showWarning({
+							message : data.errorMsg
+						});
+					}
+				}
+			});
+		});
+	},
+	
+	/**
+	 * 禁用
+	 */
+	disableAction : function(){
+		var that = this;
+		shr.showConfirm('是否现在禁用？', function() {
+			top.Messenger().hideAll();
+			that.remoteCall({
+				method : "disablePorject",
+				param : {
+					billId : that.billId
+				},
+				success : function(data) {
+					if(data && data.state == "success"){
+						parent.location.reload();
+						shr.showSuccess({
+							message : "禁用成功！"
+						});
+						$.block.hide();	
+					}else{
+						shr.showWarning({
+							message : data.errorMsg
+						});
+					}
+				}
+			});
+		});
+	},
+});

addon/customer/web/js/project/projectManagementList.js

@@ -0,0 +1,178 @@
+/**
+ * 项目管理-列表
+ */
+shr.defineClass("shr.project.projectManagementList",shr.framework.List,{
+	initalizeDOM : function() {
+		shr.project.projectManagementList.superClass.initalizeDOM.call(this);
+		var _self = this;
+	},
+	
+	/**
+	 * 启用
+	 */
+	enableAction : function(){
+		var that = this;
+		var billIds = $("#grid").jqGrid("getSelectedRows");
+		if (billIds == undefined || billIds.length == 0 || (billIds && billIds.length == 1 && billIds[0] == "")) {
+			shr.showWarning({
+				message : "请先选中一行数据！",
+				hideAfter : 5
+			})
+			return;
+		} else {
+			for(var i = 0; i < billIds.length; i++) {
+				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
+				if(state && state != '未启用' && state != '禁用' && state != "0" && state != "3"){
+					shr.showWarning({
+						message : '只能启用“未启用”、“禁用”的招聘项目！',
+						hideAfter : 5
+					});
+					return ;
+				}
+			}
+			shr.showConfirm('确认启用项目？', function() {
+				top.Messenger().hideAll();
+				that.doRemoteWithBatchAction({
+					method : "enablePorject",
+					billId : billIds.toString()
+				});
+			});
+		}
+	},
+	
+	/**
+	 * 禁用
+	 */
+	disableAction : function(){
+		var that = this;
+		var billIds = $("#grid").jqGrid("getSelectedRows");
+		if (billIds == undefined || billIds.length == 0 || (billIds && billIds.length == 1 && billIds[0] == "")) {
+			shr.showWarning({
+				message : "请先选中一行数据！",
+				hideAfter : 5
+			})
+			return;
+		} else {
+			for(var i = 0; i < billIds.length; i++) {
+				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
+				if(state && state != '已启用' && state != "1"){
+					shr.showWarning({
+						message : '只能禁用“进行中”的招聘项目！！',
+						hideAfter : 5
+					});
+					return ;
+				}
+			}
+			var confirmMsg = '确认禁用项目？';
+			shr.showConfirm(confirmMsg, function() {
+				top.Messenger().hideAll();
+				that.doRemoteWithBatchAction({
+					method : "disableProject",
+					billId : billIds.toString()
+				});
+			});
+		}
+	},
+	/**
+	 * 描述:删除操作
+	 * 
+	 * @action
+	 */
+	deleteAction : function() {
+		var that = this;
+		var billIds = $("#grid").jqGrid("getSelectedRows");
+		if (billIds == undefined || billIds.length == 0 || (billIds && billIds.length == 1 && billIds[0] == "")) {
+			shr.showWarning({
+				message : "请先选中一行数据！",
+				hideAfter : 5
+			})
+			return;
+		} else {
+			for(var i = 0; i < billIds.length; i++) {
+				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
+				if(state && state != '未启用' && state != '禁用' && state != "0" && state != "3"){
+					shr.showWarning({
+						message : '只能结束“进行中”、“禁用”的招聘项目！',
+						hideAfter : 5
+					});
+					return ;
+				}
+			}
+			var confirmMsg = '是否确认删除所选项目？';
+			shr.showConfirm(confirmMsg, function() {
+				top.Messenger().hideAll();
+				that.doRemoteWithBatchAction({
+					method : "delete",
+					billId : billIds.toString()
+				});
+			});
+		}
+	},	
+//	/**
+//	 * 描述:项目变更
+//	 * 
+//	 * @action
+//	 */
+//	changeAction : function() {
+//		var that = this;
+//		var billIds = $("#grid").jqGrid("getSelectedRows");
+//		if (billIds == undefined || billIds.length == 0 || (billIds && billIds.length == 1 && billIds[0] == "")) {
+//			shr.showWarning({
+//				message : "请先选中一行数据！",
+//				hideAfter : 5
+//			})
+//			return;
+//		} else {
+//			for(var i = 0; i < billIds.length; i++) {
+//				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
+//				if(state && state != '未启用' && state != '禁用' && state != "0" && state != "3"){
+//					shr.showWarning({
+//						message : '只能删除“已禁用”的项目！',
+//						hideAfter : 5
+//					});
+//					return ;
+//				}
+//			}
+//			var confirmMsg = '是否确认删除所选项目？';
+//			shr.showConfirm(confirmMsg, function() {
+//				top.Messenger().hideAll();
+//				that.doRemoteWithBatchAction({
+//					method : "delete",
+//					billId : billIds.toString()
+//				});
+//			});
+//		}
+//	},
+//	/**描述:项目变更-列表
+//	 */
+//	changeListAction : function() {
+//		var that = this;
+//		var billIds = $("#grid").jqGrid("getSelectedRows");
+//		if (billIds == undefined || billIds.length == 0 || (billIds && billIds.length == 1 && billIds[0] == "")) {
+//			shr.showWarning({
+//				message : "请先选中一行数据！",
+//				hideAfter : 5
+//			})
+//			return;
+//		} else {
+//			for(var i = 0; i < billIds.length; i++) {
+//				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
+//				if(state && state != '未启用' && state != '禁用' && state != "0" && state != "3"){
+//					shr.showWarning({
+//						message : '只能删除“已禁用”的项目！',
+//						hideAfter : 5
+//					});
+//					return ;
+//				}
+//			}
+//			var confirmMsg = '是否确认删除所选项目？';
+//			shr.showConfirm(confirmMsg, function() {
+//				top.Messenger().hideAll();
+//				that.doRemoteWithBatchAction({
+//					method : "deleteOne",
+//					billId : billIds.toString()
+//				});
+//			});
+//		}
+//	},
+});

metadata/com/kingdee/eas/hr/project/MemberManagement.bizunit

@@ -101,9 +101,9 @@
             <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.MemberManagementListUI" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.MemberManagement].extendedProperty.maxFieldIndex">
-            <lang locale="en_US" value="6" />
-            <lang locale="zh_CN" value="6" />
-            <lang locale="zh_TW" value="6" />
+            <lang locale="en_US" value="8" />
+            <lang locale="zh_CN" value="8" />
+            <lang locale="zh_TW" value="8" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.MemberManagement].extendedProperty.userDefined">
             <lang locale="en_US" value="true" />

metadata/com/kingdee/eas/hr/project/app/CT_PRO_MemberManagement.table

@@ -91,20 +91,6 @@
             <scale>0</scale>
             <precision>100</precision>
         </column>
-        <column>
-            <name>CFProjectManagementID</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagementID].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagementID].description</description>
-            <userDefined>true</userDefined>
-            <isMultilingual>false</isMultilingual>
-            <isEncoded>false</isEncoded>
-            <isNullable>false</isNullable>
-            <defaultValue>''</defaultValue>
-            <sqlType>VARCHAR</sqlType>
-            <length>44</length>
-            <scale>0</scale>
-            <precision>0</precision>
-        </column>
         <column>
             <name>FAdminOrgUnitId</name>
             <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FAdminOrgUnitId].alias</alias>
@@ -365,7 +351,7 @@
             <isMultilingual>false</isMultilingual>
             <isEncoded>false</isEncoded>
             <isNullable>false</isNullable>
-            <defaultValue />
+            <defaultValue>''</defaultValue>
             <sqlType>VARCHAR</sqlType>
             <length>44</length>
             <scale>0</scale>
@@ -385,6 +371,20 @@
             <scale>0</scale>
             <precision>0</precision>
         </column>
+        <column>
+            <name>CFProjectManagemen</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagemen].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagemen].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>VARCHAR</sqlType>
+            <length>44</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
     </columns>
     <primaryKey>
         <name>PK_MemberManagemen</name>
@@ -571,6 +571,25 @@
                 </fkColumnPair>
             </fkColumnPairs>
         </foreignKey>
+        <foreignKey>
+            <name>CFK_PRO_PROMMRjcud</name>
+            <userDefined>true</userDefined>
+            <refTable>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="CT_PRO_ProjectManagement" />
+            </refTable>
+            <fkColumnPairs>
+                <fkColumnPair>
+                    <sequence>0</sequence>
+                    <refColumn>
+                        <key name="name" value="FID" />
+                    </refColumn>
+                    <fkColumn>
+                        <key name="name" value="CFProjectManagemen" />
+                    </fkColumn>
+                </fkColumnPair>
+            </fkColumnPairs>
+        </foreignKey>
     </foreignKeys>
     <resource>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].alias">
@@ -615,15 +634,16 @@
             <lang locale="zh_HK" value="項目編碼" />
             <lang locale="zh_TW" value="項目編碼" />
         </rs>
-        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagementID].alias">
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagemen].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="项目管理" />
             <lang locale="zh_HK" value="項目管理" />
             <lang locale="zh_TW" value="項目管理" />
         </rs>
-        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagementID].description">
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagemen].description">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="" />
+            <lang locale="zh_CN" value="项目管理" />
+            <lang locale="zh_HK" value="項目管理" />
             <lang locale="zh_TW" value="項目管理" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectName].alias">

metadata/com/kingdee/eas/hr/project/app/MemberManagement.entity

@@ -332,20 +332,6 @@
                 <key name="name" value="CFNotes" />
             </mappingField>
         </ownProperty>
-        <linkProperty>
-            <name>projectManagement</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].description</description>
-            <userDefined>true</userDefined>
-            <configured>false</configured>
-            <mappingField>
-                <key name="name" value="CFProjectManagementID" />
-            </mappingField>
-            <relationship>
-                <key name="package" value="com.kingdee.eas.hr.project.app" />
-                <key name="name" value="R_MemberManagement_ProjectManagement_entrys" />
-            </relationship>
-        </linkProperty>
         <ownProperty>
             <name>state</name>
             <alias>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].alias</alias>
@@ -366,6 +352,20 @@
                 <key name="name" value="CFState" />
             </mappingField>
         </ownProperty>
+        <linkProperty>
+            <name>projectManagement</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <mappingField>
+                <key name="name" value="CFProjectManagemen" />
+            </mappingField>
+            <relationship>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="R_MemberManagement_ProjectManagement_projectManagement" />
+            </relationship>
+        </linkProperty>
     </properties>
     <logicalKey>
         <name>id</name>
@@ -971,9 +971,49 @@
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].description">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
+            <lang locale="zh_CN" value="项目管理" />
+            <lang locale="zh_HK" value="項目管理" />
+            <lang locale="zh_TW" value="項目管理" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.ColWidthInKDTable">
+            <lang locale="en_US" value="50" />
+            <lang locale="zh_CN" value="50" />
+            <lang locale="zh_TW" value="50" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.dataField">
+            <lang locale="en_US" value="projectName" />
+            <lang locale="zh_CN" value="projectName" />
+            <lang locale="zh_TW" value="projectName" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isForGrouping">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isForMapping">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isForMatching">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isForWrittenBack">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isInCode">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isVisibleForKDTable">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectRole].alias">
             <lang locale="en_US" value="null" />
@@ -1287,9 +1327,9 @@
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].defaultValue">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="ENABLE" />
-            <lang locale="zh_HK" value="ENABLE" />
-            <lang locale="zh_TW" value="ENABLE" />
+            <lang locale="zh_CN" value="NEW" />
+            <lang locale="zh_HK" value="NEW" />
+            <lang locale="zh_TW" value="NEW" />
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].description">
             <lang locale="en_US" value="null" />

metadata/com/kingdee/eas/hr/project/app/MemberManagementEntry.entity

@@ -217,6 +217,11 @@
             <lang locale="zh_CN" value="" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagementEntry].extendedProperty.genBusinessImplCode">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagementEntry].logicalKey[id].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />

metadata/com/kingdee/eas/hr/project/app/MemberManagementQuery.query

@@ -113,6 +113,19 @@
                 <key name="name" value="Person" />
             </entityRef>
         </subEntity>
+        <subEntity>
+            <name>projectManagement</name>
+            <alias>joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].subObjects.subEntity[projectManagement].alias</alias>
+            <userDefined>true</userDefined>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="MemberManagementQuery" />
+            </query>
+            <entityRef>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="ProjectManagement" />
+            </entityRef>
+        </subEntity>
     </subObjects>
     <units>
         <propertyUnit>
@@ -1262,6 +1275,99 @@
                 <key name="name" value="MemberManagementQuery" />
             </query>
         </queryField>
+        <queryField>
+            <name>projectManagement.projectName</name>
+            <userDefined>true</userDefined>
+            <formulaString>#0</formulaString>
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectManagement.projectName].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>4e7390cb-3b74-4865-ad12-713402c479ca</key>
+                    <parentUnit>
+                        <key name="name" value="projectManagement.projectName" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="projectManagement" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="projectName" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="MemberManagementQuery" />
+            </query>
+        </queryField>
+        <propertyUnit>
+            <name>e005d01c-b842-47a8-bafc-01eb7d37d6ee</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[e005d01c-b842-47a8-bafc-01eb7d37d6ee].displayName</displayName>
+            <groupType />
+            <isSelector>false</isSelector>
+            <isFilter>false</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType />
+            <propertyRefs>
+                <propertyRef>
+                    <key>1d29f728-5af4-42a7-85e5-83caa8f6c49d</key>
+                    <parentUnit>
+                        <key name="name" value="e005d01c-b842-47a8-bafc-01eb7d37d6ee" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="MemberManagement" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="projectManagement" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="MemberManagementQuery" />
+            </query>
+        </propertyUnit>
+        <propertyUnit>
+            <name>9352d077-9a7c-4ac1-a537-4bd54fda31a0</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[9352d077-9a7c-4ac1-a537-4bd54fda31a0].displayName</displayName>
+            <groupType />
+            <isSelector>false</isSelector>
+            <isFilter>false</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType />
+            <propertyRefs>
+                <propertyRef>
+                    <key>e6ed6c1f-80be-49cb-873c-f4ae503a7a02</key>
+                    <parentUnit>
+                        <key name="name" value="9352d077-9a7c-4ac1-a537-4bd54fda31a0" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="projectManagement" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="id" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="MemberManagementQuery" />
+            </query>
+        </propertyUnit>
     </units>
     <defaultFilter>
         <name>defaultFilter</name>
@@ -1518,6 +1624,36 @@
                 <key name="name" value="MemberManagementQuery" />
             </query>
         </join>
+        <join>
+            <name>63a9c552-fa0d-486a-8928-583a5e79928b</name>
+            <formulaString>#0</formulaString>
+            <type>LEFT OUTER JOIN</type>
+            <leftObject>
+                <key name="name" value="MemberManagement" />
+            </leftObject>
+            <rightObject>
+                <key name="name" value="projectManagement" />
+            </rightObject>
+            <joinItems>
+                <joinItem>
+                    <name>7f4f11ed-ff67-4b72-87e5-a9754377cc59</name>
+                    <compareType>=</compareType>
+                    <leftField>
+                        <key name="name" value="e005d01c-b842-47a8-bafc-01eb7d37d6ee" />
+                    </leftField>
+                    <rightField>
+                        <key name="name" value="9352d077-9a7c-4ac1-a537-4bd54fda31a0" />
+                    </rightField>
+                    <join>
+                        <key name="name" value="63a9c552-fa0d-486a-8928-583a5e79928b" />
+                    </join>
+                </joinItem>
+            </joinItems>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="MemberManagementQuery" />
+            </query>
+        </join>
     </joins>
     <resource>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].alias">
@@ -1601,6 +1737,12 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].subObjects.subEntity[projectManagement].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].subObjects.subEntity[projectRole].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -1625,6 +1767,12 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[9352d077-9a7c-4ac1-a537-4bd54fda31a0].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[NewUnit0].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -1685,6 +1833,12 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[e005d01c-b842-47a8-bafc-01eb7d37d6ee].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[fbfb6893-e0eb-45e3-afe2-cff6ee18f027].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -1916,6 +2070,27 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectManagement.projectName].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="项目管理" />
+            <lang locale="zh_HK" value="項目管理" />
+            <lang locale="zh_TW" value="項目管理" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectManagement.projectName].extendedProperty.isCommonQueryFilter">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectManagement.projectName].extendedProperty.isCommonQuerySorter">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectManagement.projectName].extendedProperty.isUsingF7">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectName].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="项目名称" />

metadata/com/kingdee/eas/hr/project/app/R_MemberManagement_ProjectManagement_entrys.relation

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<relationship xmlns="com.kingdee.bos.metadata">
-    <package>com.kingdee.eas.hr.project.app</package>
-    <name>R_MemberManagement_ProjectManagement_entrys</name>
-    <alias>relationship[com.kingdee.eas.hr.project.app.R_MemberManagement_ProjectManagement_entrys].alias</alias>
-    <description>relationship[com.kingdee.eas.hr.project.app.R_MemberManagement_ProjectManagement_entrys].description</description>
-    <userDefined>true</userDefined>
-    <type>Composition</type>
-    <clientCardinality>1</clientCardinality>
-    <supplierCardinality>0..1</supplierCardinality>
-    <xmlNodeRelationship />
-    <clientObject>
-        <key name="package" value="com.kingdee.eas.hr.project.app" />
-        <key name="name" value="MemberManagement" />
-    </clientObject>
-    <supplierObject>
-        <key name="package" value="com.kingdee.eas.hr.project.app" />
-        <key name="name" value="ProjectManagement" />
-    </supplierObject>
-    <resource>
-        <rs key="relationship[com.kingdee.eas.hr.project.app.R_MemberManagement_ProjectManagement_entrys].alias">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="R_MemberManagement_ProjectManagement_entrys" />
-            <lang locale="zh_HK" value="R_MemberManagement_ProjectManagement_entrys" />
-            <lang locale="zh_TW" value="R_MemberManagement_ProjectManagement_entrys" />
-        </rs>
-        <rs key="relationship[com.kingdee.eas.hr.project.app.R_MemberManagement_ProjectManagement_entrys].description">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="relationship[com.kingdee.eas.hr.project.app.R_MemberManagement_ProjectManagement_entrys].extendedProperty.userDefined">
-            <lang locale="en_US" value="true" />
-            <lang locale="zh_CN" value="true" />
-            <lang locale="zh_TW" value="true" />
-        </rs>
-    </resource>
-</relationship>

metadata/com/kingdee/eas/hr/project/app/R_MemberManagement_ProjectManagement_projectManagement.relation

@@ -30,4 +30,3 @@
         </rs>
     </resource>
 </relationship>
-

metadata/com/kingdee/eas/hr/project/client/MemberManagementEditUI.ui

@@ -721,12 +721,12 @@
             </parent>
         </component>
         <component>
-            <name>kDLabelContainer1</name>
-            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].alias</alias>
+            <name>contstate</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].alias</alias>
             <userDefined>true</userDefined>
             <classType>com.kingdee.bos.ctrl.swing.KDLabelContainer</classType>
             <isContainer>true</isContainer>
-            <constraints>441,61,270,19</constraints>
+            <constraints>0,0,270,19</constraints>
             <tabIndex>0</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
@@ -739,28 +739,28 @@
                 <property>
                     <name>boundLabelText</name>
                     <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelText].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelText].value</value>
                     <isMultiLan>true</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>boundLabelLength</name>
                     <type>int</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelLength].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelLength].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>boundLabelUnderline</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelUnderline].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelUnderline].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>visible</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[visible].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[visible].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
@@ -770,8 +770,8 @@
             </parent>
         </component>
         <component>
-            <name>contstate</name>
-            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].alias</alias>
+            <name>contprojectManagement</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].alias</alias>
             <userDefined>true</userDefined>
             <classType>com.kingdee.bos.ctrl.swing.KDLabelContainer</classType>
             <isContainer>true</isContainer>
@@ -788,28 +788,28 @@
                 <property>
                     <name>boundLabelText</name>
                     <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelText].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelText].value</value>
                     <isMultiLan>true</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>boundLabelLength</name>
                     <type>int</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelLength].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelLength].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>boundLabelUnderline</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelUnderline].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelUnderline].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>visible</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[visible].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[visible].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
@@ -1520,118 +1520,126 @@
             </propertyBindings>
         </component>
         <component>
-            <name>kDBizPromptBox1</name>
-            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].alias</alias>
+            <name>state</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].alias</alias>
             <userDefined>true</userDefined>
-            <classType>com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox</classType>
+            <classType>com.kingdee.bos.ctrl.swing.KDComboBox</classType>
             <isContainer>false</isContainer>
             <constraints>7</constraints>
-            <tabIndex>0</tabIndex>
+            <tabIndex>27</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
-            <layoutInfo>
-                <name />
-                <type>XYLayout</type>
-                <value />
-            </layoutInfo>
             <properties>
-                <property>
-                    <name>queryInfo</name>
-                    <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[queryInfo].value</value>
-                    <isMultiLan>false</isMultiLan>
-                    <userDefined>true</userDefined>
-                </property>
                 <property>
                     <name>visible</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[visible].value</value>
-                    <isMultiLan>false</isMultiLan>
-                    <userDefined>true</userDefined>
-                </property>
-                <property>
-                    <name>editable</name>
-                    <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[editable].value</value>
-                    <isMultiLan>false</isMultiLan>
-                    <userDefined>true</userDefined>
-                </property>
-                <property>
-                    <name>displayFormat</name>
-                    <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[displayFormat].value</value>
-                    <isMultiLan>false</isMultiLan>
-                    <userDefined>true</userDefined>
-                </property>
-                <property>
-                    <name>editFormat</name>
-                    <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[editFormat].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[visible].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
-                    <name>commitFormat</name>
+                    <name>items</name>
                     <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[commitFormat].value</value>
-                    <isMultiLan>false</isMultiLan>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[items].value</value>
+                    <isMultiLan>true</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>required</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[required].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[required].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
             </properties>
             <parent>
-                <key name="name" value="kDLabelContainer1" />
+                <key name="name" value="contstate" />
             </parent>
+            <propertyBindings>
+                <propertyBinding>
+                    <propertyName>selectedItem</propertyName>
+                    <propertyType>java.lang.Object</propertyType>
+                    <bindingObject>editData</bindingObject>
+                    <bindingField>state</bindingField>
+                    <fieldType>com.kingdee.shr.base.syssetting.BaseItemStateEnum</fieldType>
+                    <accessType>2</accessType>
+                    <autoMode>false</autoMode>
+                    <herited>false</herited>
+                    <userDefined>true</userDefined>
+                </propertyBinding>
+            </propertyBindings>
         </component>
         <component>
-            <name>state</name>
-            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].alias</alias>
+            <name>prmtprojectManagement</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].alias</alias>
             <userDefined>true</userDefined>
-            <classType>com.kingdee.bos.ctrl.swing.KDComboBox</classType>
+            <classType>com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox</classType>
             <isContainer>false</isContainer>
             <constraints>7</constraints>
-            <tabIndex>27</tabIndex>
+            <tabIndex>28</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
             <properties>
+                <property>
+                    <name>queryInfo</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[queryInfo].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
                 <property>
                     <name>visible</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[visible].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[visible].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
-                    <name>items</name>
+                    <name>editable</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[editable].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>displayFormat</name>
                     <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[items].value</value>
-                    <isMultiLan>true</isMultiLan>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[displayFormat].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>editFormat</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[editFormat].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>commitFormat</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[commitFormat].value</value>
+                    <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>required</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[required].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[required].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
             </properties>
             <parent>
-                <key name="name" value="contstate" />
+                <key name="name" value="contprojectManagement" />
             </parent>
             <propertyBindings>
                 <propertyBinding>
-                    <propertyName>selectedItem</propertyName>
+                    <propertyName>data</propertyName>
                     <propertyType>java.lang.Object</propertyType>
                     <bindingObject>editData</bindingObject>
-                    <bindingField>state</bindingField>
-                    <fieldType>com.kingdee.shr.base.syssetting.BaseItemStateEnum</fieldType>
+                    <bindingField>projectManagement</bindingField>
+                    <fieldType>com.kingdee.eas.hr.project.ProjectManagementInfo</fieldType>
                     <accessType>2</accessType>
                     <autoMode>false</autoMode>
                     <herited>false</herited>
@@ -2688,6 +2696,36 @@
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelLength].value">
+            <lang locale="en_US" value="100" />
+            <lang locale="zh_CN" value="100" />
+            <lang locale="zh_HK" value="100" />
+            <lang locale="zh_TW" value="100" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelText].value">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="项目管理" />
+            <lang locale="zh_HK" value="項目管理" />
+            <lang locale="zh_TW" value="項目管理" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelUnderline].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[visible].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectName].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -2778,54 +2816,6 @@
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].alias">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[commitFormat].value">
-            <lang locale="en_US" value="$number$" />
-            <lang locale="zh_CN" value="$number$" />
-            <lang locale="zh_HK" value="$number$" />
-            <lang locale="zh_TW" value="$number$" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[displayFormat].value">
-            <lang locale="en_US" value="$type$" />
-            <lang locale="zh_CN" value="$type$" />
-            <lang locale="zh_HK" value="$type$" />
-            <lang locale="zh_TW" value="$type$" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[editFormat].value">
-            <lang locale="en_US" value="$number$" />
-            <lang locale="zh_CN" value="$number$" />
-            <lang locale="zh_HK" value="$number$" />
-            <lang locale="zh_TW" value="$number$" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[editable].value">
-            <lang locale="en_US" value="true" />
-            <lang locale="zh_CN" value="true" />
-            <lang locale="zh_HK" value="true" />
-            <lang locale="zh_TW" value="true" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[queryInfo].value">
-            <lang locale="en_US" value="com.kingdee.eas.hr.project.app.ProjectRoleQuery" />
-            <lang locale="zh_CN" value="com.kingdee.eas.hr.project.app.ProjectRoleQuery" />
-            <lang locale="zh_HK" value="com.kingdee.eas.hr.project.app.ProjectRoleQuery" />
-            <lang locale="zh_TW" value="com.kingdee.eas.hr.project.app.ProjectRoleQuery" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[required].value">
-            <lang locale="en_US" value="false" />
-            <lang locale="zh_CN" value="false" />
-            <lang locale="zh_HK" value="false" />
-            <lang locale="zh_TW" value="false" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[visible].value">
-            <lang locale="en_US" value="true" />
-            <lang locale="zh_CN" value="true" />
-            <lang locale="zh_HK" value="true" />
-            <lang locale="zh_TW" value="true" />
-        </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDDateCreateTime].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="创建时间" />
@@ -2862,36 +2852,6 @@
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].alias">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelLength].value">
-            <lang locale="en_US" value="100" />
-            <lang locale="zh_CN" value="100" />
-            <lang locale="zh_HK" value="100" />
-            <lang locale="zh_TW" value="100" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelText].value">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="项目管理" />
-            <lang locale="zh_HK" value="項目管理" />
-            <lang locale="zh_TW" value="項目管理" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelUnderline].value">
-            <lang locale="en_US" value="true" />
-            <lang locale="zh_CN" value="true" />
-            <lang locale="zh_HK" value="true" />
-            <lang locale="zh_TW" value="true" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[visible].value">
-            <lang locale="en_US" value="true" />
-            <lang locale="zh_CN" value="true" />
-            <lang locale="zh_HK" value="true" />
-            <lang locale="zh_TW" value="true" />
-        </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kdtEntrys].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -3143,6 +3103,54 @@
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="项目管理" />
+            <lang locale="zh_HK" value="項目管理" />
+            <lang locale="zh_TW" value="項目管理" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[commitFormat].value">
+            <lang locale="en_US" value="$number$" />
+            <lang locale="zh_CN" value="$number$" />
+            <lang locale="zh_HK" value="$number$" />
+            <lang locale="zh_TW" value="$number$" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[displayFormat].value">
+            <lang locale="en_US" value="$projectName$" />
+            <lang locale="zh_CN" value="$projectName$" />
+            <lang locale="zh_HK" value="$projectName$" />
+            <lang locale="zh_TW" value="$projectName$" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[editFormat].value">
+            <lang locale="en_US" value="$number$" />
+            <lang locale="zh_CN" value="$number$" />
+            <lang locale="zh_HK" value="$number$" />
+            <lang locale="zh_TW" value="$number$" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[editable].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[queryInfo].value">
+            <lang locale="en_US" value="com.kingdee.eas.hr.project.app.ProjectManagementQuery" />
+            <lang locale="zh_CN" value="com.kingdee.eas.hr.project.app.ProjectManagementQuery" />
+            <lang locale="zh_HK" value="com.kingdee.eas.hr.project.app.ProjectManagementQuery" />
+            <lang locale="zh_TW" value="com.kingdee.eas.hr.project.app.ProjectManagementQuery" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[required].value">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_HK" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[visible].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectRole].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="项目角色" />

src/com/kingdee/eas/hr/project/app/MemberManagementControllerBean.java

@@ -35,4 +35,9 @@ public class MemberManagementControllerBean extends AbstractMemberManagementCont
 {
     private static Logger logger =
         Logger.getLogger("com.kingdee.eas.hr.project.app.MemberManagementControllerBean");
+
+    @Override
+    protected IObjectPK _submit(Context ctx, IObjectValue model) throws BOSException, EASBizException {
+        return super._submit(ctx, model);
+    }
 }

websrc/com/kingdee/eas/hr/project/builder/ProjectMTreeBuilder.java

@@ -10,7 +10,7 @@ import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.framework.TreeBaseInfo;
 import com.kingdee.eas.hr.project.*;
 import com.kingdee.shr.base.syssetting.app.builder.CommonTreeBuilder;
-import com.kingdee.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,7 +35,15 @@ public class ProjectMTreeBuilder extends CommonTreeBuilder {
          List<Map<String, Object>> list = Lists.newArrayList();
         list.add((Map<String, Object>)this.getRootNode(ctx,params));
         IProjectManagement pm = ProjectManagementFactory.getLocalInstance(ctx);
-        ProjectManagementCollection pc = pm.getProjectManagementCollection();
+        StringBuffer sql = new StringBuffer("select * where projectState in('1','2')");
+        String domain = params.get("domain");
+        if(StringUtils.isNotBlank(domain)) {
+            String userAdminOrgRangeSql = params.get("userAdminOrgRangeSql");
+            sql.append("and adminOrg.id in(");
+            sql.append(userAdminOrgRangeSql);
+            sql.append(")");
+        }
+        ProjectManagementCollection pc = pm.getProjectManagementCollection(sql.toString());
         if(null!=pc&&!pc.isEmpty()) {
             for (int i=0;i<pc.size();i++) {
                 ProjectManagementInfo pmInfo = pc.get(i);

websrc/com/kingdee/eas/hr/project/handler/MemberManagementEditHandler.java

@@ -0,0 +1,70 @@
+package com.kingdee.eas.hr.project.handler;
+
+import com.google.common.collect.Maps;
+import com.kingdee.bos.Context;
+import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
+
+import com.kingdee.eas.hr.project.MemberManagementInfo;
+import com.kingdee.eas.hr.project.ProjectManagementFactory;
+import com.kingdee.eas.hr.project.ProjectManagementInfo;
+import com.kingdee.shr.base.syssetting.context.SHRContext;
+import com.kingdee.shr.base.syssetting.exception.SHRWebException;
+
+import com.kingdee.shr.base.syssetting.web.handler.EditHandler;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.ui.ModelMap;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.MessageFormat;
+import java.util.Map;
+
+/** 项目成员管理表单
+ * @BelongsProject: dataImpExp820
+ * @BelongsPackage: com.kingdee.eas.hr.project.handler
+ * @Author: lhbj
+ * @CreateTime: 2024-11-27  18:21
+ * @Description: TODO
+ * @Version: 1.0
+ */
+public class MemberManagementEditHandler extends EditHandler {
+
+    @Override
+    protected void setInitData(HttpServletRequest request, HttpServletResponse response, ModelMap modelMap, Map<String, Object> initData) throws SHRWebException {
+        super.setInitData(request, response, modelMap, initData);
+        MemberManagementInfo management = (MemberManagementInfo) modelMap.getAttribute("model");
+        initData.put("MemberState",management.getState().getValue());
+        Context ctx = SHRContext.getInstance().getContext();
+        try {
+            String prijectId = this.getProjectId(request);
+            if(StringUtils.isNotBlank(prijectId)) {
+                Map<String,String> projectMap = Maps.newHashMap();
+                ProjectManagementInfo p= ProjectManagementFactory.getLocalInstance(ctx).getProjectManagementInfo(new ObjectUuidPK(prijectId));
+                projectMap.put("id",p.getId().toString());
+                projectMap.put("number",p.getNumber());
+                projectMap.put("projectCode",p.getString("projectCode"));
+                projectMap.put("projectName",p.getString("projectName"));
+                projectMap.put("projectLevel",p.getString("projectLevel"));
+                projectMap.put("notes",p.getString("notes"));
+                projectMap.put("projectState",p.getString("projectState"));
+                initData.put("projectManagement",projectMap);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+    protected String getProjectId(HttpServletRequest request) throws SHRWebException {
+        String billId = request.getParameter("prijectID");
+        if (StringUtils.isEmpty(billId)) {
+            billId = request.getParameter("prijectId");
+        }
+
+        if (StringUtils.isEmpty(billId)) {
+            billId = (String)request.getAttribute("prijectId");
+        }
+        return billId;
+
+    }
+
+}

websrc/com/kingdee/eas/hr/project/handler/MemberManagementListHandler.java

@@ -1,24 +1,16 @@
 package com.kingdee.eas.hr.project.handler;
 
-import com.kingdee.bos.BOSException;
 import com.kingdee.bos.metadata.entity.FilterInfo;
 import com.kingdee.bos.metadata.entity.FilterItemCollection;
 import com.kingdee.bos.metadata.entity.FilterItemInfo;
-import com.kingdee.shr.base.syssetting.DomainFilterFacadeFactory;
-import com.kingdee.shr.base.syssetting.context.SHRContext;
 import com.kingdee.shr.base.syssetting.exception.SHRWebException;
 import com.kingdee.shr.base.syssetting.web.dynamic.model.ListUIViewInfo;
 import com.kingdee.shr.base.syssetting.web.dynamic.model.TreeNavigationInfo;
 import com.kingdee.shr.base.syssetting.web.dynamic.model.UIViewInfo;
-import com.kingdee.shr.base.syssetting.web.dynamic.util.UIViewUtil;
 import com.kingdee.shr.base.syssetting.web.handler.ListHandler;
-import com.kingdee.shr.base.syssetting.web.json.JSONUtils;
-import com.kingdee.util.StringUtils;
 import org.springframework.ui.ModelMap;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
 
 /** 项目成员管理列表
  * @BelongsProject: dataImpExp820
@@ -42,7 +34,7 @@ public class MemberManagementListHandler extends ListHandler {
         return uiViewInfo;
     }
     protected FilterInfo getTreeDomainFilter(HttpServletRequest request) throws SHRWebException {
-        FilterInfo ifo = null;;
+        FilterInfo ifo = null;
         FilterInfo filterInfo = super.getTreeDomainFilter(request);
         if(null!=filterInfo) {
             FilterItemCollection fcs = filterInfo.getFilterItems();
@@ -56,4 +48,12 @@ public class MemberManagementListHandler extends ListHandler {
         return ifo;
     }
 
+    @Override
+    protected FilterInfo getDefaultFilter(HttpServletRequest request, HttpServletResponse response) throws SHRWebException {
+        String userAdminOrgRangeSql = this.assembleTreeDataUserAdminOrgRangeSQL(request);
+        FilterInfo ifo = new FilterInfo();
+        ifo.getFilterItems().add(new FilterItemInfo("projectManagement.adminOrg.id in("+userAdminOrgRangeSql+")"));
+        ifo.getFilterItems().add(new FilterItemInfo("projectManagement.projectState in('1','2')"));
+        return ifo;
+    }
 }