diff --git a/src/api/xm/core/xmBranchState.js b/src/api/xm/core/xmBranchState.js index aa13a0b1..321a6f3b 100644 --- a/src/api/xm/core/xmBranchState.js +++ b/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关系 diff --git a/src/api/xm/core/xmBranchTaskTypeState.js b/src/api/xm/core/xmBranchTaskTypeState.js index 93a169e5..48009f1a 100644 --- a/src/api/xm/core/xmBranchTaskTypeState.js +++ b/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关系 diff --git a/src/api/xm/core/xmPhase.js b/src/api/xm/core/xmPhase.js new file mode 100644 index 00000000..e8f7176f --- /dev/null +++ b/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); }; + diff --git a/src/api/xm/core/xmPhaseBaseline.js b/src/api/xm/core/xmPhaseBaseline.js new file mode 100644 index 00000000..75307ce7 --- /dev/null +++ b/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); }; \ No newline at end of file diff --git a/src/api/xm/core/xmPhaseTemplate.js b/src/api/xm/core/xmPhaseTemplate.js new file mode 100644 index 00000000..557c7071 --- /dev/null +++ b/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); }; \ No newline at end of file diff --git a/src/api/xm/core/xmProductPhase.js b/src/api/xm/core/xmProductPhase.js deleted file mode 100644 index 51ef89f9..00000000 --- a/src/api/xm/core/xmProductPhase.js +++ /dev/null @@ -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); }; - diff --git a/src/api/xm/core/xmProject.js b/src/api/xm/core/xmProject.js index 128cb97b..fe05d340 100644 --- a/src/api/xm/core/xmProject.js +++ b/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关系 diff --git a/src/api/xm/core/xmProjectBaseline.js b/src/api/xm/core/xmProjectBaseline.js index 41edbb30..d1db8dd0 100644 --- a/src/api/xm/core/xmProjectBaseline.js +++ b/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关系 diff --git a/src/api/xm/core/xmProjectMBudgetCostNouser.js b/src/api/xm/core/xmProjectMBudgetCostNouser.js index 011207e0..7660c8da 100644 --- a/src/api/xm/core/xmProjectMBudgetCostNouser.js +++ b/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关系 diff --git a/src/api/xm/core/xmProjectMBudgetCostUser.js b/src/api/xm/core/xmProjectMBudgetCostUser.js index 0c3f410c..6e9fdfa7 100644 --- a/src/api/xm/core/xmProjectMBudgetCostUser.js +++ b/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关系 diff --git a/src/api/xm/core/xmProjectMCostNouser.js b/src/api/xm/core/xmProjectMCostNouser.js index eb10735b..666c753f 100644 --- a/src/api/xm/core/xmProjectMCostNouser.js +++ b/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关系 diff --git a/src/api/xm/core/xmProjectMCostUser.js b/src/api/xm/core/xmProjectMCostUser.js index 00797aa3..c4b6c6f9 100644 --- a/src/api/xm/core/xmProjectMCostUser.js +++ b/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关系 diff --git a/src/api/xm/core/xmProjectPhase.js b/src/api/xm/core/xmProjectPhase.js deleted file mode 100644 index 389749b4..00000000 --- a/src/api/xm/core/xmProjectPhase.js +++ /dev/null @@ -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); }; - diff --git a/src/api/xm/core/xmProjectPhaseBaseline.js b/src/api/xm/core/xmProjectPhaseBaseline.js deleted file mode 100644 index eb192460..00000000 --- a/src/api/xm/core/xmProjectPhaseBaseline.js +++ /dev/null @@ -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); }; \ No newline at end of file diff --git a/src/api/xm/core/xmProjectPhaseTemplate.js b/src/api/xm/core/xmProjectPhaseTemplate.js deleted file mode 100644 index 7cc071ad..00000000 --- a/src/api/xm/core/xmProjectPhaseTemplate.js +++ /dev/null @@ -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); }; \ No newline at end of file diff --git a/src/api/xm/core/xmProjectState.js b/src/api/xm/core/xmProjectState.js index 7e2e8dd8..f3562ab6 100644 --- a/src/api/xm/core/xmProjectState.js +++ b/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关系 diff --git a/src/api/xm/core/xmProjectStateHis.js b/src/api/xm/core/xmProjectStateHis.js index c5ccc467..0a4e062a 100644 --- a/src/api/xm/core/xmProjectStateHis.js +++ b/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关系 diff --git a/src/api/xm/core/xmProjectTaskTypeState.js b/src/api/xm/core/xmProjectTaskTypeState.js index 5d3d4ae6..116d30eb 100644 --- a/src/api/xm/core/xmProjectTaskTypeState.js +++ b/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关系 diff --git a/src/api/xm/core/xmProjectTemplate.js b/src/api/xm/core/xmProjectTemplate.js index fb811010..989fad3b 100644 --- a/src/api/xm/core/xmProjectTemplate.js +++ b/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关系 diff --git a/src/api/xm/core/xmTaskTemplate.js b/src/api/xm/core/xmTaskTemplate.js index 00ac043b..8d6bf12e 100644 --- a/src/api/xm/core/xmTaskTemplate.js +++ b/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关系 diff --git a/src/views/datav/xm/branch/index.vue b/src/views/datav/xm/branch/index.vue index a061211d..47c102ec 100644 --- a/src/views/datav/xm/branch/index.vue +++ b/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{ diff --git a/src/views/datav/xm/project/cards.vue b/src/views/datav/xm/project/cards.vue index 1a1178f4..ec1c7be9 100644 --- a/src/views/datav/xm/project/cards.vue +++ b/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];//当前进度 //资金占比 diff --git a/src/views/datav/xm/project/index.vue b/src/views/datav/xm/project/index.vue index aa61703d..ed80475a 100644 --- a/src/views/datav/xm/project/index.vue +++ b/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 { + 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 diff --git a/src/views/xm/XmOverview.vue b/src/views/xm/XmOverview.vue index 0891f80d..8361dd7b 100644 --- a/src/views/xm/XmOverview.vue +++ b/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' diff --git a/src/views/xm/core/components/xm-gantt.vue b/src/views/xm/core/components/xm-gantt.vue index cbadf573..c9569fe2 100644 --- a/src/views/xm/core/components/xm-gantt.vue +++ b/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"> - diff --git a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue index aef9e658..3173cb29 100644 --- a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue +++ b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue @@ -63,8 +63,8 @@ - - + + @@ -81,17 +81,17 @@ - - + + - - + + - - + + @@ -132,11 +132,11 @@ - - + + - - + + @@ -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 在下面加自定义属性,记得补上面的一个逗号**/ diff --git a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue index 5d395c19..ad44ba25 100644 --- a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue +++ b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue @@ -63,8 +63,8 @@ - - + + @@ -81,17 +81,17 @@ - - + + - - + + - - + + @@ -132,11 +132,11 @@ - - + + - - + + @@ -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 在下面加自定义属性,记得补上面的一个逗号**/ diff --git a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue index 098a1fd3..93999d07 100644 --- a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue +++ b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue @@ -44,13 +44,13 @@ - + - + - - + + @@ -60,8 +60,8 @@ - - + + @@ -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 自定义属性请在下面加 请加备注**/ diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue index 266095d0..a3af048b 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue @@ -27,29 +27,29 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -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 在下面加自定义属性,记得补上面的一个逗号**/ diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue index 4a82b661..a873f284 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue @@ -27,29 +27,29 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -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 在下面加自定义属性,记得补上面的一个逗号**/ diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue index b58b45ac..e4ce888b 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue @@ -19,14 +19,14 @@ - - - - - - - - + + + + + + + + @@ -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 自定义属性请在下面加 请加备注**/ diff --git a/src/views/xm/core/xmIteration/XmIterationInfo.vue b/src/views/xm/core/xmIteration/XmIterationInfo.vue index 7553fafe..6e030e2a 100644 --- a/src/views/xm/core/xmIteration/XmIterationInfo.vue +++ b/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, diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue b/src/views/xm/core/xmPhase/XmPhaseAdd.vue similarity index 66% rename from src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue rename to src/views/xm/core/xmPhase/XmPhaseAdd.vue index 4ace99dc..5ee15e8f 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue +++ b/src/views/xm/core/xmPhase/XmPhaseAdd.vue @@ -1,11 +1,11 @@