From af021310456dcffaaf430606647457e71ed7adda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 27 Feb 2022 22:13:55 +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

---
 .../xm/core/xmProjectPhase/XmProjectPhaseAdd.vue  |  3 +++
 .../core/xmProjectPhase/XmProjectPhaseBatch.vue   | 15 +++++++--------
 .../xm/core/xmProjectPhase/XmProjectPhaseEdit.vue | 10 ++++++++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
index 7ee63e52..5ecc4f36 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
@@ -8,6 +8,9 @@
 					<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-form-item label="计划名称" prop="phaseName">
 						<el-input v-model="addForm.phaseName" placeholder="计划名称" ></el-input>
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
index 17db8f03..309dde0e 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
@@ -1,6 +1,7 @@
 <template>
   <section>
     <el-row>
+      <!--
       <el-button
         type="danger"
         v-loading="load.del"
@@ -9,6 +10,7 @@
         icon="el-icon-delete"
         >批量删除</el-button
       >
+      -->
       <el-button
         type="warning"
         @click="saveBatchEdit"
@@ -16,12 +18,13 @@
         icon="el-icon-finished"
         >批量保存</el-button
       >
-
+      <!--
       <el-button
         type="success"
         @click="handlePopover(null, 'add')"
         icon="el-icon-plus"
       ></el-button>
+      -->
       <el-button @click="noBatchEdit" v-loading="load.edit" icon="el-icon-back"
         >返回</el-button
       >
@@ -304,6 +307,7 @@
 
 <script>
 import util from "@/common/js/util"; //全局公共库
+import treeTool from "@/common/js/treeTool"; //全局公共库
 //import Sticky from '@/components/Sticky' // 粘性header组件
 import { listOption } from "@/api/mdp/meta/itemOption"; //下拉框数据查询
 import {
@@ -321,13 +325,8 @@ import { mapGetters } from "vuex";
 export default {
   computed: {
     ...mapGetters(["userInfo", "roles"]),
-    projectPhaseTreeData() {
-      debugger;
-      let xmProjectPhases = this.xmProjectPhases ? this.xmProjectPhases : [];
-
-      var projectPhaseTreeData = this.translateDataToTree(xmProjectPhases);
-      //this.rowDrop();
-
+    projectPhaseTreeData() {  
+      var projectPhaseTreeData = treeTool.translateDataToTree(this.xmProjectPhases,"parentPhaseId","id");  
       return projectPhaseTreeData;
     },
     phaseBudgetData() {
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
index 52f9484d..6a03b756 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
@@ -8,7 +8,7 @@
 					<!--新增界面 XmProjectPhase xm_project_phase-->
 					<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
             <el-row class="border padding">
-              <el-steps :active="parseInt(editForm.phaseStatus)" simple finish-status="success" align-center>
+              <el-steps :active="parseInt(editForm.phaseStatus)+1" simple finish-status="success" align-center>
                 <el-step v-for="(item,index) in statusList" @click.native="on_click(item.id)" :title="item.name" :key="index"></el-step> 
               </el-steps>
             </el-row>
@@ -16,7 +16,10 @@
 							
 							<el-form-item label="类型" prop="ntype">
 								<el-radio disabled v-model="editForm.ntype" label="1">计划集</el-radio>
-								<el-radio disabled v-model="editForm.ntype" label="0">计划</el-radio>
+								<el-radio disabled v-model="editForm.ntype" label="0">计划</el-radio> 
+								<font color="red">
+									<br>计划集只负责汇总数据，类似文件夹功能。计划集下可建立子计划集、子计划，但不能关联任务;<br>计划下不能建立子计划集，也不能建立子计划，但可以关联任务
+								</font>
 							</el-form-item>  
 							<el-form-item label="计划名称" prop="phaseName">
 								<el-input v-model="editForm.phaseName" placeholder="计划名称" ></el-input>
@@ -225,6 +228,9 @@
 					seqNo: [
 						{ required: true, message: '序号不能为空', trigger: 'blur' }
 					],
+					ntype:[
+						{ required: true, message: '计划类型不能为空', trigger: 'blur' }
+					]
 				},
 				oldeditForm:{},
 				//新增界面数据 xm_project_phase