From 29e423e6bf27d7975cd009791e7e2cf7df74c9f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 2 Apr 2022 01:55:25 +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/styles/mdp.scss                           |  3 +-
 .../xm/core/xmMenuWorkItem/XmSubBugList.vue   | 25 +++++------
 .../xm/core/xmMenuWorkItem/XmSubMenuList.vue  | 43 ++++++++++---------
 .../xm/core/xmMenuWorkItem/XmSubTaskList.vue  | 22 ++++------
 .../xm/core/xmMenuWorkItem/XmSubWorkItem.vue  | 19 +++++++-
 .../xm/core/xmTaskWorkItem/XmSubTaskList.vue  |  5 ---
 .../xm/core/xmTaskWorkItem/XmSubWorkItem.vue  |  5 +++
 7 files changed, 66 insertions(+), 56 deletions(-)

diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index 5fa6780c..0a43cfcf 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -241,8 +241,9 @@
 
 .el-table__row td:hover{
 	.cell-bar{
-		display: block;
+		display: block; 
 		float: right;  
+    width: 90%;
 	}
   .cell-text{
     display:none;
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
index 1bce38c0..f866714d 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
@@ -1,25 +1,20 @@
 <template>
-    <el-row v-show="parentXmMenu.dclass==='3' && xmBugs.length>0"> 
-      <el-row>
-        <div class="icon" style="background-color: #F56C6C;">
-          <i class="el-icon-warning"></i>
-        </div>
-        缺陷 
-        <span style="float:right;">
-          <el-button @click="batchDel" type="danger" icon="el-icon-delete" plain></el-button>
-        </span>
-      </el-row>
+    <el-row v-show="parentXmMenu.dclass==='3' && xmBugs.length>0">  
       <el-row>
         <el-table :data="xmBugs" :max-height="400" @selection-change="selsChange" @row-click="rowClick">
           <el-table-column type="selection" label="全选"></el-table-column>
-          <el-table-column prop="id" label="缺陷编号" width="100px" show-overflow-tooltip="">
-            
-            </el-table-column> 
-          <el-table-column prop="name" label="名称" min-width="250px">
+          <el-table-column prop="name" label="名称" min-width="250px"  show-overflow-tooltip>
               <template slot-scope="scope">
 				  <div class="icon" style="background-color: #F56C6C;">
 					<i class="el-icon-warning"></i>
-					</div>{{scope.row.id}}&nbsp;&nbsp;{{scope.row.name}}
+					</div>
+					
+					<span class="cell-text">
+						 {{scope.row.name}}
+					</span>
+					<span class="cell-bar" >
+							  <el-input title="名称" placeholder="名称" v-model="scope.row.name"  style="width:100%;"  @change="editXmQuestionSomeFields(scope.row,'name',$event)"></el-input> 
+					</span> 
 			  </template>
             </el-table-column> 
 
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
index a1b52587..f0d20578 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
@@ -1,29 +1,30 @@
 <template>
   <section> 
-    <el-row v-if="parentXmMenu.dclass<'3' && xmMenus.length>0">
-      <el-row v-if="parentXmMenu.dclass==='1'">
-         <div class="icon" style="background-color:  rgb(0, 153, 51);">
-            <i class="el-icon-s-flag"></i>
-          </div>特性
-          
-          <span style="float:right;">
-            <el-button @click="batchDel" type="danger" icon="el-icon-delete" plain></el-button>
-          </span>
-      </el-row>
-      <el-row v-if="parentXmMenu.dclass==='2'">
-        <div  class="icon" :style="{backgroundColor: calcMenuLabel.color }">
-            <i :class="calcMenuLabel.icon"></i>
-          </div>  
-          用户故事  
-          
-          <span style="float:right;">
-            <el-button @click="batchDel" type="danger" icon="el-icon-delete" plain></el-button>
-          </span>
-      </el-row> 
+    <el-row v-if="parentXmMenu.dclass<'3' && xmMenus.length>0"> 
       <el-row>
         <el-table :data="xmMenus" :max-height="400"  highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
           <el-table-column type="selection" label="全选"></el-table-column>
-          <el-table-column prop="menuName" label="名称" min-width="250"></el-table-column>
+          <el-table-column prop="menuName" label="名称" min-width="250" show-overflow-tooltip> 
+              <template slot-scope="scope" >
+				  <span style="display:inline;">
+				<div  v-if="scope.row.dclass=='1'" class="icon" style="background-color:  rgb(255, 153, 51);">
+				<i class="el-icon-s-promotion"></i>
+				</div>
+				<div v-if="scope.row.dclass=='2'" class="icon" style="background-color:  rgb(0, 153, 51);">
+				<i class="el-icon-s-flag"></i>
+				</div>
+				<div v-if="scope.row.dclass=='3'" class="icon" style="background-color:  rgb(79, 140, 255);">
+				<i class="el-icon-document"></i>
+				</div>
+				  </span>  
+					<span class="cell-text">
+						{{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}}
+					</span>
+					<span class="cell-bar">
+							<el-input title="序号" style="width:30%;"  v-model="scope.row.seqNo" placeholder="序号"  @change="editXmMenuSomeFields(scope.row,'seqNo',$event)"></el-input><el-input title="名称" placeholder="名称" v-model="scope.row.menuName"  style="width:60%;"  @change="editXmMenuSomeFields(scope.row,'menuName',$event)"></el-input> 
+					</span> 
+			  </template>
+		  </el-table-column>
           <el-table-column prop="status" label="状态"  min-width="80"  sortable>
 								<template slot-scope="scope">
 									<div class="cell-text">
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
index 7c6b897e..0b1795f7 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
@@ -1,23 +1,19 @@
 <template>
-    <el-row v-show="parentXmMenu.dclass==='3' && xmTasks.length>0"> 
-      <el-row>
-         <div class="icon" style="background-color:  #1CC7EA;">
-            <i class="el-icon-s-operation"></i>
-          </div>
-        任务
-        <span style="float:right;">
-          <el-button @click="getXmTasks" type="primary" icon="el-icon-search" plain></el-button>
-          <el-button @click="batchDel" type="danger" icon="el-icon-delete" plain></el-button>
-        </span>
-      </el-row>
+    <el-row v-show="parentXmMenu.dclass==='3' && xmTasks.length>0">  
       <el-row>
         <el-table :data="xmTasks"  :max-height="400" v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
           <el-table-column type="selection" label="全选"></el-table-column>
-          <el-table-column prop="name" label="名称">
+          <el-table-column prop="name" label="名称"  show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div    class="icon" :style="{backgroundColor:  scope.row.ntype==='1'?'#E6A23C':'#1CC7EA'}">
 									<i :class="scope.row.ntype==='1'?'el-icon-odometer':'el-icon-s-operation'" ></i>
-									</div>  {{scope.row.name}}
+									</div>    
+									<span class="cell-text">
+										 {{scope.row.sortLevel}}&nbsp;{{scope.row.name}}
+									</span>
+									<span class="cell-bar">
+									  	<el-input title="序号" style="width:30%;"  v-model="scope.row.sortLevel" placeholder="序号"  @change="editXmTaskSomeFields(scope.row,'sortLevel',$event)"></el-input><el-input title="名称" placeholder="名称" v-model="scope.row.name"  style="width:60%;"  @change="editXmTaskSomeFields(scope.row,'name',$event)"></el-input> 
+									</span>
                 </template>
               </el-table-column>
               <el-table-column
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubWorkItem.vue b/src/views/xm/core/xmMenuWorkItem/XmSubWorkItem.vue
index 755838cb..831d9658 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubWorkItem.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubWorkItem.vue
@@ -27,6 +27,8 @@
             <i class="el-icon-warning"></i>
           </div>
         添加缺陷</el-button>
+      <el-button   icon="el-icon-delete" type="danger" plain @click="doDelete"> 
+        </el-button>
       </span>
     </el-row>
        <xm-sub-menu-list ref="menuList" :link-project-id="linkProjectId?linkProjectId:(xmProject?xmProject.id:null)" :parentXmMenu="parentXmMenu" @menus-change="onMenusChange" @add-submit="$emit('add-sub-menu',$event)"></xm-sub-menu-list>
@@ -74,7 +76,7 @@ export default {
     'parentXmMenu','linkProjectId'
   ],
   watch: {
-    'parentXmMenu.menuId':function(){
+    'parentXmMenu':function(){
       this.initData();
     }
 
@@ -112,6 +114,21 @@ export default {
           this.$refs.bugList.showAdd();
         }
     },
+    doDelete(){ 
+          if((this.$refs.menuList.sels.length+ this.$refs.taskList.sels.length+this.$refs.bugList.sels.length)==0){
+            this.$notify({showClose:true,message:'请先选择要删除的数据',type:'warning'})
+            return;
+          }
+         if(this.$refs.menuList.sels.length>0){
+           this.$refs.menuList.batchDel();
+         }
+         if(this.$refs.taskList.sels.length>0){
+           this.$refs.taskList.batchDel();
+         }
+         if(this.$refs.bugList.sels.length>0){
+           this.$refs.bugList.batchDel();
+         } 
+    },
     onMenusChange(menus){
       this.xmMenus=menus
     },
diff --git a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
index 4c1a1633..d8d8912b 100644
--- a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
@@ -1,10 +1,5 @@
 <template>
     <el-row  v-show="xmTasks.length>0">
-      <el-row> 
-        <span style="float:right;">
-          <el-button @click="batchDel" type="danger" icon="el-icon-delete" plain></el-button>
-        </span>
-      </el-row>
       <el-row>
         <el-table :data="xmTasks"  :max-height="400" v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
           <el-table-column type="selection" label="全选"></el-table-column>
diff --git a/src/views/xm/core/xmTaskWorkItem/XmSubWorkItem.vue b/src/views/xm/core/xmTaskWorkItem/XmSubWorkItem.vue
index 2a909d25..62657cb9 100644
--- a/src/views/xm/core/xmTaskWorkItem/XmSubWorkItem.vue
+++ b/src/views/xm/core/xmTaskWorkItem/XmSubWorkItem.vue
@@ -15,6 +15,8 @@
             <i class="el-icon-s-operation"></i>
           </div>
         添加任务</el-button> 
+         <el-button type="danger" plain icon="el-icon-delete" @click="doDelete"> 
+         </el-button> 
       </span>
     </el-row> 
         <xm-sub-task-list  ref="taskList"  :parent-xm-task="parentXmTask" @tasks-change="onTasksChange" @workload-submit="onWorkloadSubmit"></xm-sub-task-list>
@@ -77,6 +79,9 @@ export default {
     },
     onWorkloadSubmit(xmTask){
       this.$emit('workload-submit',xmTask)
+    },
+    doDelete(){
+      this.$refs.taskList.batchDel(); 
     }
     /**end 自定义函数请在上面加**/
   }, //end methods