From 5ac799311af91ac5dbbb927903111372e7e7a4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 8 Jun 2022 12:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmTask/XmPhase.vue   | 19 ++++---------------
 src/views/xm/core/xmTask/XmTaskMng.vue | 16 +++++++++-------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 76d1d40f..94cf4c35 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -65,8 +65,7 @@
             ></el-button>
           </el-popover>
           <el-button
-            @click="showParentTaskList" 
-            v-if="  queryScope=='plan'||queryScope=='planTask'"
+            @click="showParentTaskList"  
             title="更换任务的上级，实现任务搬家功能"
             icon="el-icon-upload2"
             v-loading="load.edit"
@@ -138,25 +137,15 @@
                   >查询</el-button
                 >
               </el-col>
-            </el-row>
-            <el-row> 
-              <el-col :span="24" style="padding-top: 5px">
-                <el-button type="danger"
-                  v-if="isTaskCenter != '1' && isMy != '1'"
-                  @click="batchDel"
-                  v-loading="load.edit"
-                  icon="el-icon-edit"
-                  >批量删除</el-button
-                >
-              </el-col>
-            </el-row>
+            </el-row> 
             <el-row> 
               <el-col :span="24" style="padding-top: 5px">
                 <el-button  title="一般情况下默认半个小时会统一更新一次，不需要手动更新，如需要立即汇总数据到上级计划，可以手动执行刷新操作"
-                  v-if="queryScope=='planTask'||queryScope=='plan'"
+                   
                   @click="calcProjectProgress"
                   v-loading="load.edit"
                   icon="el-icon-edit"
+                  type="warning"
                   >刷新全部计划进度数据</el-button
                 >
               </el-col>
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 317fb032..70d9072c 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -161,8 +161,7 @@
             ></el-button>
           </el-popover>
           <el-button
-            @click="showParentTaskList" 
-            v-if="  queryScope=='plan'||queryScope=='planTask'"
+            @click="showParentTaskList"  
             title="更换任务的上级，实现任务搬家功能"
             icon="el-icon-upload2"
             v-loading="load.edit"
@@ -373,7 +372,7 @@
                   <div    class="icon" :style="{backgroundColor:  scope.row.ntype==='1'?'#E6A23C':'#409EFF'}">
 									<i :class="scope.row.ntype==='1'?'el-icon-odometer':'el-icon-s-operation'" ></i>
 									</div>  
-                  <span class="vlink"   type="primary" @click.stop="showDrawer(scope.row)">
+                  <span    type="primary">
                     {{ scope.row.sortLevel }}&nbsp;  {{ scope.row.name }}
                     </span>
                   
@@ -866,10 +865,10 @@
         :reload="true"
         :xm-menu="{ menuId: editForm.menuId, menuName: editForm.menuName }"
       ></xm-menu-rich-detail>
-    </el-drawer>  
-		<el-drawer title="选中上级" :visible.sync="selectParentTaskVisible"  size="60%"  append-to-body   :close-on-click-modal="false">
-			<xm-task-list check-scope="plan" queryScope="plan" :sel-project="filters.selProject"   @task-selected="onSelectedParentTask"></xm-task-list>
-		</el-drawer>
+    </el-drawer>    
+    <el-dialog title="选择新的上级计划" append-to-body :visible.sync="selectParentTaskVisible" width="60%" top="20px">
+      <xm-phase-select :sel-project="filters.selProject"   @select="onSelectedParentTask"></xm-phase-select>
+    </el-dialog>
   </section>
 </template>
 
@@ -926,6 +925,8 @@ import XmGroupSelect from "../xmGroup/XmGroupSelect.vue";
   
   	import TagDialog from "@/views/mdp/arc/tag/TagDialog";
   	import XmTaskWorkloadEdit from "@/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit";
+    
+import XmPhaseSelect from "./XmPhaseSelect.vue"; 
 
 export default {
   computed: {
@@ -2500,6 +2501,7 @@ export default {
     XmGroupDialog,
     XmTableConfig,
     XmTaskWorkloadEdit,
+    XmPhaseSelect,
     //在下面添加其它组件
   },
   mounted() {