From ade456c152ddc46150d96cae9aed7364969a0973 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, 12 Jun 2022 05:18:52 +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

---
 .../xmPhaseTemplate/XmPhaseTemplateAdd.vue    | 224 -------------
 .../xmPhaseTemplate/XmPhaseTemplateEdit.vue   | 213 ------------
 .../xmPhaseTemplate/XmPhaseTemplateMng.vue    | 316 ------------------
 .../XmProjectTemplateInfo.vue                 |   9 +-
 4 files changed, 3 insertions(+), 759 deletions(-)
 delete mode 100644 src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue
 delete mode 100644 src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue
 delete mode 100644 src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue

diff --git a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue
deleted file mode 100644
index 3b9971ff..00000000
--- a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue
+++ /dev/null
@@ -1,224 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<!--新增界面 XmPhaseTemplate xm_phase_template--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm"> 
-				<el-form-item label="计划名称" prop="name">
-					<el-input v-model="addForm.name" placeholder="计划名称" ></el-input>
-				</el-form-item> 
-				<el-form-item label="序号" prop="seqNo">
-					<el-input v-model="addForm.seqNo"  placeholder="排序序号，值越小越靠前，如1.0，1.1，1.1.1等"></el-input> 
-				</el-form-item> 
-				<el-form-item  label="计划类型" prop="planType"> 
-					<el-select v-model="addForm.planType">
-						<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item  label="任务类型" prop="taskType"> 
-					<el-select v-model="addForm.taskType">
-						<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="addForm.remark" placeholder="备注" ></el-input>
-				</el-form-item> 
-				<el-form-item label="预计工时" prop="budgetHours">
-					<el-input-number v-model="addForm.budgetHours" :precision="2" :step="8" :min="0" placeholder="工时(不包括下一级)-应该大于或等于任务中总工时"></el-input-number><el-tag>参考工时{{autoParams.budgetHours}}小时,工作日{{autoParams.weekday}}天</el-tag> <el-button @click.native="fillToField" type="success">填充</el-button>
-				</el-form-item>  
-				<el-form-item label="预计人数" prop="budgetStaffNu">
-					<el-input-number v-model="addForm.budgetStaffNu" :precision="0" :step="1" :min="0" placeholder="投入人员数(不包括下一级)-应该大于或等于任务中总人数"></el-input-number> <el-tag>参考{{autoParams.budgetStaffNu}}人</el-tag>
-				</el-form-item>  
-				<el-form-item label="非人力成本总预算" prop="budgetNouserAt">
-					<el-input-number v-model="addForm.budgetNouserAt" :precision="2" :step="1000" :min="0" placeholder="非人力成本总预算(不包括下一级)-应该大于或等于任务中非人力总成本"></el-input-number> <el-tag>参考{{autoParams.budgetNouserAt}}元，{{this.toFixed( autoParams.budgetNouserAt/10000)}}万元</el-tag>
-				</el-form-item>  
-				<el-form-item label="预计总工作量" prop="budgetWorkload">
-					<el-input-number v-model="addForm.budgetWorkload" :precision="2" :step="8" :min="0" placeholder="预计总工作量(人时,不包括下一级)-应该大于或者等于任务中的预算总工作量"></el-input-number> <el-tag>参考{{autoParams.budgetWorkload}}人时，{{this.toFixed(autoParams.budgetWorkload/24/20)}}人月</el-tag>
-				</el-form-item> 
-				<el-form-item label="内部人力成本总预算" prop="budgetIuserAt">
-					<el-input-number v-model="addForm.budgetIuserAt" :precision="2" :step="1000" :min="0" placeholder="内部人力成本总预算(不包括下一级)-应该大于或等于任务中内部人力总成本"></el-input-number> <el-tag>参考{{autoParams.budgetIuserAt}}元，{{this.toFixed(autoParams.budgetIuserAt/10000)}}万元</el-tag>
-				</el-form-item> 
-				<el-form-item label="外购人力成本总预算" prop="budgetOuserAt">
-					<el-input-number v-model="addForm.budgetOuserAt" :precision="2" :step="1000" :min="0" placeholder="外购人力成本总预算(不包括下一级)-应该大于或等于任务中外购总成本"></el-input-number> <el-tag>参考{{autoParams.budgetOuserAt}}元，{{this.toFixed(autoParams.budgetOuserAt/10000)}}万元</el-tag>
-				</el-form-item>
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
-	import { addXmPhaseTemplate } from '@/api/xm/core/xmPhaseTemplate';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ]),
-			autoParams:function(){
-				
-				var defaultPlanWorkingStaffNu=this.addForm.budgetStaffNu;
-				if(defaultPlanWorkingStaffNu==null || defaultPlanWorkingStaffNu=='' || defaultPlanWorkingStaffNu <=0 ){
-					defaultPlanWorkingStaffNu=1;
-				} 
-				var defaultPlanWorkingHours=this.addForm.budgetHours
-				if(defaultPlanWorkingHours==null || defaultPlanWorkingHours=='' || defaultPlanWorkingHours<=0){
-					defaultPlanWorkingHours=8
-				}
-				var autoParams={
-					budgetHours:defaultPlanWorkingHours,
-					budgetStaffNu: defaultPlanWorkingStaffNu,
-					budgetWorkload: defaultPlanWorkingHours * defaultPlanWorkingStaffNu
-
-				}
-				 var budgetHours=defaultPlanWorkingHours; 
-				autoParams.weekday=parseInt(budgetHours/8)
-				autoParams.budgetHours=this.toFixed(budgetHours)
-				autoParams.budgetWorkload= this.toFixed(autoParams.budgetHours*defaultPlanWorkingStaffNu)
-				autoParams.budgetOuserAt=this.toFixed( autoParams.budgetWorkload * 100 * 0.6)
-				autoParams.budgetIuserAt=this.toFixed( autoParams.budgetWorkload * 100 * 0.4)
-				autoParams.budgetNouserAt=autoParams.budgetWorkload * 100 * 0.2
-				return autoParams
-			}
-		},
-		props:['xmPhaseTemplate','visible','xmParentPhaseTemplate','selProjectTemplate'],
-		watch: {
-	      'xmPhaseTemplate':function( xmPhaseTemplate ) {
-			this.addForm = xmPhaseTemplate;
-			if(this.selProjectTemplate){
-				this.addForm.projectId=this.selProjectTemplate.id
-				this.addForm.projectName=this.selProjectTemplate.projectName
-			}
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				addFormRules: {
-					id: [
-						//{ required: true, message: '计划主键不能为空', trigger: 'blur' }
-					],					
-					name: [
-						{ required: true, message: '计划名称不能为空', trigger: 'blur' }
-					],
-					planType: [
-						//{ required: true, message: '请选择计划类型', trigger: 'blur' }
-					],
-					taskType: [
-						{ required: true, message: '请选择任务类型', trigger: 'blur' }
-					],
-					seqNo: [
-						{ required: true, message: '序号不能为空', trigger: 'blur' }
-					],
-				},
-				//新增界面数据 xm_phase_template
-				addForm: {
-					id:'',name:'',remark:'',parentPhaseId:'',branchId:'',beginDate:'',endDate:'',budgetHours:'',budgetStaffNu:'',projectTypeId:'',projectTypeName:'',budgetNouserAt:'',budgetIuserAt:'',budgetOuserAt:'',budgetWorkload:'',"taskType":'',planType:'m1',seqNo:'1'
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['addForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//新增提交XmPhaseTemplate xm_phase_template 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () { 
-				if(!this.selProjectTemplate){
-					this.$notify.warning("模板不能为空，请先选择项目模板")
-					return;
-				}
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-						
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.add=true
-							let params = Object.assign({}, this.addForm);  
-							if(this.xmParentPhaseTemplate){
-								params.parentPhaseId=this.xmParentPhaseTemplate.id
-								params.parentPhaseName=this.xmParentPhaseTemplate.name
-							} 
-							params.projectId=this.selProjectTemplate.id
-							params.projectName=this.selProjectTemplate.name
-							addXmPhaseTemplate(params).then((res) => {
-								this.load.add=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['addForm'].resetFields();
-									this.$emit('submit');//  @submit="afterAddSubmit"
-								}
-								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err  => this.load.add=false);
-						});
-					}
-				});
-			},
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/ 
-			getWeekday(first, last) {
-				//计算工作日方法：遍历这两个日期区间的每一个日期，获取他的getDay()
-
-				//分别获取first和last的毫秒数(时间戳)
-				first = first.getTime();
-				last = last.getTime();
-
-				var count = 0;
-				for (var i = first; i <= last; i += 24 * 3600 * 1000) {
-					var d = new Date(i);
-					if (d.getDay() >= 1 && d.getDay() <= 5) {
-						count++;
-					}
-				}
-				return count;
-			},
-			toFixed(floatValue){
-				if(floatValue ==null || floatValue=='' || floatValue == undefined){
-					return 0;
-				}else{
-					return parseFloat(floatValue).toFixed(2);
-				}
-			},
-			fillToField:function(){
-				this.addForm=Object.assign(this.addForm,this.autoParams);
-			}	
-			/**end 在上面加自定义方法**/
-			
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-phase-template-edit':XmPhaseTemplateEdit
-		},
-		mounted() {
-			this.addForm=Object.assign(this.addForm, this.xmPhaseTemplate);  
-			if(this.selProjectTemplate){
-				this.addForm.projectId=this.selProjectTemplate.id
-				this.addForm.projectName=this.selProjectTemplate.projectName
-			} 
-			
-			initSimpleDicts('all',['planType','taskType']).then(res=>{
-				this.dicts=res.data.data;
-			})
-			
-		}//end mounted
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue
deleted file mode 100644
index 92fa7114..00000000
--- a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<!--新增界面 XmPhaseTemplate xm_phase_template--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm"> 
-				<el-form-item label="计划名称" prop="name">
-					<el-input v-model="editForm.name" placeholder="计划名称" ></el-input>
-				</el-form-item> 
-				<el-form-item label="序号" prop="seqNo">
-					<el-input v-model="editForm.seqNo"   placeholder="排序序号，值越小越靠前，如1.0，2.0等"></el-input> 
-				</el-form-item> 
-				<el-form-item  label="计划类型" prop="planType"> 
-					<el-select v-model="editForm.planType">
-						<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item  label="任务类型" prop="taskType"> 
-					<el-select v-model="editForm.taskType">
-						<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="editForm.remark" placeholder="备注" ></el-input>
-				</el-form-item> 
-				<el-form-item label="预计工时" prop="budgetHours">
-					<el-input-number v-model="editForm.budgetHours" :precision="2" :step="8" :min="0" placeholder="工时(不包括下一级)-应该大于或等于任务中总工时"></el-input-number><el-tag>参考工时{{autoParams.budgetHours}}小时,工作日{{autoParams.weekday}}天</el-tag> <el-button @click.native="fillToField" type="success">填充</el-button>
-				</el-form-item>  
-				<el-form-item label="预计人数" prop="budgetStaffNu">
-					<el-input-number v-model="editForm.budgetStaffNu" :precision="0" :step="1" :min="0" placeholder="投入人员数(不包括下一级)-应该大于或等于任务中总人数"></el-input-number> <el-tag>参考{{autoParams.budgetStaffNu}}人</el-tag>
-				</el-form-item>  
-				<el-form-item label="非人力成本总预算" prop="budgetNouserAt">
-					<el-input-number v-model="editForm.budgetNouserAt" :precision="2" :step="1000" :min="0" placeholder="非人力成本总预算(不包括下一级)-应该大于或等于任务中非人力总成本"></el-input-number> <el-tag>参考{{autoParams.budgetNouserAt}}元，{{this.toFixed( autoParams.budgetNouserAt/10000)}}万元</el-tag>
-				</el-form-item>  
-				<el-form-item label="预计总工作量" prop="budgetWorkload">
-					<el-input-number v-model="editForm.budgetWorkload" :precision="2" :step="8" :min="0" placeholder="预计总工作量(人时,不包括下一级)-应该大于或者等于任务中的预算总工作量"></el-input-number> <el-tag>参考{{autoParams.budgetWorkload}}人时，{{this.toFixed(autoParams.budgetWorkload/24/20)}}人月</el-tag>
-				</el-form-item> 
-				<el-form-item label="内部人力成本总预算" prop="budgetIuserAt">
-					<el-input-number v-model="editForm.budgetIuserAt" :precision="2" :step="1000" :min="0" placeholder="内部人力成本总预算(不包括下一级)-应该大于或等于任务中内部人力总成本"></el-input-number> <el-tag>参考{{autoParams.budgetIuserAt}}元，{{this.toFixed(autoParams.budgetIuserAt/10000)}}万元</el-tag>
-				</el-form-item> 
-				<el-form-item label="外购人力成本总预算" prop="budgetOuserAt">
-					<el-input-number v-model="editForm.budgetOuserAt" :precision="2" :step="1000" :min="0" placeholder="外购人力成本总预算(不包括下一级)-应该大于或等于任务中外购总成本"></el-input-number> <el-tag>参考{{autoParams.budgetOuserAt}}元，{{this.toFixed(autoParams.budgetOuserAt/10000)}}万元</el-tag>
-				</el-form-item>
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
-	import {  editXmPhaseTemplate } from '@/api/xm/core/xmPhaseTemplate';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ]),
-			autoParams:function(){
-				
-				var defaultPlanWorkingStaffNu=this.editForm.budgetStaffNu;
-				if(defaultPlanWorkingStaffNu==null || defaultPlanWorkingStaffNu=='' || defaultPlanWorkingStaffNu <=0 ){
-					defaultPlanWorkingStaffNu=1;
-				} 
-				var defaultPlanWorkingHours=this.editForm.budgetHours
-				if(defaultPlanWorkingHours==null || defaultPlanWorkingHours=='' || defaultPlanWorkingHours<=0){
-					defaultPlanWorkingHours=8
-				}
-				var autoParams={
-					budgetHours:defaultPlanWorkingHours,
-					budgetStaffNu: defaultPlanWorkingStaffNu,
-					budgetWorkload: defaultPlanWorkingHours * defaultPlanWorkingStaffNu
-
-				}
-				 var budgetHours=defaultPlanWorkingHours; 
-				autoParams.weekday=parseInt(budgetHours/8)
-				autoParams.budgetHours=this.toFixed(budgetHours)
-				autoParams.budgetWorkload= this.toFixed(autoParams.budgetHours*defaultPlanWorkingStaffNu)
-				autoParams.budgetOuserAt=this.toFixed( autoParams.budgetWorkload * 100 * 0.6)
-				autoParams.budgetIuserAt=this.toFixed( autoParams.budgetWorkload * 100 * 0.4)
-				autoParams.budgetNouserAt=autoParams.budgetWorkload * 100 * 0.2
-				return autoParams
-			}
-		},
-		props:['xmPhaseTemplate','visible','xmParentPhaseTemplate'],
-		watch: {
-	      'xmPhaseTemplate':function( xmPhaseTemplate ) {
-	        this.editForm = xmPhaseTemplate;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, add: false, del: false,  edit: false },//查询中...
-				editFormRules: {
-					id: [
-						//{ required: true, message: '计划主键不能为空', trigger: 'blur' }
-					],				
-					name: [
-						{ required: true, message: '计划名称不能为空', trigger: 'blur' }
-					],
-					planType: [
-						//{ required: true, message: '请选择计划类型', trigger: 'blur' }
-					],
-					taskType: [
-						{ required: true, message: '请选择任务类型', trigger: 'blur' }
-					],
-					seqNo: [
-						{ required: true, message: '序号不能为空', trigger: 'blur' }
-					],
-				},
-				//新增界面数据 xm_phase_template
-				 editForm: {
-					id:'',name:'',remark:'',parentPhaseId:'',branchId:'',beginDate:'',endDate:'',budgetHours:'',budgetStaffNu:'',projectTypeId:'',projectTypeName:'',budgetNouserAt:'',budgetIuserAt:'',budgetOuserAt:'',budgetWorkload:'',"taskType":'',planType:'m1'
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['editForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//新增提交XmPhaseTemplate xm_phase_template 父组件监听@submit="afterAddSubmit"
-			 editSubmit: function () {
-				
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.edit=true
-							let params = Object.assign({}, this.editForm); 
-							if(this.xmParentPhaseTemplate){
-								params.parentPhaseId=this.xmParentPhaseTemplate.id
-								params.parentPhaseName=this.xmParentPhaseTemplate.name
-							}
-							 editXmPhaseTemplate(params).then((res) => {
-								this.load.edit=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['editForm'].resetFields();
-									this.$emit('submit');//  @submit="afterAddSubmit"
-								}
-								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err  => this.load.edit=false);
-						});
-					}
-				});
-			},
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/ 
-			getWeekday(first, last) {
-				//计算工作日方法：遍历这两个日期区间的每一个日期，获取他的getDay()
-
-				//分别获取first和last的毫秒数(时间戳)
-				first = first.getTime();
-				last = last.getTime();
-
-				var count = 0;
-				for (var i = first; i <= last; i += 24 * 3600 * 1000) {
-					var d = new Date(i);
-					if (d.getDay() >= 1 && d.getDay() <= 5) {
-						count++;
-					}
-				}
-				return count;
-			},
-			toFixed(floatValue){
-				if(floatValue ==null || floatValue=='' || floatValue == undefined){
-					return 0;
-				}else{
-					return parseFloat(floatValue).toFixed(2);
-				}
-			},
-			fillToField:function(){
-				this.editForm=Object.assign(this.editForm,this.autoParams);
-			}	
-			/**end 在上面加自定义方法**/
-			
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-phase-template-edit':XmPhaseTemplateEdit
-		},
-		mounted() {
-			this.editForm=Object.assign(this.editForm, this.xmPhaseTemplate);  
-			
-			
-			initSimpleDicts('all',['planType','taskType']).then(res=>{
-				this.dicts=res.data.data;
-			})
-
-			
-		}//end mounted
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue
deleted file mode 100644
index e6a9c511..00000000
--- a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue
+++ /dev/null
@@ -1,316 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row v-if="!simple">
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>  
-			<el-input v-model="filters.projectName" style="width: 20%;" placeholder="点击选择项目" @click.native="showProjectTemplate"></el-input>  
-			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmPhases">查询</el-button>
- 			<el-button v-if="isSelect" type="primary" @click="selectedConfirm">确认选择</el-button>  
-		</el-row>
-		
-		<el-row class="page-main" v-if="!simple"> 
-			<!--列表 XmPhaseTemplate xm_phase_template-->
-			<el-table ref="table" :height="maxTableHeight" lazy :load="loadXmPhaseLazy" :data="xmPhaseTemplateTreeData" @sort-change="sortChange" row-key="id"  :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-				<el-table-column sortable type="selection" width="40"></el-table-column> 
-				<el-table-column prop="name" label="计划名称" min-width="260" >
-					
-					 <template slot-scope="scope">  
-						<span>
-							<span v-show="scope.row.milestone=='1'">
-								<i class="el-icon-star-on"></i>
-							</span>
-							<span v-show="scope.row.isKeyPath=='1'"> 
-								<i class="el-icon-s-help"></i>
-							</span>
-							<el-link :icon="scope.row.ntype=='1'?'el-icon-folder-opened':''" type="primary">{{scope.row.seqNo}} &nbsp;&nbsp;  
-							</el-link>
-							{{scope.row.name}}   
-						</span>
-					 </template>
-				</el-table-column>
-				<el-table-column prop="remark" label="备注" min-width="80" show-overflow-tooltip></el-table-column> 
-				<el-table-column   label="预计工作量(人时)" min-width="80" show-overflow-tooltip>
-					<el-table-column prop="budgetHours" label="工时" min-width="80" ></el-table-column>
-					<el-table-column prop="budgetStaffNu" label="投入人员数" min-width="80" ></el-table-column> 
-					<el-table-column prop="budgetWorkload" label="总工作量" min-width="80" ></el-table-column> 
-				</el-table-column> 
-				<el-table-column   label="成本预算(元)" min-width="80" show-overflow-tooltip>
-					<el-table-column prop="budgetAt" label="总预算" min-width="80" ></el-table-column>
-					<el-table-column prop="budgetNouserAt" label="非人力" min-width="80" ></el-table-column>
-					<el-table-column prop="budgetIuserAt" label="内部" min-width="80" ></el-table-column>
-					<el-table-column prop="budgetOuserAt" label="外购" min-width="80" ></el-table-column>
-				</el-table-column> 
-				<el-table-column label="操作" width="260" fixed="right"  v-if="!isSelect" >
-					<template slot-scope="scope">
-						<el-button  @click="showEdit( scope.row,scope.$index)">改</el-button>
-						<el-button type="danger" @click="handleDel(scope.row,scope.$index)">删</el-button> 
-						<el-button  @click="showSubAdd( scope.row,scope.$index)">+子计划</el-button> 
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
-		
-
-		</el-row>
-		<el-row  v-if="simple"> 
-			<!--列表 XmPhaseTemplate xm_phase_template-->
-			<el-table lazy :load="loadXmPhaseLazy"  default-expand-all :height="maxTableHeight" :data="xmPhaseTemplateTreeData" @sort-change="sortChange" row-key="id"  :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
- 				<el-table-column prop="name" label="计划名称" min-width="180" > 
-					 <template slot-scope="scope">  
-						 {{scope.row.seqNo}} &nbsp;&nbsp;{{scope.row.name}}
-					 </template> 
-				</el-table-column>  
-			</el-table>
-			<el-pagination  layout="total, sizes, prev, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
-		
-
-		</el-row>
-					<!--编辑 XmPhaseTemplate xm_phase_template界面-->
-		<el-drawer title="编辑计划" :visible.sync="editFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				<xm-phase-template-edit  :xm-phase-template="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-phase-template-edit>
-		</el-drawer>
-
-		<!--新增 XmPhaseTemplate xm_phase_template界面-->
-		<el-drawer title="新增计划" :visible.sync="addFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-			<xm-phase-template-add :sel-project-template="filters.projectTemplate" :xm-parent-phase-template="parentPhaseTemplate" :xm-phase-template="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-phase-template-add>
-		</el-drawer> 
-		<el-drawer title="项目模板" :with-header="false" :visible.sync="projectTemplateVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-			<xm-project-template-list    :visible="addFormVisible" @cancel="projectTemplateVisible=false" @selected="onProjectTemplateSelected"></xm-project-template-list>
-		</el-drawer> 
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	import treeTool from '@/common/js/treeTool';//全局公共库
-	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
-	import { listXmPhase } from '@/api/xm/core/xmPhase'; 
-	import  XmProjectTemplateList from '../xmProjectTemplate/XmProjectTemplateList';//修改界面
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		name:'xm-phase-template-mng',
-		props:['xmType','selProjectTemplate','simple','isSelect'],
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-			]), 
-			xmPhaseTemplateTreeData(){ 
-				return treeTool.translateDataToTree(this.xmPhases,'parentPhaseId','id');
-			},
-		},
-		watch:{ 
-			selProjectTemplate(){
-				if(this.selProjectTemplate){
-					this.filters.projectTemplate=this.selProjectTemplate
-				}else{
-					this.filters.projectTemplate=null;
-				}
-				this.getXmPhases()
-			}
-		},
-		data() {
-			return {
-				filters: {
-					key: '', 
-					projectId:'',
-					projectName:'',
-					productId:'',
-					productName:'', 
-				},
-				xmPhases: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:500,//每页数据
-					count:false,//是否需要重新计算总记录数
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				sels: [],//列表选中数据
-				dicts:{projectType:[]},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				
-				addFormVisible: false,//新增xmPhaseTemplate界面是否显示
-				//新增xmPhaseTemplate界面初始化数据
-				addForm: {
-					id:'',name:'',remark:'',parentPhaseId:'',branchId:'',beginDate:'',endDate:'',budgetHours:'',budgetStaffNu:'',xmType:'',projectTypeName:'',budgetNouserAt:'',budgetIuserAt:'',budgetOuserAt:'',budgetWorkload:''
-				},
-				
-				editFormVisible: false,//编辑界面是否显示
-				//编辑xmPhaseTemplate界面初始化数据
-				editForm: {
-					id:'',name:'',remark:'',parentPhaseId:'',branchId:'',beginDate:'',endDate:'',budgetHours:'',budgetStaffNu:'',xmType:'',projectTypeName:'',budgetNouserAt:'',budgetIuserAt:'',budgetOuserAt:'',budgetWorkload:''
-				},
-				parentPhaseTemplate:null,
-				projectTemplateVisible:false,
-				maxTableHeight:300,
-				/**begin 自定义属性请在下面加 请加备注**/
-					
-				/**end 自定义属性请在上面加 请加备注**/
-			}
-		},//end data
-		methods: { 
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize; 
-				this.getXmPhases();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getXmPhases();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getXmPhases();
-			},
-			searchXmPhases(){
-				 this.pageInfo.count=true; 
-				 this.getXmPhases();
-			},
-			getParams(params){
-				if( this.filters.projectId  ){
-					params.projectId=this.filters.projectId
-				} 
-				if( this.filters.productId  ){
-					params.productId=this.filters.productId
-				} 
-				return params;
-			},
-			//获取列表 XmPhaseTemplate xm_phase_template
-			getXmPhases() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
-					params.orderBy= orderBys.join(",")
-				} 
-				this.getParams(params)
-				if(!params.projectId && !params.productId){ 
-					this.$notify({position:'bottom-left',showClose:true,message: "请选择项目模板/产品模板", type: 'error' });
-					return; 
-				}
-				params.isTop="1"
-				this.load.list = true;
-				listXmPhase(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
-						this.xmPhases = res.data.data;
-					}else{
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
-					} 
-					this.load.list = false;
-				}).catch( err => this.load.list = false );
-			},
-
-			//显示编辑界面 XmPhaseTemplate xm_phase_template
-			showEdit: function ( row,index ) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面 XmPhaseTemplate xm_phase_template
-			showAdd: function () { 
-				this.addFormVisible = true;
-				//this.addForm=Object.assign({}, this.editForm);
-			},
-
-			showSubAdd: function (row) { 
-				this.parentPhaseTemplate=row
-				this.editForm=row;
-				this.addFormVisible = true;
-				//this.addForm=Object.assign({}, this.editForm);
-			},
-			
-			afterAddSubmit(){
-				this.addFormVisible=false;
-				this.pageInfo.count=true;
-				this.getXmPhases();
-			},
-			afterEditSubmit(){
-				this.editFormVisible=false;
-			},
-			//选择行xmPhaseTemplate
-			selsChange: function (sels) {
-				this.sels = sels;
-			}, 
-			 
-			rowClick: function(row, event, column){
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-			},
-			/**begin 自定义函数请在下面加**/
-			selectedConfirm(){
-				this.$emit("selected-confirm",this.sels);
-			}, 
-			showProjectTemplate:function(){
-				this.projectTemplateVisible=true;
-			},
-			onProjectTemplateSelected:function(projectTemplate){
-				this.projectTemplateVisible=false;
-				this.filters.projectId=projectTemplate.id; 
-				this.filters.projectName=projectTemplate.name; 
-				this.$emit('selected-project-template',projectTemplate)
-				this.getXmPhases();
-			},
-			
-			loadXmPhaseLazy(tree, treeNode, resolve) {     
-					var params={parentPhaseId:tree.id}
-					params=this.getParams(params);
-					params.isTop=""
-					this.load.list = true;
-					var func=listXmPhase 
-					func(params).then(res=>{
-						this.load.list = false
-						var tips = res.data.tips;
-						if(tips.isOk){
-							resolve(res.data.data) 
-						}else{
-							resolve([])
-						}
-					}).catch( err => this.load.list = false );   
-				
-			},
-			/**end 自定义函数请在上面加**/
-			
-		},//end methods
-		components: {  
-			XmProjectTemplateList, 
-		},
-		mounted() { 
-			if(this.selProjectTemplate){
-				this.filters.projectTemplate=this.selProjectTemplate
-			}
-			this.$nextTick(() => { 
-                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
-				this.getXmPhases();   
-			}); 
-			
-			
-		//普通查询 条件之间and关系 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-
-			
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
index a82136b8..60ad9d30 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
@@ -5,13 +5,11 @@
 				<div class="info-type">
 					<el-radio-group v-model="infotype" size="medium">
 						<el-radio-button label="任务"></el-radio-button>
-						<el-radio-button label="计划"></el-radio-button> 
-					</el-radio-group> 
+ 					</el-radio-group> 
 				</div>
 				<div class="info-detail">
 					<xm-task-template-mng v-if="infotype=='任务'" :sel-project-template="selProjectTemplate" ></xm-task-template-mng>
-					<xm-phase-template-mng v-if="infotype=='计划'" :sel-project-template="selProjectTemplate" ></xm-phase-template-mng> 
-				</div>
+ 				</div>
 			</div>
 		</el-row>
 	</section>
@@ -24,8 +22,7 @@
 	import { listXmProjectTemplate,editStatus , delXmProjectTemplate, batchDelXmProjectTemplate } from '@/api/xm/core/xmProject'; 
 	import { mapGetters } from 'vuex';
 	import xmTaskTemplateMng from '../xmTaskTemplate/XmTaskTemplateMng'; 
-	import xmProjectTemplateEdit from './XmProjectTemplateEdit';
- 	import xmPhaseTemplateMng from '../xmPhaseTemplate/XmPhaseTemplateMng'; 
+	import xmProjectTemplateEdit from './XmProjectTemplateEdit'; 
  
 	export default { 
 		props: ["selProjectTemplate"],