From d2ae4575157d2f66a30b1a2c5996e47c76dec870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 12 Jul 2022 22:59:12 +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

---
 .../xm/core/xmIteration/XmIterationInfo.vue   |  6 +--
 .../XmIterationOverviewComplex.vue            |  4 +-
 src/views/xm/core/xmMenu/XmEpicFeatures.vue   |  6 +--
 src/views/xm/core/xmMenu/XmMenuBox.vue        |  8 ++--
 src/views/xm/core/xmMenu/XmMenuMng.vue        | 10 ++---
 .../xmProject/XmProjectForLinkComplex.vue     | 45 ++++++++++---------
 src/views/xm/core/xmTask/XmPhase.vue          | 22 ++++++---
 7 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationInfo.vue b/src/views/xm/core/xmIteration/XmIterationInfo.vue
index 93c58400..877fedec 100644
--- a/src/views/xm/core/xmIteration/XmIterationInfo.vue
+++ b/src/views/xm/core/xmIteration/XmIterationInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="page-container">
+  <section>
     <el-row>
       <el-menu
         :default-active="infotype"
@@ -341,7 +341,7 @@
         <xm-menu-mng
           v-if="infotype == '需求'"
           :xm-iteration="xmIteration"
-          :disabled-mng="false"
+          :xm-product="{id:xmIteration.productId,name:xmIteration.productName}" 
         ></xm-menu-mng>
         <xm-task-mng
           v-if="infotype == '任务'"
@@ -405,7 +405,7 @@ import xmCost from "../xmProject/XmProjectCost";
 import xmBudget from "../xmProject/XmProjectBudgetCost";
 import xmContract from "../xmContract/XmContractMng";
 import xmEnvList from "../xmEnvList/XmEnvListMng";
-import xmMenuMng from "../xmMenu/XmMenuMng";
+import xmMenuMng from "../xmMenu/XmMenuBox";
 import xmMenuWithPlan from "../xmMenu/XmMenuWithPlan";
 import xmProjectStateMng from "../xmProjectState/XmProjectStateMng";
 import xmTestCaseExecMng from "../xmTestCaseExec/XmTestCaseExecMng";
diff --git a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue
index ee5000ba..9ec9b183 100644
--- a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="page-container  padding-left padding-right">
+  <section class="padding-left padding-right">
       <el-menu mode="horizontal" :default-active="showPanelName"  @select="onMenuToolBarSelect">
         <el-menu-item index="overview">
           <span slot="title">迭代概览</span>
@@ -28,7 +28,7 @@
         <xm-iteration-edit v-if="showPanelName=='detail'" :xm-iteration="xmIteration" @edit-fields="onEditFields"></xm-iteration-edit>
       <xm-iteration-link-for-product  v-if="showPanelName=='iterationProductLink'" :xm-iteration="xmIteration"></xm-iteration-link-for-product>
       <xm-iteration-link-for-project  v-if="showPanelName=='iterationProjectLink'" :xm-iteration="xmIteration"></xm-iteration-link-for-project>
-      <xm-iteration-menu-mng v-if="showPanelName=='iterationMenuMng'" :xm-iteration="xmIteration"  ref="iterationMenuMng"></xm-iteration-menu-mng>
+      <xm-iteration-menu-mng v-if="showPanelName=='iterationMenuMng'" :xm-iteration="xmIteration"  ref="iterationMenuMng"  class="padding-top"></xm-iteration-menu-mng>
       <div v-if="showPanelName=='iterationCalc'" class="padding">
         <el-row>
           <el-button type="primary" @click="loadTasksToXmIterationState" v-loading="load.calcIteration">计算迭代统计数据</el-button>
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index 5f7db170..fe6efe25 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -39,7 +39,7 @@
 									<el-button  @click="showImportFromMenuTemplate()" icon="el-icon-upload2">由模板快速导入需求</el-button>
 								</el-col>
 							</el-row>
-							<el-button type="primary"  round  slot="reference" icon="el-icon-plus"></el-button>
+							<el-button type="primary" v-if="!disabledMng" round  slot="reference" icon="el-icon-plus"></el-button>
 						</el-popover> 
 						<el-popover
 							placement="top-start"
@@ -60,7 +60,7 @@
 									@click="batchDel"
 									v-loading="load.del"
 									icon="el-icon-delete"
-									title="批量删除"
+									title="批量删除" v-if="!disabledMng"
 									>批量删除</el-button
 								>
 								<el-button          @click="loadTasksToXmMenuState" icon="el-icon-s-marketing" title="汇总进度">汇总进度</el-button> 
@@ -74,7 +74,7 @@
 								>
 							</el-col>
 							</el-row> 
