diff --git a/src/views/xm/core/components/xm-gantt.vue b/src/views/xm/core/components/xm-gantt.vue index ce180510..cbadf573 100644 --- a/src/views/xm/core/components/xm-gantt.vue +++ b/src/views/xm/core/components/xm-gantt.vue @@ -9,7 +9,7 @@ :treeProps="{children: 'children', hasChildren: 'hasChildren',pid:'parentPhaseId', pre: 'finishTaskCnt'}" :props="columns" row-key="id"> - - - + + @@ -198,10 +198,10 @@ load:{ list: false, edit: false, del: false, add: false },//查询中... addFormRules: { id: [ - //{ required: true, message: '阶段主键不能为空', trigger: 'blur' } + //{ required: true, message: '计划主键不能为空', trigger: 'blur' } ], phaseName: [ - { required: true, message: '阶段名称不能为空', trigger: 'blur' } + { required: true, message: '计划名称不能为空', trigger: 'blur' } ], planType: [ { required: true, message: '请选择计划类型', trigger: 'blur' } diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue index 4c767d63..e324c008 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue @@ -45,7 +45,7 @@ - + @@ -279,7 +279,7 @@ xmRecordVisible:false, valueChangeRows:[], batchEditVisible:false, - menuVisible:false,//由需求自动创建阶段计划 + menuVisible:false,//由需求自动创建计划 tableHeight:300, pickerOptions: util.pickerOptions('date'), gstcVisible:false, @@ -364,7 +364,7 @@ showEdit: function ( row,index ) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } this.editForm = Object.assign({}, row); @@ -374,7 +374,7 @@ showAdd: function () { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } this.parentProjectPhase=null; @@ -386,7 +386,7 @@ showSubAdd: function (parentProjectPhase) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } var myrow=JSON.parse(JSON.stringify(parentProjectPhase)) @@ -498,7 +498,7 @@ handleDel: function (row,index) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } if(!!row.bizFlowState ){ @@ -530,7 +530,7 @@ batchDel: function () { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } var phases=this.sels.filter(i=>{ @@ -562,7 +562,7 @@ showPhaseTemplate: function(parentPhase){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } this.parentProjectPhase=parentPhase @@ -767,7 +767,7 @@ saveBatchEdit:function(){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } if(this.valueChangeRows.length==0){ @@ -1104,7 +1104,7 @@ showMenu:function(parentPhase){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } this.parentProjectPhase=parentPhase @@ -1130,7 +1130,7 @@ handlePopover:function(row,opType){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } if('add'==opType){ diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue index 5efc5a73..9d43718f 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue @@ -4,7 +4,7 @@ - + @@ -19,8 +19,8 @@ - - + + @@ -108,7 +108,7 @@ - + @@ -212,10 +212,10 @@ load:{ list: false, add: false, del: false, edit: false },//查询中... editFormRules: { id: [ - //{ required: true, message: '阶段主键不能为空', trigger: 'blur' } + //{ required: true, message: '计划主键不能为空', trigger: 'blur' } ], phaseName: [ - { required: true, message: '阶段名称不能为空', trigger: 'blur' } + { required: true, message: '计划名称不能为空', trigger: 'blur' } ], planType: [ { required: true, message: '请选择计划类型', trigger: 'blur' } diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue index 5226ba69..52dab0dd 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue @@ -69,51 +69,16 @@ - + - {{scope.row.seqNo}} - - - - - - - - - - +子阶段 - +从模板批量导入子阶段 - +由需求创建子阶段 - - 编辑 - 从任务汇总实际数据 - 日志 - 删除 - 变更发审(审核通过后起效) - 删除发审(审核通过后删除) - - - - - 去设置 - {{scope.row.mngUsername}} - - - {{ (scope.row.actRate!=null?scope.row.actRate:0)+'%'}} - - {{scope.row.phaseName}} + + {{scope.row.seqNo}} {{scope.row.phaseName}} + + {{item.remark}} - - - - {{formatDate(scope.row.beginDate)}}{{formatDate(scope.row.endDate)}} - {{item.remark}} - - - - - - {{scope.row.phaseBudgetWorkload}} - {{scope.row.phaseActWorkload}} - - - - - {{scope.row.phaseBudgetCostAt}} - {{scope.row.actCostAt}} - - + + + + + + + + + + + + + + @@ -155,6 +120,48 @@ + + + + + + 子计划 + + + 从模板批量导入子计划 + + + 由需求创建子计划 + + + 添加 + + 编辑 + 删除 + 日志 + 汇总进度 + + + + + + + + + + + + + 变更发审(审核通过后起效) + 删除发审(审核通过后删除) + + + + + @@ -172,8 +179,8 @@ - - + + @@ -361,7 +368,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; xmRecordVisible:false, valueChangeRows:[], batchEditVisible:false, - menuVisible:false,//由需求自动创建阶段计划 + menuVisible:false,//由需求自动创建计划 tableHeight:200, pickerOptions: util.pickerOptions('date'), gstcVisible:false, @@ -457,7 +464,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; showEdit: function ( row,index ) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } this.editForm = Object.assign({}, row); @@ -467,7 +474,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; showAdd: function () { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } this.parentProjectPhase=null; @@ -479,7 +486,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; showSubAdd: function (parentProjectPhase) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } var myrow=JSON.parse(JSON.stringify(parentProjectPhase)) @@ -591,7 +598,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; handleDel: function (row,index) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } if(!!row.bizFlowState ){ @@ -623,7 +630,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; batchDel: function () { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } var phases=this.sels.filter(i=>{ @@ -655,7 +662,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; showPhaseTemplate: function(parentPhase){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } this.parentProjectPhase=parentPhase @@ -759,7 +766,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; sendToProcessApprova:function(row,bizKey){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } if(row.bizFlowState=='1'){ @@ -846,7 +853,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; handleCommand(command) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } if(command.type=='sendToProcessApprova'){ @@ -1011,7 +1018,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; saveBatchEdit:function(){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } if(this.valueChangeRows.length==0){ @@ -1207,7 +1214,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; showMenu:function(parentPhase){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } this.parentProjectPhase=parentPhase @@ -1233,7 +1240,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; handlePopover:function(row,opType){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作计划", type: 'error' }); return; } if('add'==opType){ diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseOverview.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseOverview.vue index e4a635d9..149d9252 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseOverview.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseOverview.vue @@ -22,14 +22,14 @@ - 阶段信息 + 计划信息 - 阶段管理员 + 计划管理员 @@ -77,7 +77,7 @@ - 阶段计划周期 + 计划周期 @@ -119,7 +119,7 @@ - 阶段工时 + 计划工时 diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue index 8060ead3..944bf673 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue @@ -2,9 +2,9 @@ - + - 阶段 {{editForm.phaseName}} + 计划 {{editForm.phaseName}} {{scope.row.seqNo}} {{scope.row.phaseName}} @@ -108,7 +108,7 @@ xmRecordVisible:false, valueChangeRows:[], batchEditVisible:false, - menuVisible:false,//由需求自动创建阶段计划 + menuVisible:false,//由需求自动创建计划 pickerOptions: util.pickerOptions('date'), gstcVisible:false, tableHeight:300, diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue index 0a0c5681..ee07ce0b 100644 --- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue +++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue @@ -6,17 +6,17 @@ - - + + - - + + - - + + diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue index 28bc17ad..7bc3bb11 100644 --- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue +++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue @@ -6,17 +6,17 @@ - - + + - - + + - - + + diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue index 1c710400..13878e17 100644 --- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue +++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue @@ -12,10 +12,10 @@ - - + + - + diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue index 67521dee..fdbfae3f 100644 --- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue +++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue @@ -3,8 +3,8 @@ - - + + @@ -109,10 +109,10 @@ load:{ list: false, edit: false, del: false, add: false },//查询中... addFormRules: { id: [ - //{ required: true, message: '阶段主键不能为空', trigger: 'blur' } + //{ required: true, message: '计划主键不能为空', trigger: 'blur' } ], phaseName: [ - { required: true, message: '阶段名称不能为空', trigger: 'blur' } + { required: true, message: '计划名称不能为空', trigger: 'blur' } ], planType: [ //{ required: true, message: '请选择计划类型', trigger: 'blur' } diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue index 235753cb..36f7f7d3 100644 --- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue +++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue @@ -3,8 +3,8 @@ - - + + @@ -105,10 +105,10 @@ load:{ list: false, add: false, del: false, edit: false },//查询中... editFormRules: { id: [ - //{ required: true, message: '阶段主键不能为空', trigger: 'blur' } + //{ required: true, message: '计划主键不能为空', trigger: 'blur' } ], phaseName: [ - { required: true, message: '阶段名称不能为空', trigger: 'blur' } + { required: true, message: '计划名称不能为空', trigger: 'blur' } ], planType: [ //{ required: true, message: '请选择计划类型', trigger: 'blur' } diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue index ff6d4685..f8253832 100644 --- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue +++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue @@ -4,7 +4,7 @@ 查询 选择项目模板 - +项目阶段 + +项目计划 确认选择 @@ -12,7 +12,7 @@ - + {{scope.row.seqNo}} {{scope.row.phaseName}} @@ -30,7 +30,7 @@ 改 删 - +子阶段 + +子计划 @@ -41,7 +41,7 @@ - + {{scope.row.seqNo}} {{scope.row.phaseName}} @@ -52,12 +52,12 @@ - + - + diff --git a/src/views/xm/core/xmProjectState/XmCockpit.vue b/src/views/xm/core/xmProjectState/XmCockpit.vue index 2f4644be..2edbb01c 100644 --- a/src/views/xm/core/xmProjectState/XmCockpit.vue +++ b/src/views/xm/core/xmProjectState/XmCockpit.vue @@ -26,8 +26,8 @@ - - + + diff --git a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue index a4838697..8a782bca 100644 --- a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue +++ b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue @@ -48,10 +48,10 @@ - + - + @@ -138,11 +138,11 @@ - - + + - - + + diff --git a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue index 04aaadc3..2921faa1 100644 --- a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue +++ b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue @@ -48,10 +48,10 @@ - + - + @@ -138,11 +138,11 @@ - - + + - - + + diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue index 114e7c25..167edf84 100644 --- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue +++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue @@ -48,10 +48,10 @@ - + - + diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue index 3729d3cc..b59db251 100644 --- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue +++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue @@ -48,10 +48,10 @@ - + - + diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue index bc24d267..c8156170 100644 --- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue +++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue @@ -26,8 +26,8 @@ - - + + diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue index 02dceed0..cfa62256 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue @@ -5,12 +5,12 @@ - + - + diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue index bb457be3..aee081f6 100644 --- a/src/views/xm/core/xmRecord/XmRecord.vue +++ b/src/views/xm/core/xmRecord/XmRecord.vue @@ -100,7 +100,7 @@ }, tableHeight:300, /**begin 自定义属性请在下面加 请加备注**/ - objTypeOptions: [{key:"all",name:"全部"},{key:"task",name:"任务"},{"key":"project" ,name:"项目"},{key:"budget",name:"预算"},{key:"cost",name:"成本"},{key:"phase",name:"阶段计划"},{"key":"group",name:"团队"}] + objTypeOptions: [{key:"all",name:"全部"},{key:"task",name:"任务"},{"key":"project" ,name:"项目"},{key:"budget",name:"预算"},{key:"cost",name:"成本"},{key:"phase",name:"计划"},{"key":"group",name:"团队"}] /**end 自定义属性请在上面加 请加备注**/ } },//end data diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 1d9a46ef..dded3b6c 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -1637,7 +1637,7 @@ export default { if (this.currentProjectPhase == null) { this.$message({ showClose: true, - message: "请先选择项目阶段计划", + message: "请先选择项目计划", type: "error", }); return false; @@ -1668,7 +1668,7 @@ export default { if (!this.currentProjectPhase) { this.$message({ showClose: true, - message: "请先选择项目阶段计划", + message: "请先选择项目计划", type: "error", }); return; @@ -1804,7 +1804,7 @@ export default { }, showMenu: function (parentTask) { if (this.projectPhase == null) { - this.$message.error("请先选中阶段计划"); + this.$message.error("请先选中计划"); return; } @@ -2182,7 +2182,7 @@ export default { if (this.projectPhase == null) { this.$message({ showClose: true, - message: "请选择阶段计划再编辑", + message: "请选择计划再编辑", type: "error", }); return; diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue index 7ea5656d..491cc039 100644 --- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue +++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue @@ -7,7 +7,7 @@ 返回 - 阶段总预算: {{((projectPhase.phaseBudgetNouserAt+projectPhase.phaseBudgetInnerUserAt+projectPhase.phaseBudgetOutUserAt)/10000).toFixed(2)}}万,剩{{(taskBudgetData.surplusPhaseBudgetCostAt/10000).toFixed(2)}}万 + 计划总预算: {{((projectPhase.phaseBudgetNouserAt+projectPhase.phaseBudgetInnerUserAt+projectPhase.phaseBudgetOutUserAt)/10000).toFixed(2)}}万,剩{{(taskBudgetData.surplusPhaseBudgetCostAt/10000).toFixed(2)}}万 非人力总预算:{{(projectPhase.phaseBudgetNouserAt/10000).toFixed(2)}}万,剩{{(taskBudgetData.surplusPhaseBudgetNouserAt/10000).toFixed(2)}}万 内部人力总预算:{{(projectPhase.phaseBudgetInnerUserAt/10000).toFixed(2)}}万,剩{{(taskBudgetData.surplusPhaseBudgetInnerUserAt/10000).toFixed(2)}}万 外购人力总预算:{{(projectPhase.phaseBudgetOutUserAt/10000).toFixed(2)}}万,剩{{(taskBudgetData.surplusPhaseBudgetOutUserAt/10000).toFixed(2)}}万 @@ -422,7 +422,7 @@ return; } if(this.currentProjectPhase==null){ - this.$message({showClose: true, message: "请先选择项目阶段计划", type: 'error' }); + this.$message({showClose: true, message: "请先选择项目计划", type: 'error' }); return false; } this.taskTemplateVisible=true; @@ -445,7 +445,7 @@ return; } if(!this.currentProjectPhase){ - this.$message({showClose: true, message: "请先选择项目阶段计划", type: 'error' }); + this.$message({showClose: true, message: "请先选择项目计划", type: 'error' }); return; } this.addFormVisible = true; diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue index 6c4e965d..b30ad06d 100644 --- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue +++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue @@ -229,7 +229,7 @@ params.projectName=this.xmProjectPhaseTemplate.projectName params.projectId=this.xmProjectPhaseTemplate.projectId }else{ - this.$message.error("任务归属的项目阶段不能为空"); + this.$message.error("任务归属的项目计划不能为空"); return; } } diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue index 3b60a263..74e63906 100644 --- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue +++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue @@ -214,7 +214,7 @@ } if(!this.projectPhaseTemplate){ - this.$message.error("请选择阶段") + this.$message.error("请选择计划") return; } this.addFormVisible = true;