From 084f7ab568c68d0a4e5b7201a4c7896396673709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 14 Mar 2022 12:55:41 +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  |  7 ++++++-
 src/views/xm/core/xmTask/XmTaskEdit.vue | 28 +++++++++++++++++--------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 07b4c589..95760782 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -7,6 +7,9 @@
 					<el-form-item label="" prop="ntype">
 						 <el-radio :disabled="parentTask&&parentTask.id&&parentTask.ntype==='0'" v-model="addForm.ntype" label="1">计划项</el-radio>
 						 <el-radio v-model="addForm.ntype" label="0">任务</el-radio>
+						 <br>
+						 <font v-if="addForm.ntype==='0'" color="red" style="font-size:12px;">任务：任务一般不再包含子任务；建议细分到一个人一天或者几天内能完成这种粒度，任务的预算不能大于上一级预算。</font> 
+						 <font v-if="addForm.ntype==='1'" color="red" style="font-size:12px;">计划：计划负责分解上级预算，汇总统计下级实际数据，计划下包含子计划或者子任务</font>
 					</el-form-item>
 					<el-form-item v-if="addForm.ptype==='0'" label="归属项目" prop="projectId">
 						<el-tag>{{addForm.projectName}}</el-tag>
@@ -17,7 +20,9 @@
 					</el-form-item>
 					<el-form-item label="上级" prop="parentTaskname">  
 						<el-tag v-if="addForm.parentTaskid"  @close="clearParentTask" closable >{{addForm.parentTaskname}}</el-tag>
-						<el-button  type="text"  @click.stop="selectParentTaskVisible=true"  >选上级</el-button><font color="red" style="font-size:12px;">&nbsp;&nbsp;请尽量选择上级,对任务进行归类，方便排版和操作</font>
+						<el-button  type="text"  @click.stop="selectParentTaskVisible=true"  >选上级</el-button>
+						<br>
+						<font color="red" style="font-size:12px;">&nbsp;&nbsp;任务数多的情况下，请尽量设置上级,对任务进行归类，方便对其进行管理</font>
 					</el-form-item>
 					<el-form-item label="名称" prop="name"> 
 							<el-input style="width:100%;" v-model="addForm.name" placeholder="名称" ></el-input>  
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 92507b3c..9de25a0d 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -7,16 +7,26 @@
 					<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>
+						 
+						 <br>
+						 <font v-if="editForm.ntype==='0'" color="red" style="font-size:12px;">任务：任务一般不再包含子任务；建议细分到一个人一天或者几天内能完成这种粒度，任务的预算不能大于上一级预算。</font> 
+						 <font v-if="editForm.ntype==='1'" color="red" style="font-size:12px;">计划：计划负责分解上级预算，汇总统计下级实际数据，计划下包含子计划或者子任务</font>
+					</el-form-item> 
+					<el-form-item v-if="editForm.ptype==='0'" label="归属项目" prop="projectId"> 
+						{{editForm.projectName?editForm.projectName:editForm.projectId}}
 					</el-form-item>
-					<el-form-item label="名称" prop="name">
-						<el-row>
-						<el-col :span="24" style="padding-left:10px;">
-							<el-input v-model="editForm.name" placeholder="名称" ></el-input>
-							<el-tooltip content="归属项目"><el-tag>{{editForm.projectName}}</el-tag></el-tooltip>
-							<el-divider direction="vertical"></el-divider>
-							<el-tooltip content="上级" ><el-tag>{{editForm.parentTaskid?(editForm.parentTaskname?editForm.parentTaskname:editForm.parentTaskid):"无上级"}}</el-tag></el-tooltip>
-						</el-col>
-						</el-row>
+					
+					<el-form-item v-if="editForm.ptype==='1'" label="归属产品" prop="productId">
+						{{editForm.productName?editForm.productName:editForm.productId}}
+					</el-form-item>
+					
+					<el-form-item label="上级计划" prop="parentTaskname">  
+						<font v-if="editForm.parentTaskid" >{{editForm.parentTaskname?editForm.parentTaskname:editForm.parentTaskid}}</font> 
+						<font v-else>无上级(视为顶级)</font> 
+
+					</el-form-item>
+					<el-form-item label="名称" prop="name"> 
+							<el-input v-model="editForm.name" placeholder="名称" ></el-input>   
 					</el-form-item> 
 					<el-form-item label="序号" prop="sortLevel"> 
 						<el-input  v-model="editForm.sortLevel" style="width:30%;"   placeholder="如1.0或者1.2.3等" ></el-input> <font style="color:red;">如1.0或者1.2.3等</font>