-							<el-button  slot="reference" @click="moreVisible=!moreVisible" icon="el-icon-more"></el-button>
+							<el-button slot="reference" @click="moreVisible=!moreVisible" icon="el-icon-more"></el-button>
 						</el-popover> 
 						</span>
 					 </el-row>
diff --git a/src/views/xm/core/xmMenu/XmMenuBox.vue b/src/views/xm/core/xmMenu/XmMenuBox.vue
index 7dbf667c..c0b48d2a 100644
--- a/src/views/xm/core/xmMenu/XmMenuBox.vue
+++ b/src/views/xm/core/xmMenu/XmMenuBox.vue
@@ -3,12 +3,12 @@
 		<el-row class="padding-left padding-right">
 			<el-col :span="8">
 				<el-row class="padding-left padding-right" v-if="!xmProduct||!xmProduct.id" > 
-						<xm-product-select ref="xmProductSelect1" style="display:inline;"  :auto-select="true" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect"></xm-product-select>
+						<xm-product-select ref="xmProductSelect1" style="display:inline;"  :auto-select="true" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect" ></xm-product-select>
 				</el-row>
-				<xm-epic-features v-if="filters.xmProduct && filters.xmProduct.id" :xm-product="filters.xmProduct" :sel-project="selProject"  @row-click="onEpicFeaturesRowClick"></xm-epic-features>
+				<xm-epic-features v-if="filters.xmProduct && filters.xmProduct.id" :xm-product="filters.xmProduct" :sel-project="selProject"  @row-click="onEpicFeaturesRowClick" :disabled-mng="xmIteration&&xmIteration.id?true:false"></xm-epic-features>
 			</el-col> 
 			<el-col :span="16" v-if="filters.xmProduct && filters.xmProduct.id">
-				<xm-menu-mng class="padding-left" :xm-product="filters.xmProduct" :sel-project="selProject"  :parent-menu="parentMenu"></xm-menu-mng>
+				<xm-menu-mng class="padding-left" :xm-product="filters.xmProduct" :sel-project="selProject"  :parent-menu="parentMenu" :xm-iteration="xmIteration" :disabled-mng="xmIteration&&xmIteration.id?true:false"></xm-menu-mng>
 			</el-col>
 		</el-row>
 	</section>
@@ -27,7 +27,7 @@
 		components: {   
 			XmEpicFeatures,XmMenuMng,XmProductSelect
 		},
