From 7442dc5356e1d3817734b6ed5951f38e54ff1088 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, 8 Mar 2022 16:40:46 +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/xmTask/XmTaskAdd.vue         | 13 +++----------
 src/views/xm/core/xmTask/XmTaskEdit.vue        | 10 +---------
 src/views/xm/core/xmTask/XmTaskList.vue        |  6 +++---
 src/views/xm/core/xmTask/XmTaskListForMenu.vue |  2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue         | 12 +++++++-----
 5 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 21b226f6..f2d01d69 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -23,14 +23,7 @@
 		<el-row class="page-main ">
 			<!--新增界面 XmTask xm_task-->
 			<el-form :model="addForm"  label-width="100px" :rules="addFormRules" ref="addForm">
-				<el-card class="box-card" header="基础信息" id="baseInfoAdd" shadow="hover"> 
-					<el-form-item label="" prop="ntype">
-						<el-radio  v-model="addForm.ntype" label="1">任务集</el-radio>
-						<el-radio  v-model="addForm.ntype" label="0">任务</el-radio> 
-						<font color="red">
-							<br>任务集只负责汇总数据，类似文件夹功能。任务集下可建立子任务集、子任务,但不能关联需求;<br>任务下不能建立子任务集，也不能建立子任务，但可以关联需求
-						</font>
-					</el-form-item>  
+				<el-card class="box-card" header="基础信息" id="baseInfoAdd" shadow="hover">  
 					<el-form-item label="名称" prop="name">
 						<el-row>
 						<el-col :span="24" style="padding-left:10px;">
@@ -557,8 +550,8 @@
 			}
 			
 			if(this.parentTask ){
-				if(this.parentTask.children){
-					this.addForm.sortLevel=this.parentTask.sortLevel+"."+(this.parentTask.children.length+1)
+				if(this.parentTask.childrenCnt){
+					this.addForm.sortLevel=this.parentTask.sortLevel+"."+(this.parentTask.childrenCnt.length+1)
 				}else{
 					this.addForm.sortLevel=this.parentTask.sortLevel+"."+1
 				}
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index a3d214dc..f87d66ce 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -23,15 +23,7 @@
 		<el-row class="page-main ">
 			<!--新增界面 XmTask xm_task--> 
 			<el-form :model="editForm"  label-width="100px" :rules="editFormRules" ref="editForm">     
-				<el-card class="box-card" header="基础信息" id="baseInfo" shadow="hover"> 
-					
-					<el-form-item label="" prop="ntype">
-						<el-radio  v-model="editForm.ntype" label="1">任务集</el-radio>
-						<el-radio  v-model="editForm.ntype" label="0">任务</el-radio>
-						<font color="red">
-							<br>任务集只负责汇总数据，类似文件夹功能。任务集下可建立子任务集、子任务,但不能关联需求;<br>任务下不能建立子任务集，也不能建立子任务，但可以关联需求
-						</font>
-					</el-form-item>  
+				<el-card class="box-card" header="基础信息" id="baseInfo" shadow="hover">  
 					<el-form-item label="名称" prop="name">
 						<el-row>
 						<el-col :span="24" style="padding-left:10px;">
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index ef5ef875..7e0df221 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -36,7 +36,7 @@
 							<el-table-column v-show="isMultiSelect"  sortable width="70" type="selection"></el-table-column>
 							<el-table-column prop="name" label="任务名称"  min-width="260" show-overflow-tooltip>
 								<template slot-scope="scope">
-								<el-link type="primary"  :icon="scope.row.ntype=='1'?'el-icon-folder-opened':''">
+								<span>
 									{{ scope.row.sortLevel }}&nbsp;
 									<el-tag v-if="scope.row.level <= '2'" type="info"
 									>轻微</el-tag
@@ -47,9 +47,9 @@
 									<el-tag v-else-if="scope.row.level == '4'" type="danger"
 									>紧急</el-tag
 									>
-									<el-tag v-else type="danger">特急</el-tag>
-									</el-link>
+									<el-tag v-else type="danger">特急</el-tag> 
 									{{ scope.row.name }}
+									</span>
 								</template>
 							</el-table-column> 
 							<el-table-column prop="menuName" min-width="150" label="需求"  show-overflow-tooltip></el-table-column>
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index f8c18dab..1f7c9d06 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -18,7 +18,7 @@
 						stripe
 						fit
 						default-expand-all
-						:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+						:tree-props="{children: 'children', hasChildren: 'childrenCnt'}"
 						row-key="id"
 						 :height="tableHeight"
 						 ref="table"
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 537d672d..9c4ca9ee 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -391,13 +391,13 @@
               <el-table-column  
                 label="全选"
                 type="selection"
-                width="70"
+                width="50"
               > 
               </el-table-column>
               <el-table-column  
                 label="序号"
                 type="index"
-                width="70"
+                width="50"
               > 
               </el-table-column>
               <el-table-column
@@ -405,9 +405,10 @@
                 prop="name"
                 label="任务名称(点击详情)"
                 min-width="250"
+                show-overflow-tooltip
               >
                 <template slot-scope="scope">
-                  <el-link type="primary" @click.stop="showDrawer(scope.row)" :icon="scope.row.ntype=='1'?'el-icon-folder-opened':''">
+                  <span class="vlink" type="primary" @click.stop="showDrawer(scope.row)">
                     {{ scope.row.sortLevel }}&nbsp;
                     <el-tag v-if="scope.row.level <= '2'" type="info"
                       >轻微</el-tag
@@ -419,8 +420,9 @@
                       >紧急</el-tag
                     >
                     <el-tag v-else type="danger">特急</el-tag>
-                    </el-link>
-                    {{ scope.row.name }}
+                     {{ scope.row.name }}
+                    </span>
+                   
                 </template>
               </el-table-column>
               <el-table-column