From 80a824a0c534f55465b3de4e9b6a0d52ea9bbc77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 19 Jan 2023 17:03:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmGroup/XmGroupMng.vue      |  7 ++-
 src/views/xm/core/xmIteration/top-nav.vue     |  6 +--
 .../xm/core/xmQuestion/XmQuestionEdit.vue     | 10 ++--
 src/views/xm/core/xmTask/XmTaskAdd.vue        | 47 ++++++++++++++-----
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue
index e5d0090a..ecef806d 100644
--- a/src/views/xm/core/xmGroup/XmGroupMng.vue
+++ b/src/views/xm/core/xmGroup/XmGroupMng.vue
@@ -268,7 +268,12 @@ XmTaskExecuserSelect,
 					topdata.assUserid=this.filters.selProject.assUserid
 					topdata.assUsername=this.filters.selProject.assUsername
 				}else if(this.xmProduct && this.xmProduct.id){
-					topLabel=this.xmProduct.productName+"-产品组织架构"
+					
+					if(this.xmProduct.productName){
+						topLabel=this.xmProduct.productName+"-产品组织架构"
+					}else{
+						topLabel=this.xmProduct.id+"-产品组织架构"
+					}
 					currNodeType='product'
 					topdata=this.xmProduct
 					topdata.leaderUserid=this.xmProduct.pmUserid
diff --git a/src/views/xm/core/xmIteration/top-nav.vue b/src/views/xm/core/xmIteration/top-nav.vue
index 61a58a44..208fb7b2 100644
--- a/src/views/xm/core/xmIteration/top-nav.vue
+++ b/src/views/xm/core/xmIteration/top-nav.vue
@@ -58,12 +58,10 @@
         </el-menu-item>
         <el-menu-item :index="'/xm/core/iteration/question?iterationId='+xmIteration.id">
           <span slot="title"><i class="el-icon-question"></i>缺陷</span>
-        </el-menu-item>
-        <!--
+        </el-menu-item> 
         <el-menu-item :index="'/xm/core/iteration/group?iterationId='+xmIteration.id">
           <span slot="title"><i class="el-icon-user-solid"></i>团队</span>
-        </el-menu-item> 
-        -->
+        </el-menu-item>  
         <el-menu-item :index="'/xm/core/iteration/report?iterationId='+xmIteration.id">
           <span slot="title"><i class="el-icon-s-data"></i>效能</span>
         </el-menu-item> 
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 74c152be..1c0473c8 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -180,14 +180,14 @@
 					</el-row>
 				</el-form>
 				<el-drawer title="选中用户" :visible.sync="selectUserVisible"  size="70%"  append-to-body   :close-on-click-modal="false">
-					<xm-group-mng  :sel-project="selProject" :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng>
+					<xm-group-mng  v-if="selectUserVisible"   :sel-project="selProject" :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng>
 				</el-drawer>
 				<el-drawer title="选中任务" :visible.sync="selectTaskVisible"  size="70%"    append-to-body   :close-on-click-modal="false">
-					<xm-task-list  :sel-project="selProject"   @task-selected="onSelectedTask"></xm-task-list>
+					<xm-task-list  v-if="selectTaskVisible"   :sel-project="selProject"   @task-selected="onSelectedTask"></xm-task-list>
 				</el-drawer>
 
 				<el-drawer append-to-body title="需求选择" :visible.sync="selectMenuVisible"   size="60%"   :close-on-click-modal="false">
-					<xm-menu-select :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:xmProductCpd" :xm-iteration="xmIteration" :visible="selectMenuVisible" :is-select-menu="true" checkScope="3"  @selected="onSelectedMenu" :sel-project="selProject"></xm-menu-select>
+					<xm-menu-select v-if="selectMenuVisible" :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:xmProductCpd" :xm-iteration="xmIteration" :visible="selectMenuVisible" :is-select-menu="true" checkScope="3"  @selected="onSelectedMenu" :sel-project="selProject"></xm-menu-select>
 				</el-drawer>
 			</el-row>  
 			<el-drawer append-to-body title="标签" :visible.sync="tagSelectVisible" class="dialog-body" size="60%">
@@ -196,11 +196,11 @@
 			</el-drawer>
 			
 			<el-dialog append-to-body title="模块选择"  :visible.sync="funcVisible" width="60%" top="20px"  :close-on-click-modal="false">
-				<xm-func-select  @row-click="onFuncSelected" :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:xmProductCpd"></xm-func-select>
+				<xm-func-select v-if="funcVisible"  @row-click="onFuncSelected" :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:xmProductCpd"></xm-func-select>
 			</el-dialog>
 			
 			<el-dialog append-to-body title="执行用例选择"  :visible.sync="caseVisible" width="80%" top="20px"  :close-on-click-modal="false">
-				<xm-test-plan-case-mng :select="true" :visible="caseVisible" :xm-test-plan="xmTestPlan" :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:xmProductCpd" @select="onTestPlanCaseSelected" ></xm-test-plan-case-mng>
+				<xm-test-plan-case-mng  v-if="caseVisible" :select="true" :visible="caseVisible" :xm-test-plan="xmTestPlan" :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:xmProductCpd" @select="onTestPlanCaseSelected" ></xm-test-plan-case-mng>
 			</el-dialog>
 	</section>
 </template>
diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 8b8d46b7..f3714a4e 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -12,10 +12,15 @@
 						{{addForm.ntype==='0'?'任务名称':'计划名称'}}
 						</template>
 							<el-input v-model="addForm.name" placeholder="名称" ></el-input>   
-							<span class="label-font-color"> 
+							<span class="label-font-color" v-if="xmProjectCpd && xmProjectCpd.id"> 
   									<span>归属项目：{{addForm.projectName?addForm.projectName:''}}{{addForm.projectId?'('+addForm.projectId+')':''}} &nbsp;&nbsp;</span>
  									<span v-if="addForm.productId">归属产品：{{addForm.productId?addForm.productId:''}}  </span>
-						</span>
+							</span>
+							
+							<span class="label-font-color" v-if="!xmProjectCpd || !xmProjectCpd.id"> 
+								<span>归属项目：</span><xm-project-select style="display:inline;"  :auto-select="false"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
+								<span v-if="addForm.productId">归属产品：{{addForm.productId?addForm.productId:''}}  </span> 
+							</span>
 					</el-form-item>    
 						
 						
@@ -208,28 +213,25 @@
 			</el-form>
 		</el-row>
 		<el-drawer append-to-body title="选择负责人" :visible.sync="groupUserSelectVisible" size="60%"    :close-on-click-modal="false">
-			<xm-group-select :visible="groupUserSelectVisible" :sel-project="xmProject" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-group-select>
+			<xm-group-select v-if="groupUserSelectVisible" :visible="groupUserSelectVisible" :sel-project="addForm.projectId?{id:addForm.projectId,name:addForm.projectName}:xmProjectCpd" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-group-select>
 		</el-drawer>
 		<el-drawer append-to-body title="新增技能" :visible.sync="skillVisible" size="60%"    :close-on-click-modal="false">
-			<skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng>
+			<skill-mng  v-if="skillVisible" :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng>
 		</el-drawer>
 
 		<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" size="60%"   :close-on-click-modal="false">
-			<xm-menu-select :is-select-menu="true"  @selected="onMenuSelected" :sel-project="xmProject" :xm-product="xmProduct" :xm-iteration="xmIteration"></xm-menu-select>
-		</el-drawer>
-		<el-drawer append-to-body title="选择执行人"  :visible.sync="execGroupUserSelectVisible" size="60%"    :close-on-click-modal="false">
-			<xm-group-select :visible="execGroupUserSelectVisible" :sel-project="xmProject" :isSelectSingleUser="1" @user-confirm="execGroupUserSelectConfirm"></xm-group-select>
-		</el-drawer>
+			<xm-menu-select v-if="menuVisible" :is-select-menu="true"  @selected="onMenuSelected" :sel-project="addForm.projectId?{id:addForm.projectId,name:addForm.projectName}:xmProjectCpd" :xm-product="xmProduct" :xm-iteration="xmIteration"></xm-menu-select>
+		</el-drawer> 
 
 		<el-drawer title="选中任务" :visible.sync="selectTaskVisible"  size="60%"  append-to-body   :close-on-click-modal="false">
-			<xm-task-list  check-scope="task" query-scope="planTask" :sel-project="xmProject" :xm-product="xmProduct" :ptype="addForm.ptype"  @task-selected="onSelectedTask"></xm-task-list>
+			<xm-task-list  v-if="selectTaskVisible"  check-scope="task" query-scope="planTask" :sel-project="addForm.projectId?{id:addForm.projectId,name:addForm.projectName}:xmProjectCpd" :xm-product="xmProduct" :ptype="addForm.ptype"  @task-selected="onSelectedTask"></xm-task-list>
 		</el-drawer>
 
 		<el-drawer title="选中上级" :visible.sync="selectParentTaskVisible"  size="60%"  append-to-body   :close-on-click-modal="false">
-			<xm-phase-select check-scope="plan" query-scope="plan" :sel-project="xmProject" :xm-product="xmProduct" :ptype="addForm.ptype"   @select="onSelectedParentTask"></xm-phase-select>
+			<xm-phase-select v-if="selectParentTaskVisible" check-scope="plan" query-scope="plan" :sel-project="addForm.projectId?{id:addForm.projectId,name:addForm.projectName}:xmProjectCpd" :xm-product="xmProduct" :ptype="addForm.ptype"   @select="onSelectedParentTask"></xm-phase-select>
 		</el-drawer>
 		<el-drawer append-to-body title="需求明细" :visible.sync="menuDetailVisible" size="60%"    :close-on-click-modal="false">
-			<xm-menu-rich-detail :visible="menuDetailVisible"  :reload="true" :xm-menu="{menuId:addForm.menuId,menuName:addForm.menuName}" ></xm-menu-rich-detail>
+			<xm-menu-rich-detail v-if="menuDetailVisible" :visible="menuDetailVisible"  :reload="true" :xm-menu="{menuId:addForm.menuId,menuName:addForm.menuName}" ></xm-menu-rich-detail>
 		</el-drawer>
 	</section>
 </template>
@@ -248,6 +250,7 @@
 	import XmTaskList from '../xmTask/XmTaskList';
 	import XmGroupSelect from '../xmGroup/XmGroupSelect.vue'; 
 	import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm'
+	import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect";
 	export default {
 		computed: {
 			...mapGetters([
@@ -270,6 +273,15 @@
 						return 5
 					}
 				} 
+			},
+			xmProjectCpd(){
+				if(this.xmProject && this.xmProject.id){
+					return this.xmProject
+				}
+				if(this.parentTask && this.parentTask.id && this.parentTask.projectId){
+					 return {id:this.parentTask.projectId,name:this.parentTask.projectName}
+				} 
+				return null;
 			}
 		},
 		props:['xmTask','visible','xmProject','xmProduct',"parentTask","ptype",'xmIteration'],
@@ -636,10 +648,19 @@
 			toMenu(){
 				this.menuDetailVisible=true
 			},
+			
+			onProjectRowClick: function (project) { 
+				this.addForm.projectId=project.id
+				this.addForm.projectName=project.name
+			},
+			onProjectClear(){ 
+				this.addForm.projectId=""
+				this.addForm.projectName=""
+			},
 		},//end method
 		components: {
  			xmSkillMng,
-			skillMng,xmMenuSelect,XmTaskList,XmGroupSelect,MdpSelectUserXm,XmPhaseSelect
+			skillMng,xmMenuSelect,XmTaskList,XmGroupSelect,MdpSelectUserXm,XmPhaseSelect,XmProjectSelect
 			//在下面添加其它组件 'xm-task-edit':XmTaskEdit
 		},
 		mounted() {