From 32ffc87e96a227e6750e818ee946d10d7f77375d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 11 Mar 2022 02:46:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mdp/arc/tag/TagMng.vue       | 16 +++---
 src/views/xm/core/xmTask/XmTaskMng.vue | 75 ++++++--------------------
 2 files changed, 25 insertions(+), 66 deletions(-)

diff --git a/src/views/mdp/arc/tag/TagMng.vue b/src/views/mdp/arc/tag/TagMng.vue
index 465901bf..4d98c314 100644
--- a/src/views/mdp/arc/tag/TagMng.vue
+++ b/src/views/mdp/arc/tag/TagMng.vue
@@ -4,14 +4,14 @@
       <el-row v-if="editVisible==false">
         <el-col :span="10"> 
           <el-button type="primary"  @click="selectConfirm" icon="el-icon-finished">确认选择</el-button>
-          <el-button  @click="getAllHrSkill" v-loading="sectionLoading" icon="el-icon-search">刷新标签</el-button>
+          <el-button  @click="searchTags" v-loading="sectionLoading" icon="el-icon-search">刷新标签</el-button>
         </el-col> 
         <el-col :span="14"> 
-           <el-button type="text"  @click="editVisible=true" icon="el-icon-edit">管理技能</el-button> 
-          <el-tooltip content="黄色表示已经有的技能">
+           <el-button type="text"  @click="editVisible=true" icon="el-icon-edit">管理标签</el-button> 
+          <el-tooltip content="黄色表示已经有的标签">
             <span class="addTagSquare"></span>
           </el-tooltip>
-          <el-tooltip content="白色表示尚未拥有的技能">
+          <el-tooltip content="白色表示尚未拥有的标签">
             <span class="closeTagSquare"></span>
           </el-tooltip>
         </el-col> 
@@ -29,14 +29,14 @@
           <el-input
             style="width:50%;"
             v-model="needAddTagCategoryNameInputValue"
-            placeholder="回车直接快速添加技能分类"
+            placeholder="回车直接快速添加标签分类"
             @keyup.enter.native="addTagCategorySubmitMethod"
           ></el-input>
           <el-button type="primary"  @click="addTagCategorySubmitMethod" icon="el-icon-finished">保存分类</el-button>
-          <el-tooltip content="黄色表示已经有的技能">
+          <el-tooltip content="黄色表示已经有的标签">
             <span class="addTagSquare"></span>
           </el-tooltip>
-          <el-tooltip content="白色表示尚未拥有的技能">
+          <el-tooltip content="白色表示尚未拥有的标签">
             <span class="closeTagSquare"></span>
           </el-tooltip>
         </el-col> 
@@ -89,7 +89,7 @@
             <el-input
               style="200px;"
               v-model="item.showAddButtonInputValue"
-              placeholder="请输入技能,回车即可"
+              placeholder="请输入标签,回车即可"
               @keyup.enter.native="addTagMethod(index)"
               autofocus
             ></el-input>
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 14791e0c..d31fe974 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -7,6 +7,14 @@
         :class="{ 'flex-box': displayType == 'agil' }"
       >
         <el-row>  
+          
+          <el-popover
+            placement="right"
+            width="400"
+            trigger="click"> 
+            <xm-project-select v-if="!selProject||!selProject.id" :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick"></xm-project-select>
+              <el-link type="warning" slot="reference" v-if="!selProject||!selProject.id"  icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
+          </el-popover> 
 					<el-select style="width: 100px" v-model="filters.taskState" placeholder="状态">
 									<el-option value="0" label="待领取"></el-option>
 									<el-option value="1" label="已领取执行中"></el-option>
@@ -109,25 +117,7 @@
             >{{ filters.tags[0].tagName.substr(0, 5) }}等({{
               filters.tags.length
             }})个</el-tag
-          >
-
-          <font v-if="!selProject">
-            <el-tag
-              class="hidden-md-and-down"
-              v-if="filters.selProject"
-              closable
-              @click="showProjectList"
-              @close="clearProject"
-              >{{ this.filters.selProject.name }}</el-tag
-            >
-            <el-button
-              class="hidden-md-and-down"
-              v-else
-              @click="showProjectList"
-              type="plian"
-              >选项目</el-button
-            >
-          </font>
+          > 
           <el-input
             style="width: 200px"
             v-model="filters.key"
@@ -214,20 +204,7 @@
                 <el-button v-else @click="showProductVisible" type="plian"
                   >选产品</el-button
                 >
-              </el-col>
-              <el-col :span="24" style="padding-top: 5px" v-if="!selProject">
-                <font class="more-label-font">项目:</font
-                ><el-tag
-                  v-if="filters.selProject"
-                  closable
-                  @click="showProjectList"
-                  @close="clearProject"
-                  >{{ this.filters.selProject.name }}</el-tag
-                >
-                <el-button v-else @click="showProjectList" type="plian"
-                  >选项目</el-button
-                >
-              </el-col>
+              </el-col> 
               <el-col :span="24" style="padding-top: 5px">
                 <font class="more-label-font">需求:</font>
                 <font v-if="filters.menus && filters.menus.length > 0">
@@ -874,20 +851,7 @@
         @changeShowInfo="changeShowInfo"
         @submit="changeShowInfo"
       ></xm-project-info>
-    </el-drawer>
-
-    <el-drawer
-      title="选中项目"
-      :visible.sync="selectProjectVisible"
-      :size="750"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <xm-project-list
-        class="padding-left"
-        @project-confirm="onPorjectConfirm"
-      ></xm-project-list>
-    </el-drawer>
+    </el-drawer> 
 
     <el-drawer
       append-to-body
@@ -1055,7 +1019,7 @@ import xmMenuSelect from "../xmMenu/XmMenuSelect";
 
 import { addXmMyFocus, delXmMyFocus } from "@/api/xm/core/xmMyFocus";
 
-import XmProjectList from "../xmProject/XmProjectList";
+import XmProjectSelect from "../xmProject/XmProjectSelect";
 
 import XmMenuRichDetail from "../xmMenu/XmMenuRichDetail";
 import XmProductSelect from "../xmProduct/XmProductSelect"; //修改界面
@@ -1298,8 +1262,7 @@ export default {
       parentTask: null,
       projectInfoVisible: false,
       batchEditVisible: false,
-      valueChangeRows: [], //批量修改时，存储修改过的行
-      selectProjectVisible: false,
+      valueChangeRows: [], //批量修改时，存储修改过的行 
       menuVisible: false,
       menuDetailVisible: false,
       pickerOptions: util.pickerOptions(),
@@ -2109,13 +2072,9 @@ export default {
       this.filters.product = product;
       this.productSelectVisible = false;
       this.searchXmTasks();
-    },
-    showProjectList: function () {
-      this.selectProjectVisible = true;
-    },
-    onPorjectConfirm: function (project) {
-      this.filters.selProject = project;
-      this.selectProjectVisible = false;
+    }, 
+    onProjectRowClick: function (project) {
+      this.filters.selProject = project; 
       this.searchXmTasks();
     },
     handleCommand(command) {
@@ -2426,7 +2385,7 @@ export default {
     skillMng,
     xmPhaseMng,
     xmTaskTemplateMng,
-    XmProjectList,
+    XmProjectSelect,
     xmExchangeMng,
     xmMenuSelect,
     XmMenuRichDetail,