优化

src/api/xm/core/xmBranchState.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * 机构内所有项目指标汇总
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'主键 主键',bizDate:'统计日期yyyy-mm-dd类型',totalFileCnt:'文件数据',totalBugCnt:'bug数目',totalTaskCnt:'任务数',totalBudgetNouserAmount:'项目总非人力预算-来自项目表',totalStaffCnt:'总参与人数',calcTime:'统计执行日期',calcStatus:'0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖',totalCostNouserAmount:'项目总非人力成本',totalClosedBugCnt:'已关闭bug总数',totalResolvedBugCnt:'已解决bug总数',totalCompleteTaskCnt:'已完成任务总数-来自任务表',totalPhaseCnt:'项目阶段计划数',totalCompletePhaseCnt:'项目阶段计划已完成数',totalNeedPayAmount:'待付款总金额',totalFinishPayAmount:'已付款总金额',totalNeedColAmount:'待收款总金额',totalFinishColAmount:'已收款总金额',totalCostUserAmount:'项目总人力成本',totalBudgetInnerUserAmount:'项目总内部人力预算-来自项目表',totalPlanWorkload:'项目总预算工作量-来自项目表',totalRiskCnt:'项目风险总数',totalCompleteRiskCnt:'已完成风险总数',branchId:'机构编号',branchName:'机构名称',totalBudgetOutUserAmount:'项目总外购人力预算-来自项目表',totalCompleteWorkload:'已完成工作量-来自计划中实际完成工作量',totalCostInnerUserAmount:'项目总内部人力成本金额',totalCostOutUserAmount:'项目总外购人力成本金额',totalProgress:'项目进度0~100之间，来自任务表',totalActiveBugCnt:'激活的bug总数',totalConfirmedBugCnt:'已解决bug总数',projectStatus:'项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停',totalActWorkload:'实际总工作量，来自任务表',totalActOutWorkload:'实际外购总工作量，来自任务表',totalActInnerWorkload:'实际内部总工作量，来自任务表',totalTaskBudgetCostAt:'已经分配到任务的总预算',totalTaskOutCnt:'外购任务数，来自任务表',totalNeedPayCnt:'待付款笔数',totalFinishPayCnt:'完成付款总比数',totalFinishPayUserCnt:'已付款总人数',totalNeedPayUserCnt:'待付款总人数',totalPlanInnerUserWorkload:'内部人力总工作量-应该大于或等于阶段计划内部人力总成本',totalPlanOutUserWorkload:'外购人力总工作量-应该大于或等于阶段计划外购人力总成本',testCases:'测试案例总数',execCases:'测试中案例总数',designCases:'设计中案例总数',finishCases:'完成案例总数',iterationCnt:'迭代数',productCnt:'产品数',menuCnt:'需求数'}
+ *2 查询、新增、修改的参数格式  params={id:'主键 主键',bizDate:'统计日期yyyy-mm-dd类型',totalFileCnt:'文件数据',totalBugCnt:'bug数目',totalTaskCnt:'任务数',totalBudgetNouserAmount:'项目总非人力预算-来自项目表',totalStaffCnt:'总参与人数',calcTime:'统计执行日期',calcStatus:'0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖',totalCostNouserAmount:'项目总非人力成本',totalClosedBugCnt:'已关闭bug总数',totalResolvedBugCnt:'已解决bug总数',totalCompleteTaskCnt:'已完成任务总数-来自任务表',totalPhaseCnt:'项目阶段计划数',totalCompletePhaseCnt:'项目阶段计划已完成数',totalNeedPayAmount:'待付款总金额',totalFinishPayAmount:'已付款总金额',totalNeedColAmount:'待收款总金额',totalFinishColAmount:'已收款总金额',totalCostUserAmount:'项目总人力成本',totalBudgetIuserAmount:'项目总内部人力预算-来自项目表',totalPlanWorkload:'项目总预算工作量-来自项目表',totalRiskCnt:'项目风险总数',totalCompleteRiskCnt:'已完成风险总数',branchId:'机构编号',branchName:'机构名称',totalBudgetOuserAmount:'项目总外购人力预算-来自项目表',totalCompleteWorkload:'已完成工作量-来自计划中实际完成工作量',totalCostIuserAmount:'项目总内部人力成本金额',totalCostOuserAmount:'项目总外购人力成本金额',totalProgress:'项目进度0~100之间，来自任务表',totalActiveBugCnt:'激活的bug总数',totalConfirmedBugCnt:'已解决bug总数',projectStatus:'项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停',totalActWorkload:'实际总工作量，来自任务表',totalActOutWorkload:'实际外购总工作量，来自任务表',totalActInnerWorkload:'实际内部总工作量，来自任务表',totalTaskBudgetCostAt:'已经分配到任务的总预算',totalTaskOutCnt:'外购任务数，来自任务表',totalNeedPayCnt:'待付款笔数',totalFinishPayCnt:'完成付款总比数',totalFinishPayUserCnt:'已付款总人数',totalNeedPayUserCnt:'待付款总人数',totalPlanIuserWorkload:'内部人力总工作量-应该大于或等于阶段计划内部人力总成本',totalPlanOuserWorkload:'外购人力总工作量-应该大于或等于阶段计划外购人力总成本',testCases:'测试案例总数',execCases:'测试中案例总数',designCases:'设计中案例总数',finishCases:'完成案例总数',iterationCnt:'迭代数',productCnt:'产品数',menuCnt:'需求数'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmBranchTaskTypeState.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * 按机构编号任务类型汇总
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'主键 主键',taskType:'任务类型',planWorkload:'工作量',planAmount:'预算金额',actWorkload:'实际完成工作量',actAmount:'实际完成金额',branchId:'机构编号',bizDate:'业务日期yyyy-MM-dd型',calcTime:'计算日期',planOutUserAt:'外购资金预算',planInnerUserAt:'内购资金预算',actOutUserAt:'实际外购成本',actInnerUserAt:'实际内购成本',planOutUserWorkload:'计划外购工作量',planInnerUserWorkload:'计划内购工作量',actOutUserWorkload:'实际外购工作量',actInnerUserWorkload:'实际内购工作量',planNouserAt:'计划非人力成本',actNouserAt:'实际非人力成本',branchName:'机构名称'}
+ *2 查询、新增、修改的参数格式  params={id:'主键 主键',taskType:'任务类型',planWorkload:'工作量',planAmount:'预算金额',actWorkload:'实际完成工作量',actAmount:'实际完成金额',branchId:'机构编号',bizDate:'业务日期yyyy-MM-dd型',calcTime:'计算日期',planOuserAt:'外购资金预算',planIuserAt:'内购资金预算',actOuserAt:'实际外购成本',actIuserAt:'实际内购成本',planOuserWorkload:'计划外购工作量',planIuserWorkload:'计划内购工作量',actOuserWorkload:'实际外购工作量',actIuserWorkload:'实际内购工作量',planNouserAt:'计划非人力成本',actNouserAt:'实际非人力成本',branchName:'机构名称'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmPhase.js

@@ -0,0 +1,53 @@
+import axios from '@/utils/request'
+
+import config from '@/common/config'
+
+let base = config.getCoreBasePath();
+
+
+/**
+ * xm_project_phase
+ *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
+ *2 查询、新增、修改的参数格式  params={id:'阶段主键 主键',name:'阶段名称',remark:'备注',parentId:'上级阶段编号',branchId:'机构编号',projectId:'当前项目编号',beginDate:'开始时间',endDate:'结束时间',planWorkingHours:'工时',planWorkingStaffNu:'投入人员数',ctime:'创建时间',totalBudgetNouser:'非人力成本总预算',totalBudgetIuser:'内部人力成本总预算',totalBudgetOuser:'外购人力成本总预算',baselineId:'项目级基线',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除'}
+ **/
+ 
+//普通查询 条件之间and关系  
+export const listXmPhase = params => { return axios.get(`${base}/xm/core/xmPhase/list`, { params: params }); };
+
+//模糊查询xm_project_phase 条件之间or关系  
+//export const listXmPhaseKey = params => { return axios.get(`${base}/xm/core/xmPhase/listKey`, { params: params }); };
+
+//删除一条xm_project_phase params={id:'阶段主键 主键'}
+export const delXmPhase = params => { return axios.post(`${base}/xm/core/xmPhase/del`,params); };
+
+//批量删除xm_project_phase  params=[{id:'阶段主键 主键'}]
+export const batchDelXmPhase = params => { return axios.post(`${base}/xm/core/xmPhase/batchDel`, params); };
+
+//修改一条xm_project_phase记录
+export const editXmPhase = params => { return axios.post(`${base}/xm/core/xmPhase/edit`, params); };
+
+//新增一条xm_project_phase
+export const addXmPhase = params => { return axios.post(`${base}/xm/core/xmPhase/add`, params); };
+
+//批量从模板导入到项目  params=[{id:'阶段主键 主键'}]
+export const batchImportFromTemplate = params => { return axios.post(`${base}/xm/core/xmPhase/batchImportFromTemplate`, params); };
+
+
+
+//批量从模板导入到项目  params=[{id:'阶段主键 主键'}]
+export const batchSaveBudget = params => { return axios.post(`${base}/xm/core/xmPhase/batchSaveBudget`, params); };
+
+//批量从模板导入到项目  params=[{id:'阶段主键 主键'}]
+export const calcSomePhaseActDataFromTasks = params => { return axios.post(`${base}/xm/core/xmPhase/calcSomePhaseActDataFromTasks`, params); };
+
+export const loaMenusToXmPhase = params => { return axios.post(`${base}/xm/core/xmPhase/loaMenusToXmPhase`, params); };
+
+//修改负责人
+export const setPhaseMngUser = params => { return axios.post(`${base}/xm/core/xmPhase/setPhaseMngUser`, params); };
+
+
+export const calcKeyPaths = params => { return axios.post(`${base}/xm/core/xmPhase/calcKeyPaths`, params); };
+
+
+export const selectTotalProductAndPhaseBudgetCost = params => { return axios.post(`${base}/xm/core/xmPhase/selectTotalProductAndPhaseBudgetCost`, params); };
+

src/api/xm/core/xmPhaseBaseline.js

@@ -0,0 +1,30 @@
+import axios from '@/utils/request'
+
+import config from '@/common/config'
+
+let base = config.getCoreBasePath();
+
+
+/**
+ * xm_project_phase_baseline
+ *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
+ *2 查询、新增、修改的参数格式  params={id:'基线主键 主键',baseCtime:'基线建立时间',phaseId:'阶段主键',name:'阶段名称',remark:'备注',parentId:'上级阶段编号',branchId:'机构编号',projectId:'当前项目编号',beginDate:'开始时间',endDate:'结束时间',planWorkingHours:'工时',planWorkingStaffNu:'投入人员数',ctime:'创建时间',totalBudgetNouser:'非人力成本总预算',totalBudgetIuser:'内部人力成本总预算',totalBudgetOuser:'外购人力成本总预算',baseRemark:'基线备注',baselineId:'项目级基线',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除'}
+ **/
+ 
+//普通查询 条件之间and关系  
+export const listXmPhaseBaseline = params => { return axios.get(`${base}/xm/core/xmPhaseBaseline/list`, { params: params }); };
+
+//模糊查询xm_project_phase_baseline 条件之间or关系  
+//export const listXmPhaseBaselineKey = params => { return axios.get(`${base}/xm/core/xmPhaseBaseline/listKey`, { params: params }); };
+
+//删除一条xm_project_phase_baseline params={id:'基线主键 主键'}
+export const delXmPhaseBaseline = params => { return axios.post(`${base}/xm/core/xmPhaseBaseline/del`,params); };
+
+//批量删除xm_project_phase_baseline  params=[{id:'基线主键 主键'}]
+export const batchDelXmPhaseBaseline = params => { return axios.post(`${base}/xm/core/xmPhaseBaseline/batchDel`, params); };
+
+//修改一条xm_project_phase_baseline记录
+export const editXmPhaseBaseline = params => { return axios.post(`${base}/xm/core/xmPhaseBaseline/edit`, params); };
+
+//新增一条xm_project_phase_baseline
+export const addXmPhaseBaseline = params => { return axios.post(`${base}/xm/core/xmPhaseBaseline/add`, params); };

src/api/xm/core/xmPhaseTemplate.js

@@ -0,0 +1,30 @@
+import axios from '@/utils/request'
+
+import config from '@/common/config'
+
+let base = config.getCoreBasePath();
+
+
+/**
+ * 项目阶段模板
+ *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
+ *2 查询、新增、修改的参数格式  params={id:'阶段主键 主键',name:'阶段名称',remark:'备注',parentId:'上级阶段编号',branchId:'机构编号',projectId:'当前项目编号',beginDate:'开始时间',endDate:'结束时间',phaseBudgetHours:'工时(不包括下一级)-应该大于或等于task中总工时',phaseBudgetStaffNu:'投入人员数(不包括下一级)-应该大于或等于task中总人数',ctime:'创建时间',phaseBudgetNouserAt:'非人力成本总预算(不包括下一级)-应该大于或等于task中非人力总成本',phaseBudgetIuserAt:'内部人力成本总预算(不包括下一级)-应该大于或等于task中内部人力总成本',phaseBudgetOuserAt:'外购人力成本总预算(不包括下一级)-应该大于或等于task中外购总成本',phaseBudgetWorkload:'总工作量单位人时-应该大于或者等于task中的预算总工作量',taskType:'0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType',planType:'计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年',seqNo:'顺序号',phaseBudgetIuserWorkload:'内部人力工作量总预算(不包括下一级)-应该大于或等于task中内部人力总成本',phaseBudgetOuserWorkload:'外购人力工作量总预算(不包括下一级)-应该大于或等于task中外购总成本',phaseBudgetIuserPrice:'内部人力成本单价元/人时',phaseBudgetOuserPrice:'外购人力成本单价元/人时',phaseBudgetOuserCnt:'外购人数',phaseBudgetIuserCnt:'内部人数'}
+ **/
+ 
+//普通查询 条件之间and关系  
+export const listXmPhaseTemplate = params => { return axios.get(`${base}/xm/core/xmPhaseTemplate/list`, { params: params }); };
+
+//模糊查询项目阶段模板 条件之间or关系  
+//export const listXmPhaseTemplateKey = params => { return axios.get(`${base}/xm/core/xmPhaseTemplate/listKey`, { params: params }); };
+
+//删除一条项目阶段模板 params={id:'阶段主键 主键'}
+export const delXmPhaseTemplate = params => { return axios.post(`${base}/xm/core/xmPhaseTemplate/del`,params); };
+
+//批量删除项目阶段模板  params=[{id:'阶段主键 主键'}]
+export const batchDelXmPhaseTemplate = params => { return axios.post(`${base}/xm/core/xmPhaseTemplate/batchDel`, params); };
+
+//修改一条项目阶段模板记录
+export const editXmPhaseTemplate = params => { return axios.post(`${base}/xm/core/xmPhaseTemplate/edit`, params); };
+
+//新增一条项目阶段模板
+export const addXmPhaseTemplate = params => { return axios.post(`${base}/xm/core/xmPhaseTemplate/add`, params); };

src/api/xm/core/xmProductPhase.js

@@ -1,53 +0,0 @@
-import axios from '@/utils/request'
-
-import config from '@/common/config'
-
-let base = config.getCoreBasePath();
-
-
-/**
- * xm_project_phase
- *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'阶段主键 主键',phaseName:'阶段名称',remark:'备注',parentPhaseId:'上级阶段编号',branchId:'机构编号',projectId:'当前项目编号',beginDate:'开始时间',endDate:'结束时间',planWorkingHours:'工时',planWorkingStaffNu:'投入人员数',ctime:'创建时间',totalBudgetNouser:'非人力成本总预算',totalBudgetInnerUser:'内部人力成本总预算',totalBudgetOutUser:'外购人力成本总预算',projectBaselineId:'项目级基线',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除'}
- **/
- 
-//普通查询 条件之间and关系  
-export const listXmProductPhase = params => { return axios.get(`${base}/xm/core/xmProductPhase/list`, { params: params }); };
-
-//模糊查询xm_project_phase 条件之间or关系  
-//export const listXmProductPhaseKey = params => { return axios.get(`${base}/xm/core/xmProductPhase/listKey`, { params: params }); };
-
-//删除一条xm_project_phase params={id:'阶段主键 主键'}
-export const delXmProductPhase = params => { return axios.post(`${base}/xm/core/xmProductPhase/del`,params); };
-
-//批量删除xm_project_phase  params=[{id:'阶段主键 主键'}]
-export const batchDelXmProductPhase = params => { return axios.post(`${base}/xm/core/xmProductPhase/batchDel`, params); };
-
-//修改一条xm_project_phase记录
-export const editXmProductPhase = params => { return axios.post(`${base}/xm/core/xmProductPhase/edit`, params); };
-
-//新增一条xm_project_phase
-export const addXmProductPhase = params => { return axios.post(`${base}/xm/core/xmProductPhase/add`, params); };
-
-//批量从模板导入到项目  params=[{id:'阶段主键 主键'}]
-export const batchImportFromTemplate = params => { return axios.post(`${base}/xm/core/xmProductPhase/batchImportFromTemplate`, params); };
-
-
-
-//批量从模板导入到项目  params=[{id:'阶段主键 主键'}]
-export const batchSaveBudget = params => { return axios.post(`${base}/xm/core/xmProductPhase/batchSaveBudget`, params); };
-
-//批量从模板导入到项目  params=[{id:'阶段主键 主键'}]
-export const calcSomePhaseActDataFromTasks = params => { return axios.post(`${base}/xm/core/xmProductPhase/calcSomePhaseActDataFromTasks`, params); };
-
-export const loaMenusToXmProductPhase = params => { return axios.post(`${base}/xm/core/xmProductPhase/loaMenusToXmProductPhase`, params); };
-
-//修改负责人
-export const setPhaseMngUser = params => { return axios.post(`${base}/xm/core/xmProductPhase/setPhaseMngUser`, params); };
-
-
-export const calcKeyPaths = params => { return axios.post(`${base}/xm/core/xmProductPhase/calcKeyPaths`, params); };
-
-
-export const selectTotalProductAndPhaseBudgetCost = params => { return axios.post(`${base}/xm/core/xmProductPhase/selectTotalProductAndPhaseBudgetCost`, params); };
-

src/api/xm/core/xmProject.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * xm_project
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'项目编号 主键',code:'项目代号',name:'项目名称',xmType:'项目类型',startTime:'项目开始时间',endTime:'项目结束时间',urgent:'紧急程度',priority:'优先程度',description:'项目描述',createUserid:'项目创建人编号',createUsername:'项目创建人',createTime:'创建时间',assess:'项目考核',assessRemarks:'考核备注',status:'项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停',branchId:'机构编号',planTotalCost:'总预算',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',planNouserAt:'非人力成本总预算-应该大于或等于阶段计划非人力总成本',planInnerUserAt:'内部人力成本总预算-应该大于或等于阶段计划内部人力总成本',planOutUserAt:'外购人力成本总预算-应该大于或等于阶段计划外购人力总成本',locked:'是否锁定整个项目不允许变化0否1是',baseTime:'基线时间',baseRemark:'基线备注',baselineId:'基线主键',planWorkload:'总预算工作量-应该大于或等于阶段计划总工作量',totalReceivables:'总预计收款金额',budgetMarginRate:'预估毛利率',contractAmt:'合同总金额',planInnerUserPrice:'内部人力成本单价元/人时',planOutUserPrice:'外购人力成本单价元/人时',planOutUserCnt:'外购人数',planInnerUserCnt:'内部人数',planWorkingHours:'预计工作小时数目',taxRate:'税率',planInnerUserWorkload:'内部人力总工作量-应该大于或等于阶段计划内部人力总成本',planOutUserWorkload:'外购人力总工作量-应该大于或等于阶段计划外购人力总成本',productId:'产品编号',productName:'产品名称',fromTplId:'关联模板编号'}
+ *2 查询、新增、修改的参数格式  params={id:'项目编号 主键',code:'项目代号',name:'项目名称',xmType:'项目类型',startTime:'项目开始时间',endTime:'项目结束时间',urgent:'紧急程度',priority:'优先程度',description:'项目描述',createUserid:'项目创建人编号',createUsername:'项目创建人',createTime:'创建时间',assess:'项目考核',assessRemarks:'考核备注',status:'项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停',branchId:'机构编号',planTotalCost:'总预算',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',planNouserAt:'非人力成本总预算-应该大于或等于阶段计划非人力总成本',planIuserAt:'内部人力成本总预算-应该大于或等于阶段计划内部人力总成本',planOuserAt:'外购人力成本总预算-应该大于或等于阶段计划外购人力总成本',locked:'是否锁定整个项目不允许变化0否1是',baseTime:'基线时间',baseRemark:'基线备注',baselineId:'基线主键',planWorkload:'总预算工作量-应该大于或等于阶段计划总工作量',totalReceivables:'总预计收款金额',budgetMarginRate:'预估毛利率',contractAmt:'合同总金额',planIuserPrice:'内部人力成本单价元/人时',planOuserPrice:'外购人力成本单价元/人时',planOuserCnt:'外购人数',planIuserCnt:'内部人数',planWorkingHours:'预计工作小时数目',taxRate:'税率',planIuserWorkload:'内部人力总工作量-应该大于或等于阶段计划内部人力总成本',planOuserWorkload:'外购人力总工作量-应该大于或等于阶段计划外购人力总成本',productId:'产品编号',productName:'产品名称',fromTplId:'关联模板编号'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmProjectBaseline.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * xm_project_baseline
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'基线表主键 主键',code:'项目代号',name:'项目名称',xmType:'项目类型',startTime:'项目开始时间',endTime:'项目结束时间',urgent:'紧急程度',priority:'优先程度',description:'项目描述',createUserid:'项目创建人编号',createUsername:'项目创建人',createTime:'创建时间',assess:'项目考核',assessRemarks:'考核备注',status:'项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停',branchId:'机构编号',planTotalCost:'总预算',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',planNouserAt:'非人力成本总预算-应该大于或等于阶段计划非人力总成本',planInnerUserAt:'内部人力成本总预算-应该大于或等于阶段计划内部人力总成本',planOutUserAt:'外购人力成本总预算-应该大于或等于阶段计划外购人力总成本',locked:'是否锁定整个项目不允许变化0否1是',baseTime:'基线时间',baseRemark:'基线备注',baselineId:'基线主键',planWorkload:'总预算工作量-应该大于或等于阶段计划总工作量',totalReceivables:'总预计收款金额',budgetMarginRate:'预估毛利率',contractAmt:'合同总金额',planInnerUserPrice:'内部人力成本单价元/人时',planOutUserPrice:'外购人力成本单价元/人时',planOutUserCnt:'外购人数',planInnerUserCnt:'内部人数',planWorkingHours:'预计工作小时数目',taxRate:'税率',planInnerUserWorkload:'内部人力总工作量-应该大于或等于阶段计划内部人力总成本',planOutUserWorkload:'外购人力总工作量-应该大于或等于阶段计划外购人力总成本',projectId:'项目编号',ctime:'创建时间'}
+ *2 查询、新增、修改的参数格式  params={id:'基线表主键 主键',code:'项目代号',name:'项目名称',xmType:'项目类型',startTime:'项目开始时间',endTime:'项目结束时间',urgent:'紧急程度',priority:'优先程度',description:'项目描述',createUserid:'项目创建人编号',createUsername:'项目创建人',createTime:'创建时间',assess:'项目考核',assessRemarks:'考核备注',status:'项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停',branchId:'机构编号',planTotalCost:'总预算',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',planNouserAt:'非人力成本总预算-应该大于或等于阶段计划非人力总成本',planIuserAt:'内部人力成本总预算-应该大于或等于阶段计划内部人力总成本',planOuserAt:'外购人力成本总预算-应该大于或等于阶段计划外购人力总成本',locked:'是否锁定整个项目不允许变化0否1是',baseTime:'基线时间',baseRemark:'基线备注',baselineId:'基线主键',planWorkload:'总预算工作量-应该大于或等于阶段计划总工作量',totalReceivables:'总预计收款金额',budgetMarginRate:'预估毛利率',contractAmt:'合同总金额',planIuserPrice:'内部人力成本单价元/人时',planOuserPrice:'外购人力成本单价元/人时',planOuserCnt:'外购人数',planIuserCnt:'内部人数',planWorkingHours:'预计工作小时数目',taxRate:'税率',planIuserWorkload:'内部人力总工作量-应该大于或等于阶段计划内部人力总成本',planOuserWorkload:'外购人力总工作量-应该大于或等于阶段计划外购人力总成本',projectId:'项目编号',ctime:'创建时间'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmProjectMBudgetCostNouser.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * xm_project_m_budget_cost_nouser
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'主键 主键',projectId:'项目编号',budgetCost:'预算金额',remark:'备注',subjectId:'预算科目',bizzStartDate:'费用归属周期开始日期',bizzEndDate:'费用归属周期结束日期',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',projectPhaseId:'阶段计划',costType:'成本类型0非人力1内部人力2外购人力',bizzMonth:'费用归属月份yyyy-mm'}
+ *2 查询、新增、修改的参数格式  params={id:'主键 主键',projectId:'项目编号',budgetCost:'预算金额',remark:'备注',subjectId:'预算科目',bizzStartDate:'费用归属周期开始日期',bizzEndDate:'费用归属周期结束日期',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',phaseId:'阶段计划',costType:'成本类型0非人力1内部人力2外购人力',bizzMonth:'费用归属月份yyyy-mm'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmProjectMBudgetCostUser.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * xm_project_m_budget_cost_user
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'主键 主键',projectId:'项目编号',userid:'项目成员编号',budgetCost:'预算金额/每月',remark:'备注',username:'用户名',subjectId:'预算科目编号',bizzStartDate:'费用归属周期开始日期',bizzEndDate:'费用归属周期结束日期',bizzMonth:'费用归属月份yyyy-mm',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',projectPhaseId:'项目阶段',costType:'成本类型0非人力1内部人力2外购人力'}
+ *2 查询、新增、修改的参数格式  params={id:'主键 主键',projectId:'项目编号',userid:'项目成员编号',budgetCost:'预算金额/每月',remark:'备注',username:'用户名',subjectId:'预算科目编号',bizzStartDate:'费用归属周期开始日期',bizzEndDate:'费用归属周期结束日期',bizzMonth:'费用归属月份yyyy-mm',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',phaseId:'项目阶段',costType:'成本类型0非人力1内部人力2外购人力'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmProjectMCostNouser.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * xm_project_m_cost_nouser
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'主键 主键',projectId:'项目编号',userid:'用户编号',createTime:'创建时间',sendCostTime:'费用发放时间',username:'用户名称',projectName:'项目名称',remark:'备注',taskId:'任务编号',taskName:'任务名称',subjectId:'科目编号',bizzStartDate:'费用归属周期开始日期',bizzEndDate:'费用归属周期结束日期',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',projectPhaseId:'项目计划阶段编号',actCostAmount:'实际成本金额',costType:'成本类型0非人力1内部人力2外购人力',bizMonth:'业务归属月份yyyy-mm',bizDate:'业务归属日期yyyy-mm-dd',subjectName:'科目名称',projectPhaseName:'阶段名称'}
+ *2 查询、新增、修改的参数格式  params={id:'主键 主键',projectId:'项目编号',userid:'用户编号',createTime:'创建时间',sendCostTime:'费用发放时间',username:'用户名称',projectName:'项目名称',remark:'备注',taskId:'任务编号',taskName:'任务名称',subjectId:'科目编号',bizzStartDate:'费用归属周期开始日期',bizzEndDate:'费用归属周期结束日期',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',phaseId:'项目计划阶段编号',actCostAmount:'实际成本金额',costType:'成本类型0非人力1内部人力2外购人力',bizMonth:'业务归属月份yyyy-mm',bizDate:'业务归属日期yyyy-mm-dd',subjectName:'科目名称',projectPhaseName:'阶段名称'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmProjectMCostUser.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * xm_project_m_cost_user
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'主键 主键',subjectId:'科目编号',projectId:'项目编号',userid:'用户编号',createTime:'创建时间',sendCostTime:'费用发放时间',username:'用户名称',projectName:'项目名称',remark:'备注',taskId:'任务编号',taskName:'任务名称',actWorkload:'实际工时',bizzStartDate:'费用归属周期开始日期',bizzEndDate:'费用归属周期结束日期',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',projectPhaseId:'项目计划阶段编号',actCostAmount:'金额',costType:'成本类型0非人力1内部人力2外购人力',bizMonth:'业务归属月份yyyy-mm',bizDate:'业务归属日期yyyy-mm-dd',subjectName:'科目名称',projectPhaseName:'阶段名称'}
+ *2 查询、新增、修改的参数格式  params={id:'主键 主键',subjectId:'科目编号',projectId:'项目编号',userid:'用户编号',createTime:'创建时间',sendCostTime:'费用发放时间',username:'用户名称',projectName:'项目名称',remark:'备注',taskId:'任务编号',taskName:'任务名称',actWorkload:'实际工时',bizzStartDate:'费用归属周期开始日期',bizzEndDate:'费用归属周期结束日期',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',phaseId:'项目计划阶段编号',actCostAmount:'金额',costType:'成本类型0非人力1内部人力2外购人力',bizMonth:'业务归属月份yyyy-mm',bizDate:'业务归属日期yyyy-mm-dd',subjectName:'科目名称',projectPhaseName:'阶段名称'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmProjectPhase.js

@@ -1,53 +0,0 @@
-import axios from '@/utils/request'
-
-import config from '@/common/config'
-
-let base = config.getCoreBasePath();
-
-
-/**
- * xm_project_phase
- *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'阶段主键 主键',phaseName:'阶段名称',remark:'备注',parentPhaseId:'上级阶段编号',branchId:'机构编号',projectId:'当前项目编号',beginDate:'开始时间',endDate:'结束时间',planWorkingHours:'工时',planWorkingStaffNu:'投入人员数',ctime:'创建时间',totalBudgetNouser:'非人力成本总预算',totalBudgetInnerUser:'内部人力成本总预算',totalBudgetOutUser:'外购人力成本总预算',projectBaselineId:'项目级基线',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除'}
- **/
- 
-//普通查询 条件之间and关系  
-export const listXmProjectPhase = params => { return axios.get(`${base}/xm/core/xmProjectPhase/list`, { params: params }); };
-
-//模糊查询xm_project_phase 条件之间or关系  
-//export const listXmProjectPhaseKey = params => { return axios.get(`${base}/xm/core/xmProjectPhase/listKey`, { params: params }); };
-
-//删除一条xm_project_phase params={id:'阶段主键 主键'}
-export const delXmProjectPhase = params => { return axios.post(`${base}/xm/core/xmProjectPhase/del`,params); };
-
-//批量删除xm_project_phase  params=[{id:'阶段主键 主键'}]
-export const batchDelXmProjectPhase = params => { return axios.post(`${base}/xm/core/xmProjectPhase/batchDel`, params); };
-
-//修改一条xm_project_phase记录
-export const editXmProjectPhase = params => { return axios.post(`${base}/xm/core/xmProjectPhase/edit`, params); };
-
-//新增一条xm_project_phase
-export const addXmProjectPhase = params => { return axios.post(`${base}/xm/core/xmProjectPhase/add`, params); };
-
-//批量从模板导入到项目  params=[{id:'阶段主键 主键'}]
-export const batchImportFromTemplate = params => { return axios.post(`${base}/xm/core/xmProjectPhase/batchImportFromTemplate`, params); };
-
-
-
-//批量从模板导入到项目  params=[{id:'阶段主键 主键'}]
-export const batchSaveBudget = params => { return axios.post(`${base}/xm/core/xmProjectPhase/batchSaveBudget`, params); };
-
-//批量从模板导入到项目  params=[{id:'阶段主键 主键'}]
-export const calcSomePhaseActDataFromTasks = params => { return axios.post(`${base}/xm/core/xmProjectPhase/calcSomePhaseActDataFromTasks`, params); };
-
-export const loadTasksToXmProjectPhase = params => { return axios.post(`${base}/xm/core/xmProjectPhase/loadTasksToXmProjectPhase`, params); };
-
-//修改负责人
-export const setPhaseMngUser = params => { return axios.post(`${base}/xm/core/xmProjectPhase/setPhaseMngUser`, params); };
-
-
-export const calcKeyPaths = params => { return axios.post(`${base}/xm/core/xmProjectPhase/calcKeyPaths`, params); };
-
-
-export const selectTotalProjectAndPhaseBudgetCost = params => { return axios.post(`${base}/xm/core/xmProjectPhase/selectTotalProjectAndPhaseBudgetCost`, params); };
-

src/api/xm/core/xmProjectPhaseBaseline.js

@@ -1,30 +0,0 @@
-import axios from '@/utils/request'
-
-import config from '@/common/config'
-
-let base = config.getCoreBasePath();
-
-
-/**
- * xm_project_phase_baseline
- *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'基线主键 主键',baseCtime:'基线建立时间',projectPhaseId:'阶段主键',phaseName:'阶段名称',remark:'备注',parentPhaseId:'上级阶段编号',branchId:'机构编号',projectId:'当前项目编号',beginDate:'开始时间',endDate:'结束时间',planWorkingHours:'工时',planWorkingStaffNu:'投入人员数',ctime:'创建时间',totalBudgetNouser:'非人力成本总预算',totalBudgetInnerUser:'内部人力成本总预算',totalBudgetOutUser:'外购人力成本总预算',baseRemark:'基线备注',projectBaselineId:'项目级基线',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除'}
- **/
- 
-//普通查询 条件之间and关系  
-export const listXmProjectPhaseBaseline = params => { return axios.get(`${base}/xm/core/xmProjectPhaseBaseline/list`, { params: params }); };
-
-//模糊查询xm_project_phase_baseline 条件之间or关系  
-//export const listXmProjectPhaseBaselineKey = params => { return axios.get(`${base}/xm/core/xmProjectPhaseBaseline/listKey`, { params: params }); };
-
-//删除一条xm_project_phase_baseline params={id:'基线主键 主键'}
-export const delXmProjectPhaseBaseline = params => { return axios.post(`${base}/xm/core/xmProjectPhaseBaseline/del`,params); };
-
-//批量删除xm_project_phase_baseline  params=[{id:'基线主键 主键'}]
-export const batchDelXmProjectPhaseBaseline = params => { return axios.post(`${base}/xm/core/xmProjectPhaseBaseline/batchDel`, params); };
-
-//修改一条xm_project_phase_baseline记录
-export const editXmProjectPhaseBaseline = params => { return axios.post(`${base}/xm/core/xmProjectPhaseBaseline/edit`, params); };
-
-//新增一条xm_project_phase_baseline
-export const addXmProjectPhaseBaseline = params => { return axios.post(`${base}/xm/core/xmProjectPhaseBaseline/add`, params); };

src/api/xm/core/xmProjectPhaseTemplate.js

@@ -1,30 +0,0 @@
-import axios from '@/utils/request'
-
-import config from '@/common/config'
-
-let base = config.getCoreBasePath();
-
-
-/**
- * 项目阶段模板
- *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'阶段主键 主键',phaseName:'阶段名称',remark:'备注',parentPhaseId:'上级阶段编号',branchId:'机构编号',projectId:'当前项目编号',beginDate:'开始时间',endDate:'结束时间',phaseBudgetHours:'工时(不包括下一级)-应该大于或等于task中总工时',phaseBudgetStaffNu:'投入人员数(不包括下一级)-应该大于或等于task中总人数',ctime:'创建时间',phaseBudgetNouserAt:'非人力成本总预算(不包括下一级)-应该大于或等于task中非人力总成本',phaseBudgetInnerUserAt:'内部人力成本总预算(不包括下一级)-应该大于或等于task中内部人力总成本',phaseBudgetOutUserAt:'外购人力成本总预算(不包括下一级)-应该大于或等于task中外购总成本',phaseBudgetWorkload:'总工作量单位人时-应该大于或者等于task中的预算总工作量',taskType:'0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType',planType:'计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年',seqNo:'顺序号',phaseBudgetInnerUserWorkload:'内部人力工作量总预算(不包括下一级)-应该大于或等于task中内部人力总成本',phaseBudgetOutUserWorkload:'外购人力工作量总预算(不包括下一级)-应该大于或等于task中外购总成本',phaseBudgetInnerUserPrice:'内部人力成本单价元/人时',phaseBudgetOutUserPrice:'外购人力成本单价元/人时',phaseBudgetOutUserCnt:'外购人数',phaseBudgetInnerUserCnt:'内部人数'}
- **/
- 
-//普通查询 条件之间and关系  
-export const listXmProjectPhaseTemplate = params => { return axios.get(`${base}/xm/core/xmProjectPhaseTemplate/list`, { params: params }); };
-
-//模糊查询项目阶段模板 条件之间or关系  
-//export const listXmProjectPhaseTemplateKey = params => { return axios.get(`${base}/xm/core/xmProjectPhaseTemplate/listKey`, { params: params }); };
-
-//删除一条项目阶段模板 params={id:'阶段主键 主键'}
-export const delXmProjectPhaseTemplate = params => { return axios.post(`${base}/xm/core/xmProjectPhaseTemplate/del`,params); };
-
-//批量删除项目阶段模板  params=[{id:'阶段主键 主键'}]
-export const batchDelXmProjectPhaseTemplate = params => { return axios.post(`${base}/xm/core/xmProjectPhaseTemplate/batchDel`, params); };
-
-//修改一条项目阶段模板记录
-export const editXmProjectPhaseTemplate = params => { return axios.post(`${base}/xm/core/xmProjectPhaseTemplate/edit`, params); };
-
-//新增一条项目阶段模板
-export const addXmProjectPhaseTemplate = params => { return axios.post(`${base}/xm/core/xmProjectPhaseTemplate/add`, params); };

src/api/xm/core/xmProjectState.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * 项目指标日统计表
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'主键 主键',projectId:'项目编号',bizDate:'统计日期yyyy-mm-dd类型',totalFileCnt:'文件数据',totalBugCnt:'bug数目',totalTaskCnt:'任务数',totalBudgetNouserAmount:'项目总非人力预算-来自项目表',projectName:'项目名称',totalStaffCnt:'总参与人数',calCtime:'统计执行日期',calStatus:'0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖',totalCostNouserAmount:'项目总非人力成本',totalClosedBugCnt:'已关闭bug总数',totalResolvedBugCnt:'已解决bug总数',totalCompleteTaskCnt:'已完成任务总数-来自任务表',totalPhaseCnt:'项目阶段计划数',totalCompletePhaseCnt:'项目阶段计划已完成数',totalNeedPayAmount:'待付款总金额',totalFinishPayAmount:'已付款总金额',totalNeedColAmount:'待收款总金额',totalFinishColAmount:'已收款总金额',totalCostUserAmount:'项目总人力成本',totalBudgetInnerUserAmount:'项目总内部人力预算-来自项目表',totalPlanWorkload:'项目总预算工作量-来自项目表',totalRiskCnt:'项目风险总数',totalCompleteRiskCnt:'已完成风险总数',branchId:'机构编号',branchName:'机构名称',totalBudgetOutUserAmount:'项目总外购人力预算-来自项目表',totalCompleteWorkload:'已完成工作量-来自计划中实际完成工作量',todayNewBugCnt:'今日新增bug数目',todayResolvedBugCnt:'今日解决bug数目',todayClosedBugCnt:'今日关闭bug',todayNewTaskCnt:'今日新增任务数',todayCompleteTaskCnt:'今日完成任务数',todayNewPhaseCnt:'今日新增计划数目',todayCompletePhaseCnt:'今日完成计划数目',todayNewStaffCnt:'今日新增员工数',todaySubStaffCnt:'今日退出员工数',todayNewPlanWorkload:'今日新增预算工作量',todayNewActWorkload:'今日新增实际工作量',todayNeedColAmount:'今日需要收款金额',todayFinishColAmount:'今日完成收款金额',todayCostUserAmount:'今日人力成本金额',todayCostInnerUserAmount:'今日内部人力成本金额',todayCostOutUserAmount:'今日外购人力成本金额',todayCostNouserAmount:'今日非人力成本金额',totalCostInnerUserAmount:'项目总内部人力成本金额',totalCostOutUserAmount:'项目总外购人力成本金额',todayNeedPayAmount:'今日新增待付款总金额',todayFinishPayAmount:'今日新增完成付款总金额',todayNewRiskCnt:'今日新增项目风险总数',todayCompleteRiskCnt:'今日完成风险总数',todayNewFileCnt:'今日新增文档',totalProgress:'项目进度0~100之间，来自任务表',totalActiveBugCnt:'激活的bug总数',totalConfirmedBugCnt:'已解决bug总数',projectStatus:'项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停',totalActWorkload:'实际总工作量，来自任务表',totalActOutWorkload:'实际外购总工作量，来自任务表',totalActInnerWorkload:'实际内部总工作量，来自任务表',totalTaskBudgetCostAt:'已经分配到任务的总预算',totalTaskOutCnt:'外购任务数，来自任务表',totalNeedPayCnt:'待付款笔数',totalFinishPayCnt:'完成付款总比数',todayConfirmedBugCnt:'今日确认bug',todayActiveBugCnt:'今日激活的bug',totalFinishPayUserCnt:'已付款总人数',totalNeedPayUserCnt:'待付款总人数',todayNeedPayUserCnt:'今日待付款总人数',todayFinishPayUserCnt:'今日已付款总人数'}
+ *2 查询、新增、修改的参数格式  params={id:'主键 主键',projectId:'项目编号',bizDate:'统计日期yyyy-mm-dd类型',totalFileCnt:'文件数据',totalBugCnt:'bug数目',totalTaskCnt:'任务数',totalBudgetNouserAmount:'项目总非人力预算-来自项目表',projectName:'项目名称',totalStaffCnt:'总参与人数',calCtime:'统计执行日期',calStatus:'0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖',totalCostNouserAmount:'项目总非人力成本',totalClosedBugCnt:'已关闭bug总数',totalResolvedBugCnt:'已解决bug总数',totalCompleteTaskCnt:'已完成任务总数-来自任务表',totalPhaseCnt:'项目阶段计划数',totalCompletePhaseCnt:'项目阶段计划已完成数',totalNeedPayAmount:'待付款总金额',totalFinishPayAmount:'已付款总金额',totalNeedColAmount:'待收款总金额',totalFinishColAmount:'已收款总金额',totalCostUserAmount:'项目总人力成本',totalBudgetIuserAmount:'项目总内部人力预算-来自项目表',totalPlanWorkload:'项目总预算工作量-来自项目表',totalRiskCnt:'项目风险总数',totalCompleteRiskCnt:'已完成风险总数',branchId:'机构编号',branchName:'机构名称',totalBudgetOuserAmount:'项目总外购人力预算-来自项目表',totalCompleteWorkload:'已完成工作量-来自计划中实际完成工作量',todayNewBugCnt:'今日新增bug数目',todayResolvedBugCnt:'今日解决bug数目',todayClosedBugCnt:'今日关闭bug',todayNewTaskCnt:'今日新增任务数',todayCompleteTaskCnt:'今日完成任务数',todayNewPhaseCnt:'今日新增计划数目',todayCompletePhaseCnt:'今日完成计划数目',todayNewStaffCnt:'今日新增员工数',todaySubStaffCnt:'今日退出员工数',todayNewPlanWorkload:'今日新增预算工作量',todayNewActWorkload:'今日新增实际工作量',todayNeedColAmount:'今日需要收款金额',todayFinishColAmount:'今日完成收款金额',todayCostUserAmount:'今日人力成本金额',todayCostIuserAmount:'今日内部人力成本金额',todayCostOuserAmount:'今日外购人力成本金额',todayCostNouserAmount:'今日非人力成本金额',totalCostIuserAmount:'项目总内部人力成本金额',totalCostOuserAmount:'项目总外购人力成本金额',todayNeedPayAmount:'今日新增待付款总金额',todayFinishPayAmount:'今日新增完成付款总金额',todayNewRiskCnt:'今日新增项目风险总数',todayCompleteRiskCnt:'今日完成风险总数',todayNewFileCnt:'今日新增文档',totalProgress:'项目进度0~100之间，来自任务表',totalActiveBugCnt:'激活的bug总数',totalConfirmedBugCnt:'已解决bug总数',projectStatus:'项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停',totalActWorkload:'实际总工作量，来自任务表',totalActOutWorkload:'实际外购总工作量，来自任务表',totalActInnerWorkload:'实际内部总工作量，来自任务表',totalTaskBudgetCostAt:'已经分配到任务的总预算',totalTaskOutCnt:'外购任务数，来自任务表',totalNeedPayCnt:'待付款笔数',totalFinishPayCnt:'完成付款总比数',todayConfirmedBugCnt:'今日确认bug',todayActiveBugCnt:'今日激活的bug',totalFinishPayUserCnt:'已付款总人数',totalNeedPayUserCnt:'待付款总人数',todayNeedPayUserCnt:'今日待付款总人数',todayFinishPayUserCnt:'今日已付款总人数'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmProjectStateHis.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * xm_project_state_his
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'本表主键 主键',projectId:'项目编号',bizDate:'统计日期yyyy-mm-dd类型',totalFileCnt:'文件数据',totalBugCnt:'bug数目',totalTaskCnt:'任务数',totalBudgetNouserAmount:'项目总非人力预算-来自项目表',projectName:'项目名称',stateId:'xm_project_state原表主键id',totalStaffCnt:'总参与人数',calCtime:'统计执行日期',calStatus:'0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖',totalCostNouserAmount:'项目总非人力成本',totalCloseBugCnt:'已关闭bug总数',totalResolveBugCnt:'已解决bug总数',totalCompleteTaskCnt:'已完成任务总数-来自任务表',totalPhaseCnt:'项目阶段计划数',totalCompletePhaseCnt:'项目阶段计划已完成数',totalNeedPayAmount:'待付款总金额',totalFinishPayAmount:'已付款总金额',totalNeedColAmount:'待收款总金额',totalFinishColAmount:'已收款总金额',totalCostUserAmount:'项目总人力成本',totalBudgetInnerUserAmount:'项目总内部人力预算-来自项目表',totalPlanWorkload:'项目总预算工作量-来自项目表',totalRiskCnt:'项目风险总数',totalCompleteRiskCnt:'已完成风险总数',branchId:'机构编号',branchName:'机构名称',totalBudgetOutUserAmount:'项目总外购人力预算-来自项目表',totalCompleteWorkload:'已完成工作量-来自计划中实际完成工作量'}
+ *2 查询、新增、修改的参数格式  params={id:'本表主键 主键',projectId:'项目编号',bizDate:'统计日期yyyy-mm-dd类型',totalFileCnt:'文件数据',totalBugCnt:'bug数目',totalTaskCnt:'任务数',totalBudgetNouserAmount:'项目总非人力预算-来自项目表',projectName:'项目名称',stateId:'xm_project_state原表主键id',totalStaffCnt:'总参与人数',calCtime:'统计执行日期',calStatus:'0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖',totalCostNouserAmount:'项目总非人力成本',totalCloseBugCnt:'已关闭bug总数',totalResolveBugCnt:'已解决bug总数',totalCompleteTaskCnt:'已完成任务总数-来自任务表',totalPhaseCnt:'项目阶段计划数',totalCompletePhaseCnt:'项目阶段计划已完成数',totalNeedPayAmount:'待付款总金额',totalFinishPayAmount:'已付款总金额',totalNeedColAmount:'待收款总金额',totalFinishColAmount:'已收款总金额',totalCostUserAmount:'项目总人力成本',totalBudgetIuserAmount:'项目总内部人力预算-来自项目表',totalPlanWorkload:'项目总预算工作量-来自项目表',totalRiskCnt:'项目风险总数',totalCompleteRiskCnt:'已完成风险总数',branchId:'机构编号',branchName:'机构名称',totalBudgetOuserAmount:'项目总外购人力预算-来自项目表',totalCompleteWorkload:'已完成工作量-来自计划中实际完成工作量'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmProjectTaskTypeState.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * 按任务类型汇总
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'主键 主键',projectId:'项目编号',projectName:'项目名称',taskType:'任务类型',planWorkload:'工作量',planAmount:'预算金额',actWorkload:'实际完成工作量',actAmount:'实际完成金额',branchId:'机构编号',bizDate:'业务日期yyyy-MM-dd型',calcTime:'计算日期',planOutUserAt:'外购资金预算',planInnerUserAt:'内购资金预算',actOutUserAt:'实际外购成本',actInnerUserAt:'实际内购成本',planOutUserWorkload:'计划外购工作量',planInnerUserWorkload:'计划内购工作量',actOutUserWorkload:'实际外购工作量',actInnerUserWorkload:'实际内购工作量',planNouserAt:'计划非人力成本',actNouserAt:'实际非人力成本'}
+ *2 查询、新增、修改的参数格式  params={id:'主键 主键',projectId:'项目编号',projectName:'项目名称',taskType:'任务类型',planWorkload:'工作量',planAmount:'预算金额',actWorkload:'实际完成工作量',actAmount:'实际完成金额',branchId:'机构编号',bizDate:'业务日期yyyy-MM-dd型',calcTime:'计算日期',planOuserAt:'外购资金预算',planIuserAt:'内购资金预算',actOuserAt:'实际外购成本',actIuserAt:'实际内购成本',planOuserWorkload:'计划外购工作量',planIuserWorkload:'计划内购工作量',actOuserWorkload:'实际外购工作量',actIuserWorkload:'实际内购工作量',planNouserAt:'计划非人力成本',actNouserAt:'实际非人力成本'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmProjectTemplate.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * xm_project_template
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'项目编号 主键',code:'项目代号',name:'项目名称',xmType:'项目类型',startTime:'项目开始时间',endTime:'项目结束时间',urgent:'紧急程度',priority:'优先程度',description:'项目描述',createUserid:'项目创建人编号',createUsername:'项目创建人',createTime:'创建时间',assess:'项目考核',assessRemarks:'考核备注',status:'项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停',branchId:'机构编号',planTotalCost:'总预算',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',planNouserAt:'非人力成本总预算-应该大于或等于阶段计划非人力总成本',planInnerUserAt:'内部人力成本总预算-应该大于或等于阶段计划内部人力总成本',planOutUserAt:'外购人力成本总预算-应该大于或等于阶段计划外购人力总成本',locked:'是否锁定整个项目不允许变化0否1是',baseTime:'基线时间',baseRemark:'基线备注',baselineId:'基线主键',planWorkload:'总预算工作量-应该大于或等于阶段计划总工作量',totalReceivables:'总预计收款金额',budgetMarginRate:'预估毛利率',contractAmt:'合同总金额',planInnerUserPrice:'内部人力成本单价元/人时',planOutUserPrice:'外购人力成本单价元/人时',planOutUserCnt:'外购人数',planInnerUserCnt:'内部人数',planWorkingHours:'预计工作小时数目',taxRate:'税率',planInnerUserWorkload:'内部人力总工作量-应该大于或等于阶段计划内部人力总成本',planOutUserWorkload:'外购人力总工作量-应该大于或等于阶段计划外购人力总成本',productId:'产品编号',productName:'产品名称',templateId:'项目模板编号',tcuserid:'模板创建人编号',tcusername:'模板创建人姓名',tremark:'模板备注',tctime:'模板创建时间',tcbranchId:'模板创建机构编号',shareScope:'共享范围0-全部,1-本机构'}
+ *2 查询、新增、修改的参数格式  params={id:'项目编号 主键',code:'项目代号',name:'项目名称',xmType:'项目类型',startTime:'项目开始时间',endTime:'项目结束时间',urgent:'紧急程度',priority:'优先程度',description:'项目描述',createUserid:'项目创建人编号',createUsername:'项目创建人',createTime:'创建时间',assess:'项目考核',assessRemarks:'考核备注',status:'项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停',branchId:'机构编号',planTotalCost:'总预算',bizProcInstId:'当前流程实例编号',bizFlowState:'当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除',planNouserAt:'非人力成本总预算-应该大于或等于阶段计划非人力总成本',planIuserAt:'内部人力成本总预算-应该大于或等于阶段计划内部人力总成本',planOuserAt:'外购人力成本总预算-应该大于或等于阶段计划外购人力总成本',locked:'是否锁定整个项目不允许变化0否1是',baseTime:'基线时间',baseRemark:'基线备注',baselineId:'基线主键',planWorkload:'总预算工作量-应该大于或等于阶段计划总工作量',totalReceivables:'总预计收款金额',budgetMarginRate:'预估毛利率',contractAmt:'合同总金额',planIuserPrice:'内部人力成本单价元/人时',planOuserPrice:'外购人力成本单价元/人时',planOuserCnt:'外购人数',planIuserCnt:'内部人数',planWorkingHours:'预计工作小时数目',taxRate:'税率',planIuserWorkload:'内部人力总工作量-应该大于或等于阶段计划内部人力总成本',planOuserWorkload:'外购人力总工作量-应该大于或等于阶段计划外购人力总成本',productId:'产品编号',productName:'产品名称',templateId:'项目模板编号',tcuserid:'模板创建人编号',tcusername:'模板创建人姓名',tremark:'模板备注',tctime:'模板创建时间',tcbranchId:'模板创建机构编号',shareScope:'共享范围0-全部,1-本机构'}
  **/
  
 //普通查询 条件之间and关系  

src/api/xm/core/xmTaskTemplate.js

@@ -8,7 +8,7 @@ let base = config.getCoreBasePath();
 /**
  * xm_task_template
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'任务编号 主键',name:'任务名称',parentTaskid:'父任务编号',parentTaskname:'父任务名称',projectId:'项目编号',projectName:'项目名称',level:'任务级别',sortLevel:'排序级别',preTaskid:'前置任务编号',preTaskname:'前置任务名称',startTime:'任务开始时间',endTime:'任务结束时间',milestone:'里程碑',description:'任务描述',remarks:'备注',createUserid:'任务创建人编号',createUsername:'任务创建人',createTime:'创建时间',rate:'任务进度0-100',budgetCost:'当前任务预算金额（包括所有成本，不包括下一级）',budgetWorkload:'预算工时（不包括下一级）',taskState:'任务状态0待领取1已领取执行中2已完工3已结算',taskType:'0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType',taskClass:'1需结算0不需结算',toTaskCenter:'是否发布到任务大厅0否1是',projectPhaseId:'项目阶段编号',projectPhaseName:'项目阶段名称',taskSkillNames:'技能列表,逗号分隔',taskSkillIds:'技能编号列表逗号分隔',taskOut:'是否外购',planType:'计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年',settleSchemel:'任务结算方案-来自数字字典xmTaskSettleSchemel',menuId:'归属功能编号',menuName:'归属功能名称'}
+ *2 查询、新增、修改的参数格式  params={id:'任务编号 主键',name:'任务名称',parentTaskid:'父任务编号',parentTaskname:'父任务名称',projectId:'项目编号',projectName:'项目名称',level:'任务级别',sortLevel:'排序级别',preTaskid:'前置任务编号',preTaskname:'前置任务名称',startTime:'任务开始时间',endTime:'任务结束时间',milestone:'里程碑',description:'任务描述',remarks:'备注',createUserid:'任务创建人编号',createUsername:'任务创建人',createTime:'创建时间',rate:'任务进度0-100',budgetCost:'当前任务预算金额（包括所有成本，不包括下一级）',budgetWorkload:'预算工时（不包括下一级）',taskState:'任务状态0待领取1已领取执行中2已完工3已结算',taskType:'0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType',taskClass:'1需结算0不需结算',toTaskCenter:'是否发布到任务大厅0否1是',phaseId:'项目阶段编号',projectPhaseName:'项目阶段名称',taskSkillNames:'技能列表,逗号分隔',taskSkillIds:'技能编号列表逗号分隔',taskOut:'是否外购',planType:'计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年',settleSchemel:'任务结算方案-来自数字字典xmTaskSettleSchemel',menuId:'归属功能编号',menuName:'归属功能名称'}
  **/
  
 //普通查询 条件之间and关系  

src/views/datav/xm/branch/index.vue

@@ -74,7 +74,7 @@ export default {
         {
           title: '累计金额',
           number: {
-            number: [(this.floatValue(this.xmBranchState.totalBudgetNouserAmount) + this.floatValue(this.xmBranchState.totalBudgetInnerUserAmount) + this.floatValue(this.xmBranchState.totalBudgetOutUserAmount))/10000],
+            number: [(this.floatValue(this.xmBranchState.totalBudgetNouserAmount) + this.floatValue(this.xmBranchState.totalBudgetIuserAmount) + this.floatValue(this.xmBranchState.totalBudgetOuserAmount))/10000],
             content: '{nt}',
             textAlign: 'right',
             style: {
@@ -236,8 +236,8 @@ export default {
     waterLevelChartData(){
       if(this.xmBranchState){
         var data={}
-        var allAmount=this.floatValue(this.xmBranchState.totalBudgetNouserAmount) + this.floatValue(this.xmBranchState.totalBudgetInnerUserAmount) + this.floatValue(this.xmBranchState.totalBudgetOutUserAmount);
-        data.finishNum= this.floatValue(this.xmBranchState.totalCostNouserAmount) + this.floatValue(this.xmBranchState.totalCostInnerUserAmount) +this.floatValue(this.xmBranchState.totalCostOutUserAmount) 
+        var allAmount=this.floatValue(this.xmBranchState.totalBudgetNouserAmount) + this.floatValue(this.xmBranchState.totalBudgetIuserAmount) + this.floatValue(this.xmBranchState.totalBudgetOuserAmount);
+        data.finishNum= this.floatValue(this.xmBranchState.totalCostNouserAmount) + this.floatValue(this.xmBranchState.totalCostIuserAmount) +this.floatValue(this.xmBranchState.totalCostOuserAmount) 
         data.finishPercent= parseFloat(data.finishNum/allAmount * 100).toFixed(0)
         return data;
      }else{

src/views/datav/xm/project/cards.vue

@@ -38,7 +38,7 @@ export default {
        
        var cards= this.data.map(i=>{
            var card=JSON.parse(JSON.stringify(this.cardConfig))
-           card.title=i.phaseName 
+           card.title=i.name 
            card.total.number=[i.phaseBudgetWorkload];//累计工作量 人月
            card.num.number=[i.actRate];//当前进度
            //资金占比

src/views/datav/xm/project/index.vue

@@ -45,7 +45,7 @@ import cards from './cards'
   import { listXmGroupState} from '@/api/xm/core/xmGroupState';
 	import { listXmProjectTaskTypeState } from '@/api/xm/core/xmProjectTaskTypeState';
   import { listXmRecord } from '@/api/xm/core/xmRecord';
-  import { listXmProjectPhase } from '@/api/xm/core/xmProjectPhase';
+  import { listXmPhase } from '@/api/xm/core/xmPhase';
 
 
   import { mapGetters } from 'vuex'
@@ -74,7 +74,7 @@ export default {
         {
           title: '累计金额',
           number: {
-            number: [(this.floatValue(this.xmProjectState.totalBudgetNouserAmount) + this.floatValue(this.xmProjectState.totalBudgetInnerUserAmount) + this.floatValue(this.xmProjectState.totalBudgetOutUserAmount))/10000],
+            number: [(this.floatValue(this.xmProjectState.totalBudgetNouserAmount) + this.floatValue(this.xmProjectState.totalBudgetIuserAmount) + this.floatValue(this.xmProjectState.totalBudgetOuserAmount))/10000],
             content: '{nt}',
             textAlign: 'right',
             style: {
@@ -236,8 +236,8 @@ export default {
     waterLevelChartData(){
       if(this.xmProjectState){
         var data={}
-        var allAmount=this.floatValue(this.xmProjectState.totalBudgetNouserAmount) + this.floatValue(this.xmProjectState.totalBudgetInnerUserAmount) + this.floatValue(this.xmProjectState.totalBudgetOutUserAmount);
-        data.finishNum= this.floatValue(this.xmProjectState.totalCostNouserAmount) + this.floatValue(this.xmProjectState.totalCostInnerUserAmount) +this.floatValue(this.xmProjectState.totalCostOutUserAmount) 
+        var allAmount=this.floatValue(this.xmProjectState.totalBudgetNouserAmount) + this.floatValue(this.xmProjectState.totalBudgetIuserAmount) + this.floatValue(this.xmProjectState.totalBudgetOuserAmount);
+        data.finishNum= this.floatValue(this.xmProjectState.totalCostNouserAmount) + this.floatValue(this.xmProjectState.totalCostIuserAmount) +this.floatValue(this.xmProjectState.totalCostOuserAmount) 
         data.finishPercent= parseFloat(data.finishNum/allAmount * 100).toFixed(0)
         return data;
      }else{
@@ -255,10 +255,10 @@ export default {
         }
     },
     cardsData(){
-      if(this.xmProjectPhases && this.xmProjectPhases.length>0){
+      if(this.xmPhases && this.xmPhases.length>0){
          var totalPlanWorkload=this.floatValue(this.xmProjectState.totalPlanWorkload)  
         
-        return this.xmProjectPhases.map(i=>{
+        return this.xmPhases.map(i=>{
            i.totalPlanWorkload=totalPlanWorkload
            return i;
         })
@@ -277,7 +277,7 @@ export default {
       xmGroupStates:[],
       xmProjectTaskTypeStates:[],
       xmRecords:[],
-      xmProjectPhases:[],
+      xmPhases:[],
       options:{
         taskType:[],
       },
@@ -301,7 +301,7 @@ export default {
       },
       
       
-      xmProjectPhasePageInfo:{//分页数据
+      xmPhasePageInfo:{//分页数据
         total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize:5,//每页数据
         count:false,//是否需要重新计算总记录数
@@ -391,29 +391,29 @@ export default {
  					} 
  				}) ;
       },
-    //获取列表 XmProjectPhase 功能状态表,无需前端维护，所有数据由汇总统计得出
-    getXmProjectPhases() {
+    //获取列表 XmPhase 功能状态表,无需前端维护，所有数据由汇总统计得出
+    getXmPhases() {
       let params = {
-        pageSize: this.xmProjectPhasePageInfo.pageSize,
-        pageNum: this.xmProjectPhasePageInfo.pageNum,
-        total: this.xmProjectPhasePageInfo.total,
-        count:this.xmProjectPhasePageInfo.count
+        pageSize: this.xmPhasePageInfo.pageSize,
+        pageNum: this.xmPhasePageInfo.pageNum,
+        total: this.xmPhasePageInfo.total,
+        count:this.xmPhasePageInfo.count
       };
-      if(this.xmProjectPhasePageInfo.orderFields!=null && this.xmProjectPhasePageInfo.orderFields.length>0){
+      if(this.xmPhasePageInfo.orderFields!=null && this.xmPhasePageInfo.orderFields.length>0){
         let orderBys=[];
-        for(var i=0;i<this.xmProjectPhasePageInfo.orderFields.length;i++){ 
-          orderBys.push(this.xmProjectPhasePageInfo.orderFields[i]+" "+this.xmProjectPhasePageInfo.orderDirs[i])
+        for(var i=0;i<this.xmPhasePageInfo.orderFields.length;i++){ 
+          orderBys.push(this.xmPhasePageInfo.orderFields[i]+" "+this.xmPhasePageInfo.orderDirs[i])
         }  
         params.orderBy= orderBys.join(",")
       } 
 
       params.projectId=this.filters.projectId
-       listXmProjectPhase(params).then((res) => {
+       listXmPhase(params).then((res) => {
         var tips=res.data.tips;
         if(tips.isOk){ 
-          this.xmProjectPhasePageInfo.total = res.data.total;
-          this.xmProjectPhasePageInfo.count=false;
-          this.xmProjectPhases = res.data.data;
+          this.xmPhasePageInfo.total = res.data.total;
+          this.xmPhasePageInfo.count=false;
+          this.xmPhases = res.data.data;
         }else{
          } 
        }) ;
@@ -434,7 +434,7 @@ export default {
     this.getXmGroupStates();
     this.getXmProjectTaskTypeStates();
     this.getXmRecords();
-    this.getXmProjectPhases();
+    this.getXmPhases();
     listOption([{categoryId:'all',itemCode:'taskType'}] ).then(res=>{
       if(res.data.tips.isOk){ 
         this.options=res.data.data

src/views/xm/XmOverview.vue

@@ -662,14 +662,14 @@ export default {
                   }
                 },
                 name: '非人力'},
-              {value: this.xmBranchState.totalBudgetInnerUserAmount,
+              {value: this.xmBranchState.totalBudgetIuserAmount,
                 itemStyle: {
                   normal:{
                     color: '#73C0DE'
                   }
                 },
                 name: '内部人力'},
-              {value: this.xmBranchState.totalBudgetOutUserAmount,
+              {value: this.xmBranchState.totalBudgetOuserAmount,
                 itemStyle: {
                   normal:{
                     color: '#5470C6'
@@ -722,14 +722,14 @@ export default {
               }
             },
             data: [
-              {value: this.xmBranchState.totalPlanInnerUserWorkload,
+              {value: this.xmBranchState.totalPlanIuserWorkload,
                 itemStyle: {
                   normal:{
                     color: '#91CC75'
                   }
                 },
                 name: '内部人力'},
-              {value: this.xmBranchState.totalPlanOutUserWorkload,
+              {value: this.xmBranchState.totalPlanOuserWorkload,
                 itemStyle: {
                   normal:{
                     color: '#3BA272'

src/views/xm/core/components/xm-gantt.vue

@@ -9,9 +9,9 @@
 						:treeProps="{children: 'children', hasChildren: 'hasChildren',pid:'parentPhaseId', pre: 'finishTaskCnt'}"
 						:props="columns"
             row-key="id">
-            <!-- <el-table-column prop="phaseName" label="计划名称" min-width="160" > 
+            <!-- <el-table-column prop="name" label="计划名称" min-width="160" > 
               <template slot-scope="scope">
-                <span>{{scope.row.phaseName}}</span>
+                <span>{{scope.row.name}}</span>
               </template>
             </el-table-column> -->
       </wl-gantt>

src/views/xm/core/xmBranchState/XmBranchStateAdd.vue

@@ -63,8 +63,8 @@
 				<el-form-item label="项目总人力成本" prop="totalCostUserAmount">
 					<el-input v-model="addForm.totalCostUserAmount" placeholder="项目总人力成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetInnerUserAmount">
-					<el-input v-model="addForm.totalBudgetInnerUserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetIuserAmount">
+					<el-input v-model="addForm.totalBudgetIuserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="项目总预算工作量-来自项目表" prop="totalPlanWorkload">
 					<el-input v-model="addForm.totalPlanWorkload" placeholder="项目总预算工作量-来自项目表"></el-input>
@@ -81,17 +81,17 @@
 				<el-form-item label="机构名称" prop="branchName">
 					<el-input v-model="addForm.branchName" placeholder="机构名称" ></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOutUserAmount">
-					<el-input v-model="addForm.totalBudgetOutUserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOuserAmount">
+					<el-input v-model="addForm.totalBudgetOuserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="已完成工作量-来自计划中实际完成工作量" prop="totalCompleteWorkload">
 					<el-input v-model="addForm.totalCompleteWorkload" placeholder="已完成工作量-来自计划中实际完成工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总内部人力成本金额" prop="totalCostInnerUserAmount">
-					<el-input v-model="addForm.totalCostInnerUserAmount" placeholder="项目总内部人力成本金额"></el-input>
+				<el-form-item label="项目总内部人力成本金额" prop="totalCostIuserAmount">
+					<el-input v-model="addForm.totalCostIuserAmount" placeholder="项目总内部人力成本金额"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总外购人力成本金额" prop="totalCostOutUserAmount">
-					<el-input v-model="addForm.totalCostOutUserAmount" placeholder="项目总外购人力成本金额"></el-input>
+				<el-form-item label="项目总外购人力成本金额" prop="totalCostOuserAmount">
+					<el-input v-model="addForm.totalCostOuserAmount" placeholder="项目总外购人力成本金额"></el-input>
 				</el-form-item> 
 				<el-form-item label="项目进度0~100之间，来自任务表" prop="totalProgress">
 					<el-input v-model="addForm.totalProgress" placeholder="项目进度0~100之间，来自任务表"></el-input>
@@ -132,11 +132,11 @@
 				<el-form-item label="待付款总人数" prop="totalNeedPayUserCnt">
 					<el-input v-model="addForm.totalNeedPayUserCnt" placeholder="待付款总人数"></el-input>
 				</el-form-item> 
-				<el-form-item label="内部人力总工作量-应该大于或等于计划内部人力总成本" prop="totalPlanInnerUserWorkload">
-					<el-input v-model="addForm.totalPlanInnerUserWorkload" placeholder="内部人力总工作量-应该大于或等于计划内部人力总成本"></el-input>
+				<el-form-item label="内部人力总工作量-应该大于或等于计划内部人力总成本" prop="totalPlanIuserWorkload">
+					<el-input v-model="addForm.totalPlanIuserWorkload" placeholder="内部人力总工作量-应该大于或等于计划内部人力总成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="外购人力总工作量-应该大于或等于计划外购人力总成本" prop="totalPlanOutUserWorkload">
-					<el-input v-model="addForm.totalPlanOutUserWorkload" placeholder="外购人力总工作量-应该大于或等于计划外购人力总成本"></el-input>
+				<el-form-item label="外购人力总工作量-应该大于或等于计划外购人力总成本" prop="totalPlanOuserWorkload">
+					<el-input v-model="addForm.totalPlanOuserWorkload" placeholder="外购人力总工作量-应该大于或等于计划外购人力总成本"></el-input>
 				</el-form-item> 
 				<el-form-item label="测试案例总数" prop="testCases">
 					<el-input-number v-model="addForm.testCases" :min="0" :max="200"></el-input-number>
@@ -204,7 +204,7 @@
 				},
 				//新增界面数据 机构内所有项目指标汇总
 				addForm: {
-					bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',id:'',totalStaffCnt:'',calcTime:'',calcStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanInnerUserWorkload:'',totalPlanOutUserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:''
+					bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',id:'',totalStaffCnt:'',calcTime:'',calcStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',totalCostIuserAmount:'',totalCostOuserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanIuserWorkload:'',totalPlanOuserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmBranchState/XmBranchStateEdit.vue

@@ -63,8 +63,8 @@
 				<el-form-item label="项目总人力成本" prop="totalCostUserAmount">
 					<el-input v-model="editForm.totalCostUserAmount" placeholder="项目总人力成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetInnerUserAmount">
-					<el-input v-model="editForm.totalBudgetInnerUserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetIuserAmount">
+					<el-input v-model="editForm.totalBudgetIuserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="项目总预算工作量-来自项目表" prop="totalPlanWorkload">
 					<el-input v-model="editForm.totalPlanWorkload" placeholder="项目总预算工作量-来自项目表"></el-input>
@@ -81,17 +81,17 @@
 				<el-form-item label="机构名称" prop="branchName">
 					<el-input v-model="editForm.branchName" placeholder="机构名称"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOutUserAmount">
-					<el-input v-model="editForm.totalBudgetOutUserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOuserAmount">
+					<el-input v-model="editForm.totalBudgetOuserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="已完成工作量-来自计划中实际完成工作量" prop="totalCompleteWorkload">
 					<el-input v-model="editForm.totalCompleteWorkload" placeholder="已完成工作量-来自计划中实际完成工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总内部人力成本金额" prop="totalCostInnerUserAmount">
-					<el-input v-model="editForm.totalCostInnerUserAmount" placeholder="项目总内部人力成本金额"></el-input>
+				<el-form-item label="项目总内部人力成本金额" prop="totalCostIuserAmount">
+					<el-input v-model="editForm.totalCostIuserAmount" placeholder="项目总内部人力成本金额"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总外购人力成本金额" prop="totalCostOutUserAmount">
-					<el-input v-model="editForm.totalCostOutUserAmount" placeholder="项目总外购人力成本金额"></el-input>
+				<el-form-item label="项目总外购人力成本金额" prop="totalCostOuserAmount">
+					<el-input v-model="editForm.totalCostOuserAmount" placeholder="项目总外购人力成本金额"></el-input>
 				</el-form-item> 
 				<el-form-item label="项目进度0~100之间，来自任务表" prop="totalProgress">
 					<el-input v-model="editForm.totalProgress" placeholder="项目进度0~100之间，来自任务表"></el-input>
@@ -132,11 +132,11 @@
 				<el-form-item label="待付款总人数" prop="totalNeedPayUserCnt">
 					<el-input v-model="editForm.totalNeedPayUserCnt" placeholder="待付款总人数"></el-input>
 				</el-form-item> 
-				<el-form-item label="内部人力总工作量-应该大于或等于计划内部人力总成本" prop="totalPlanInnerUserWorkload">
-					<el-input v-model="editForm.totalPlanInnerUserWorkload" placeholder="内部人力总工作量-应该大于或等于计划内部人力总成本"></el-input>
+				<el-form-item label="内部人力总工作量-应该大于或等于计划内部人力总成本" prop="totalPlanIuserWorkload">
+					<el-input v-model="editForm.totalPlanIuserWorkload" placeholder="内部人力总工作量-应该大于或等于计划内部人力总成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="外购人力总工作量-应该大于或等于计划外购人力总成本" prop="totalPlanOutUserWorkload">
-					<el-input v-model="editForm.totalPlanOutUserWorkload" placeholder="外购人力总工作量-应该大于或等于计划外购人力总成本"></el-input>
+				<el-form-item label="外购人力总工作量-应该大于或等于计划外购人力总成本" prop="totalPlanOuserWorkload">
+					<el-input v-model="editForm.totalPlanOuserWorkload" placeholder="外购人力总工作量-应该大于或等于计划外购人力总成本"></el-input>
 				</el-form-item> 
 				<el-form-item label="测试案例总数" prop="testCases">
 					<el-input-number v-model="editForm.testCases" :min="0" :max="200"></el-input-number>
@@ -204,7 +204,7 @@
 				},
 				//编辑界面数据  XmBranchState 机构内所有项目指标汇总
 				editForm: {
-					bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',id:'',totalStaffCnt:'',calcTime:'',calcStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanInnerUserWorkload:'',totalPlanOutUserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:''
+					bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',id:'',totalStaffCnt:'',calcTime:'',calcStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',totalCostIuserAmount:'',totalCostOuserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanIuserWorkload:'',totalPlanOuserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmBranchState/XmBranchStateMng.vue

@@ -44,13 +44,13 @@
 				<el-table-column prop="totalNeedColAmount" label="待收款总金额" min-width="80" ></el-table-column>
 				<el-table-column prop="totalFinishColAmount" label="已收款总金额" min-width="80" ></el-table-column>
 				<el-table-column prop="totalCostUserAmount" label="项目总人力成本" min-width="80" ></el-table-column>
-				<el-table-column prop="totalBudgetInnerUserAmount" label="项目总内部人力预算" min-width="80" ></el-table-column>
+				<el-table-column prop="totalBudgetIuserAmount" label="项目总内部人力预算" min-width="80" ></el-table-column>
 				<el-table-column prop="totalRiskCnt" label="项目风险总数" min-width="80" ></el-table-column>
 				<el-table-column prop="totalCompleteRiskCnt" label="已完成风险总数" min-width="80" ></el-table-column>
-				<el-table-column prop="totalBudgetOutUserAmount" label="项目总外购人力预算" min-width="80" ></el-table-column>
+				<el-table-column prop="totalBudgetOuserAmount" label="项目总外购人力预算" min-width="80" ></el-table-column>
 				<el-table-column prop="totalCompleteWorkload" label="已完成工作量" min-width="80" ></el-table-column>
-				<el-table-column prop="totalCostInnerUserAmount" label="项目总内部人力成本金额" min-width="80" ></el-table-column>
-				<el-table-column prop="totalCostOutUserAmount" label="项目总外购人力成本金额" min-width="80" ></el-table-column>
+				<el-table-column prop="totalCostIuserAmount" label="项目总内部人力成本金额" min-width="80" ></el-table-column>
+				<el-table-column prop="totalCostOuserAmount" label="项目总外购人力成本金额" min-width="80" ></el-table-column>
 				<el-table-column prop="totalActiveBugCnt" label="激活的bug总数" min-width="80" ></el-table-column>
 				<el-table-column prop="totalConfirmedBugCnt" label="已解决bug总数" min-width="80" ></el-table-column>
 				<el-table-column prop="totalActOutWorkload" label="实际外购总工作量" min-width="80" ></el-table-column>
@@ -60,8 +60,8 @@
 				<el-table-column prop="totalFinishPayCnt" label="完成付款总比数" min-width="80" ></el-table-column>
 				<el-table-column prop="totalFinishPayUserCnt" label="已付款总人数" min-width="80" ></el-table-column>
 				<el-table-column prop="totalNeedPayUserCnt" label="待付款总人数" min-width="80" ></el-table-column>
-				<el-table-column prop="totalPlanInnerUserWorkload" label="内部人力总工作量" min-width="80" ></el-table-column>
-				<el-table-column prop="totalPlanOutUserWorkload" label="外购人力总工作量" min-width="80" ></el-table-column>
+				<el-table-column prop="totalPlanIuserWorkload" label="内部人力总工作量" min-width="80" ></el-table-column>
+				<el-table-column prop="totalPlanOuserWorkload" label="外购人力总工作量" min-width="80" ></el-table-column>
 				<el-table-column prop="designCases" label="设计中案例总数" min-width="80" ></el-table-column>
 				<el-table-column prop="finishCases" label="完成案例总数" min-width="80" ></el-table-column> 
 				<el-table-column prop="totalPhaseCnt" label="项目计划数" min-width="80" ></el-table-column>
@@ -125,13 +125,13 @@
 				addFormVisible: false,//新增xmBranchState界面是否显示
 				//新增xmBranchState界面初始化数据
 				addForm: {
-					bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',id:'',totalStaffCnt:'',calcTime:'',calcStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanInnerUserWorkload:'',totalPlanOutUserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:''
+					bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',id:'',totalStaffCnt:'',calcTime:'',calcStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',totalCostIuserAmount:'',totalCostOuserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanIuserWorkload:'',totalPlanOuserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmBranchState界面初始化数据
 				editForm: {
-					bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',id:'',totalStaffCnt:'',calcTime:'',calcStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanInnerUserWorkload:'',totalPlanOutUserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:''
+					bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',id:'',totalStaffCnt:'',calcTime:'',calcStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',totalCostIuserAmount:'',totalCostOuserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanIuserWorkload:'',totalPlanOuserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:''
 				},
 				maxTableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/

src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue

@@ -27,29 +27,29 @@
 				<el-form-item label="计算日期" prop="calcTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.calcTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
 				</el-form-item> 
-				<el-form-item label="外购资金预算" prop="planOutUserAt">
-					<el-input v-model="addForm.planOutUserAt" placeholder="外购资金预算"></el-input>
+				<el-form-item label="外购资金预算" prop="planOuserAt">
+					<el-input v-model="addForm.planOuserAt" placeholder="外购资金预算"></el-input>
 				</el-form-item> 
-				<el-form-item label="内购资金预算" prop="planInnerUserAt">
-					<el-input v-model="addForm.planInnerUserAt" placeholder="内购资金预算"></el-input>
+				<el-form-item label="内购资金预算" prop="planIuserAt">
+					<el-input v-model="addForm.planIuserAt" placeholder="内购资金预算"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际外购成本" prop="actOutUserAt">
-					<el-input v-model="addForm.actOutUserAt" placeholder="实际外购成本"></el-input>
+				<el-form-item label="实际外购成本" prop="actOuserAt">
+					<el-input v-model="addForm.actOuserAt" placeholder="实际外购成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际内购成本" prop="actInnerUserAt">
-					<el-input v-model="addForm.actInnerUserAt" placeholder="实际内购成本"></el-input>
+				<el-form-item label="实际内购成本" prop="actIuserAt">
+					<el-input v-model="addForm.actIuserAt" placeholder="实际内购成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="计划外购工作量" prop="planOutUserWorkload">
-					<el-input v-model="addForm.planOutUserWorkload" placeholder="计划外购工作量"></el-input>
+				<el-form-item label="计划外购工作量" prop="planOuserWorkload">
+					<el-input v-model="addForm.planOuserWorkload" placeholder="计划外购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="计划内购工作量" prop="planInnerUserWorkload">
-					<el-input v-model="addForm.planInnerUserWorkload" placeholder="计划内购工作量"></el-input>
+				<el-form-item label="计划内购工作量" prop="planIuserWorkload">
+					<el-input v-model="addForm.planIuserWorkload" placeholder="计划内购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际外购工作量" prop="actOutUserWorkload">
-					<el-input v-model="addForm.actOutUserWorkload" placeholder="实际外购工作量"></el-input>
+				<el-form-item label="实际外购工作量" prop="actOuserWorkload">
+					<el-input v-model="addForm.actOuserWorkload" placeholder="实际外购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际内购工作量" prop="actInnerUserWorkload">
-					<el-input v-model="addForm.actInnerUserWorkload" placeholder="实际内购工作量"></el-input>
+				<el-form-item label="实际内购工作量" prop="actIuserWorkload">
+					<el-input v-model="addForm.actIuserWorkload" placeholder="实际内购工作量"></el-input>
 				</el-form-item> 
 				<el-form-item label="计划非人力成本" prop="planNouserAt">
 					<el-input v-model="addForm.planNouserAt" placeholder="计划非人力成本"></el-input>
@@ -108,7 +108,7 @@
 				},
 				//新增界面数据 按机构编号任务类型汇总
 				addForm: {
-					taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOutUserAt:'',planInnerUserAt:'',actOutUserAt:'',actInnerUserAt:'',planOutUserWorkload:'',planInnerUserWorkload:'',actOutUserWorkload:'',actInnerUserWorkload:'',planNouserAt:'',actNouserAt:'',id:'',branchName:''
+					taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOuserAt:'',planIuserAt:'',actOuserAt:'',actIuserAt:'',planOuserWorkload:'',planIuserWorkload:'',actOuserWorkload:'',actIuserWorkload:'',planNouserAt:'',actNouserAt:'',id:'',branchName:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue

@@ -27,29 +27,29 @@
 				<el-form-item label="计算日期" prop="calcTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.calcTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
 				</el-form-item> 
-				<el-form-item label="外购资金预算" prop="planOutUserAt">
-					<el-input v-model="editForm.planOutUserAt" placeholder="外购资金预算"></el-input>
+				<el-form-item label="外购资金预算" prop="planOuserAt">
+					<el-input v-model="editForm.planOuserAt" placeholder="外购资金预算"></el-input>
 				</el-form-item> 
-				<el-form-item label="内购资金预算" prop="planInnerUserAt">
-					<el-input v-model="editForm.planInnerUserAt" placeholder="内购资金预算"></el-input>
+				<el-form-item label="内购资金预算" prop="planIuserAt">
+					<el-input v-model="editForm.planIuserAt" placeholder="内购资金预算"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际外购成本" prop="actOutUserAt">
-					<el-input v-model="editForm.actOutUserAt" placeholder="实际外购成本"></el-input>
+				<el-form-item label="实际外购成本" prop="actOuserAt">
+					<el-input v-model="editForm.actOuserAt" placeholder="实际外购成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际内购成本" prop="actInnerUserAt">
-					<el-input v-model="editForm.actInnerUserAt" placeholder="实际内购成本"></el-input>
+				<el-form-item label="实际内购成本" prop="actIuserAt">
+					<el-input v-model="editForm.actIuserAt" placeholder="实际内购成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="计划外购工作量" prop="planOutUserWorkload">
-					<el-input v-model="editForm.planOutUserWorkload" placeholder="计划外购工作量"></el-input>
+				<el-form-item label="计划外购工作量" prop="planOuserWorkload">
+					<el-input v-model="editForm.planOuserWorkload" placeholder="计划外购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="计划内购工作量" prop="planInnerUserWorkload">
-					<el-input v-model="editForm.planInnerUserWorkload" placeholder="计划内购工作量"></el-input>
+				<el-form-item label="计划内购工作量" prop="planIuserWorkload">
+					<el-input v-model="editForm.planIuserWorkload" placeholder="计划内购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际外购工作量" prop="actOutUserWorkload">
-					<el-input v-model="editForm.actOutUserWorkload" placeholder="实际外购工作量"></el-input>
+				<el-form-item label="实际外购工作量" prop="actOuserWorkload">
+					<el-input v-model="editForm.actOuserWorkload" placeholder="实际外购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际内购工作量" prop="actInnerUserWorkload">
-					<el-input v-model="editForm.actInnerUserWorkload" placeholder="实际内购工作量"></el-input>
+				<el-form-item label="实际内购工作量" prop="actIuserWorkload">
+					<el-input v-model="editForm.actIuserWorkload" placeholder="实际内购工作量"></el-input>
 				</el-form-item> 
 				<el-form-item label="计划非人力成本" prop="planNouserAt">
 					<el-input v-model="editForm.planNouserAt" placeholder="计划非人力成本"></el-input>
@@ -108,7 +108,7 @@
 				},
 				//编辑界面数据  XmBranchTaskTypeState 按机构编号任务类型汇总
 				editForm: {
-					taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOutUserAt:'',planInnerUserAt:'',actOutUserAt:'',actInnerUserAt:'',planOutUserWorkload:'',planInnerUserWorkload:'',actOutUserWorkload:'',actInnerUserWorkload:'',planNouserAt:'',actNouserAt:'',id:'',branchName:''
+					taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOuserAt:'',planIuserAt:'',actOuserAt:'',actIuserAt:'',planOuserWorkload:'',planIuserWorkload:'',actOuserWorkload:'',actIuserWorkload:'',planNouserAt:'',actNouserAt:'',id:'',branchName:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue

@@ -19,14 +19,14 @@
 				<el-table-column prop="branchId" label="机构编号" min-width="80" ></el-table-column>
 				<el-table-column prop="bizDate" label="业务日期yyyy-MM-dd型" min-width="80" ></el-table-column>
 				<el-table-column prop="calcTime" label="计算日期" min-width="80" ></el-table-column>
-				<el-table-column prop="planOutUserAt" label="外购资金预算" min-width="80" ></el-table-column>
-				<el-table-column prop="planInnerUserAt" label="内购资金预算" min-width="80" ></el-table-column>
-				<el-table-column prop="actOutUserAt" label="实际外购成本" min-width="80" ></el-table-column>
-				<el-table-column prop="actInnerUserAt" label="实际内购成本" min-width="80" ></el-table-column>
-				<el-table-column prop="planOutUserWorkload" label="计划外购工作量" min-width="80" ></el-table-column>
-				<el-table-column prop="planInnerUserWorkload" label="计划内购工作量" min-width="80" ></el-table-column>
-				<el-table-column prop="actOutUserWorkload" label="实际外购工作量" min-width="80" ></el-table-column>
-				<el-table-column prop="actInnerUserWorkload" label="实际内购工作量" min-width="80" ></el-table-column>
+				<el-table-column prop="planOuserAt" label="外购资金预算" min-width="80" ></el-table-column>
+				<el-table-column prop="planIuserAt" label="内购资金预算" min-width="80" ></el-table-column>
+				<el-table-column prop="actOuserAt" label="实际外购成本" min-width="80" ></el-table-column>
+				<el-table-column prop="actIuserAt" label="实际内购成本" min-width="80" ></el-table-column>
+				<el-table-column prop="planOuserWorkload" label="计划外购工作量" min-width="80" ></el-table-column>
+				<el-table-column prop="planIuserWorkload" label="计划内购工作量" min-width="80" ></el-table-column>
+				<el-table-column prop="actOuserWorkload" label="实际外购工作量" min-width="80" ></el-table-column>
+				<el-table-column prop="actIuserWorkload" label="实际内购工作量" min-width="80" ></el-table-column>
 				<el-table-column prop="planNouserAt" label="计划非人力成本" min-width="80" ></el-table-column>
 				<el-table-column prop="actNouserAt" label="实际非人力成本" min-width="80" ></el-table-column>
 				<el-table-column prop="id" label="主键" min-width="80" ></el-table-column>
@@ -91,13 +91,13 @@
 				addFormVisible: false,//新增xmBranchTaskTypeState界面是否显示
 				//新增xmBranchTaskTypeState界面初始化数据
 				addForm: {
-					taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOutUserAt:'',planInnerUserAt:'',actOutUserAt:'',actInnerUserAt:'',planOutUserWorkload:'',planInnerUserWorkload:'',actOutUserWorkload:'',actInnerUserWorkload:'',planNouserAt:'',actNouserAt:'',id:'',branchName:''
+					taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOuserAt:'',planIuserAt:'',actOuserAt:'',actIuserAt:'',planOuserWorkload:'',planIuserWorkload:'',actOuserWorkload:'',actIuserWorkload:'',planNouserAt:'',actNouserAt:'',id:'',branchName:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmBranchTaskTypeState界面初始化数据
 				editForm: {
-					taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOutUserAt:'',planInnerUserAt:'',actOutUserAt:'',actInnerUserAt:'',planOutUserWorkload:'',planInnerUserWorkload:'',actOutUserWorkload:'',actInnerUserWorkload:'',planNouserAt:'',actNouserAt:'',id:'',branchName:''
+					taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOuserAt:'',planIuserAt:'',actOuserAt:'',actIuserAt:'',planOuserWorkload:'',planIuserWorkload:'',actOuserWorkload:'',actIuserWorkload:'',planNouserAt:'',actNouserAt:'',id:'',branchName:''
 				}
 				/**begin 自定义属性请在下面加 请加备注**/
 					

src/views/xm/core/xmIteration/XmIterationInfo.vue

@@ -69,7 +69,7 @@
 	import xmBudget from '../xmProject/XmProjectBudgetCost';
 	import xmContract from '../xmProjectContract/XmProjectContractMng';
 	import xmEnvList from '../xmProjectEnvList/XmProjectEnvListMng';
-	import xmProjectPhaseMng from '../xmProjectPhase/XmProjectPhaseMng';
+	import xmPhaseMng from '../xmPhase/XmPhaseMng';
 	import xmMenuMng from '../xmMenu/XmMenuMng';
 	import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
@@ -178,9 +178,9 @@
           pageNum = this.$refs.xmTaskMng.pageInfo.pageNum;
         } else if (this.infotype === '计划') {
           header = ['序号', '计划名称', '开始时间', '结束时间', '进度(%)', '状态', '计划人数', '实际人数', '计划工期', '实际工期',  '计划工作量（人时）', '实际工作量（人时）', '计划非人力成本(元)', '实际非人力成本(元)', '计划内购人力成本(元)', '实际内购人力成本(元)', '计划外购人力成本(元)', '实际外购人力成本(元)', '计划成本合计(元)', '实际成本合计(元)', '审批状态', '备注'];
-          keyList = ['seqNo', 'phaseName', 'beginDate', 'endDate', 'actRate', 'phaseStatus', 'phaseBudgetOutUserCnt', 'actStaffNu', 'phaseBudgetHours', 'actHours', 'phaseBudgetWorkload', 'phaseActWorkload', 'phaseBudgetNouserAt', 'actNouserAt', 'phaseBudgetInnerUserAt', 'actInnerUserAt', 'phaseBudgetOutUserAt', 'actOutUserAt', 'phaseBudgetCostAt', 'actCostAt', 'bizFlowState', 'remark'];
-          list = this.$refs.xmProjectPhaseMng.projectPhaseTreeData;
-          pageNum = this.$refs.xmProjectPhaseMng.pageInfo.pageNum;
+          keyList = ['seqNo', 'name', 'beginDate', 'endDate', 'actRate', 'phaseStatus', 'phaseBudgetOuserCnt', 'actStaffNu', 'phaseBudgetHours', 'actHours', 'phaseBudgetWorkload', 'phaseActWorkload', 'phaseBudgetNouserAt', 'actNouserAt', 'phaseBudgetIuserAt', 'actIuserAt', 'phaseBudgetOuserAt', 'actOuserAt', 'phaseBudgetCostAt', 'actCostAt', 'bizFlowState', 'remark'];
+          list = this.$refs.xmPhaseMng.projectPhaseTreeData;
+          pageNum = this.$refs.xmPhaseMng.pageInfo.pageNum;
 
         } else if (this.infotype === '需求监控') {
           header = ['序号', '需求名称', '计划状态', '负责人', '上线时间', '计划开始时间', '实际开始时间', '计划结束时间', '实际结束时间', '计划工作量(人时)', '实际工作量(人时)', '计划成本(元)', '实际成本(元)', '总体完成比例%', '需求完成比例%', '设计完成比例%', '开发完成比例%', 'sit完成比例%', 'uat完成比例%', '上线状态'];
@@ -227,7 +227,7 @@
             const row = filterVal.map(j => {
               let key = '';
               if(j == 'phaseStatus') {
-                return this.$refs.xmProjectPhaseMng.formateOption('xmPhaseStatus', v.phaseStatus);
+                return this.$refs.xmPhaseMng.formateOption('xmPhaseStatus', v.phaseStatus);
               } else if(j == 'bizFlowState') {
                 return `${bizFlowStateDict[parseInt(v[j]) || 0]}`;
               } else {
@@ -284,7 +284,7 @@
 		},//end methods
 		components: { 
 			xmTaskMng,
-			xmProjectPhaseMng,
+			xmPhaseMng,
 			xmGroupMng,
 			xmExchange,
 			xmQuestion,

src/views/xm/core/xmProduct/XmProductInfo.vue

@@ -141,7 +141,7 @@
 			  <xm-group-mng v-if="infotype=='团队'" :xm-product="xmProduct"></xm-group-mng>
 			  <xm-file-mng v-if="infotype=='文档'" :xm-product="xmProduct"></xm-file-mng>
 			  <xm-task-mng v-if="infotype=='计划'" ref="projectPlan" work-item-type="projectPlan" :xm-product="xmProduct" key="projectPlan"></xm-task-mng> 
-			  <!--<xm-project-phase-for-product v-if="infotype=='计划'" ref="xmProjectPhaseMng" :xm-product="xmProduct" ></xm-project-phase-for-product> -->
+			  <!--<xm-phase-for-product v-if="infotype=='计划'" ref="xmPhaseMng" :xm-product="xmProduct" ></xm-phase-for-product> -->
 			  <xm-test-case-exec-mng v-if="infotype=='测试计划'" :visible="infotype=='测试计划'"  :xm-product='xmProduct' ref="xmQuestion"></xm-test-case-exec-mng>
 			<xm-menu-with-plan v-if="infotype=='需求监控'" ref="xmMenuWithPlan" :xm-product="xmProduct"></xm-menu-with-plan>
 			<xm-project-state-mng v-if="infotype=='项目监控'" :xm-product="xmProduct"></xm-project-state-mng>
@@ -183,7 +183,7 @@
 	import xmBudget from '../xmProject/XmProjectBudgetCost';
 	import xmContract from '../xmProjectContract/XmProjectContractMng';
 	import xmEnvList from '../xmProjectEnvList/XmProjectEnvListMng';
-	import xmProjectPhaseForProduct from '../xmProjectPhase/xmProjectPhaseForProduct';
+	import xmPhaseForProduct from '../xmPhase/xmPhaseForProduct';
 	import xmMenuMng from '../xmMenu/XmMenuMng';
 	import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
@@ -292,9 +292,9 @@ import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
           pageNum = this.$refs.xmTaskMng.pageInfo.pageNum;
         } else if (this.infotype === '计划') {
           header = ['序号', '计划名称', '开始时间', '结束时间', '进度(%)', '状态', '计划人数', '实际人数', '计划工期', '实际工期',  '计划工作量（人时）', '实际工作量（人时）', '计划非人力成本(元)', '实际非人力成本(元)', '计划内购人力成本(元)', '实际内购人力成本(元)', '计划外购人力成本(元)', '实际外购人力成本(元)', '计划成本合计(元)', '实际成本合计(元)', '审批状态', '备注'];
-          keyList = ['seqNo', 'phaseName', 'beginDate', 'endDate', 'actRate', 'phaseStatus', 'phaseBudgetOutUserCnt', 'actStaffNu', 'phaseBudgetHours', 'actHours', 'phaseBudgetWorkload', 'phaseActWorkload', 'phaseBudgetNouserAt', 'actNouserAt', 'phaseBudgetInnerUserAt', 'actInnerUserAt', 'phaseBudgetOutUserAt', 'actOutUserAt', 'phaseBudgetCostAt', 'actCostAt', 'bizFlowState', 'remark'];
-          list = this.$refs.xmProjectPhaseMng.projectPhaseTreeData;
-          pageNum = this.$refs.xmProjectPhaseMng.pageInfo.pageNum;
+          keyList = ['seqNo', 'name', 'beginDate', 'endDate', 'actRate', 'phaseStatus', 'phaseBudgetOuserCnt', 'actStaffNu', 'phaseBudgetHours', 'actHours', 'phaseBudgetWorkload', 'phaseActWorkload', 'phaseBudgetNouserAt', 'actNouserAt', 'phaseBudgetIuserAt', 'actIuserAt', 'phaseBudgetOuserAt', 'actOuserAt', 'phaseBudgetCostAt', 'actCostAt', 'bizFlowState', 'remark'];
+          list = this.$refs.xmPhaseMng.projectPhaseTreeData;
+          pageNum = this.$refs.xmPhaseMng.pageInfo.pageNum;
 
         } else if (this.infotype === '需求监控') {
           header = ['序号', '需求名称', '计划状态', '负责人', '上线时间', '计划开始时间', '实际开始时间', '计划结束时间', '实际结束时间', '计划工作量(人时)', '实际工作量(人时)', '计划成本(元)', '实际成本(元)', '总体完成比例%', '需求完成比例%', '设计完成比例%', '开发完成比例%', 'sit完成比例%', 'uat完成比例%', '上线状态'];
@@ -341,7 +341,7 @@ import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
             const row = filterVal.map(j => {
               let key = '';
               if(j == 'phaseStatus') {
-                return this.$refs.xmProjectPhaseMng.formateOption('xmPhaseStatus', v.phaseStatus);
+                return this.$refs.xmPhaseMng.formateOption('xmPhaseStatus', v.phaseStatus);
               } else if(j == 'bizFlowState') {
                 return `${bizFlowStateDict[parseInt(v[j]) || 0]}`;
               } else {
@@ -398,7 +398,7 @@ import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
 		},//end methods
 		components: { 
 			xmTaskMng,
-			xmProjectPhaseForProduct,
+			xmPhaseForProduct,
 			xmGroupMng,
 			xmExchange,
 			xmQuestion,

src/views/xm/core/xmProject/XmProjectAdd.vue

@@ -92,37 +92,37 @@
 									<el-divider></el-divider>
 									<el-row>
 										<el-col :span="4">内购</el-col>
-										<el-col :span="4"><el-input style="width:120px;"  type="number" v-model="addForm.planInnerUserCnt" :precision="0" :step="1" :min="0" placeholder="内购人数"></el-input>  
+										<el-col :span="4"><el-input style="width:120px;"  type="number" v-model="addForm.planIuserCnt" :precision="0" :step="1" :min="0" placeholder="内购人数"></el-input>  
 										</el-col>
-										<el-col :span="4">{{autoParams.planInnerUserWorkload}}人时</el-col>
-										<el-col :span="4"><el-input  style="width:120px;" type="number" v-model="addForm.planInnerUserPrice" :precision="0" :step="1" :min="0" placeholder="预计内部人时单价"></el-input> </el-col>
-										<el-col :span="8">{{this.toFixed(autoParams.planInnerUserAt)}}元,{{this.toFixed(autoParams.planInnerUserAt/10000)}} 万元</el-col>
+										<el-col :span="4">{{autoParams.planIuserWorkload}}人时</el-col>
+										<el-col :span="4"><el-input  style="width:120px;" type="number" v-model="addForm.planIuserPrice" :precision="0" :step="1" :min="0" placeholder="预计内部人时单价"></el-input> </el-col>
+										<el-col :span="8">{{this.toFixed(autoParams.planIuserAt)}}元,{{this.toFixed(autoParams.planIuserAt/10000)}} 万元</el-col>
 									</el-row>
 									<el-divider></el-divider>
 									<el-row>
 										<el-col :span="4">外购</el-col>
-										<el-col :span="4"><el-input  style="width:120px;" type="number" v-model="addForm.planOutUserCnt" :precision="0" :step="1" :min="0" placeholder="外购人数"></el-input>  
+										<el-col :span="4"><el-input  style="width:120px;" type="number" v-model="addForm.planOuserCnt" :precision="0" :step="1" :min="0" placeholder="外购人数"></el-input>  
 										</el-col>
-										<el-col :span="4">{{autoParams.planOutUserWorkload}}人时</el-col>
-										<el-col :span="4"><el-input  style="width:120px;" type="number" v-model="addForm.planOutUserPrice" :precision="0" :step="1" :min="0" placeholder="预计外购人时单价"></el-input> </el-col>
-										<el-col :span="4">{{autoParams.planOutUserAt }} 元 {{autoParams.planOutUserAt/10000 }}万元</el-col>
+										<el-col :span="4">{{autoParams.planOuserWorkload}}人时</el-col>
+										<el-col :span="4"><el-input  style="width:120px;" type="number" v-model="addForm.planOuserPrice" :precision="0" :step="1" :min="0" placeholder="预计外购人时单价"></el-input> </el-col>
+										<el-col :span="4">{{autoParams.planOuserAt }} 元 {{autoParams.planOuserAt/10000 }}万元</el-col>
 									
 									</el-row>
 									<el-divider></el-divider>
 									<el-row>
 										<el-col :span="4">合计</el-col>
-										<el-col :span="4"> {{autoParams.planOutUserCnt+autoParams.planInnerUserCnt}}
+										<el-col :span="4"> {{autoParams.planOuserCnt+autoParams.planIuserCnt}}
 										</el-col>
-										<el-col :span="4">{{autoParams.planOutUserWorkload+autoParams.planInnerUserWorkload  }}人时,{{ (autoParams.planOutUserWorkload+autoParams.planInnerUserWorkload)/8/20  }}人月 </el-col>
-										<el-col :span="4">平均：{{ (parseFloat2(autoParams.planOutUserPrice) + parseFloat2(autoParams.planInnerUserPrice))/2}}元/人时</el-col>
+										<el-col :span="4">{{autoParams.planOuserWorkload+autoParams.planIuserWorkload  }}人时,{{ (autoParams.planOuserWorkload+autoParams.planIuserWorkload)/8/20  }}人月 </el-col>
+										<el-col :span="4">平均：{{ (parseFloat2(autoParams.planOuserPrice) + parseFloat2(autoParams.planIuserPrice))/2}}元/人时</el-col>
 										<el-col :span="8">{{autoParams.planTotalCost}} 元，{{(autoParams.planTotalCost)/10000}} 万元</el-col>
 									</el-row> 
 								 	 
 								</el-tab-pane>
 								<el-tab-pane label="成本总览" name="planTotalCost">
 									<el-row>
-										内购：  <el-input style="width:120px;" type="number" v-model="addForm.planInnerUserAt" :precision="2" :step="1000" :min="0" placeholder="内部人力成本总预算"></el-input> <el-tag> {{this.toFixed(autoParams.planInnerUserAt/10000)}}万元</el-tag>
-										外购：  <el-input style="width:120px;" type="number" v-model="addForm.planOutUserAt" :precision="2" :step="1000" :min="0" placeholder="外购人力成本总预算"></el-input> <el-tag> {{this.toFixed(autoParams.planOutUserAt/10000)}}万元</el-tag>
+										内购：  <el-input style="width:120px;" type="number" v-model="addForm.planIuserAt" :precision="2" :step="1000" :min="0" placeholder="内部人力成本总预算"></el-input> <el-tag> {{this.toFixed(autoParams.planIuserAt/10000)}}万元</el-tag>
+										外购：  <el-input style="width:120px;" type="number" v-model="addForm.planOuserAt" :precision="2" :step="1000" :min="0" placeholder="外购人力成本总预算"></el-input> <el-tag> {{this.toFixed(autoParams.planOuserAt/10000)}}万元</el-tag>
 										非人力：<el-input style="width:120px;" type="number" v-model="addForm.planNouserAt" :precision="2" :step="1000" :min="0" placeholder="人力成本总预算"></el-input> <el-tag> {{this.toFixed( autoParams.planNouserAt/10000)}}万元</el-tag>
 									</el-row>
 									<el-divider></el-divider>
@@ -182,25 +182,25 @@
 			autoParams:function(){
 				
 				 
-				var planOutUserPrice=this.toFixed(this.addForm.planOutUserPrice)
-				var planInnerUserPrice=this.toFixed(this.addForm.planInnerUserPrice)
-				var planOutUserCnt=this.toFixed(this.addForm.planOutUserCnt)
-				var planInnerUserCnt=this.toFixed(this.addForm.planInnerUserCnt)
+				var planOuserPrice=this.toFixed(this.addForm.planOuserPrice)
+				var planIuserPrice=this.toFixed(this.addForm.planIuserPrice)
+				var planOuserCnt=this.toFixed(this.addForm.planOuserCnt)
+				var planIuserCnt=this.toFixed(this.addForm.planIuserCnt)
 				var planWorkingHours=this.toFixed(this.addForm.planWorkingHours )
 				var planNouserAt=this.toFixed(this.addForm.planNouserAt ) 
 				var budgetMarginRate=this.toFixed(this.addForm.budgetMarginRate,4 ) 
 				var taxRate=this.toFixed(this.addForm.taxRate,4)
-				if(planOutUserPrice==null || planOutUserPrice==''){
-					planOutUserPrice=100
+				if(planOuserPrice==null || planOuserPrice==''){
+					planOuserPrice=100
 				}
-				if(planInnerUserPrice==null || planInnerUserPrice==''){
-					planInnerUserPrice=80
+				if(planIuserPrice==null || planIuserPrice==''){
+					planIuserPrice=80
 				}
-				if(planOutUserCnt==null || planOutUserCnt==''){
-					planOutUserCnt=0.0
+				if(planOuserCnt==null || planOuserCnt==''){
+					planOuserCnt=0.0
 				}
-				if(planInnerUserCnt==null || planInnerUserCnt==''){
-					planInnerUserCnt=0.0
+				if(planIuserCnt==null || planIuserCnt==''){
+					planIuserCnt=0.0
 				}
 				
 				if(planNouserAt==null || planNouserAt==''){
@@ -229,19 +229,19 @@
 			 	} 
 				autoParams.weekday=weekday
 				autoParams.planWorkingHours=planWorkingHours
-				autoParams.planOutUserPrice=planOutUserPrice
-				autoParams.planInnerUserPrice=planInnerUserPrice
-				autoParams.planOutUserCnt=planOutUserCnt
-				autoParams.planInnerUserCnt=planInnerUserCnt 
+				autoParams.planOuserPrice=planOuserPrice
+				autoParams.planIuserPrice=planIuserPrice
+				autoParams.planOuserCnt=planOuserCnt
+				autoParams.planIuserCnt=planIuserCnt 
 				autoParams.taxRate=taxRate 
-				autoParams.planInnerUserWorkload= planInnerUserCnt*planWorkingHours
-				autoParams.planOutUserWorkload= planOutUserCnt*planWorkingHours
-				autoParams.planWorkload=  planInnerUserCnt*planWorkingHours + planOutUserCnt*planWorkingHours
-				autoParams.planOutUserAt= planOutUserCnt * planWorkingHours * planOutUserPrice
-				autoParams.planInnerUserAt=  planInnerUserCnt * planWorkingHours * planInnerUserPrice
+				autoParams.planIuserWorkload= planIuserCnt*planWorkingHours
+				autoParams.planOuserWorkload= planOuserCnt*planWorkingHours
+				autoParams.planWorkload=  planIuserCnt*planWorkingHours + planOuserCnt*planWorkingHours
+				autoParams.planOuserAt= planOuserCnt * planWorkingHours * planOuserPrice
+				autoParams.planIuserAt=  planIuserCnt * planWorkingHours * planIuserPrice
 				autoParams.planNouserAt= planNouserAt
 				autoParams.budgetMarginRate=budgetMarginRate
-				autoParams.planTotalCost=  autoParams.planOutUserAt + autoParams.planInnerUserAt + autoParams.planNouserAt
+				autoParams.planTotalCost=  autoParams.planOuserAt + autoParams.planIuserAt + autoParams.planNouserAt
 				autoParams.totalReceivables=autoParams.planTotalCost/(1-budgetMarginRate)/ (1-taxRate)
 				autoParams.contractAmt =autoParams.totalReceivables
 				var totalReceivables=this.addForm.totalReceivables
@@ -262,8 +262,8 @@
 			},
 			planTotalAt:function(){
 				return {
-					planOutUserAt:this.addForm.planOutUserAt,
-					planInnerUserAt:this.addForm.planInnerUserAt,
+					planOuserAt:this.addForm.planOuserAt,
+					planIuserAt:this.addForm.planIuserAt,
 					planNouserAt:this.addForm.planNouserAt,  
 				}
 			},
@@ -280,7 +280,7 @@
 		  },
 		  'planTotalAt':{
 			  handler(planTotalAt){  
-				this.addForm.planTotalCost=this.toFixed(this.parseFloat2(planTotalAt.planOutUserAt)+this.parseFloat2(planTotalAt.planInnerUserAt)+this.parseFloat2(planTotalAt.planNouserAt))
+				this.addForm.planTotalCost=this.toFixed(this.parseFloat2(planTotalAt.planOuserAt)+this.parseFloat2(planTotalAt.planIuserAt)+this.parseFloat2(planTotalAt.planNouserAt))
 				//this.addForm.totalReceivables=this.toFixed(this.parseFloat2(this.addForm.planTotalCost) * (1+0.3)) 
 			  },
 			  deep:true
@@ -337,7 +337,7 @@
 				},
 				//编辑界面数据  XmProject xm_project
 				addForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:0.06,planNouserAt:0,planInnerUserAt:0,planOutUserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:0.13,contractAmt:0,planInnerUserPrice:85,planOutUserPrice:100,planOutUserCnt:1,planInnerUserCnt:1,planWorkingHours:0,planInnerUserWorkload:0,planOutUserWorkload:0,budgetCtrl:'0',admUserid:'',admUsername:'',pmUserid:'',pmUsername:'',assUserid:'',assUsername:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:0.06,planNouserAt:0,planIuserAt:0,planOuserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:0.13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:1,planIuserCnt:1,planWorkingHours:0,planIuserWorkload:0,planOuserWorkload:0,budgetCtrl:'0',admUserid:'',admUsername:'',pmUserid:'',pmUsername:'',assUserid:'',assUsername:''
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				xmGroups:[],
@@ -393,9 +393,9 @@
 							this.load.add=true
 							let params = Object.assign({}, this.addForm); 
 							params.groups=this.xmGroups;
-							params.planInnerUserWorkload=this.autoParams.planInnerUserWorkload
+							params.planIuserWorkload=this.autoParams.planIuserWorkload
 							
-							params.planOutUserWorkload=this.autoParams.planOutUserWorkload
+							params.planOuserWorkload=this.autoParams.planOuserWorkload
 							params.planWorkload=this.autoParams.planWorkload
 							addXmProject(params).then((res) => {
 								this.load.add=false;
@@ -453,8 +453,8 @@
 			
 			fillPlanCostAtToField:function(){
 				this.addForm.planNouserAt=this.toFixed(this.autoParams.planNouserAt)
-				this.addForm.planOutUserAt=this.toFixed(this.autoParams.planOutUserAt )
-				this.addForm.planInnerUserAt=this.toFixed(this.autoParams.planInnerUserAt )
+				this.addForm.planOuserAt=this.toFixed(this.autoParams.planOuserAt )
+				this.addForm.planIuserAt=this.toFixed(this.autoParams.planIuserAt )
 				this.addForm.planTotalCost=this.toFixed(this.autoParams.planTotalCost)
 
 			},

src/views/xm/core/xmProject/XmProjectBudgetCost.vue

@@ -8,8 +8,8 @@
 				</el-radio-group>
 				<span style="margin-left:10px;font-size:14px;">项目总预算：</span> <el-tag type="success">{{selProjectBudget.planTotalCost}}</el-tag>
 				<span style="margin-left:10px;font-size:14px;">非人力总预算：</span><el-tag>{{selProjectBudget.planNouserAt}}</el-tag> 
-				<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag>{{selProjectBudget.planInnerUserAt}}</el-tag> 
-				<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag>{{selProjectBudget.planOutUserAt}}</el-tag> 
+				<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag>{{selProjectBudget.planIuserAt}}</el-tag> 
+				<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag>{{selProjectBudget.planOuserAt}}</el-tag> 
 			</div>
 			<div class="title-bar">
 				<el-radio-group v-model="showType" size="medium">
@@ -264,10 +264,10 @@ import { months } from 'moment';
 					return;
 				}  
 				var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost)
-				var planInnerUserAt=this.getFloatValue(this.selProjectBudget.planInnerUserAt)
-				var planOutUserAt=this.getFloatValue(this.selProjectBudget.planOutUserAt)
+				var planIuserAt=this.getFloatValue(this.selProjectBudget.planIuserAt)
+				var planOuserAt=this.getFloatValue(this.selProjectBudget.planOuserAt)
 				var planNouserAt=this.getFloatValue(this.selProjectBudget.planNouserAt)
-				this.selProjectBudget.planTotalCost=planInnerUserAt+planOutUserAt+planNouserAt
+				this.selProjectBudget.planTotalCost=planIuserAt+planOuserAt+planNouserAt
 				this.$confirm('确定修改项目总预算吗?', '提示', {
 					type: 'warning'
 				}).then(() => { 
@@ -277,8 +277,8 @@ import { months } from 'moment';
 						var tips=res.data.tips;
 						if(tips.isOk){
 							this.selProject.planTotalCost=this.selProjectBudget.planTotalCost
-							this.selProject.planInnerUserAt=this.selProjectBudget.planInnerUserAt 
-							this.selProject.planOutUserAt=this.selProjectBudget.planOutUserAt 
+							this.selProject.planIuserAt=this.selProjectBudget.planIuserAt 
+							this.selProject.planOuserAt=this.selProjectBudget.planOuserAt 
 							this.selProject.planNouserAt=this.selProjectBudget.planNouserAt 
 						}else{
 							this.selProjectBudget=Object.assign({},this.selProject)

src/views/xm/core/xmProject/XmProjectCost.vue

@@ -8,8 +8,8 @@
 				</el-radio-group>
 				<span style="margin-left:10px;font-size:14px;">项目总预算：</span> <el-tag type="success">{{selProjectBudget.planTotalCost}}</el-tag>
 				<span style="margin-left:10px;font-size:14px;">非人力总预算：</span><el-tag>{{selProjectBudget.planNouserAt}}</el-tag> 
-				<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag>{{selProjectBudget.planInnerUserAt}}</el-tag> 
-				<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag>{{selProjectBudget.planOutUserAt}}</el-tag> 
+				<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag>{{selProjectBudget.planIuserAt}}</el-tag> 
+				<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag>{{selProjectBudget.planOuserAt}}</el-tag> 
 			</div>
 			<div class="title-bar">
 				<el-radio-group v-model="showType" size="medium">
@@ -262,10 +262,10 @@ import { months } from 'moment';
 					return;
 				}  
 				var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost)
-				var planInnerUserAt=this.getFloatValue(this.selProjectBudget.planInnerUserAt)
-				var planOutUserAt=this.getFloatValue(this.selProjectBudget.planOutUserAt)
+				var planIuserAt=this.getFloatValue(this.selProjectBudget.planIuserAt)
+				var planOuserAt=this.getFloatValue(this.selProjectBudget.planOuserAt)
 				var planNouserAt=this.getFloatValue(this.selProjectBudget.planNouserAt)
-				this.selProjectBudget.planTotalCost=planInnerUserAt+planOutUserAt+planNouserAt
+				this.selProjectBudget.planTotalCost=planIuserAt+planOuserAt+planNouserAt
 				this.$confirm('确定修改项目总支出吗?', '提示', {
 					type: 'warning'
 				}).then(() => { 
@@ -275,8 +275,8 @@ import { months } from 'moment';
 						var tips=res.data.tips;
 						if(tips.isOk){
 							this.selProject.planTotalCost=this.selProjectBudget.planTotalCost
-							this.selProject.planInnerUserAt=this.selProjectBudget.planInnerUserAt 
-							this.selProject.planOutUserAt=this.selProjectBudget.planOutUserAt 
+							this.selProject.planIuserAt=this.selProjectBudget.planIuserAt 
+							this.selProject.planOuserAt=this.selProjectBudget.planOuserAt 
 							this.selProject.planNouserAt=this.selProjectBudget.planNouserAt 
 						}else{
 							this.selProjectBudget=Object.assign({},this.selProject)

src/views/xm/core/xmProject/XmProjectEdit.vue

@@ -90,36 +90,36 @@
 							<el-divider></el-divider>
 							<el-row>
 								<el-col :span="4">内购</el-col>
-								<el-col :span="4"><el-input style="width:150px;"  type="number" v-model="editForm.planInnerUserCnt" :precision="0" :step="1" :min="0" placeholder="内购人数"></el-input>  
+								<el-col :span="4"><el-input style="width:150px;"  type="number" v-model="editForm.planIuserCnt" :precision="0" :step="1" :min="0" placeholder="内购人数"></el-input>  
 								</el-col>
-								<el-col :span="4">{{autoParams.planInnerUserWorkload}}人时</el-col>
-								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planInnerUserPrice" :precision="0" :step="1" :min="0" placeholder="预计内部人时单价"></el-input> </el-col>
-								<el-col :span="8">{{this.toFixed(autoParams.planInnerUserAt)}}元,{{this.toFixed(autoParams.planInnerUserAt/10000)}} 万元</el-col>
+								<el-col :span="4">{{autoParams.planIuserWorkload}}人时</el-col>
+								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planIuserPrice" :precision="0" :step="1" :min="0" placeholder="预计内部人时单价"></el-input> </el-col>
+								<el-col :span="8">{{this.toFixed(autoParams.planIuserAt)}}元,{{this.toFixed(autoParams.planIuserAt/10000)}} 万元</el-col>
 							</el-row>
 							<el-divider></el-divider>
 							<el-row>
 								<el-col :span="4">外购</el-col>
-								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planOutUserCnt" :precision="0" :step="1" :min="0" placeholder="外购人数"></el-input>  
+								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planOuserCnt" :precision="0" :step="1" :min="0" placeholder="外购人数"></el-input>  
 								</el-col>
-								<el-col :span="4">{{autoParams.planOutUserWorkload}}人时</el-col>
-								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planOutUserPrice" :precision="0" :step="1" :min="0" placeholder="预计外购人时单价"></el-input> </el-col>
-								<el-col :span="4">{{autoParams.planOutUserAt }} 元 {{autoParams.planOutUserAt/10000 }}万元</el-col>
+								<el-col :span="4">{{autoParams.planOuserWorkload}}人时</el-col>
+								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planOuserPrice" :precision="0" :step="1" :min="0" placeholder="预计外购人时单价"></el-input> </el-col>
+								<el-col :span="4">{{autoParams.planOuserAt }} 元 {{autoParams.planOuserAt/10000 }}万元</el-col>
 							
 							</el-row>
 							<el-divider></el-divider>
 							<el-row>
 								<el-col :span="4">合计</el-col>
-								<el-col :span="4"> {{autoParams.planOutUserCnt+autoParams.planInnerUserCnt}}
+								<el-col :span="4"> {{autoParams.planOuserCnt+autoParams.planIuserCnt}}
 								</el-col>
-								<el-col :span="4">{{autoParams.planOutUserWorkload+autoParams.planInnerUserWorkload  }}人时,{{ (autoParams.planOutUserWorkload+autoParams.planInnerUserWorkload)/8/20  }}人月 </el-col>
-								<el-col :span="4">平均：{{ (parseFloat2(autoParams.planOutUserPrice) + parseFloat2(autoParams.planInnerUserPrice))/2}}元/人时</el-col>
+								<el-col :span="4">{{autoParams.planOuserWorkload+autoParams.planIuserWorkload  }}人时,{{ (autoParams.planOuserWorkload+autoParams.planIuserWorkload)/8/20  }}人月 </el-col>
+								<el-col :span="4">平均：{{ (parseFloat2(autoParams.planOuserPrice) + parseFloat2(autoParams.planIuserPrice))/2}}元/人时</el-col>
 								<el-col :span="8">{{autoParams.planTotalCost}} 元，{{(autoParams.planTotalCost)/10000}} 万元</el-col>
 							</el-row> 
 						</el-form-item>
 						<el-form-item label="成本总览"> 
 							<el-row>
-								内购：  <el-input style="width:150px;" type="number" disabled v-model="editForm.planInnerUserAt" :precision="2" :step="1000" :min="0" placeholder="内部人力成本总预算"></el-input> <el-tag> {{this.toFixed(autoParams.planInnerUserAt/10000)}}万元</el-tag>
-								外购：  <el-input style="width:150px;" type="number" disabled v-model="editForm.planOutUserAt" :precision="2" :step="1000" :min="0" placeholder="外购人力成本总预算"></el-input> <el-tag> {{this.toFixed(autoParams.planOutUserAt/10000)}}万元</el-tag>
+								内购：  <el-input style="width:150px;" type="number" disabled v-model="editForm.planIuserAt" :precision="2" :step="1000" :min="0" placeholder="内部人力成本总预算"></el-input> <el-tag> {{this.toFixed(autoParams.planIuserAt/10000)}}万元</el-tag>
+								外购：  <el-input style="width:150px;" type="number" disabled v-model="editForm.planOuserAt" :precision="2" :step="1000" :min="0" placeholder="外购人力成本总预算"></el-input> <el-tag> {{this.toFixed(autoParams.planOuserAt/10000)}}万元</el-tag>
 								非人力：<el-input style="width:150px;" type="number" v-model="editForm.planNouserAt" :precision="2" :step="1000" :min="0" placeholder="人力成本总预算"></el-input> <el-tag> {{this.toFixed( autoParams.planNouserAt/10000)}}万元</el-tag>
 							</el-row>
 							<el-divider></el-divider>
@@ -186,25 +186,25 @@
 			autoParams:function(){
 				
 				 
-				var planOutUserPrice=this.toFixed(this.editForm.planOutUserPrice)
-				var planInnerUserPrice=this.toFixed(this.editForm.planInnerUserPrice)
-				var planOutUserCnt=this.toFixed(this.editForm.planOutUserCnt)
-				var planInnerUserCnt=this.toFixed(this.editForm.planInnerUserCnt)
+				var planOuserPrice=this.toFixed(this.editForm.planOuserPrice)
+				var planIuserPrice=this.toFixed(this.editForm.planIuserPrice)
+				var planOuserCnt=this.toFixed(this.editForm.planOuserCnt)
+				var planIuserCnt=this.toFixed(this.editForm.planIuserCnt)
 				var planWorkingHours=this.toFixed(this.editForm.planWorkingHours )
 				var planNouserAt=this.toFixed(this.editForm.planNouserAt ) 
 				var budgetMarginRate=this.toFixed(this.editForm.budgetMarginRate,4 ) 
 				var taxRate=this.toFixed(this.editForm.taxRate,4)
-				if(planOutUserPrice==null || planOutUserPrice==''){
-					planOutUserPrice=100
+				if(planOuserPrice==null || planOuserPrice==''){
+					planOuserPrice=100
 				}
-				if(planInnerUserPrice==null || planInnerUserPrice==''){
-					planInnerUserPrice=80
+				if(planIuserPrice==null || planIuserPrice==''){
+					planIuserPrice=80
 				}
-				if(planOutUserCnt==null || planOutUserCnt==''){
-					planOutUserCnt=0.0
+				if(planOuserCnt==null || planOuserCnt==''){
+					planOuserCnt=0.0
 				}
-				if(planInnerUserCnt==null || planInnerUserCnt==''){
-					planInnerUserCnt=0.0
+				if(planIuserCnt==null || planIuserCnt==''){
+					planIuserCnt=0.0
 				}
 				
 				if(planNouserAt==null || planNouserAt==''){
@@ -233,19 +233,19 @@
 			 	} 
 				autoParams.weekday=weekday
 				autoParams.planWorkingHours=planWorkingHours
-				autoParams.planOutUserPrice=planOutUserPrice
-				autoParams.planInnerUserPrice=planInnerUserPrice
-				autoParams.planOutUserCnt=planOutUserCnt
-				autoParams.planInnerUserCnt=planInnerUserCnt 
+				autoParams.planOuserPrice=planOuserPrice
+				autoParams.planIuserPrice=planIuserPrice
+				autoParams.planOuserCnt=planOuserCnt
+				autoParams.planIuserCnt=planIuserCnt 
 				autoParams.taxRate=taxRate 
-				autoParams.planInnerUserWorkload= planInnerUserCnt*planWorkingHours
-				autoParams.planOutUserWorkload= planOutUserCnt*planWorkingHours
-				autoParams.planWorkload=  planInnerUserCnt*planWorkingHours + planOutUserCnt*planWorkingHours
-				autoParams.planOutUserAt= planOutUserCnt * planWorkingHours * planOutUserPrice
-				autoParams.planInnerUserAt=  planInnerUserCnt * planWorkingHours * planInnerUserPrice
+				autoParams.planIuserWorkload= planIuserCnt*planWorkingHours
+				autoParams.planOuserWorkload= planOuserCnt*planWorkingHours
+				autoParams.planWorkload=  planIuserCnt*planWorkingHours + planOuserCnt*planWorkingHours
+				autoParams.planOuserAt= planOuserCnt * planWorkingHours * planOuserPrice
+				autoParams.planIuserAt=  planIuserCnt * planWorkingHours * planIuserPrice
 				autoParams.planNouserAt= planNouserAt
 				autoParams.budgetMarginRate=budgetMarginRate
-				autoParams.planTotalCost=  autoParams.planOutUserAt + autoParams.planInnerUserAt + autoParams.planNouserAt
+				autoParams.planTotalCost=  autoParams.planOuserAt + autoParams.planIuserAt + autoParams.planNouserAt
 				autoParams.totalReceivables=autoParams.planTotalCost/(1-budgetMarginRate)/ (1-taxRate)
 				autoParams.contractAmt =autoParams.totalReceivables
 				var totalReceivables=this.editForm.totalReceivables
@@ -266,8 +266,8 @@
 			},
 			planTotalAt:function(){
 				return {
-					planOutUserAt:this.editForm.planOutUserAt,
-					planInnerUserAt:this.editForm.planInnerUserAt,
+					planOuserAt:this.editForm.planOuserAt,
+					planIuserAt:this.editForm.planIuserAt,
 					planNouserAt:this.editForm.planNouserAt,  
 				}
 			},
@@ -300,7 +300,7 @@
 		  },
 		  'planTotalAt':{
 			  handler(planTotalAt){  
-				this.editForm.planTotalCost=this.toFixed(this.parseFloat2(planTotalAt.planOutUserAt)+this.parseFloat2(planTotalAt.planInnerUserAt)+this.parseFloat2(planTotalAt.planNouserAt))
+				this.editForm.planTotalCost=this.toFixed(this.parseFloat2(planTotalAt.planOuserAt)+this.parseFloat2(planTotalAt.planIuserAt)+this.parseFloat2(planTotalAt.planNouserAt))
 				//this.editForm.totalReceivables=this.toFixed(this.parseFloat2(this.editForm.planTotalCost) * (1+0.3)) 
 			  },
 			  deep:true
@@ -394,7 +394,7 @@
 				},
 				//编辑界面数据  XmProject xm_project
 				editForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:0.06,planNouserAt:0,planInnerUserAt:0,planOutUserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:0.13,contractAmt:0,planInnerUserPrice:85,planOutUserPrice:100,planOutUserCnt:1,planInnerUserCnt:1,planWorkingHours:0,planInnerUserWorkload:0,planOutUserWorkload:0,budgetCtrl:'0',admUserid:'',admUsername:'',pmUserid:'',pmUsername:'',assUserid:'',assUsername:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:0.06,planNouserAt:0,planIuserAt:0,planOuserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:0.13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:1,planIuserCnt:1,planWorkingHours:0,planIuserWorkload:0,planOuserWorkload:0,budgetCtrl:'0',admUserid:'',admUsername:'',pmUserid:'',pmUsername:'',assUserid:'',assUsername:''
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				xmGroups:[],
@@ -455,8 +455,8 @@
 						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
 							this.load.edit=true
 							let params = Object.assign({}, this.editForm);  
-							params.planInnerUserWorkload=this.autoParams.planInnerUserWorkload 
-							params.planOutUserWorkload=this.autoParams.planOutUserWorkload
+							params.planIuserWorkload=this.autoParams.planIuserWorkload 
+							params.planOuserWorkload=this.autoParams.planOuserWorkload
 							params.planWorkload=this.autoParams.planWorkload
 							editXmProject(params).then((res) => {
 								this.load.edit=false;
@@ -530,8 +530,8 @@
 			
 			fillPlanCostAtToField:function(){
 				this.editForm.planNouserAt=this.toFixed(this.autoParams.planNouserAt)
-				this.editForm.planOutUserAt=this.toFixed(this.autoParams.planOutUserAt )
-				this.editForm.planInnerUserAt=this.toFixed(this.autoParams.planInnerUserAt )
+				this.editForm.planOuserAt=this.toFixed(this.autoParams.planOuserAt )
+				this.editForm.planIuserAt=this.toFixed(this.autoParams.planIuserAt )
 				this.editForm.planTotalCost=this.toFixed(this.autoParams.planTotalCost)
 
 			},
@@ -574,8 +574,8 @@
 					return;
 				}
 				
-				row.planInnerUserWorkload=this.autoParams.planInnerUserWorkload 
-				row.planOutUserWorkload=this.autoParams.planOutUserWorkload
+				row.planIuserWorkload=this.autoParams.planIuserWorkload 
+				row.planOuserWorkload=this.autoParams.planOuserWorkload
 				row.planWorkload=this.autoParams.planWorkload
 				let extVars={projectId:row.id}
 				let jsonExtVars=JSON.stringify(extVars); 

src/views/xm/core/xmProject/XmProjectForLink.vue

@@ -83,14 +83,14 @@ import XmProjectList from './XmProjectList.vue';
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
 				addForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				tableHeight:300,
 				//编辑xmProject界面初始化数据
 				editForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:''
 				},
 				xmProjectListVisible:false,
  

src/views/xm/core/xmProject/XmProjectInfo.vue

@@ -140,7 +140,7 @@
 			  <xm-group-mng v-if="infotype=='团队'" :sel-project="selProject"></xm-group-mng>
 			  <xm-file-mng v-if="infotype=='文档'" :sel-project="selProject"></xm-file-mng>
 			   <xm-task-mng v-if="infotype=='计划'" ref="projectPlan" work-item-type="projectPlan" :sel-project="selProject" key="projectPlan"></xm-task-mng>
-			 <!-- <xm-project-phase-mng v-if="infotype=='计划'" ref="xmProjectPhaseMng" :sel-project="selProject" ></xm-project-phase-mng> -->
+			 <!-- <xm-phase-mng v-if="infotype=='计划'" ref="xmPhaseMng" :sel-project="selProject" ></xm-phase-mng> -->
 			  <xm-test-case-exec-mng v-if="infotype=='测试计划'" :visible="infotype=='测试计划'"  :sel-project='selProject' ref="xmQuestion"></xm-test-case-exec-mng>
 			<xm-menu-with-plan v-if="infotype=='需求监控'" ref="xmMenuWithPlan" :sel-project="selProject"></xm-menu-with-plan>
 			<xm-project-state-mng v-if="infotype=='项目监控'" :sel-project="selProject"></xm-project-state-mng>
@@ -180,7 +180,7 @@
 	import xmBudget from './XmProjectBudgetCost';
 	import xmContract from '../xmProjectContract/XmProjectContractMng';
 	import xmEnvList from '../xmProjectEnvList/XmProjectEnvListMng';
-	import xmProjectPhaseMng from '../xmProjectPhase/XmProjectPhaseMng';
+	import xmPhaseMng from '../xmPhase/XmPhaseMng';
 	import xmMenuMng from '../xmMenu/XmMenuMng';
 	import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
@@ -289,9 +289,9 @@
           pageNum = this.$refs.xmTaskMng.pageInfo.pageNum;
         } else if (this.infotype === '计划') {
           header = ['序号', '计划名称', '开始时间', '结束时间', '进度(%)', '状态', '计划人数', '实际人数', '计划工期', '实际工期',  '计划工作量（人时）', '实际工作量（人时）', '计划非人力成本(元)', '实际非人力成本(元)', '计划内购人力成本(元)', '实际内购人力成本(元)', '计划外购人力成本(元)', '实际外购人力成本(元)', '计划成本合计(元)', '实际成本合计(元)', '审批状态', '备注'];
-          keyList = ['seqNo', 'phaseName', 'beginDate', 'endDate', 'actRate', 'phaseStatus', 'phaseBudgetOutUserCnt', 'actStaffNu', 'phaseBudgetHours', 'actHours', 'phaseBudgetWorkload', 'phaseActWorkload', 'phaseBudgetNouserAt', 'actNouserAt', 'phaseBudgetInnerUserAt', 'actInnerUserAt', 'phaseBudgetOutUserAt', 'actOutUserAt', 'phaseBudgetCostAt', 'actCostAt', 'bizFlowState', 'remark'];
-          list = this.$refs.xmProjectPhaseMng.projectPhaseTreeData;
-          pageNum = this.$refs.xmProjectPhaseMng.pageInfo.pageNum;
+          keyList = ['seqNo', 'name', 'beginDate', 'endDate', 'actRate', 'phaseStatus', 'phaseBudgetOuserCnt', 'actStaffNu', 'phaseBudgetHours', 'actHours', 'phaseBudgetWorkload', 'phaseActWorkload', 'phaseBudgetNouserAt', 'actNouserAt', 'phaseBudgetIuserAt', 'actIuserAt', 'phaseBudgetOuserAt', 'actOuserAt', 'phaseBudgetCostAt', 'actCostAt', 'bizFlowState', 'remark'];
+          list = this.$refs.xmPhaseMng.projectPhaseTreeData;
+          pageNum = this.$refs.xmPhaseMng.pageInfo.pageNum;
 
         } else if (this.infotype === '需求监控') {
           header = ['序号', '需求名称', '计划状态', '负责人', '上线时间', '计划开始时间', '实际开始时间', '计划结束时间', '实际结束时间', '计划工作量(人时)', '实际工作量(人时)', '计划成本(元)', '实际成本(元)', '总体完成比例%', '需求完成比例%', '设计完成比例%', '开发完成比例%', 'sit完成比例%', 'uat完成比例%', '上线状态'];
@@ -338,7 +338,7 @@
             const row = filterVal.map(j => {
               let key = '';
               if(j == 'phaseStatus') {
-                return this.$refs.xmProjectPhaseMng.formateOption('xmPhaseStatus', v.phaseStatus);
+                return this.$refs.xmPhaseMng.formateOption('xmPhaseStatus', v.phaseStatus);
               } else if(j == 'bizFlowState') {
                 return `${bizFlowStateDict[parseInt(v[j]) || 0]}`;
               } else {
@@ -395,7 +395,7 @@
 		},//end methods
 		components: { 
 			xmTaskMng,
-			xmProjectPhaseMng,
+			xmPhaseMng,
 			xmGroupMng,
 			xmExchange,
 			xmQuestion,

src/views/xm/core/xmProject/XmProjectList.vue

@@ -65,14 +65,14 @@
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
 				addForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				tableHeight:300,
 				//编辑xmProject界面初始化数据
 				editForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:''
 				},
  
  

src/views/xm/core/xmProject/XmProjectMng.vue

@@ -375,13 +375,13 @@
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
 				addForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:'',budgetCtrl:'0',
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:'',budgetCtrl:'0',
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProject界面初始化数据
 				editForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:'',budgetCtrl:'0',
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:'',budgetCtrl:'0',
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
 				menukey: "all",

src/views/xm/core/xmProject/XmProjectOverview.vue

@@ -617,14 +617,14 @@ export default {
                   }
                 },
                 name: '非人力'},
-              {value: this.selProject.planInnerUserAt,
+              {value: this.selProject.planIuserAt,
                 itemStyle: {
                   normal:{
                     color: '#73C0DE'
                   }
                 },
                 name: '内部人力'},
-              {value: this.selProject.planOutUserAt,
+              {value: this.selProject.planOuserAt,
                 itemStyle: {
                   normal:{
                     color: '#5470C6'
@@ -677,14 +677,14 @@ export default {
               }
             },
             data: [
-              {value: this.selProject.planInnerUserWorkload,
+              {value: this.selProject.planIuserWorkload,
                 itemStyle: {
                   normal:{
                     color: '#91CC75'
                   }
                 },
                 name: '内部人力'},
-              {value: this.selProject.planOutUserWorkload,
+              {value: this.selProject.planOuserWorkload,
                 itemStyle: {
                   normal:{
                     color: '#3BA272'

src/views/xm/core/xmProject/XmProjectRecycle.vue

@@ -78,13 +78,13 @@
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
 				addForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示 
 				//编辑xmProject界面初始化数据
 				editForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:''
 				},
 				maxTableHeight:300,
  

src/views/xm/core/xmProject/XmProjectSelect.vue

@@ -54,14 +54,14 @@
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
 				addForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				maxTableHeight:300,
 				//编辑xmProject界面初始化数据
 				editForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:''
 				},
  
  

src/views/xm/core/xmProject/XmProjectTplMng.vue

@@ -142,13 +142,13 @@
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
 				addForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:'',budgetCtrl:'0',
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:'',budgetCtrl:'0',
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProject界面初始化数据
 				editForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:'',budgetCtrl:'0',
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',budgetOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:'',budgetCtrl:'0',
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
 				menukey: "all", 

src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue

@@ -133,7 +133,7 @@
 				bizzMonthList:['01','02','03','04','05','06','07','08','09','10','11','12'],
 				//新增界面数据 xm_project_m_budget_cost_user
 				addForm: {
-					projectId:'',userid:'',budgetCost:'',id:'',remark:'',username:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizzMonth:'',bizProcInstId:'',bizFlowState:'0',projectPhaseId:'',costType:'0',subjectName:''
+					projectId:'',userid:'',budgetCost:'',id:'',remark:'',username:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizzMonth:'',bizProcInstId:'',bizFlowState:'0',phaseId:'',costType:'0',subjectName:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue

@@ -90,7 +90,7 @@
 				},
 				//编辑界面数据  XmProjectMBudgetCostNouser xm_project_m_budget_cost_nouser
 				editForm: {
-					projectId:'',budgetCost:'',id:'',remark:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',costType:'',bizzMonth:'',subjectName:''
+					projectId:'',budgetCost:'',id:'',remark:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',costType:'',bizzMonth:'',subjectName:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue

@@ -14,8 +14,8 @@
 			<font class="hidden-md-and-down">
 				<span style="margin-left:10px;font-size:14px;">项目总预算：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
 				<span style="margin-left:10px;font-size:14px;">非人力总预算：</span><el-tag type='warning'>{{selProject.planNouserAt}}</el-tag>  
-				<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag type='warning'>{{selProject.planInnerUserAt}}</el-tag>  
-				<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag type='warning'>{{selProject.planOutUserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag type='warning'>{{selProject.planIuserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag type='warning'>{{selProject.planOuserAt}}</el-tag>  
 			</font>
 		</el-row>
 		<el-row class="page-main "> 
@@ -139,13 +139,13 @@
 				addFormVisible: false,//新增xmProjectMBudgetCostNouser界面是否显示
 				//新增xmProjectMBudgetCostNouser界面初始化数据
 				addForm: {
-					projectId:'',budgetCost:'',id:'',remark:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',costType:'',bizzMonth:''
+					projectId:'',budgetCost:'',id:'',remark:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',costType:'',bizzMonth:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProjectMBudgetCostNouser界面初始化数据
 				editForm: {
-					projectId:'',budgetCost:'',id:'',remark:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',costType:'',bizzMonth:''
+					projectId:'',budgetCost:'',id:'',remark:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',costType:'',bizzMonth:''
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
 				

src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue

@@ -135,7 +135,7 @@
 				bizzMonthList:['01','02','03','04','05','06','07','08','09','10','11','12'],
 				//新增界面数据 xm_project_m_budget_cost_user
 				addForm: {
-					projectId:'',userid:'',budgetCost:'',id:'',remark:'',username:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizzMonth:'',bizProcInstId:'',bizFlowState:'0',projectPhaseId:'',costType:'1',subjectName:''
+					projectId:'',userid:'',budgetCost:'',id:'',remark:'',username:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizzMonth:'',bizProcInstId:'',bizFlowState:'0',phaseId:'',costType:'1',subjectName:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue

@@ -96,7 +96,7 @@
 				},
 				//编辑界面数据  XmProjectMBudgetCostUser xm_project_m_budget_cost_user
 				editForm: {
-					projectId:'',userid:'',budgetCost:'',id:'',remark:'',username:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizzMonth:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',costType:'',subjectName:''
+					projectId:'',userid:'',budgetCost:'',id:'',remark:'',username:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizzMonth:'',bizProcInstId:'',bizFlowState:'',phaseId:'',costType:'',subjectName:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue

@@ -14,8 +14,8 @@
 			<font class="hidden-md-and-down">
 				<span  style="margin-left:10px;font-size:14px;">项目总预算：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
 				<span style="margin-left:10px;font-size:14px;">非人力总预算：</span><el-tag type='warning'>{{selProject.planNouserAt}}</el-tag>  
-				<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag type='warning'>{{selProject.planInnerUserAt}}</el-tag>  
-				<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag type='warning'>{{selProject.planOutUserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag type='warning'>{{selProject.planIuserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag type='warning'>{{selProject.planOuserAt}}</el-tag>  
 			</font>
 		</el-row>
 		<el-row class="page-main "> 
@@ -144,13 +144,13 @@
 				addFormVisible: false,//新增xmProjectMBudgetCostUser界面是否显示
 				//新增xmProjectMBudgetCostUser界面初始化数据
 				addForm: {
-					projectId:'',userid:'',budgetCost:'',id:'',remark:'',username:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizzMonth:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',costType:''
+					projectId:'',userid:'',budgetCost:'',id:'',remark:'',username:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizzMonth:'',bizProcInstId:'',bizFlowState:'',phaseId:'',costType:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProjectMBudgetCostUser界面初始化数据
 				editForm: {
-					projectId:'',userid:'',budgetCost:'',id:'',remark:'',username:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizzMonth:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',costType:''
+					projectId:'',userid:'',budgetCost:'',id:'',remark:'',username:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizzMonth:'',bizProcInstId:'',bizFlowState:'',phaseId:'',costType:''
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
 				batchEditVisible:false,	

src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue

@@ -90,7 +90,7 @@
 				},
 				//编辑界面数据  XmProjectMCostNouser xm_project_m_budget_cost_nouser
 				addForm: {
-					projectId:'',budgetCost:'',id:'',remark:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',costType:'',bizzMonth:'',subjectName:''
+					projectId:'',budgetCost:'',id:'',remark:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',costType:'',bizzMonth:'',subjectName:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue

@@ -48,8 +48,8 @@
 				<el-form-item label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" prop="bizFlowState">
 					<el-input v-model="editForm.bizFlowState" placeholder="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目计划计划编号" prop="projectPhaseId">
-					<el-input v-model="editForm.projectPhaseId" placeholder="项目计划计划编号"></el-input>
+				<el-form-item label="项目计划计划编号" prop="phaseId">
+					<el-input v-model="editForm.phaseId" placeholder="项目计划计划编号"></el-input>
 				</el-form-item> 
 				<el-form-item label="实际成本金额" prop="actCostAmount">
 					<el-input v-model="editForm.actCostAmount" placeholder="实际成本金额"></el-input>
@@ -114,7 +114,7 @@
 				},
 				//编辑界面数据  XmProjectMCostNouser xm_project_m_cost_nouser
 				editForm: {
-					projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
+					projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue

@@ -13,8 +13,8 @@
 			<font class="hidden-md-and-down">
 				<span style="margin-left:10px;font-size:14px;">项目总成本：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
 				<span style="margin-left:10px;font-size:14px;">非人力总成本：</span><el-tag type='warning'>{{selProject.planNouserAt}}</el-tag>  
-				<span style="margin-left:10px;font-size:14px;">内部人力总成本：</span><el-tag type='warning'>{{selProject.planInnerUserAt}}</el-tag>  
-				<span style="margin-left:10px;font-size:14px;">外购人力总成本：</span><el-tag type='warning'>{{selProject.planOutUserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">内部人力总成本：</span><el-tag type='warning'>{{selProject.planIuserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">外购人力总成本：</span><el-tag type='warning'>{{selProject.planOuserAt}}</el-tag>  
 			</font>
 		</el-row>
 		<el-row class="page-main "> 
@@ -139,14 +139,14 @@
 				//新增xmProjectMCostNouser界面初始化数据
 
 				addForm: {
-					projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
+					projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProjectMCostNouser界面初始化数据
 
 				editForm: {
-					projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
+					projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',subjectId:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
 				

src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue

@@ -112,7 +112,7 @@
 				},
 				//编辑界面数据  XmProjectMCostUser xm_project_m_budget_cost_user
 				addForm: {
-					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
+					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue

@@ -51,8 +51,8 @@
 				<el-form-item label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" prop="bizFlowState">
 					<el-input v-model="editForm.bizFlowState" placeholder="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目计划计划编号" prop="projectPhaseId">
-					<el-input v-model="editForm.projectPhaseId" placeholder="项目计划计划编号"></el-input>
+				<el-form-item label="项目计划计划编号" prop="phaseId">
+					<el-input v-model="editForm.phaseId" placeholder="项目计划计划编号"></el-input>
 				</el-form-item> 
 				<el-form-item label="金额" prop="actCostAmount">
 					<el-input v-model="editForm.actCostAmount" placeholder="金额"></el-input>
@@ -117,7 +117,7 @@
 				},
 				//编辑界面数据  XmProjectMCostUser xm_project_m_cost_user
 				editForm: {
-					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
+					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue

@@ -119,13 +119,13 @@
 				addFormVisible: false,//新增xmProjectMCostUser界面是否显示
 				//新增xmProjectMCostUser界面初始化数据
 				addForm: {
-					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
+					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProjectMCostUser界面初始化数据
 				editForm: {
-					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
+					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
 				},
 				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/ 

src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue

@@ -15,8 +15,8 @@
 			<font class="hidden-md-and-down">	
 				<span style="margin-left:10px;font-size:14px;">项目总成本：</span><el-tag type='success'> {{selProject.planTotalCost}}</el-tag> 
 				<span style="margin-left:10px;font-size:14px;">非人力总成本：</span><el-tag type='warning'>{{selProject.planNouserAt}}</el-tag>  
-				<span style="margin-left:10px;font-size:14px;">内部人力总成本：</span><el-tag type='warning'>{{selProject.planInnerUserAt}}</el-tag>  
-				<span style="margin-left:10px;font-size:14px;">外购人力总成本：</span><el-tag type='warning'>{{selProject.planOutUserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">内部人力总成本：</span><el-tag type='warning'>{{selProject.planIuserAt}}</el-tag>  
+				<span style="margin-left:10px;font-size:14px;">外购人力总成本：</span><el-tag type='warning'>{{selProject.planOuserAt}}</el-tag>  
 			</font>
 		</el-row>
 		<el-row class="page-main "> 
@@ -145,13 +145,13 @@
 				addFormVisible: false,//新增xmProjectMCostUser界面是否显示
 				//新增xmProjectMCostUser界面初始化数据
 				addForm: {
-					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
+					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProjectMCostUser界面初始化数据
 				editForm: {
-					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',projectPhaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
+					subjectId:'',projectId:'',userid:'',createTime:'',sendCostTime:'',username:'',projectName:'',remark:'',id:'',taskId:'',taskName:'',actWorkload:'',bizzStartDate:'',bizzEndDate:'',bizProcInstId:'',bizFlowState:'',phaseId:'',actCostAmount:'',costType:'',bizMonth:'',bizDate:'',subjectName:'',projectPhaseName:''
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
 				batchEditVisible:false,	

src/views/xm/core/xmProjectState/XmCockpit.vue

@@ -33,13 +33,13 @@
 				<el-table-column prop="totalNeedColAmount" label="待收款总金额" min-width="80" ></el-table-column>
 				<el-table-column prop="totalFinishColAmount" label="已收款总金额" min-width="80" ></el-table-column>
 				<el-table-column prop="totalCostUserAmount" label="项目总人力成本" min-width="80" ></el-table-column>
-				<el-table-column prop="totalBudgetInnerUserAmount" label="项目总内部人力预算-来自项目表" min-width="80" ></el-table-column>
+				<el-table-column prop="totalBudgetIuserAmount" label="项目总内部人力预算-来自项目表" min-width="80" ></el-table-column>
 				<el-table-column prop="totalPlanWorkload" label="项目总预算工作量-来自项目表" min-width="80" ></el-table-column>
 				<el-table-column prop="totalRiskCnt" label="项目风险总数" min-width="80" ></el-table-column>
 				<el-table-column prop="totalCompleteRiskCnt" label="已完成风险总数" min-width="80" ></el-table-column>
 				<el-table-column prop="branchId" label="机构编号" min-width="80" ></el-table-column>
 				<el-table-column prop="branchName" label="机构名称" min-width="80" ></el-table-column>
-				<el-table-column prop="totalBudgetOutUserAmount" label="项目总外购人力预算-来自项目表" min-width="80" ></el-table-column>
+				<el-table-column prop="totalBudgetOuserAmount" label="项目总外购人力预算-来自项目表" min-width="80" ></el-table-column>
 				<el-table-column prop="totalCompleteWorkload" label="已完成工作量-来自计划中实际完成工作量" min-width="80" ></el-table-column>
 				<el-table-column prop="todayNewBugCnt" label="今日新增bug数目" min-width="80" ></el-table-column>
 				<el-table-column prop="todayResolvedBugCnt" label="今日解决bug数目" min-width="80" ></el-table-column>
@@ -55,11 +55,11 @@
 				<el-table-column prop="todayNeedColAmount" label="今日需要收款金额" min-width="80" ></el-table-column>
 				<el-table-column prop="todayFinishColAmount" label="今日完成收款金额" min-width="80" ></el-table-column>
 				<el-table-column prop="todayCostUserAmount" label="今日人力成本金额" min-width="80" ></el-table-column>
-				<el-table-column prop="todayCostInnerUserAmount" label="今日内部人力成本金额" min-width="80" ></el-table-column>
-				<el-table-column prop="todayCostOutUserAmount" label="今日外购人力成本金额" min-width="80" ></el-table-column>
+				<el-table-column prop="todayCostIuserAmount" label="今日内部人力成本金额" min-width="80" ></el-table-column>
+				<el-table-column prop="todayCostOuserAmount" label="今日外购人力成本金额" min-width="80" ></el-table-column>
 				<el-table-column prop="todayCostNouserAmount" label="今日非人力成本金额" min-width="80" ></el-table-column>
-				<el-table-column prop="totalCostInnerUserAmount" label="项目总内部人力成本金额" min-width="80" ></el-table-column>
-				<el-table-column prop="totalCostOutUserAmount" label="项目总外购人力成本金额" min-width="80" ></el-table-column>
+				<el-table-column prop="totalCostIuserAmount" label="项目总内部人力成本金额" min-width="80" ></el-table-column>
+				<el-table-column prop="totalCostOuserAmount" label="项目总外购人力成本金额" min-width="80" ></el-table-column>
 				<el-table-column prop="todayNeedPayAmount" label="今日新增待付款总金额" min-width="80" ></el-table-column>
 				<el-table-column prop="todayFinishPayAmount" label="今日新增完成付款总金额" min-width="80" ></el-table-column>
 				<el-table-column prop="todayNewRiskCnt" label="今日新增项目风险总数" min-width="80" ></el-table-column>
@@ -142,13 +142,13 @@
 				addFormVisible: false,//新增xmProjectState界面是否显示
 				//新增xmProjectState界面初始化数据
 				addForm: {
-					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',todayNewBugCnt:'',todayResolvedBugCnt:'',todayClosedBugCnt:'',todayNewTaskCnt:'',todayCompleteTaskCnt:'',todayNewPhaseCnt:'',todayCompletePhaseCnt:'',todayNewStaffCnt:'',todaySubStaffCnt:'',todayNewPlanWorkload:'',todayNewActWorkload:'',todayNeedColAmount:'',todayFinishColAmount:'',todayCostUserAmount:'',todayCostInnerUserAmount:'',todayCostOutUserAmount:'',todayCostNouserAmount:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',todayNeedPayAmount:'',todayFinishPayAmount:'',todayNewRiskCnt:'',todayCompleteRiskCnt:'',todayNewFileCnt:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',todayConfirmedBugCnt:'',todayActiveBugCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',todayNeedPayUserCnt:'',todayFinishPayUserCnt:''
+					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',todayNewBugCnt:'',todayResolvedBugCnt:'',todayClosedBugCnt:'',todayNewTaskCnt:'',todayCompleteTaskCnt:'',todayNewPhaseCnt:'',todayCompletePhaseCnt:'',todayNewStaffCnt:'',todaySubStaffCnt:'',todayNewPlanWorkload:'',todayNewActWorkload:'',todayNeedColAmount:'',todayFinishColAmount:'',todayCostUserAmount:'',todayCostIuserAmount:'',todayCostOuserAmount:'',todayCostNouserAmount:'',totalCostIuserAmount:'',totalCostOuserAmount:'',todayNeedPayAmount:'',todayFinishPayAmount:'',todayNewRiskCnt:'',todayCompleteRiskCnt:'',todayNewFileCnt:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',todayConfirmedBugCnt:'',todayActiveBugCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',todayNeedPayUserCnt:'',todayFinishPayUserCnt:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProjectState界面初始化数据
 				editForm: {
-					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',todayNewBugCnt:'',todayResolvedBugCnt:'',todayClosedBugCnt:'',todayNewTaskCnt:'',todayCompleteTaskCnt:'',todayNewPhaseCnt:'',todayCompletePhaseCnt:'',todayNewStaffCnt:'',todaySubStaffCnt:'',todayNewPlanWorkload:'',todayNewActWorkload:'',todayNeedColAmount:'',todayFinishColAmount:'',todayCostUserAmount:'',todayCostInnerUserAmount:'',todayCostOutUserAmount:'',todayCostNouserAmount:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',todayNeedPayAmount:'',todayFinishPayAmount:'',todayNewRiskCnt:'',todayCompleteRiskCnt:'',todayNewFileCnt:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',todayConfirmedBugCnt:'',todayActiveBugCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',todayNeedPayUserCnt:'',todayFinishPayUserCnt:''
+					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',todayNewBugCnt:'',todayResolvedBugCnt:'',todayClosedBugCnt:'',todayNewTaskCnt:'',todayCompleteTaskCnt:'',todayNewPhaseCnt:'',todayCompletePhaseCnt:'',todayNewStaffCnt:'',todaySubStaffCnt:'',todayNewPlanWorkload:'',todayNewActWorkload:'',todayNeedColAmount:'',todayFinishColAmount:'',todayCostUserAmount:'',todayCostIuserAmount:'',todayCostOuserAmount:'',todayCostNouserAmount:'',totalCostIuserAmount:'',totalCostOuserAmount:'',todayNeedPayAmount:'',todayFinishPayAmount:'',todayNewRiskCnt:'',todayCompleteRiskCnt:'',todayNewFileCnt:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',todayConfirmedBugCnt:'',todayActiveBugCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',todayNeedPayUserCnt:'',todayFinishPayUserCnt:''
 				}
 				/**begin 自定义属性请在下面加 请加备注**/
 					

src/views/xm/core/xmProjectState/XmProjectStateAdd.vue

@@ -69,8 +69,8 @@
 				<el-form-item label="项目总人力成本" prop="totalCostUserAmount">
 					<el-input v-model="addForm.totalCostUserAmount" placeholder="项目总人力成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetInnerUserAmount">
-					<el-input v-model="addForm.totalBudgetInnerUserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetIuserAmount">
+					<el-input v-model="addForm.totalBudgetIuserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="项目总预算工作量-来自项目表" prop="totalPlanWorkload">
 					<el-input v-model="addForm.totalPlanWorkload" placeholder="项目总预算工作量-来自项目表"></el-input>
@@ -87,17 +87,17 @@
 				<el-form-item label="机构名称" prop="branchName">
 					<el-input v-model="addForm.branchName" placeholder="机构名称" ></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOutUserAmount">
-					<el-input v-model="addForm.totalBudgetOutUserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOuserAmount">
+					<el-input v-model="addForm.totalBudgetOuserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="已完成工作量-来自计划中实际完成工作量" prop="totalCompleteWorkload">
 					<el-input v-model="addForm.totalCompleteWorkload" placeholder="已完成工作量-来自计划中实际完成工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总内部人力成本金额" prop="totalCostInnerUserAmount">
-					<el-input v-model="addForm.totalCostInnerUserAmount" placeholder="项目总内部人力成本金额"></el-input>
+				<el-form-item label="项目总内部人力成本金额" prop="totalCostIuserAmount">
+					<el-input v-model="addForm.totalCostIuserAmount" placeholder="项目总内部人力成本金额"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总外购人力成本金额" prop="totalCostOutUserAmount">
-					<el-input v-model="addForm.totalCostOutUserAmount" placeholder="项目总外购人力成本金额"></el-input>
+				<el-form-item label="项目总外购人力成本金额" prop="totalCostOuserAmount">
+					<el-input v-model="addForm.totalCostOuserAmount" placeholder="项目总外购人力成本金额"></el-input>
 				</el-form-item> 
 				<el-form-item label="项目进度0~100之间，来自任务表" prop="totalProgress">
 					<el-input v-model="addForm.totalProgress" placeholder="项目进度0~100之间，来自任务表"></el-input>
@@ -138,11 +138,11 @@
 				<el-form-item label="待付款总人数" prop="totalNeedPayUserCnt">
 					<el-input v-model="addForm.totalNeedPayUserCnt" placeholder="待付款总人数"></el-input>
 				</el-form-item> 
-				<el-form-item label="内部人力总工作量-应该大于或等于计划内部人力总成本" prop="totalPlanInnerUserWorkload">
-					<el-input v-model="addForm.totalPlanInnerUserWorkload" placeholder="内部人力总工作量-应该大于或等于计划内部人力总成本"></el-input>
+				<el-form-item label="内部人力总工作量-应该大于或等于计划内部人力总成本" prop="totalPlanIuserWorkload">
+					<el-input v-model="addForm.totalPlanIuserWorkload" placeholder="内部人力总工作量-应该大于或等于计划内部人力总成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="外购人力总工作量-应该大于或等于计划外购人力总成本" prop="totalPlanOutUserWorkload">
-					<el-input v-model="addForm.totalPlanOutUserWorkload" placeholder="外购人力总工作量-应该大于或等于计划外购人力总成本"></el-input>
+				<el-form-item label="外购人力总工作量-应该大于或等于计划外购人力总成本" prop="totalPlanOuserWorkload">
+					<el-input v-model="addForm.totalPlanOuserWorkload" placeholder="外购人力总工作量-应该大于或等于计划外购人力总成本"></el-input>
 				</el-form-item> 
 				<el-form-item label="测试用例总数" prop="testCases">
 					<el-input-number v-model="addForm.testCases" :min="0" :max="200"></el-input-number>
@@ -216,7 +216,7 @@
 				},
 				//新增界面数据 项目指标日统计表
 				addForm: {
-					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanInnerUserWorkload:'',totalPlanOutUserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:''
+					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',totalCostIuserAmount:'',totalCostOuserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanIuserWorkload:'',totalPlanOuserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectState/XmProjectStateEdit.vue

@@ -69,8 +69,8 @@
 				<el-form-item label="项目总人力成本" prop="totalCostUserAmount">
 					<el-input v-model="editForm.totalCostUserAmount" placeholder="项目总人力成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetInnerUserAmount">
-					<el-input v-model="editForm.totalBudgetInnerUserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetIuserAmount">
+					<el-input v-model="editForm.totalBudgetIuserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="项目总预算工作量-来自项目表" prop="totalPlanWorkload">
 					<el-input v-model="editForm.totalPlanWorkload" placeholder="项目总预算工作量-来自项目表"></el-input>
@@ -87,17 +87,17 @@
 				<el-form-item label="机构名称" prop="branchName">
 					<el-input v-model="editForm.branchName" placeholder="机构名称"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOutUserAmount">
-					<el-input v-model="editForm.totalBudgetOutUserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOuserAmount">
+					<el-input v-model="editForm.totalBudgetOuserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="已完成工作量-来自计划中实际完成工作量" prop="totalCompleteWorkload">
 					<el-input v-model="editForm.totalCompleteWorkload" placeholder="已完成工作量-来自计划中实际完成工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总内部人力成本金额" prop="totalCostInnerUserAmount">
-					<el-input v-model="editForm.totalCostInnerUserAmount" placeholder="项目总内部人力成本金额"></el-input>
+				<el-form-item label="项目总内部人力成本金额" prop="totalCostIuserAmount">
+					<el-input v-model="editForm.totalCostIuserAmount" placeholder="项目总内部人力成本金额"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总外购人力成本金额" prop="totalCostOutUserAmount">
-					<el-input v-model="editForm.totalCostOutUserAmount" placeholder="项目总外购人力成本金额"></el-input>
+				<el-form-item label="项目总外购人力成本金额" prop="totalCostOuserAmount">
+					<el-input v-model="editForm.totalCostOuserAmount" placeholder="项目总外购人力成本金额"></el-input>
 				</el-form-item> 
 				<el-form-item label="项目进度0~100之间，来自任务表" prop="totalProgress">
 					<el-input v-model="editForm.totalProgress" placeholder="项目进度0~100之间，来自任务表"></el-input>
@@ -138,11 +138,11 @@
 				<el-form-item label="待付款总人数" prop="totalNeedPayUserCnt">
 					<el-input v-model="editForm.totalNeedPayUserCnt" placeholder="待付款总人数"></el-input>
 				</el-form-item> 
-				<el-form-item label="内部人力总工作量-应该大于或等于计划内部人力总成本" prop="totalPlanInnerUserWorkload">
-					<el-input v-model="editForm.totalPlanInnerUserWorkload" placeholder="内部人力总工作量-应该大于或等于计划内部人力总成本"></el-input>
+				<el-form-item label="内部人力总工作量-应该大于或等于计划内部人力总成本" prop="totalPlanIuserWorkload">
+					<el-input v-model="editForm.totalPlanIuserWorkload" placeholder="内部人力总工作量-应该大于或等于计划内部人力总成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="外购人力总工作量-应该大于或等于计划外购人力总成本" prop="totalPlanOutUserWorkload">
-					<el-input v-model="editForm.totalPlanOutUserWorkload" placeholder="外购人力总工作量-应该大于或等于计划外购人力总成本"></el-input>
+				<el-form-item label="外购人力总工作量-应该大于或等于计划外购人力总成本" prop="totalPlanOuserWorkload">
+					<el-input v-model="editForm.totalPlanOuserWorkload" placeholder="外购人力总工作量-应该大于或等于计划外购人力总成本"></el-input>
 				</el-form-item> 
 				<el-form-item label="测试用例总数" prop="testCases">
 					<el-input-number v-model="editForm.testCases" :min="0" :max="200"></el-input-number>
@@ -216,7 +216,7 @@
 				},
 				//编辑界面数据  XmProjectState 项目指标日统计表
 				editForm: {
-					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanInnerUserWorkload:'',totalPlanOutUserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:''
+					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',totalCostIuserAmount:'',totalCostOuserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanIuserWorkload:'',totalPlanOuserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectState/XmProjectStateMng.vue

@@ -17,10 +17,10 @@
 					<template slot-scope="scope">
 					<el-form   label-width="120px" >  
 						<el-form-item label="总预算金额" prop="totalFileCnt">
-							<span style="margin-left:10px;font-size:14px;">项目总预算：</span><el-tag type='success'> {{(scope.row.totalBudgetNouserAmount+scope.row.totalBudgetInnerUserAmount+scope.row.totalBudgetOutUserAmount)/10000}}万</el-tag> 
+							<span style="margin-left:10px;font-size:14px;">项目总预算：</span><el-tag type='success'> {{(scope.row.totalBudgetNouserAmount+scope.row.totalBudgetIuserAmount+scope.row.totalBudgetOuserAmount)/10000}}万</el-tag> 
 							<span style="margin-left:10px;font-size:14px;">非人力总预算：</span><el-tag :type="scope.row.totalBudgetNouserAmount>0?'warning':'danger'">{{scope.row.totalBudgetNouserAmount/10000}}万</el-tag>  
-							<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag  :type="scope.row.totalBudgetInnerUserAmount>0?'warning':'danger'">{{scope.row.totalBudgetInnerUserAmount/10000}}万</el-tag>  
-							<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag  :type="scope.row.totalBudgetOutUserAmount>0?'warning':'danger'">{{scope.row.totalBudgetOutUserAmount/10000}}万</el-tag> 
+							<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag  :type="scope.row.totalBudgetIuserAmount>0?'warning':'danger'">{{scope.row.totalBudgetIuserAmount/10000}}万</el-tag>  
+							<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag  :type="scope.row.totalBudgetOuserAmount>0?'warning':'danger'">{{scope.row.totalBudgetOuserAmount/10000}}万</el-tag> 
 							<span style="margin-left:10px;font-size:14px;">已分配到任务的总预算：</span><el-tag  :type="scope.row.totalTaskBudgetCostAt>0?'warning':'danger'">{{scope.row.totalTaskBudgetCostAt/10000}}万</el-tag>   
 						</el-form-item> 
 						<el-form-item label="bug数目" prop="totalBugCnt">
@@ -48,10 +48,10 @@
 							 外购：<el-tag type="danger">{{scope.row.totalActOutWorkload?scope.row.totalActOutWorkload:0}}</el-tag>  
 						</el-form-item>   
 						<el-form-item label="实际成本" prop="projectName">
-							 总成本：：<el-tag type="primary">{{ scope.row.totalCostNouserAmount+scope.row.totalCostInnerUserAmount+scope.row.totalCostOutUserAmount}}</el-tag> 
+							 总成本：：<el-tag type="primary">{{ scope.row.totalCostNouserAmount+scope.row.totalCostIuserAmount+scope.row.totalCostOuserAmount}}</el-tag> 
 							 非人力成本 :<el-tag type="warning">{{scope.row.totalCostNouserAmount?scope.row.totalCostNouserAmount:0}}</el-tag>       
-							 内购人力成本：<el-tag type="danger">{{scope.row.totalCostInnerUserAmount?scope.row.totalCostInnerUserAmount:0}}</el-tag>    
-							 外购人力成本：<el-tag type="danger">{{scope.row.totalCostOutUserAmount?scope.row.totalCostOutUserAmount:0}}</el-tag>    
+							 内购人力成本：<el-tag type="danger">{{scope.row.totalCostIuserAmount?scope.row.totalCostIuserAmount:0}}</el-tag>    
+							 外购人力成本：<el-tag type="danger">{{scope.row.totalCostOuserAmount?scope.row.totalCostOuserAmount:0}}</el-tag>    
 						</el-form-item>  
 						
 						<el-form-item label="结算" prop="projectName">
@@ -160,13 +160,13 @@
 				addFormVisible: false,//新增xmProjectState界面是否显示
 				//新增xmProjectState界面初始化数据
 				addForm: {
-					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',todayNewBugCnt:'',todayResolvedBugCnt:'',todayClosedBugCnt:'',todayNewTaskCnt:'',todayCompleteTaskCnt:'',todayNewPhaseCnt:'',todayCompletePhaseCnt:'',todayNewStaffCnt:'',todaySubStaffCnt:'',todayNewPlanWorkload:'',todayNewActWorkload:'',todayNeedColAmount:'',todayFinishColAmount:'',todayCostUserAmount:'',todayCostInnerUserAmount:'',todayCostOutUserAmount:'',todayCostNouserAmount:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',todayNeedPayAmount:'',todayFinishPayAmount:'',todayNewRiskCnt:'',todayCompleteRiskCnt:'',todayNewFileCnt:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',todayConfirmedBugCnt:'',todayActiveBugCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',todayNeedPayUserCnt:'',todayFinishPayUserCnt:''
+					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',todayNewBugCnt:'',todayResolvedBugCnt:'',todayClosedBugCnt:'',todayNewTaskCnt:'',todayCompleteTaskCnt:'',todayNewPhaseCnt:'',todayCompletePhaseCnt:'',todayNewStaffCnt:'',todaySubStaffCnt:'',todayNewPlanWorkload:'',todayNewActWorkload:'',todayNeedColAmount:'',todayFinishColAmount:'',todayCostUserAmount:'',todayCostIuserAmount:'',todayCostOuserAmount:'',todayCostNouserAmount:'',totalCostIuserAmount:'',totalCostOuserAmount:'',todayNeedPayAmount:'',todayFinishPayAmount:'',todayNewRiskCnt:'',todayCompleteRiskCnt:'',todayNewFileCnt:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',todayConfirmedBugCnt:'',todayActiveBugCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',todayNeedPayUserCnt:'',todayFinishPayUserCnt:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProjectState界面初始化数据
 				editForm: {
-					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',todayNewBugCnt:'',todayResolvedBugCnt:'',todayClosedBugCnt:'',todayNewTaskCnt:'',todayCompleteTaskCnt:'',todayNewPhaseCnt:'',todayCompletePhaseCnt:'',todayNewStaffCnt:'',todaySubStaffCnt:'',todayNewPlanWorkload:'',todayNewActWorkload:'',todayNeedColAmount:'',todayFinishColAmount:'',todayCostUserAmount:'',todayCostInnerUserAmount:'',todayCostOutUserAmount:'',todayCostNouserAmount:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',todayNeedPayAmount:'',todayFinishPayAmount:'',todayNewRiskCnt:'',todayCompleteRiskCnt:'',todayNewFileCnt:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',todayConfirmedBugCnt:'',todayActiveBugCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',todayNeedPayUserCnt:'',todayFinishPayUserCnt:''
+					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',todayNewBugCnt:'',todayResolvedBugCnt:'',todayClosedBugCnt:'',todayNewTaskCnt:'',todayCompleteTaskCnt:'',todayNewPhaseCnt:'',todayCompletePhaseCnt:'',todayNewStaffCnt:'',todaySubStaffCnt:'',todayNewPlanWorkload:'',todayNewActWorkload:'',todayNeedColAmount:'',todayFinishColAmount:'',todayCostUserAmount:'',todayCostIuserAmount:'',todayCostOuserAmount:'',todayCostNouserAmount:'',totalCostIuserAmount:'',totalCostOuserAmount:'',todayNeedPayAmount:'',todayFinishPayAmount:'',todayNewRiskCnt:'',todayCompleteRiskCnt:'',todayNewFileCnt:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',todayConfirmedBugCnt:'',todayActiveBugCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',todayNeedPayUserCnt:'',todayFinishPayUserCnt:''
 				},
 				selectProjectVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/

src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue

@@ -69,8 +69,8 @@
 				<el-form-item label="项目总人力成本" prop="totalCostUserAmount">
 					<el-input v-model="addForm.totalCostUserAmount" placeholder="项目总人力成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetInnerUserAmount">
-					<el-input v-model="addForm.totalBudgetInnerUserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetIuserAmount">
+					<el-input v-model="addForm.totalBudgetIuserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="项目总预算工作量-来自项目表" prop="totalPlanWorkload">
 					<el-input v-model="addForm.totalPlanWorkload" placeholder="项目总预算工作量-来自项目表"></el-input>
@@ -87,8 +87,8 @@
 				<el-form-item label="机构名称" prop="branchName">
 					<el-input v-model="addForm.branchName" placeholder="机构名称" ></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOutUserAmount">
-					<el-input v-model="addForm.totalBudgetOutUserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOuserAmount">
+					<el-input v-model="addForm.totalBudgetOuserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="已完成工作量-来自计划中实际完成工作量" prop="totalCompleteWorkload">
 					<el-input v-model="addForm.totalCompleteWorkload" placeholder="已完成工作量-来自计划中实际完成工作量"></el-input>
@@ -141,7 +141,7 @@
 				},
 				//新增界面数据 xm_project_state_his
 				addForm: {
-					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',stateId:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalCloseBugCnt:'',totalResolveBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',id:''
+					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',stateId:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalCloseBugCnt:'',totalResolveBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',id:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue

@@ -69,8 +69,8 @@
 				<el-form-item label="项目总人力成本" prop="totalCostUserAmount">
 					<el-input v-model="editForm.totalCostUserAmount" placeholder="项目总人力成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetInnerUserAmount">
-					<el-input v-model="editForm.totalBudgetInnerUserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总内部人力预算-来自项目表" prop="totalBudgetIuserAmount">
+					<el-input v-model="editForm.totalBudgetIuserAmount" placeholder="项目总内部人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="项目总预算工作量-来自项目表" prop="totalPlanWorkload">
 					<el-input v-model="editForm.totalPlanWorkload" placeholder="项目总预算工作量-来自项目表"></el-input>
@@ -87,8 +87,8 @@
 				<el-form-item label="机构名称" prop="branchName">
 					<el-input v-model="editForm.branchName" placeholder="机构名称"></el-input>
 				</el-form-item> 
-				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOutUserAmount">
-					<el-input v-model="editForm.totalBudgetOutUserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
+				<el-form-item label="项目总外购人力预算-来自项目表" prop="totalBudgetOuserAmount">
+					<el-input v-model="editForm.totalBudgetOuserAmount" placeholder="项目总外购人力预算-来自项目表"></el-input>
 				</el-form-item> 
 				<el-form-item label="已完成工作量-来自计划中实际完成工作量" prop="totalCompleteWorkload">
 					<el-input v-model="editForm.totalCompleteWorkload" placeholder="已完成工作量-来自计划中实际完成工作量"></el-input>
@@ -141,7 +141,7 @@
 				},
 				//编辑界面数据  XmProjectStateHis xm_project_state_his
 				editForm: {
-					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',stateId:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalCloseBugCnt:'',totalResolveBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',id:''
+					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',stateId:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalCloseBugCnt:'',totalResolveBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',id:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue

@@ -33,13 +33,13 @@
 				<el-table-column prop="totalNeedColAmount" label="待收款总金额" min-width="80" ></el-table-column>
 				<el-table-column prop="totalFinishColAmount" label="已收款总金额" min-width="80" ></el-table-column>
 				<el-table-column prop="totalCostUserAmount" label="项目总人力成本" min-width="80" ></el-table-column>
-				<el-table-column prop="totalBudgetInnerUserAmount" label="项目总内部人力预算-来自项目表" min-width="80" ></el-table-column>
+				<el-table-column prop="totalBudgetIuserAmount" label="项目总内部人力预算-来自项目表" min-width="80" ></el-table-column>
 				<el-table-column prop="totalPlanWorkload" label="项目总预算工作量-来自项目表" min-width="80" ></el-table-column>
 				<el-table-column prop="totalRiskCnt" label="项目风险总数" min-width="80" ></el-table-column>
 				<el-table-column prop="totalCompleteRiskCnt" label="已完成风险总数" min-width="80" ></el-table-column>
 				<el-table-column prop="branchId" label="机构编号" min-width="80" ></el-table-column>
 				<el-table-column prop="branchName" label="机构名称" min-width="80" ></el-table-column>
-				<el-table-column prop="totalBudgetOutUserAmount" label="项目总外购人力预算-来自项目表" min-width="80" ></el-table-column>
+				<el-table-column prop="totalBudgetOuserAmount" label="项目总外购人力预算-来自项目表" min-width="80" ></el-table-column>
 				<el-table-column prop="totalCompleteWorkload" label="已完成工作量-来自计划中实际完成工作量" min-width="80" ></el-table-column>
 				<el-table-column prop="id" label="本表主键" min-width="80" ></el-table-column>
 				<el-table-column label="操作" width="160" fixed="right"  >
@@ -100,13 +100,13 @@
 				addFormVisible: false,//新增xmProjectStateHis界面是否显示
 				//新增xmProjectStateHis界面初始化数据
 				addForm: {
-					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',stateId:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalCloseBugCnt:'',totalResolveBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',id:''
+					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',stateId:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalCloseBugCnt:'',totalResolveBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',id:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProjectStateHis界面初始化数据
 				editForm: {
-					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',stateId:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalCloseBugCnt:'',totalResolveBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',id:''
+					projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',stateId:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalCloseBugCnt:'',totalResolveBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',id:''
 				}
 				/**begin 自定义属性请在下面加 请加备注**/
 					

src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue

@@ -33,29 +33,29 @@
 				<el-form-item label="计算日期" prop="calcTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.calcTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
 				</el-form-item> 
-				<el-form-item label="外购资金预算" prop="planOutUserAt">
-					<el-input v-model="addForm.planOutUserAt" placeholder="外购资金预算"></el-input>
+				<el-form-item label="外购资金预算" prop="planOuserAt">
+					<el-input v-model="addForm.planOuserAt" placeholder="外购资金预算"></el-input>
 				</el-form-item> 
-				<el-form-item label="内购资金预算" prop="planInnerUserAt">
-					<el-input v-model="addForm.planInnerUserAt" placeholder="内购资金预算"></el-input>
+				<el-form-item label="内购资金预算" prop="planIuserAt">
+					<el-input v-model="addForm.planIuserAt" placeholder="内购资金预算"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际外购成本" prop="actOutUserAt">
-					<el-input v-model="addForm.actOutUserAt" placeholder="实际外购成本"></el-input>
+				<el-form-item label="实际外购成本" prop="actOuserAt">
+					<el-input v-model="addForm.actOuserAt" placeholder="实际外购成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际内购成本" prop="actInnerUserAt">
-					<el-input v-model="addForm.actInnerUserAt" placeholder="实际内购成本"></el-input>
+				<el-form-item label="实际内购成本" prop="actIuserAt">
+					<el-input v-model="addForm.actIuserAt" placeholder="实际内购成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="计划外购工作量" prop="planOutUserWorkload">
-					<el-input v-model="addForm.planOutUserWorkload" placeholder="计划外购工作量"></el-input>
+				<el-form-item label="计划外购工作量" prop="planOuserWorkload">
+					<el-input v-model="addForm.planOuserWorkload" placeholder="计划外购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="计划内购工作量" prop="planInnerUserWorkload">
-					<el-input v-model="addForm.planInnerUserWorkload" placeholder="计划内购工作量"></el-input>
+				<el-form-item label="计划内购工作量" prop="planIuserWorkload">
+					<el-input v-model="addForm.planIuserWorkload" placeholder="计划内购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际外购工作量" prop="actOutUserWorkload">
-					<el-input v-model="addForm.actOutUserWorkload" placeholder="实际外购工作量"></el-input>
+				<el-form-item label="实际外购工作量" prop="actOuserWorkload">
+					<el-input v-model="addForm.actOuserWorkload" placeholder="实际外购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际内购工作量" prop="actInnerUserWorkload">
-					<el-input v-model="addForm.actInnerUserWorkload" placeholder="实际内购工作量"></el-input>
+				<el-form-item label="实际内购工作量" prop="actIuserWorkload">
+					<el-input v-model="addForm.actIuserWorkload" placeholder="实际内购工作量"></el-input>
 				</el-form-item> 
 				<el-form-item label="计划非人力成本" prop="planNouserAt">
 					<el-input v-model="addForm.planNouserAt" placeholder="计划非人力成本"></el-input>
@@ -111,7 +111,7 @@
 				},
 				//新增界面数据 按任务类型汇总
 				addForm: {
-					projectId:'',projectName:'',taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOutUserAt:'',planInnerUserAt:'',actOutUserAt:'',actInnerUserAt:'',planOutUserWorkload:'',planInnerUserWorkload:'',actOutUserWorkload:'',actInnerUserWorkload:'',planNouserAt:'',actNouserAt:'',id:''
+					projectId:'',projectName:'',taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOuserAt:'',planIuserAt:'',actOuserAt:'',actIuserAt:'',planOuserWorkload:'',planIuserWorkload:'',actOuserWorkload:'',actIuserWorkload:'',planNouserAt:'',actNouserAt:'',id:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue

@@ -33,29 +33,29 @@
 				<el-form-item label="计算日期" prop="calcTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.calcTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
 				</el-form-item> 
-				<el-form-item label="外购资金预算" prop="planOutUserAt">
-					<el-input v-model="editForm.planOutUserAt" placeholder="外购资金预算"></el-input>
+				<el-form-item label="外购资金预算" prop="planOuserAt">
+					<el-input v-model="editForm.planOuserAt" placeholder="外购资金预算"></el-input>
 				</el-form-item> 
-				<el-form-item label="内购资金预算" prop="planInnerUserAt">
-					<el-input v-model="editForm.planInnerUserAt" placeholder="内购资金预算"></el-input>
+				<el-form-item label="内购资金预算" prop="planIuserAt">
+					<el-input v-model="editForm.planIuserAt" placeholder="内购资金预算"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际外购成本" prop="actOutUserAt">
-					<el-input v-model="editForm.actOutUserAt" placeholder="实际外购成本"></el-input>
+				<el-form-item label="实际外购成本" prop="actOuserAt">
+					<el-input v-model="editForm.actOuserAt" placeholder="实际外购成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际内购成本" prop="actInnerUserAt">
-					<el-input v-model="editForm.actInnerUserAt" placeholder="实际内购成本"></el-input>
+				<el-form-item label="实际内购成本" prop="actIuserAt">
+					<el-input v-model="editForm.actIuserAt" placeholder="实际内购成本"></el-input>
 				</el-form-item> 
-				<el-form-item label="计划外购工作量" prop="planOutUserWorkload">
-					<el-input v-model="editForm.planOutUserWorkload" placeholder="计划外购工作量"></el-input>
+				<el-form-item label="计划外购工作量" prop="planOuserWorkload">
+					<el-input v-model="editForm.planOuserWorkload" placeholder="计划外购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="计划内购工作量" prop="planInnerUserWorkload">
-					<el-input v-model="editForm.planInnerUserWorkload" placeholder="计划内购工作量"></el-input>
+				<el-form-item label="计划内购工作量" prop="planIuserWorkload">
+					<el-input v-model="editForm.planIuserWorkload" placeholder="计划内购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际外购工作量" prop="actOutUserWorkload">
-					<el-input v-model="editForm.actOutUserWorkload" placeholder="实际外购工作量"></el-input>
+				<el-form-item label="实际外购工作量" prop="actOuserWorkload">
+					<el-input v-model="editForm.actOuserWorkload" placeholder="实际外购工作量"></el-input>
 				</el-form-item> 
-				<el-form-item label="实际内购工作量" prop="actInnerUserWorkload">
-					<el-input v-model="editForm.actInnerUserWorkload" placeholder="实际内购工作量"></el-input>
+				<el-form-item label="实际内购工作量" prop="actIuserWorkload">
+					<el-input v-model="editForm.actIuserWorkload" placeholder="实际内购工作量"></el-input>
 				</el-form-item> 
 				<el-form-item label="计划非人力成本" prop="planNouserAt">
 					<el-input v-model="editForm.planNouserAt" placeholder="计划非人力成本"></el-input>
@@ -111,7 +111,7 @@
 				},
 				//编辑界面数据  XmProjectTaskTypeState 按任务类型汇总
 				editForm: {
-					projectId:'',projectName:'',taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOutUserAt:'',planInnerUserAt:'',actOutUserAt:'',actInnerUserAt:'',planOutUserWorkload:'',planInnerUserWorkload:'',actOutUserWorkload:'',actInnerUserWorkload:'',planNouserAt:'',actNouserAt:'',id:''
+					projectId:'',projectName:'',taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOuserAt:'',planIuserAt:'',actOuserAt:'',actIuserAt:'',planOuserWorkload:'',planIuserWorkload:'',actOuserWorkload:'',actIuserWorkload:'',planNouserAt:'',actNouserAt:'',id:''
 				}
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue

@@ -21,14 +21,14 @@
 				<el-table-column prop="branchId" label="机构编号" min-width="80" ></el-table-column>
 				<el-table-column prop="bizDate" label="业务日期yyyy-MM-dd型" min-width="80" ></el-table-column>
 				<el-table-column prop="calcTime" label="计算日期" min-width="80" ></el-table-column>
-				<el-table-column prop="planOutUserAt" label="外购资金预算" min-width="80" ></el-table-column>
-				<el-table-column prop="planInnerUserAt" label="内购资金预算" min-width="80" ></el-table-column>
-				<el-table-column prop="actOutUserAt" label="实际外购成本" min-width="80" ></el-table-column>
-				<el-table-column prop="actInnerUserAt" label="实际内购成本" min-width="80" ></el-table-column>
-				<el-table-column prop="planOutUserWorkload" label="计划外购工作量" min-width="80" ></el-table-column>
-				<el-table-column prop="planInnerUserWorkload" label="计划内购工作量" min-width="80" ></el-table-column>
-				<el-table-column prop="actOutUserWorkload" label="实际外购工作量" min-width="80" ></el-table-column>
-				<el-table-column prop="actInnerUserWorkload" label="实际内购工作量" min-width="80" ></el-table-column>
+				<el-table-column prop="planOuserAt" label="外购资金预算" min-width="80" ></el-table-column>
+				<el-table-column prop="planIuserAt" label="内购资金预算" min-width="80" ></el-table-column>
+				<el-table-column prop="actOuserAt" label="实际外购成本" min-width="80" ></el-table-column>
+				<el-table-column prop="actIuserAt" label="实际内购成本" min-width="80" ></el-table-column>
+				<el-table-column prop="planOuserWorkload" label="计划外购工作量" min-width="80" ></el-table-column>
+				<el-table-column prop="planIuserWorkload" label="计划内购工作量" min-width="80" ></el-table-column>
+				<el-table-column prop="actOuserWorkload" label="实际外购工作量" min-width="80" ></el-table-column>
+				<el-table-column prop="actIuserWorkload" label="实际内购工作量" min-width="80" ></el-table-column>
 				<el-table-column prop="planNouserAt" label="计划非人力成本" min-width="80" ></el-table-column>
 				<el-table-column prop="actNouserAt" label="实际非人力成本" min-width="80" ></el-table-column>
 				<el-table-column prop="id" label="主键" min-width="80" ></el-table-column>
@@ -92,13 +92,13 @@
 				addFormVisible: false,//新增xmProjectTaskTypeState界面是否显示
 				//新增xmProjectTaskTypeState界面初始化数据
 				addForm: {
-					projectId:'',projectName:'',taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOutUserAt:'',planInnerUserAt:'',actOutUserAt:'',actInnerUserAt:'',planOutUserWorkload:'',planInnerUserWorkload:'',actOutUserWorkload:'',actInnerUserWorkload:'',planNouserAt:'',actNouserAt:'',id:''
+					projectId:'',projectName:'',taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOuserAt:'',planIuserAt:'',actOuserAt:'',actIuserAt:'',planOuserWorkload:'',planIuserWorkload:'',actOuserWorkload:'',actIuserWorkload:'',planNouserAt:'',actNouserAt:'',id:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProjectTaskTypeState界面初始化数据
 				editForm: {
-					projectId:'',projectName:'',taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOutUserAt:'',planInnerUserAt:'',actOutUserAt:'',actInnerUserAt:'',planOutUserWorkload:'',planInnerUserWorkload:'',actOutUserWorkload:'',actInnerUserWorkload:'',planNouserAt:'',actNouserAt:'',id:''
+					projectId:'',projectName:'',taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOuserAt:'',planIuserAt:'',actOuserAt:'',actIuserAt:'',planOuserWorkload:'',planIuserWorkload:'',actOuserWorkload:'',actIuserWorkload:'',planNouserAt:'',actNouserAt:'',id:''
 				},
 				maxTableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/

src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue

@@ -59,37 +59,37 @@
 									<el-divider></el-divider>
 									<el-row>
 										<el-col :span="4">内购</el-col>
-										<el-col :span="4"><el-input style="width:150px;"  type="number" v-model="addForm.planInnerUserCnt" :precision="0" :step="1" :min="0" placeholder="内购人数"></el-input>  
+										<el-col :span="4"><el-input style="width:150px;"  type="number" v-model="addForm.planIuserCnt" :precision="0" :step="1" :min="0" placeholder="内购人数"></el-input>  
 										</el-col>
-										<el-col :span="4">{{autoParams.planInnerUserWorkload}}人时</el-col>
-										<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="addForm.planInnerUserPrice" :precision="0" :step="1" :min="0" placeholder="预计内部人时单价"></el-input> </el-col>
-										<el-col :span="8">{{this.toFixed(autoParams.planInnerUserAt)}}元,{{this.toFixed(autoParams.planInnerUserAt/10000)}} 万元</el-col>
+										<el-col :span="4">{{autoParams.planIuserWorkload}}人时</el-col>
+										<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="addForm.planIuserPrice" :precision="0" :step="1" :min="0" placeholder="预计内部人时单价"></el-input> </el-col>
+										<el-col :span="8">{{this.toFixed(autoParams.planIuserAt)}}元,{{this.toFixed(autoParams.planIuserAt/10000)}} 万元</el-col>
 									</el-row>
 									<el-divider></el-divider>
 									<el-row>
 										<el-col :span="4">外购</el-col>
-										<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="addForm.planOutUserCnt" :precision="0" :step="1" :min="0" placeholder="外购人数"></el-input>  
+										<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="addForm.planOuserCnt" :precision="0" :step="1" :min="0" placeholder="外购人数"></el-input>  
 										</el-col>
-										<el-col :span="4">{{autoParams.planOutUserWorkload}}人时</el-col>
-										<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="addForm.planOutUserPrice" :precision="0" :step="1" :min="0" placeholder="预计外购人时单价"></el-input> </el-col>
-										<el-col :span="4">{{autoParams.planOutUserAt }} 元 {{autoParams.planOutUserAt/10000 }}万元</el-col>
+										<el-col :span="4">{{autoParams.planOuserWorkload}}人时</el-col>
+										<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="addForm.planOuserPrice" :precision="0" :step="1" :min="0" placeholder="预计外购人时单价"></el-input> </el-col>
+										<el-col :span="4">{{autoParams.planOuserAt }} 元 {{autoParams.planOuserAt/10000 }}万元</el-col>
 									
 									</el-row>
 									<el-divider></el-divider>
 									<el-row>
 										<el-col :span="4">合计</el-col>
-										<el-col :span="4"> {{autoParams.planOutUserCnt+autoParams.planInnerUserCnt}}
+										<el-col :span="4"> {{autoParams.planOuserCnt+autoParams.planIuserCnt}}
 										</el-col>
-										<el-col :span="4">{{autoParams.planOutUserWorkload+autoParams.planInnerUserWorkload  }}人时,{{ (autoParams.planOutUserWorkload+autoParams.planInnerUserWorkload)/8/20  }}人月 </el-col>
-										<el-col :span="4">平均：{{ (parseFloat2(autoParams.planOutUserPrice) + parseFloat2(autoParams.planInnerUserPrice))/2}}元/人时</el-col>
+										<el-col :span="4">{{autoParams.planOuserWorkload+autoParams.planIuserWorkload  }}人时,{{ (autoParams.planOuserWorkload+autoParams.planIuserWorkload)/8/20  }}人月 </el-col>
+										<el-col :span="4">平均：{{ (parseFloat2(autoParams.planOuserPrice) + parseFloat2(autoParams.planIuserPrice))/2}}元/人时</el-col>
 										<el-col :span="8">{{autoParams.planTotalCost}} 元，{{(autoParams.planTotalCost)/10000}} 万元</el-col>
 									</el-row> 
 								 	 
 								</el-tab-pane>
 								<el-tab-pane label="成本总览" name="planTotalCost">
 									<el-row>
-										内购：  <el-input style="width:150px;" type="number" v-model="addForm.planInnerUserAt" :precision="2" :step="1000" :min="0" placeholder="内部人力成本总预算"></el-input> <el-tag>参考{{this.toFixed(autoParams.planInnerUserAt)}}元，{{this.toFixed(autoParams.planInnerUserAt/10000)}}万元</el-tag>
-										外购：  <el-input style="width:150px;" type="number" v-model="addForm.planOutUserAt" :precision="2" :step="1000" :min="0" placeholder="外购人力成本总预算"></el-input> <el-tag>参考{{this.toFixed(autoParams.planOutUserAt)}}元，{{this.toFixed(autoParams.planOutUserAt/10000)}}万元</el-tag>
+										内购：  <el-input style="width:150px;" type="number" v-model="addForm.planIuserAt" :precision="2" :step="1000" :min="0" placeholder="内部人力成本总预算"></el-input> <el-tag>参考{{this.toFixed(autoParams.planIuserAt)}}元，{{this.toFixed(autoParams.planIuserAt/10000)}}万元</el-tag>
+										外购：  <el-input style="width:150px;" type="number" v-model="addForm.planOuserAt" :precision="2" :step="1000" :min="0" placeholder="外购人力成本总预算"></el-input> <el-tag>参考{{this.toFixed(autoParams.planOuserAt)}}元，{{this.toFixed(autoParams.planOuserAt/10000)}}万元</el-tag>
 										非人力：<el-input style="width:150px;" type="number" v-model="addForm.planNouserAt" :precision="2" :step="1000" :min="0" placeholder="人力成本总预算"></el-input> <el-tag>参考{{this.toFixed(autoParams.planNouserAt)}}元，{{this.toFixed( autoParams.planNouserAt/10000)}}万元</el-tag>
 									</el-row>
 									<el-divider></el-divider>
@@ -148,25 +148,25 @@
 			autoParams:function(){
 				
 				 
-				var planOutUserPrice=this.toFixed(this.addForm.planOutUserPrice)
-				var planInnerUserPrice=this.toFixed(this.addForm.planInnerUserPrice)
-				var planOutUserCnt=this.toFixed(this.addForm.planOutUserCnt)
-				var planInnerUserCnt=this.toFixed(this.addForm.planInnerUserCnt)
+				var planOuserPrice=this.toFixed(this.addForm.planOuserPrice)
+				var planIuserPrice=this.toFixed(this.addForm.planIuserPrice)
+				var planOuserCnt=this.toFixed(this.addForm.planOuserCnt)
+				var planIuserCnt=this.toFixed(this.addForm.planIuserCnt)
 				var planWorkingHours=this.toFixed(this.addForm.planWorkingHours )
 				var planNouserAt=this.toFixed(this.addForm.planNouserAt ) 
 				var budgetMarginRate=this.toFixed(this.addForm.budgetMarginRate,4 ) 
 				var taxRate=this.toFixed(this.addForm.taxRate,4)
-				if(planOutUserPrice==null || planOutUserPrice==''){
-					planOutUserPrice=100
+				if(planOuserPrice==null || planOuserPrice==''){
+					planOuserPrice=100
 				}
-				if(planInnerUserPrice==null || planInnerUserPrice==''){
-					planInnerUserPrice=80
+				if(planIuserPrice==null || planIuserPrice==''){
+					planIuserPrice=80
 				}
-				if(planOutUserCnt==null || planOutUserCnt==''){
-					planOutUserCnt=0.0
+				if(planOuserCnt==null || planOuserCnt==''){
+					planOuserCnt=0.0
 				}
-				if(planInnerUserCnt==null || planInnerUserCnt==''){
-					planInnerUserCnt=0.0
+				if(planIuserCnt==null || planIuserCnt==''){
+					planIuserCnt=0.0
 				}
 				
 				if(planNouserAt==null || planNouserAt==''){
@@ -195,19 +195,19 @@
 			 	} 
 				autoParams.weekday=weekday
 				autoParams.planWorkingHours=planWorkingHours
-				autoParams.planOutUserPrice=planOutUserPrice
-				autoParams.planInnerUserPrice=planInnerUserPrice
-				autoParams.planOutUserCnt=planOutUserCnt
-				autoParams.planInnerUserCnt=planInnerUserCnt 
+				autoParams.planOuserPrice=planOuserPrice
+				autoParams.planIuserPrice=planIuserPrice
+				autoParams.planOuserCnt=planOuserCnt
+				autoParams.planIuserCnt=planIuserCnt 
 				autoParams.taxRate=taxRate 
-				autoParams.planInnerUserWorkload= planInnerUserCnt*planWorkingHours
-				autoParams.planOutUserWorkload= planOutUserCnt*planWorkingHours
-				autoParams.planWorkload=  planInnerUserCnt*planWorkingHours + planOutUserCnt*planWorkingHours
-				autoParams.planOutUserAt= planOutUserCnt * planWorkingHours * planOutUserPrice
-				autoParams.planInnerUserAt=  planInnerUserCnt * planWorkingHours * planInnerUserPrice
+				autoParams.planIuserWorkload= planIuserCnt*planWorkingHours
+				autoParams.planOuserWorkload= planOuserCnt*planWorkingHours
+				autoParams.planWorkload=  planIuserCnt*planWorkingHours + planOuserCnt*planWorkingHours
+				autoParams.planOuserAt= planOuserCnt * planWorkingHours * planOuserPrice
+				autoParams.planIuserAt=  planIuserCnt * planWorkingHours * planIuserPrice
 				autoParams.planNouserAt= planNouserAt
 				autoParams.budgetMarginRate=budgetMarginRate
-				autoParams.planTotalCost=  autoParams.planOutUserAt + autoParams.planInnerUserAt + autoParams.planNouserAt
+				autoParams.planTotalCost=  autoParams.planOuserAt + autoParams.planIuserAt + autoParams.planNouserAt
 				autoParams.totalReceivables=autoParams.planTotalCost/(1-budgetMarginRate)/ (1-taxRate)
 				autoParams.contractAmt =autoParams.totalReceivables
 				var totalReceivables=this.addForm.totalReceivables
@@ -228,8 +228,8 @@
 			},
 			planTotalAt:function(){
 				return {
-					planOutUserAt:this.addForm.planOutUserAt,
-					planInnerUserAt:this.addForm.planInnerUserAt,
+					planOuserAt:this.addForm.planOuserAt,
+					planIuserAt:this.addForm.planIuserAt,
 					planNouserAt:this.addForm.planNouserAt,  
 				}
 			},
@@ -246,7 +246,7 @@
 		  },
 		  'planTotalAt':{
 			  handler(planTotalAt){  
-				this.addForm.planTotalCost=this.toFixed(this.parseFloat2(planTotalAt.planOutUserAt)+this.parseFloat2(planTotalAt.planInnerUserAt)+this.parseFloat2(planTotalAt.planNouserAt))
+				this.addForm.planTotalCost=this.toFixed(this.parseFloat2(planTotalAt.planOuserAt)+this.parseFloat2(planTotalAt.planIuserAt)+this.parseFloat2(planTotalAt.planNouserAt))
 				//this.addForm.totalReceivables=this.toFixed(this.parseFloat2(this.addForm.planTotalCost) * (1+0.3)) 
 			  },
 			  deep:true
@@ -290,7 +290,7 @@
 				},
 				//编辑界面数据  XmProjectTemplate xm_project
 				addForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:0.06,planNouserAt:0,planInnerUserAt:0,planOutUserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:0.13,contractAmt:0,planInnerUserPrice:85,planOutUserPrice:100,planOutUserCnt:1,planInnerUserCnt:1,planWorkingHours:0,planInnerUserWorkload:0,planOutUserWorkload:0,
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:0.06,planNouserAt:0,planIuserAt:0,planOuserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:0.13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:1,planIuserCnt:1,planWorkingHours:0,planIuserWorkload:0,planOuserWorkload:0,
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/   
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
@@ -327,9 +327,9 @@
 							this.load.add=true
 							let params = Object.assign({}, this.addForm); 
 							params.groups=this.xmProjectTemplateGroups;
-							params.planInnerUserWorkload=this.autoParams.planInnerUserWorkload
+							params.planIuserWorkload=this.autoParams.planIuserWorkload
 							
-							params.planOutUserWorkload=this.autoParams.planOutUserWorkload
+							params.planOuserWorkload=this.autoParams.planOuserWorkload
 							params.planWorkload=this.autoParams.planWorkload
 							addXmProjectTemplate(params).then((res) => {
 								this.load.add=false;
@@ -385,8 +385,8 @@
 			
 			fillPlanCostAtToField:function(){
 				this.addForm.planNouserAt=this.toFixed(this.autoParams.planNouserAt)
-				this.addForm.planOutUserAt=this.toFixed(this.autoParams.planOutUserAt )
-				this.addForm.planInnerUserAt=this.toFixed(this.autoParams.planInnerUserAt )
+				this.addForm.planOuserAt=this.toFixed(this.autoParams.planOuserAt )
+				this.addForm.planIuserAt=this.toFixed(this.autoParams.planIuserAt )
 				this.addForm.planTotalCost=this.toFixed(this.autoParams.planTotalCost)
 
 			},

src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue

@@ -63,36 +63,36 @@
 							<el-divider></el-divider>
 							<el-row>
 								<el-col :span="4">内购</el-col>
-								<el-col :span="4"><el-input style="width:150px;"  type="number" v-model="editForm.planInnerUserCnt" :precision="0" :step="1" :min="0" placeholder="内购人数"></el-input>  
+								<el-col :span="4"><el-input style="width:150px;"  type="number" v-model="editForm.planIuserCnt" :precision="0" :step="1" :min="0" placeholder="内购人数"></el-input>  
 								</el-col>
-								<el-col :span="4">{{autoParams.planInnerUserWorkload}}人时</el-col>
-								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planInnerUserPrice" :precision="0" :step="1" :min="0" placeholder="预计内部人时单价"></el-input> </el-col>
-								<el-col :span="8">{{this.toFixed(autoParams.planInnerUserAt)}}元,{{this.toFixed(autoParams.planInnerUserAt/10000)}} 万元</el-col>
+								<el-col :span="4">{{autoParams.planIuserWorkload}}人时</el-col>
+								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planIuserPrice" :precision="0" :step="1" :min="0" placeholder="预计内部人时单价"></el-input> </el-col>
+								<el-col :span="8">{{this.toFixed(autoParams.planIuserAt)}}元,{{this.toFixed(autoParams.planIuserAt/10000)}} 万元</el-col>
 							</el-row>
 							<el-divider></el-divider>
 							<el-row>
 								<el-col :span="4">外购</el-col>
-								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planOutUserCnt" :precision="0" :step="1" :min="0" placeholder="外购人数"></el-input>  
+								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planOuserCnt" :precision="0" :step="1" :min="0" placeholder="外购人数"></el-input>  
 								</el-col>
-								<el-col :span="4">{{autoParams.planOutUserWorkload}}人时</el-col>
-								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planOutUserPrice" :precision="0" :step="1" :min="0" placeholder="预计外购人时单价"></el-input> </el-col>
-								<el-col :span="4">{{autoParams.planOutUserAt }} 元 {{autoParams.planOutUserAt/10000 }}万元</el-col>
+								<el-col :span="4">{{autoParams.planOuserWorkload}}人时</el-col>
+								<el-col :span="4"><el-input  style="width:150px;" type="number" v-model="editForm.planOuserPrice" :precision="0" :step="1" :min="0" placeholder="预计外购人时单价"></el-input> </el-col>
+								<el-col :span="4">{{autoParams.planOuserAt }} 元 {{autoParams.planOuserAt/10000 }}万元</el-col>
 							
 							</el-row>
 							<el-divider></el-divider>
 							<el-row>
 								<el-col :span="4">合计</el-col>
-								<el-col :span="4"> {{autoParams.planOutUserCnt+autoParams.planInnerUserCnt}}
+								<el-col :span="4"> {{autoParams.planOuserCnt+autoParams.planIuserCnt}}
 								</el-col>
-								<el-col :span="4">{{autoParams.planOutUserWorkload+autoParams.planInnerUserWorkload  }}人时,{{ (autoParams.planOutUserWorkload+autoParams.planInnerUserWorkload)/8/20  }}人月 </el-col>
-								<el-col :span="4">平均：{{ (parseFloat2(autoParams.planOutUserPrice) + parseFloat2(autoParams.planInnerUserPrice))/2}}元/人时</el-col>
+								<el-col :span="4">{{autoParams.planOuserWorkload+autoParams.planIuserWorkload  }}人时,{{ (autoParams.planOuserWorkload+autoParams.planIuserWorkload)/8/20  }}人月 </el-col>
+								<el-col :span="4">平均：{{ (parseFloat2(autoParams.planOuserPrice) + parseFloat2(autoParams.planIuserPrice))/2}}元/人时</el-col>
 								<el-col :span="8">{{autoParams.planTotalCost}} 元，{{(autoParams.planTotalCost)/10000}} 万元</el-col>
 							</el-row> 
 						</el-form-item>
 						<el-form-item label="成本总览"> 
 							<el-row>
-								内购：  <el-input style="width:150px;" type="number" v-model="editForm.planInnerUserAt" :precision="2" :step="1000" :min="0" placeholder="内部人力成本总预算"></el-input> <el-tag>参考{{this.toFixed(autoParams.planInnerUserAt)}}元，{{this.toFixed(autoParams.planInnerUserAt/10000)}}万元</el-tag>
-								外购：  <el-input style="width:150px;" type="number" v-model="editForm.planOutUserAt" :precision="2" :step="1000" :min="0" placeholder="外购人力成本总预算"></el-input> <el-tag>参考{{this.toFixed(autoParams.planOutUserAt)}}元，{{this.toFixed(autoParams.planOutUserAt/10000)}}万元</el-tag>
+								内购：  <el-input style="width:150px;" type="number" v-model="editForm.planIuserAt" :precision="2" :step="1000" :min="0" placeholder="内部人力成本总预算"></el-input> <el-tag>参考{{this.toFixed(autoParams.planIuserAt)}}元，{{this.toFixed(autoParams.planIuserAt/10000)}}万元</el-tag>
+								外购：  <el-input style="width:150px;" type="number" v-model="editForm.planOuserAt" :precision="2" :step="1000" :min="0" placeholder="外购人力成本总预算"></el-input> <el-tag>参考{{this.toFixed(autoParams.planOuserAt)}}元，{{this.toFixed(autoParams.planOuserAt/10000)}}万元</el-tag>
 								非人力：<el-input style="width:150px;" type="number" v-model="editForm.planNouserAt" :precision="2" :step="1000" :min="0" placeholder="人力成本总预算"></el-input> <el-tag>参考{{this.toFixed(autoParams.planNouserAt)}}元，{{this.toFixed( autoParams.planNouserAt/10000)}}万元</el-tag>
 							</el-row>
 							<el-divider></el-divider>
@@ -156,25 +156,25 @@
 			autoParams:function(){
 				
 				 
-				var planOutUserPrice=this.toFixed(this.editForm.planOutUserPrice)
-				var planInnerUserPrice=this.toFixed(this.editForm.planInnerUserPrice)
-				var planOutUserCnt=this.toFixed(this.editForm.planOutUserCnt)
-				var planInnerUserCnt=this.toFixed(this.editForm.planInnerUserCnt)
+				var planOuserPrice=this.toFixed(this.editForm.planOuserPrice)
+				var planIuserPrice=this.toFixed(this.editForm.planIuserPrice)
+				var planOuserCnt=this.toFixed(this.editForm.planOuserCnt)
+				var planIuserCnt=this.toFixed(this.editForm.planIuserCnt)
 				var planWorkingHours=this.toFixed(this.editForm.planWorkingHours )
 				var planNouserAt=this.toFixed(this.editForm.planNouserAt ) 
 				var budgetMarginRate=this.toFixed(this.editForm.budgetMarginRate,4 ) 
 				var taxRate=this.toFixed(this.editForm.taxRate,4)
-				if(planOutUserPrice==null || planOutUserPrice==''){
-					planOutUserPrice=100
+				if(planOuserPrice==null || planOuserPrice==''){
+					planOuserPrice=100
 				}
-				if(planInnerUserPrice==null || planInnerUserPrice==''){
-					planInnerUserPrice=80
+				if(planIuserPrice==null || planIuserPrice==''){
+					planIuserPrice=80
 				}
-				if(planOutUserCnt==null || planOutUserCnt==''){
-					planOutUserCnt=0.0
+				if(planOuserCnt==null || planOuserCnt==''){
+					planOuserCnt=0.0
 				}
-				if(planInnerUserCnt==null || planInnerUserCnt==''){
-					planInnerUserCnt=0.0
+				if(planIuserCnt==null || planIuserCnt==''){
+					planIuserCnt=0.0
 				}
 				
 				if(planNouserAt==null || planNouserAt==''){
@@ -203,19 +203,19 @@
 			 	} 
 				autoParams.weekday=weekday
 				autoParams.planWorkingHours=planWorkingHours
-				autoParams.planOutUserPrice=planOutUserPrice
-				autoParams.planInnerUserPrice=planInnerUserPrice
-				autoParams.planOutUserCnt=planOutUserCnt
-				autoParams.planInnerUserCnt=planInnerUserCnt 
+				autoParams.planOuserPrice=planOuserPrice
+				autoParams.planIuserPrice=planIuserPrice
+				autoParams.planOuserCnt=planOuserCnt
+				autoParams.planIuserCnt=planIuserCnt 
 				autoParams.taxRate=taxRate 
-				autoParams.planInnerUserWorkload= planInnerUserCnt*planWorkingHours
-				autoParams.planOutUserWorkload= planOutUserCnt*planWorkingHours
-				autoParams.planWorkload=  planInnerUserCnt*planWorkingHours + planOutUserCnt*planWorkingHours
-				autoParams.planOutUserAt= planOutUserCnt * planWorkingHours * planOutUserPrice
-				autoParams.planInnerUserAt=  planInnerUserCnt * planWorkingHours * planInnerUserPrice
+				autoParams.planIuserWorkload= planIuserCnt*planWorkingHours
+				autoParams.planOuserWorkload= planOuserCnt*planWorkingHours
+				autoParams.planWorkload=  planIuserCnt*planWorkingHours + planOuserCnt*planWorkingHours
+				autoParams.planOuserAt= planOuserCnt * planWorkingHours * planOuserPrice
+				autoParams.planIuserAt=  planIuserCnt * planWorkingHours * planIuserPrice
 				autoParams.planNouserAt= planNouserAt
 				autoParams.budgetMarginRate=budgetMarginRate
-				autoParams.planTotalCost=  autoParams.planOutUserAt + autoParams.planInnerUserAt + autoParams.planNouserAt
+				autoParams.planTotalCost=  autoParams.planOuserAt + autoParams.planIuserAt + autoParams.planNouserAt
 				autoParams.totalReceivables=autoParams.planTotalCost/(1-budgetMarginRate)/ (1-taxRate)
 				autoParams.contractAmt =autoParams.totalReceivables
 				var totalReceivables=this.editForm.totalReceivables
@@ -236,8 +236,8 @@
 			},
 			planTotalAt:function(){
 				return {
-					planOutUserAt:this.editForm.planOutUserAt,
-					planInnerUserAt:this.editForm.planInnerUserAt,
+					planOuserAt:this.editForm.planOuserAt,
+					planIuserAt:this.editForm.planIuserAt,
 					planNouserAt:this.editForm.planNouserAt,  
 				}
 			},
@@ -255,7 +255,7 @@
 		  },
 		  'planTotalAt':{
 			  handler(planTotalAt){  
-				this.editForm.planTotalCost=this.toFixed(this.parseFloat2(planTotalAt.planOutUserAt)+this.parseFloat2(planTotalAt.planInnerUserAt)+this.parseFloat2(planTotalAt.planNouserAt))
+				this.editForm.planTotalCost=this.toFixed(this.parseFloat2(planTotalAt.planOuserAt)+this.parseFloat2(planTotalAt.planIuserAt)+this.parseFloat2(planTotalAt.planNouserAt))
 				//this.editForm.totalReceivables=this.toFixed(this.parseFloat2(this.editForm.planTotalCost) * (1+0.3)) 
 			  },
 			  deep:true
@@ -299,7 +299,7 @@
 				},
 				//编辑界面数据  XmProjectTemplate xm_project
 				editForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:0.06,planNouserAt:0,planInnerUserAt:0,planOutUserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:0.13,contractAmt:0,planInnerUserPrice:85,planOutUserPrice:100,planOutUserCnt:1,planInnerUserCnt:1,planWorkingHours:0,planInnerUserWorkload:0,planOutUserWorkload:0,
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:0.06,planNouserAt:0,planIuserAt:0,planOuserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:0.13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:1,planIuserCnt:1,planWorkingHours:0,planIuserWorkload:0,planOuserWorkload:0,
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
  
@@ -342,8 +342,8 @@
 						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
 							this.load.edit=true
 							let params = Object.assign({}, this.editForm);  
-							params.planInnerUserWorkload=this.autoParams.planInnerUserWorkload 
-							params.planOutUserWorkload=this.autoParams.planOutUserWorkload
+							params.planIuserWorkload=this.autoParams.planIuserWorkload 
+							params.planOuserWorkload=this.autoParams.planOuserWorkload
 							params.planWorkload=this.autoParams.planWorkload
 							editXmProjectTemplate(params).then((res) => {
 								this.load.edit=false;
@@ -400,8 +400,8 @@
 			
 			fillPlanCostAtToField:function(){
 				this.editForm.planNouserAt=this.toFixed(this.autoParams.planNouserAt)
-				this.editForm.planOutUserAt=this.toFixed(this.autoParams.planOutUserAt )
-				this.editForm.planInnerUserAt=this.toFixed(this.autoParams.planInnerUserAt )
+				this.editForm.planOuserAt=this.toFixed(this.autoParams.planOuserAt )
+				this.editForm.planIuserAt=this.toFixed(this.autoParams.planIuserAt )
 				this.editForm.planTotalCost=this.toFixed(this.autoParams.planTotalCost)
 
 			},

src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue

@@ -10,7 +10,7 @@
 				</div>
 				<div class="info-detail">
 					<xm-task-template-mng v-if="infotype=='任务'" :sel-project-template="selProjectTemplate" ></xm-task-template-mng>
-					<xm-project-phase-template-mng v-if="infotype=='计划'" :sel-project-template="selProjectTemplate" ></xm-project-phase-template-mng> 
+					<xm-phase-template-mng v-if="infotype=='计划'" :sel-project-template="selProjectTemplate" ></xm-phase-template-mng> 
 				</div>
 			</div>
 		</el-row>
@@ -25,7 +25,7 @@
 	import { mapGetters } from 'vuex';
 	import xmTaskTemplateMng from '../xmTaskTemplate/XmTaskTemplateMng'; 
 	import xmProjectTemplateEdit from './XmProjectTemplateEdit';
- 	import xmProjectPhaseTemplateMng from '../xmProjectPhaseTemplate/XmProjectPhaseTemplateMng'; 
+ 	import xmPhaseTemplateMng from '../xmPhaseTemplate/XmPhaseTemplateMng'; 
  
 	export default { 
 		props: ["selProjectTemplate"],
@@ -74,7 +74,7 @@
 		},//end methods
 		components: { 
 			xmTaskTemplateMng,
-			xmProjectPhaseTemplateMng,  
+			xmPhaseTemplateMng,  
 			xmProjectTemplateEdit, 
 			//在下面添加其它组件
 		},

src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue

@@ -30,8 +30,8 @@
  				<el-table-column  label="预算(元)" min-width="80" >
  				<el-table-column prop="planTotalCost" label="总预算" min-width="80" ></el-table-column>
  				<el-table-column prop="planNouserAt" label="非人力" min-width="80" ></el-table-column>
-				<el-table-column prop="planInnerUserAt" label="内部" min-width="80" ></el-table-column>
-				<el-table-column prop="planOutUserAt" label="外购" min-width="80" ></el-table-column> 
+				<el-table-column prop="planIuserAt" label="内部" min-width="80" ></el-table-column>
+				<el-table-column prop="planOuserAt" label="外购" min-width="80" ></el-table-column> 
 				</el-table-column>
 				<el-table-column prop="description" label="项目描述" min-width="80" show-overflow-tooltip ></el-table-column>
 				<el-table-column label="操作" width="160" fixed="right">
@@ -85,13 +85,13 @@
 				addFormVisible: false,//新增xmProjectTemplate界面是否显示
 				//新增xmProjectTemplate界面初始化数据
 				addForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',planOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:'',taxRate:'',planInnerUserWorkload:'',planOutUserWorkload:'',productId:'',productName:'',templateId:'',tcuserid:'',tcusername:'',tremark:'',tctime:'',tcbranchId:'',shareScope:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',planOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:'',taxRate:'',planIuserWorkload:'',planOuserWorkload:'',productId:'',productName:'',templateId:'',tcuserid:'',tcusername:'',tremark:'',tctime:'',tcbranchId:'',shareScope:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProjectTemplate界面初始化数据
 				editForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',planOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:'',taxRate:'',planInnerUserWorkload:'',planOutUserWorkload:'',productId:'',productName:'',templateId:'',tcuserid:'',tcusername:'',tremark:'',tctime:'',tcbranchId:'',shareScope:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',planOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:'',taxRate:'',planIuserWorkload:'',planOuserWorkload:'',productId:'',productName:'',templateId:'',tcuserid:'',tcusername:'',tremark:'',tctime:'',tcbranchId:'',shareScope:''
 				},
 				projectTemplateInfoVisible:false,
 				maxTableHeight:300,

src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue

@@ -20,8 +20,8 @@
 				<el-table-column prop="description" label="项目描述" min-width="80" ></el-table-column>
  				<el-table-column prop="planTotalCost" label="总预算" min-width="80" ></el-table-column>
  				<el-table-column prop="planNouserAt" label="非人力预算" min-width="80" ></el-table-column>
-				<el-table-column prop="planInnerUserAt" label="内部预算" min-width="80" ></el-table-column>
-				<el-table-column prop="planOutUserAt" label="外购预算" min-width="80" ></el-table-column>
+				<el-table-column prop="planIuserAt" label="内部预算" min-width="80" ></el-table-column>
+				<el-table-column prop="planOuserAt" label="外购预算" min-width="80" ></el-table-column>
  				<el-table-column prop="planWorkload" label="总工作量" min-width="80" ></el-table-column>
 				<el-table-column prop="totalReceivables" label="总预计收款金额" min-width="80" ></el-table-column>
 				<el-table-column prop="budgetMarginRate" label="预估毛利率" min-width="80" ></el-table-column> 
@@ -99,13 +99,13 @@
 				addFormVisible: false,//新增xmProjectTemplate界面是否显示
 				//新增xmProjectTemplate界面初始化数据
 				addForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',planOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:'',taxRate:'',planInnerUserWorkload:'',planOutUserWorkload:'',productId:'',productName:'',templateId:'',tcuserid:'',tcusername:'',tremark:'',tctime:'',tcbranchId:'',shareScope:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',planOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:'',taxRate:'',planIuserWorkload:'',planOuserWorkload:'',productId:'',productName:'',templateId:'',tcuserid:'',tcusername:'',tremark:'',tctime:'',tcbranchId:'',shareScope:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmProjectTemplate界面初始化数据
 				editForm: {
-					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',planOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:'',taxRate:'',planInnerUserWorkload:'',planOutUserWorkload:'',productId:'',productName:'',templateId:'',tcuserid:'',tcusername:'',tremark:'',tctime:'',tcbranchId:'',shareScope:''
+					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planIuserAt:'',planOuserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planIuserPrice:'',planOuserPrice:'',planOuserCnt:'',planIuserCnt:'',planWorkingHours:'',taxRate:'',planIuserWorkload:'',planOuserWorkload:'',productId:'',productName:'',templateId:'',tcuserid:'',tcusername:'',tremark:'',tctime:'',tcbranchId:'',shareScope:''
 				},
 				projectTemplateInfoVisible:false,
 				maxTableHeight:300,

src/views/xm/core/xmTask/XmTaskAdd.vue

@@ -383,12 +383,12 @@
 				this.addForm.budgetWorkload=weekday * 8
 				var price=80;
 				if(this.addForm.taskOut=='1'){
-					if(this.projectPhase.phaseBudgetOutUserPrice){
-						price=this.projectPhase.phaseBudgetOutUserPrice
+					if(this.projectPhase.phaseBudgetOuserPrice){
+						price=this.projectPhase.phaseBudgetOuserPrice
 					}
 				}else{
-					if(this.projectPhase.phaseBudgetInnerUserPrice){
-						price=this.projectPhase.phaseBudgetInnerUserPrice
+					if(this.projectPhase.phaseBudgetIuserPrice){
+						price=this.projectPhase.phaseBudgetIuserPrice
 					}
 				}
 				this.addForm.budgetCost=this.addForm.budgetWorkload * price

src/views/xm/core/xmTask/XmTaskEdit.vue

@@ -458,12 +458,12 @@
 				this.editForm.budgetWorkload=weekday * 8
 				var price=80;
 				if(this.editForm.taskOut=='1'){
-					if(this.projectPhase.phaseBudgetOutUserPrice){ 
-						price=this.projectPhase.phaseBudgetOutUserPrice
+					if(this.projectPhase.phaseBudgetOuserPrice){ 
+						price=this.projectPhase.phaseBudgetOuserPrice
 					} 
 				}else{
-					if(this.projectPhase.phaseBudgetInnerUserPrice){ 
-						price=this.projectPhase.phaseBudgetInnerUserPrice
+					if(this.projectPhase.phaseBudgetIuserPrice){ 
+						price=this.projectPhase.phaseBudgetIuserPrice
 					} 
 				}
 				this.editForm.budgetCost=this.editForm.budgetWorkload * price 
@@ -471,16 +471,16 @@
 			onBudgetWorkloadChange(){
  				var price=80;
 				if(this.editForm.taskOut=='1'){
-					if(	this.projectPhase && this.projectPhase.phaseBudgetOutUserPrice){ 
-						price=this.projectPhase.phaseBudgetOutUserPrice
-					}else if( this.xmProject && this.xmProject.planOutUserPrice){
-						price=this.xmProject.planOutUserPrice
+					if(	this.projectPhase && this.projectPhase.phaseBudgetOuserPrice){ 
+						price=this.projectPhase.phaseBudgetOuserPrice
+					}else if( this.xmProject && this.xmProject.planOuserPrice){
+						price=this.xmProject.planOuserPrice
 					}
 				}else{
-					if(	this.projectPhase && this.projectPhase.phaseBudgetInnerUserPrice){ 
-						price=this.projectPhase.phaseBudgetInnerUserPrice
-					}else if( this.xmProject && this.xmProject.planInnerUserPrice){
-						price=this.xmProject.planInnerUserPrice
+					if(	this.projectPhase && this.projectPhase.phaseBudgetIuserPrice){ 
+						price=this.projectPhase.phaseBudgetIuserPrice
+					}else if( this.xmProject && this.xmProject.planIuserPrice){
+						price=this.xmProject.planIuserPrice
 					} 
 				}
 				this.editForm.budgetCost=this.editForm.budgetWorkload * price 

src/views/xm/core/xmTask/XmTaskList.vue

@@ -2,7 +2,7 @@
 	<section> 
 			<el-row>
 				<el-col :span="4" v-if=" filters.selProject">
-					<xm-project-phase-mng   :sel-project="filters.selProject" :simple="true" @row-click="projectPhaseRowClick" @clear-select="clearSelectPhase"></xm-project-phase-mng>
+					<xm-phase-mng   :sel-project="filters.selProject" :simple="true" @row-click="projectPhaseRowClick" @clear-select="clearSelectPhase"></xm-phase-mng>
 				</el-col>
 				<el-col :span=" filters.selProject?20:24">
 					<el-row class="page-main ">
@@ -94,7 +94,7 @@
 	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
 	import { getTask ,listXmTask,editXmTask,editRate, delXmTask, batchDelXmTask,batchImportTaskFromTemplate,batchSaveBudget } from '@/api/xm/core/xmTask'; 
 	import { mapGetters } from 'vuex'; 
-	import xmProjectPhaseMng from '../xmProjectPhase/XmProjectPhaseSelect'; 
+	import xmPhaseMng from '../xmPhase/XmPhaseSelect'; 
 	import XmProjectList from '../xmProject/XmProjectList';
 
 	export default { 
@@ -261,7 +261,7 @@
 				}
 				params.workexec="true";
 				if(this.projectPhase){{
-					params.projectPhaseId=this.projectPhase.id
+					params.phaseId=this.projectPhase.id
 				}}
 				if(this.isMy=='1'){
 					params.userid=this.userInfo.userid
@@ -386,12 +386,12 @@
 			getRowSum(row){
 				var budgetCost=this.getFloatValue(row.budgetCost);
 				if(row.taskOut=='1'){
-					 row.taskBudgetOutUserAt=budgetCost
-					 row.taskBudgetInnerUserAt=0
+					 row.taskBudgetOuserAt=budgetCost
+					 row.taskBudgetIuserAt=0
 					 row.taskBudgetNouserAt=0;
 				}else{
-					 row.taskBudgetOutUserAt=0
-					 row.taskBudgetInnerUserAt=budgetCost
+					 row.taskBudgetOuserAt=0
+					 row.taskBudgetIuserAt=budgetCost
 					 row.taskBudgetNouserAt=0;
 				} 
 				return budgetCost;
@@ -422,7 +422,7 @@
 		},//end methods
 		components: {  
 			  
-			xmProjectPhaseMng, XmProjectList
+			xmPhaseMng, XmProjectList
 		    //在下面添加其它组件
 		},
 		mounted() {

src/views/xm/core/xmTask/XmTaskListForMenu.vue

@@ -374,12 +374,12 @@
 			getRowSum(row){
 				var budgetCost=this.getFloatValue(row.budgetCost);
 				if(row.taskOut=='1'){
-					 row.taskBudgetOutUserAt=budgetCost
-					 row.taskBudgetInnerUserAt=0
+					 row.taskBudgetOuserAt=budgetCost
+					 row.taskBudgetIuserAt=0
 					 row.taskBudgetNouserAt=0;
 				}else{
-					 row.taskBudgetOutUserAt=0
-					 row.taskBudgetInnerUserAt=budgetCost
+					 row.taskBudgetOuserAt=0
+					 row.taskBudgetIuserAt=budgetCost
 					 row.taskBudgetNouserAt=0;
 				} 
 				return budgetCost;

src/views/xm/core/xmTask/XmTaskMng.vue

@@ -1047,7 +1047,7 @@ import xmExecuserMng from "../xmTaskExecuser/XmTaskExecuserMng";
 import xmSkillMng from "../xmTaskSkill/XmTaskSkillMng";
 import skillMng from "@/views/xm/core/skill/skillMng";
 import { batchAddSkill } from "@/api/xm/core/xmTaskSkill";
-import xmProjectPhaseMng from "../xmProjectPhase/XmProjectPhaseSelect";
+import xmPhaseMng from "../xmPhase/XmPhaseSelect";
 import { sn } from "@/common/js/sequence";
 import xmTaskTemplateMng from "../xmTaskTemplate/XmTaskTemplateMng";
 import xmExchangeMng from "../xmExchange/XmExchangeMng";
@@ -1082,8 +1082,8 @@ export default {
         if (
           this.editForm && this.editForm.id
         ) {
-          projectPhase.id = this.editForm.projectPhaseId;
-          projectPhase.phaseName = this.editForm.projectPhaseName;
+          projectPhase.id = this.editForm.phaseId;
+          projectPhase.name = this.editForm.projectPhaseName;
           projectPhase.taskType = this.editForm.taskType;
           projectPhase.projectId = this.editForm.projectId;
           projectPhase.projectName = this.editForm.projectName;
@@ -1853,14 +1853,14 @@ export default {
         i.projectId = this.selProject.id;
         i.projectName = this.selProject.name;
         if (this.projectPhase == null) {
-          i.projectPhaseId = this.parentTask.projectPhaseId;
+          i.phaseId = this.parentTask.phaseId;
           i.projectPhaseName = this.parentTask.projectPhaseName;
           i.sortLevel = i.sortLevel ? i.sortLevel : this.parentTask.sortLevel;
           i.taskType = i.taskType ? i.taskType : this.parentTask.taskType;
           i.taskClass = i.taskClass ? i.taskClass : this.parentTask.taskClass;
         } else {
-          i.projectPhaseId = this.projectPhase.id;
-          i.projectPhaseName = this.projectPhase.phaseName;
+          i.phaseId = this.projectPhase.id;
+          i.projectPhaseName = this.projectPhase.name;
           i.sortLevel = i.sortLevel ? i.sortLevel : this.projectPhase.seqNo;
           i.taskType = i.taskType ? i.taskType : this.projectPhase.taskType;
         }
@@ -2078,12 +2078,12 @@ export default {
     getRowSum(row) {
       var budgetCost = this.getFloatValue(row.budgetCost);
       if (row.taskOut == "1") {
-        row.taskBudgetOutUserAt = budgetCost;
-        row.taskBudgetInnerUserAt = 0;
+        row.taskBudgetOuserAt = budgetCost;
+        row.taskBudgetIuserAt = 0;
         row.taskBudgetNouserAt = 0;
       } else {
-        row.taskBudgetOutUserAt = 0;
-        row.taskBudgetInnerUserAt = budgetCost;
+        row.taskBudgetOuserAt = 0;
+        row.taskBudgetIuserAt = budgetCost;
         row.taskBudgetNouserAt = 0;
       }
       return budgetCost;
@@ -2353,7 +2353,7 @@ export default {
       params.workexec = "true";
       if (this.projectPhase) {
         {
-          params.projectPhaseId = this.projectPhase.id;
+          params.phaseId = this.projectPhase.id;
         }
       }
       if (this.isMy == "1") {
@@ -2424,7 +2424,7 @@ export default {
     xmExecuserMng,
     xmSkillMng,
     skillMng,
-    xmProjectPhaseMng,
+    xmPhaseMng,
     xmTaskTemplateMng,
     XmProjectList,
     xmExchangeMng,

src/views/xm/core/xmTask/XmTaskMngBatch.vue

@@ -1082,7 +1082,7 @@ export default {
       params.workexec = "true";
       if (this.projectPhase) {
         {
-          params.projectPhaseId = this.projectPhase.id;
+          params.phaseId = this.projectPhase.id;
         }
       }
       if (this.isMy == "1") {

src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue

@@ -110,7 +110,7 @@
 				},
 				//新增界面数据 xm_task_execuse
 				addForm: {
-					createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',projectPhaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
+					createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
 				},
 				userSelectVisible: false,
 				quoteDateRanger: [
@@ -146,7 +146,7 @@
 								let params = Object.assign({}, this.addForm); 
 								params.taskId = this.xmTask.id;
 								params.projectId=this.xmTask.projectId
-								params.projectPhaseId=this.xmTask.projectPhaseId
+								params.phaseId=this.xmTask.phaseId
 								params.projectName=this.xmTask.projectName
 								params.taskName=this.xmTask.name
 								if(this.quoteDateRanger.length>=2){

src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue

@@ -104,7 +104,7 @@
 				},
 				//编辑界面数据  XmTaskExecuser xm_task_execuser
 				editForm: {
-					createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',projectPhaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
+					createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				

src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue

@@ -257,13 +257,13 @@
 				addFormVisible: false,//新增xmTaskExecuser界面是否显示
 				//新增xmTaskExecuser界面初始化数据
 				addForm: {
-					createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',projectPhaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
+					createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
 				},
 
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmTaskExecuser界面初始化数据
 				editForm: {
-					createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',projectPhaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
+					createTime:'',id:'',taskId:'',userid:'',startTime:'',endTime:'',status:'',remarks:'',settleAmount:'',settleWorkload:'',settleStatus:'',settleTime:'',createUserid:'',createUsername:'',username:'',matchScore:'',quoteWeekday:'',quoteAmount:'',quoteTime:'',bizProcInstId:'',bizFlowState:'',projectId:'',phaseId:'',skillRemark:'',quoteWorkload:'',quoteStartTime:'',quoteEndTime:'',branchId:'',projectPhaseName:'',taskName:''
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
 

src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue

@@ -131,7 +131,7 @@
 				return []
 			}, 
 		},
-		props:['xmTaskTemplate','visible','parentTaskTemplate','xmProjectPhaseTemplate'],
+		props:['xmTaskTemplate','visible','parentTaskTemplate','xmPhaseTemplate'],
 		watch: {
 			'xmTaskTemplate':function(  xmTaskTemplate ) {  
 			},
@@ -187,7 +187,7 @@
 				},
 				//新增界面数据 xm_task
 				addForm: {
-					 id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:'',budgetCost:'',budgetWorkload:'',taskState:'',taskType:'',taskClass:'',toTaskCenter:'',projectPhaseId:'',projectPhaseName:'',taskSkillNames:'',taskSkillIds:'',taskOut:'',planType:'',settleSchemel:'',menuId:'',menuName:''
+					 id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:'',budgetCost:'',budgetWorkload:'',taskState:'',taskType:'',taskClass:'',toTaskCenter:'',phaseId:'',projectPhaseName:'',taskSkillNames:'',taskSkillIds:'',taskOut:'',planType:'',settleSchemel:'',menuId:'',menuName:''
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				preTask:{},
@@ -223,11 +223,11 @@
 								params.parentTaskid=this.parentTaskTemplate.id
 								params.parentTaskname=this.parentTaskTemplate.name 
 							}else {
-								if(this.xmProjectPhaseTemplate){
-									params.projectPhaseId=this.xmProjectPhaseTemplate.id
-									params.projectPhaseName=this.xmProjectPhaseTemplate.phaseName
-									params.projectName=this.xmProjectPhaseTemplate.projectName
-									params.projectId=this.xmProjectPhaseTemplate.projectId
+								if(this.xmPhaseTemplate){
+									params.phaseId=this.xmPhaseTemplate.id
+									params.projectPhaseName=this.xmPhaseTemplate.name
+									params.projectName=this.xmPhaseTemplate.projectName
+									params.projectId=this.xmPhaseTemplate.projectId
 								}else{
 									this.$notify.error("任务归属的项目计划不能为空");
 									return;

src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue

@@ -176,7 +176,7 @@
 				},
 				//新增界面数据 xm_task
 				editForm: {
-					 id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:'',budgetCost:'',budgetWorkload:'',taskState:'',taskType:'',taskClass:'',toTaskCenter:'',projectPhaseId:'',projectPhaseName:'',taskSkillNames:'',taskSkillIds:'',taskOut:'',planType:'',settleSchemel:'',menuId:'',menuName:''
+					 id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:'',budgetCost:'',budgetWorkload:'',taskState:'',taskType:'',taskClass:'',toTaskCenter:'',phaseId:'',projectPhaseName:'',taskSkillNames:'',taskSkillIds:'',taskOut:'',planType:'',settleSchemel:'',menuId:'',menuName:''
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				preTask:{},

src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue

@@ -2,7 +2,7 @@
 	<section class="page-container padding border">
 		<el-row>
 			<el-col :span="filters.projectTemplate&&filters.projectTemplate.id?6:0" >
-					<xm-project-phase-template-mng   :sel-project-template="filters.projectTemplate" :simple="true" @row-click="projectPhaseTemplateRowClick" @selected-project-template="onSelectedProjectTemplate" ref="projectPhaseTemplate"></xm-project-phase-template-mng>
+					<xm-phase-template-mng   :sel-project-template="filters.projectTemplate" :simple="true" @row-click="projectPhaseTemplateRowClick" @selected-project-template="onSelectedProjectTemplate" ref="projectPhaseTemplate"></xm-phase-template-mng>
 			</el-col>
 			<el-col :span="filters.projectTemplate&&filters.projectTemplate.id?18:24">
 				<el-row>
@@ -44,7 +44,7 @@
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
 	import { listXmTask  } from '@/api/xm/core/xmTask'; 
-	import xmProjectPhaseTemplateMng from '../xmProjectPhaseTemplate/XmProjectPhaseTemplateMng'; 
+	import xmPhaseTemplateMng from '../xmPhaseTemplate/XmPhaseTemplateMng'; 
 
 	import { mapGetters } from 'vuex'
 	
@@ -87,13 +87,13 @@
 				addFormVisible: false,//新增xmTaskTemplate界面是否显示
 				//新增xmTaskTemplate界面初始化数据
 				addForm: {
-					id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:'',budgetCost:'',budgetWorkload:'',taskState:'',taskType:'',taskClass:'',toTaskCenter:'',projectPhaseId:'',projectPhaseName:'',taskSkillNames:'',taskSkillIds:'',taskOut:'',planType:'',settleSchemel:'',menuId:'',menuName:''
+					id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:'',budgetCost:'',budgetWorkload:'',taskState:'',taskType:'',taskClass:'',toTaskCenter:'',phaseId:'',projectPhaseName:'',taskSkillNames:'',taskSkillIds:'',taskOut:'',planType:'',settleSchemel:'',menuId:'',menuName:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmTaskTemplate界面初始化数据
 				editForm: {
-					 id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:'',budgetCost:'',budgetWorkload:'',taskState:'',taskType:'',taskClass:'',toTaskCenter:'',projectPhaseId:'',projectPhaseName:'',taskSkillNames:'',taskSkillIds:'',taskOut:'',planType:'',settleSchemel:'',menuId:'',menuName:''
+					 id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:'',budgetCost:'',budgetWorkload:'',taskState:'',taskType:'',taskClass:'',toTaskCenter:'',phaseId:'',projectPhaseName:'',taskSkillNames:'',taskSkillIds:'',taskOut:'',planType:'',settleSchemel:'',menuId:'',menuName:''
 				},
 				parentTaskTemplate:null,
 				projectPhaseTemplate:null,
@@ -146,7 +146,7 @@
 					params.orderBy= orderBys.join(",")
 				}
 				if(this.projectPhaseTemplate){
-					params.projectPhaseId=this.projectPhaseTemplate.id
+					params.phaseId=this.projectPhaseTemplate.id
 				}
 				if(this.filters.projectTemplate){
 					params.projectId=this.filters.projectTemplate.id
@@ -157,7 +157,7 @@
 					this.$notify({showClose: true, message: "选择一个模板项目", type: 'error' });
 					return;
 				}
-				if(!params.projectPhaseId){
+				if(!params.phaseId){
 					this.$notify({showClose: true, message: "请在左边计划列表中选择一个计划", type: 'error' });
 					return;
 				}
@@ -271,7 +271,7 @@
 			
 		},//end methods
 		components: {  
-		    xmProjectPhaseTemplateMng,
+		    xmPhaseTemplateMng,
 		    //在下面添加其它组件
 		},
 		mounted() {