From d776337eaa98c1df5471c98b15ffedd36ab6cc43 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 21:56:51 +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

---
 .../core/xmProjectPhase/XmProjectPhaseAdd.vue | 19 ++++---------------
 .../xmProjectPhase/XmProjectPhaseEdit.vue     | 15 ++-------------
 .../XmProjectPhaseForProduct.vue              |  4 ++--
 .../core/xmProjectPhase/XmProjectPhaseMng.vue |  4 ++--
 4 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
index 696395de..4ace99dc 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
@@ -1,20 +1,9 @@
 <template>
-	<section class="page-container border padding">
+	<section class="page-container padding">
 		<el-row class="page-main ">
 			<!--新增界面 XmProjectPhase xm_project_phase-->
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
 				<el-row class="border padding">
-					
-					<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" v-if="addForm.phaseClass=='0'">
-							<br>计划集只负责汇总数据，类似文件夹功能。计划集下可建立子计划集、子计划，但不能关联任务;<br>计划下不能建立子计划集，也不能建立子计划，但可以关联任务
-						</font>
-						<font color="red" v-else-if="addForm.phaseClass=='1'">
-							<br>计划集只负责汇总数据，类似文件夹功能。计划集下可建立子计划集、子计划，但不能关联需求;<br>计划下不能建立子计划集，也不能建立子计划，但可以关联需求
-						</font>
-					</el-form-item>  
 					<el-form-item label="计划名称" prop="phaseName">
 						<el-input v-model="addForm.phaseName" placeholder="计划名称" ></el-input>
 					</el-form-item>