-        props:['xmProduct','selProject'],
+        props:['xmProduct','selProject','xmIteration'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index e8d6dc7c..1b996940 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -136,7 +136,7 @@
  								</el-col>
 								<el-col  :span="24"  style="padding-top:5px;">
 									<el-button    @click="handleExport" icon="el-icon-download">导出</el-button>
-									<el-button   v-if="  disabledMng!=false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">汇总进度</el-button>
+									<el-button   v-if="  disabledMng!==false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">汇总进度</el-button>
 
 								</el-col>
 							</el-row>
@@ -176,13 +176,13 @@
 									<el-button  @click="showImportFromMenuTemplate()" icon="el-icon-upload2">由模板快速导入需求</el-button>
 								</el-col>
 							</el-row>
-							<el-button type="primary"  round  slot="reference" icon="el-icon-plus"></el-button>
+							<el-button type="primary" v-if="!disabledMng"  round  slot="reference" icon="el-icon-plus"></el-button>
 						</el-popover>
 
-						<el-button  @click="showParentMenu" icon="el-icon-top" title="更换上级"></el-button>
- 						<el-button  v-if="disabledMng!=false"  type="danger" @click="batchDel" icon="el-icon-delete" title="删除"></el-button>
+						<el-button class="hidden-md-and-down" @click="showParentMenu" icon="el-icon-top" title="更换上级"></el-button>
+ 						<el-button class="hidden-md-and-down"  v-if="!disabledMng "  type="danger" @click="batchDel" icon="el-icon-delete" title="删除"></el-button>
  
-						<xm-table-config ref="tableConfig" style="display:inline;" :table="$refs.table"></xm-table-config>
+						<xm-table-config class="hidden-lg-and-down" ref="tableConfig" style="display:inline;" :table="$refs.table"></xm-table-config>
 
 						</span>
 					 </el-row>
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index e7600367..f98fa250 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <el-row>
-      <el-col :span="6" class="padding-right padding-left">
+      <el-col :span="4" class="padding-right padding-left">
         <el-row class="padding">
           <el-col :span="20">
             <xm-project-select
@@ -13,28 +13,14 @@
               @clear="onProjectClearSelect"
             ></xm-project-select>
           </el-col>
-          <el-col :span="4">
-            <el-popover
-              placement="bottom"
-              width="800"
-              v-model="projectAddVisible"
-              trigger="manual"
-            >
-              <xm-project-add
-                :visible="projectAddVisible"
-                op-type="add"
-                :xm-product="xmProduct"
-                @cancel="projectAddVisible = false"
-                @submit="afterProjectAddSubmit"
-              ></xm-project-add>
+          <el-col :span="4" v-if="xmProduct">
+             
               <el-link
-                type="warning"
-                slot="reference"
+                type="warning" 
                 @click="projectAddVisible = true"
                 icon="el-icon-plus"
                 ><font style="font-size: 14px">项目</font></el-link
-              >
-            </el-popover>
+              > 
           </el-col>
         </el-row>
         <el-row
@@ -134,7 +120,7 @@
 			</el-steps>
         </el-row>
       </el-col>
-      <el-col :span="18">
+      <el-col :span="20">
         <el-tabs :value="showPanel" @tab-click="tabClick">
           <el-tab-pane
             label="项目概览"
@@ -222,7 +208,7 @@
               :disabled-mng="false"
             ></xm-menu-mng>
           </el-tab-pane>
-
+          
           <el-tab-pane
             label="计划"
             lazy
@@ -280,6 +266,21 @@
         </el-tabs> 
       </el-col>
     </el-row>
+    
+            <el-dialog 
+              width="80%"
+              :visible.sync="projectAddVisible" 
+              top="20px"
+              append-to-body
+            >
+              <xm-project-add
+                :visible="projectAddVisible"
+                op-type="add"
+                :xm-product="xmProduct"
+                @cancel="projectAddVisible = false"
+                @submit="afterProjectAddSubmit"
+              ></xm-project-add> 
+            </el-dialog>
   </section>
 </template>
 
@@ -287,7 +288,7 @@
 import util from "@/common/js/util"; //全局公共库
 import config from "@/common/config"; //全局公共库
 import XmIterationMng from "../xmIteration/XmIterationMng.vue";
-import XmMenuMng from "../xmMenu/XmMenuMng.vue";
+import XmMenuMng from "../xmMenu/XmMenuBox.vue";
 import XmIterationStateShow from "../xmIterationState/XmIterationStateShow.vue";
 import { mapGetters } from "vuex";
 import XmProductMng from "../xmProduct/XmProductMng.vue";
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 0643156c..c3522413 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -9,7 +9,7 @@
           
           <span style="float:left;"> 
            <xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
-           <el-input style="width:120px;" v-model="filters.key" placeholder="名称模糊查询"  clearable></el-input>
+           <el-input style="width:120px;" v-model="filters.key" placeholder="名称模糊查询"  class="hidden-md-and-down" clearable></el-input>
            <el-button icon="el-icon-search" @click="searchXmTasks()"></el-button>  
           <el-popover
             placement="top-start"
@@ -61,13 +61,14 @@
             ></el-button>
           </el-popover>
           <el-button
+            class="hidden-lg-and-down"
             @click="showParentTaskList"  
             title="更换任务的上级，实现任务搬家功能"
             icon="el-icon-upload2"
             v-loading="load.edit"
           > </el-button> 
           <el-button type="danger"
-          class="hidden-md-and-down"
+          class="hidden-lg-and-down"
             @click="batchDel"
             v-loading="load.del"
             icon="el-icon-delete"
@@ -138,13 +139,20 @@
                   >查询</el-button
                 >
                  <el-button type="danger"
-                  class="hidden-lg-and-up"
+                  class="hidden-xl-only"
                     @click="batchDel"
                     v-loading="load.del"
                     icon="el-icon-delete"
                     title="批量删除"
                     ></el-button
                   >
+                <el-button
+                  class="hidden-xl-only"
+                  @click="showParentTaskList"  
+                  title="更换任务的上级，实现任务搬家功能"
+                  icon="el-icon-upload2"
+                  v-loading="load.edit"
+                > </el-button> 
                 <el-button 
                   icon="el-icon-close"
                   @click="moreVisible=false"
@@ -1108,11 +1116,11 @@ export default {
       if (this.filters.executor) {
         params.executorUserid = this.filters.executor.userid;
       }
-      if (this.filters.product) {
-        params.productId = this.filters.product.id;
+      if (this.filters.product) {//上级不需要按产品过滤
+        //params.productId = this.filters.product.id;
       }
-      if (this.xmIteration) {
-        params.iterationId = this.xmIteration.id;
+      if (this.xmIteration) {//上级不需要按迭代过滤
+        //params.iterationId = this.xmIteration.id;
       }
       if (this.filters.tags && this.filters.tags.length>0) {
         params.tagIdList = this.filters.tags.map(i=>i.tagId);