@@ -227,7 +216,7 @@
 				}, 
 				//新增界面数据 xm_project_phase
 				addForm: {
-					id:'',phaseName:'',remark:'',parentPhaseId:'',branchId:'',taskType:'kf',planType:'m1',projectId:'',beginDate:'',endDate:'',phaseBudgetHours:'',phaseBudgetStaffNu:'',ctime:'',phaseBudgetNouserAt:'',phaseBudgetInnerUserAt:'',phaseBudgetOutUserAt:'',projectBaselineId:'',bizProcInstId:'',bizFlowState:'',phaseBudgetWorkload:'',totalActWorkload:'',totalActNouserAt:'',totalActInerUserAt:'',totalActOutUserAt:'',planType:'',taskType:'',seqNo:'1',phaseBudgetInnerUserCnt:'',phaseBudgetOutUserCnt:'',phaseBudgetInnerUserPrice:80,phaseBudgetOutUserPrice:100,phaseBudgetInnerUserWorkload:0,phaseBudgetOutUserWorkload:0
+					id:'',phaseName:'',remark:'',parentPhaseId:'',branchId:'',taskType:'kf',planType:'m1',projectId:'',beginDate:'',endDate:'',phaseBudgetHours:'',phaseBudgetStaffNu:'',ctime:'',phaseBudgetNouserAt:'',phaseBudgetInnerUserAt:'',phaseBudgetOutUserAt:'',projectBaselineId:'',bizProcInstId:'',bizFlowState:'',phaseBudgetWorkload:'',totalActWorkload:'',totalActNouserAt:'',totalActInerUserAt:'',totalActOutUserAt:'',planType:'',taskType:'',seqNo:'1',phaseBudgetInnerUserCnt:'',phaseBudgetOutUserCnt:'',phaseBudgetInnerUserPrice:80,phaseBudgetOutUserPrice:100,phaseBudgetInnerUserWorkload:0,phaseBudgetOutUserWorkload:0,ntype:'0'
 				},
 				dateRanger: [
 					util.formatDate.format(beginDate, "yyyy-MM-dd HH:mm:ss"),
@@ -384,8 +373,8 @@
 			/**在下面写其它函数***/
 
 			if(this.parentProjectPhase){
-				if(this.parentProjectPhase.children){
-					this.addForm.seqNo=this.parentProjectPhase.seqNo+"."+(this.parentProjectPhase.children.length+1)
+				if(this.parentProjectPhase.childrenCnt){
+					this.addForm.seqNo=this.parentProjectPhase.seqNo+"."+(this.parentProjectPhase.childrenCnt+1)
 				}else{
 					this.addForm.seqNo=this.parentProjectPhase.seqNo+"."+1
 				}
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
index 0044ee6a..47cd4963 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
@@ -1,5 +1,5 @@
 <template>
-	<section class="page-container border padding">
+	<section class="page-container padding">
 
 
 		<el-row class="page-main ">
@@ -13,14 +13,6 @@
               </el-steps>
             </el-row>
 						<el-row class="border padding">
-							
-							<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> 
-								<font color="red">
-									<br>计划集只负责汇总数据，类似文件夹功能。计划集下可建立子计划集、子计划，但不能关联任务;<br>计划下不能建立子计划集，也不能建立子计划，但可以关联任务
-								</font>
-							</el-form-item>  
 							<el-form-item label="计划名称" prop="phaseName">
 								<el-input v-model="editForm.phaseName" placeholder="计划名称" ></el-input>
 							</el-form-item>
@@ -228,15 +220,12 @@
 					],
 					seqNo: [
 						{ required: true, message: '序号不能为空', trigger: 'blur' }
-					],
-					ntype:[
-						{ required: true, message: '计划类型不能为空', trigger: 'blur' }
 					]
 				},
 				oldeditForm:{},
 				//新增界面数据 xm_project_phase
 				editForm: {
-					id:'',phaseName:'',remark:'',parentPhaseId:'',branchId:'',taskType:'kf',planType:'m1',projectId:'',beginDate:'',endDate:'',phaseBudgetHours:'',phaseBudgetStaffNu:'',ctime:'',phaseBudgetNouserAt:'',phaseBudgetInnerUserAt:'',phaseBudgetOutUserAt:'',projectBaselineId:'',bizProcInstId:'',bizFlowState:'',phaseBudgetWorkload:'',totalActWorkload:'',totalActNouserAt:'',totalActInerUserAt:'',totalActOutUserAt:'',seqNo:'1',phaseBudgetInnerUserCnt:'',phaseBudgetOutUserCnt:'',phaseBudgetInnerUserPrice:80,phaseBudgetOutUserPrice:100,phaseBudgetInnerUserWorkload:0,phaseBudgetOutUserWorkload:0,phaseStatus:''
+					id:'',phaseName:'',remark:'',parentPhaseId:'',branchId:'',taskType:'kf',planType:'m1',projectId:'',beginDate:'',endDate:'',phaseBudgetHours:'',phaseBudgetStaffNu:'',ctime:'',phaseBudgetNouserAt:'',phaseBudgetInnerUserAt:'',phaseBudgetOutUserAt:'',projectBaselineId:'',bizProcInstId:'',bizFlowState:'',phaseBudgetWorkload:'',totalActWorkload:'',totalActNouserAt:'',totalActInerUserAt:'',totalActOutUserAt:'',seqNo:'1',phaseBudgetInnerUserCnt:'',phaseBudgetOutUserCnt:'',phaseBudgetInnerUserPrice:80,phaseBudgetOutUserPrice:100,phaseBudgetInnerUserWorkload:0,phaseBudgetOutUserWorkload:0,phaseStatus:'',ntype:'0'
 				},
 				dateRanger: [
 				],
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseForProduct.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseForProduct.vue
index 8fad88fc..25eb6b9e 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseForProduct.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseForProduct.vue
@@ -153,12 +153,12 @@
 			</el-row>
 
 			<!--编辑 XmProjectPhase xm_project_phase界面-->
-			<el-drawer  title="编辑计划" :visible.sync="editFormVisible" :with-header="false" size="60%"  :close-on-click-modal="false" append-to-body>
+			<el-drawer  title="编辑计划" :visible.sync="editFormVisible"  size="60%"  :close-on-click-modal="false" append-to-body>
 				  <xm-project-phase-edit :xm-project-phase="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-project-phase-edit>
 			</el-drawer >
 	
 			<!--新增 XmProjectPhase xm_project_phase界面-->
-			<el-drawer title="新增计划" :visible.sync="addFormVisible" :with-header="false" size="60%"  :close-on-click-modal="false" append-to-body>
+			<el-drawer title="新增计划" :visible.sync="addFormVisible"  size="60%"  :close-on-click-modal="false" append-to-body>
 				<xm-project-phase-add :parent-project-phase="parentProjectPhase" :xm-project-phase="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit" ></xm-project-phase-add>
 			</el-drawer> 
 			<!--计划模板-->
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index 7b3be788..9836f4b1 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -170,12 +170,12 @@
 			</el-row>
 
 			<!--编辑 XmProjectPhase xm_project_phase界面-->
-			<el-drawer  title="编辑计划" :visible.sync="editFormVisible" :with-header="false" size="60%"  :close-on-click-modal="false" append-to-body>
+			<el-drawer  title="编辑计划" :visible.sync="editFormVisible"  size="60%"  :close-on-click-modal="false" append-to-body>
 				  <xm-project-phase-edit :xm-project-phase="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-project-phase-edit>
 			</el-drawer >
 	
 			<!--新增 XmProjectPhase xm_project_phase界面-->
-			<el-drawer title="新增计划" :visible.sync="addFormVisible" :with-header="false" size="60%"  :close-on-click-modal="false" append-to-body>
+			<el-drawer title="新增计划" :visible.sync="addFormVisible"  size="60%"  :close-on-click-modal="false" append-to-body>
 				<xm-project-phase-add :parent-project-phase="parentProjectPhase" :xm-project-phase="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit" ></xm-project-phase-add>
 			</el-drawer> 
 			<!--计划模板-->