From fafdfd4bb8054935ee228696a1ba2317d99f8401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 1 Mar 2022 17:04:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xm/core/skill/skillMng.vue | 16 +++---- .../xm/core/xmAttachment/XmAttachmentAdd.vue | 2 +- .../xm/core/xmAttachment/XmAttachmentEdit.vue | 2 +- .../xm/core/xmAttachment/XmAttachmentMng.vue | 6 +-- .../core/xmBranchState/XmBranchStateAdd.vue | 2 +- .../core/xmBranchState/XmBranchStateEdit.vue | 2 +- .../core/xmBranchState/XmBranchStateMng.vue | 8 ++-- .../XmBranchTaskTypeStateAdd.vue | 2 +- .../XmBranchTaskTypeStateEdit.vue | 2 +- .../XmBranchTaskTypeStateMng.vue | 6 +-- src/views/xm/core/xmEnvList/XmEnvListAdd.vue | 2 +- src/views/xm/core/xmEnvList/XmEnvListEdit.vue | 2 +- src/views/xm/core/xmEnvList/XmEnvListMng.vue | 6 +-- .../xm/core/xmExchange/TaskUserEditor.vue | 2 +- .../xm/core/xmExchange/XmExchangeAdd.vue | 2 +- .../xm/core/xmExchange/XmExchangeEdit.vue | 2 +- .../xm/core/xmExchange/XmExchangeMng.vue | 8 ++-- src/views/xm/core/xmFile/XmFileAdd.vue | 2 +- src/views/xm/core/xmFile/XmFileEdit.vue | 2 +- src/views/xm/core/xmFile/XmFileMng.vue | 6 +-- .../xm/core/xmIteration/XmIterationAdd.vue | 6 +-- .../xm/core/xmIteration/XmIterationEdit.vue | 6 +-- .../XmIterationForProjectComplex.vue | 2 +- .../xm/core/xmIteration/XmIterationMng.vue | 20 ++++---- .../xm/core/xmIteration/XmIterationSelect.vue | 6 +-- .../xmIterationMenu/XmIterationMenuAdd.vue | 4 +- .../xmIterationMenu/XmIterationMenuEdit.vue | 4 +- .../xmIterationMenu/XmIterationMenuMng.vue | 14 +++--- .../XmIterationProductLinkAdd.vue | 2 +- .../XmIterationProductLinkEdit.vue | 2 +- .../XmIterationProductLinkMng.vue | 10 ++-- .../xmIterationState/XmIterationStateAdd.vue | 2 +- .../xmIterationState/XmIterationStateEdit.vue | 2 +- .../xmIterationState/XmIterationStateMng.vue | 6 +-- .../xmIterationState/XmIterationStateShow.vue | 6 +-- src/views/xm/core/xmMenu/XmMenuAdd.vue | 8 ++-- src/views/xm/core/xmMenu/XmMenuEdit.vue | 4 +- src/views/xm/core/xmMenu/XmMenuMng.vue | 36 +++++++------- src/views/xm/core/xmMenu/XmMenuMngBatch.vue | 46 +++++++++--------- src/views/xm/core/xmMenu/XmMenuRichDetail.vue | 2 +- src/views/xm/core/xmMenu/XmMenuSelect.vue | 4 +- src/views/xm/core/xmMenu/XmMenuWithPlan.vue | 18 +++---- .../xm/core/xmMenuExchange/MenuUserEditor.vue | 2 +- .../core/xmMenuExchange/XmMenuExchangeMng.vue | 10 ++-- .../xm/core/xmMenuState/XmMenuStateAdd.vue | 2 +- .../xm/core/xmMenuState/XmMenuStateEdit.vue | 2 +- .../xm/core/xmMenuState/XmMenuStateMng.vue | 14 +++--- .../core/xmMenuTemplate/XmMenuTemplateAdd.vue | 6 +-- .../xmMenuTemplate/XmMenuTemplateEdit.vue | 2 +- .../core/xmMenuTemplate/XmMenuTemplateMng.vue | 16 +++---- src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue | 2 +- src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue | 2 +- src/views/xm/core/xmMyFocus/XmMyFocusMng.vue | 6 +-- src/views/xm/core/xmProduct/XmProductAdd.vue | 4 +- src/views/xm/core/xmProduct/XmProductEdit.vue | 8 ++-- src/views/xm/core/xmProduct/XmProductMng.vue | 24 +++++----- .../xmProduct/XmProductProjectForLink.vue | 2 +- .../xm/core/xmProduct/XmProductSelect.vue | 6 +-- .../xm/core/xmProduct/XmProductTplMng.vue | 20 ++++---- .../XmProductProjectLinkAdd.vue | 2 +- .../XmProductProjectLinkEdit.vue | 2 +- .../XmProductProjectLinkMng.vue | 10 ++-- .../core/xmProductState/XmProductStateAdd.vue | 2 +- .../xmProductState/XmProductStateEdit.vue | 2 +- .../core/xmProductState/XmProductStateMng.vue | 6 +-- .../XmProductTemplateAdd.vue | 2 +- .../XmProductTemplateEdit.vue | 2 +- .../XmProductTemplateMng.vue | 6 +-- src/views/xm/core/xmProject/XmProjectAdd.vue | 6 +-- .../xm/core/xmProject/XmProjectAssess.vue | 4 +- .../xm/core/xmProject/XmProjectBudgetCost.vue | 4 +- src/views/xm/core/xmProject/XmProjectCost.vue | 4 +- src/views/xm/core/xmProject/XmProjectEdit.vue | 16 +++---- .../xm/core/xmProject/XmProjectForLink.vue | 6 +-- src/views/xm/core/xmProject/XmProjectList.vue | 2 +- src/views/xm/core/xmProject/XmProjectMng.vue | 30 ++++++------ .../xm/core/xmProject/XmProjectSelect.vue | 2 +- .../xm/core/xmProject/XmProjectTplMng.vue | 30 ++++++------ .../XmProjectBaselineAdd.vue | 2 +- .../XmProjectBaselineEdit.vue | 2 +- .../XmProjectBaselineMng.vue | 6 +-- .../XmProjectContractAdd.vue | 2 +- .../XmProjectContractEdit.vue | 2 +- .../XmProjectContractMng.vue | 6 +-- .../xmProjectEnvList/XmProjectEnvListAdd.vue | 2 +- .../xmProjectEnvList/XmProjectEnvListEdit.vue | 2 +- .../xmProjectEnvList/XmProjectEnvListMng.vue | 10 ++-- .../xmProjectGroup/XmProjectGroupEdit.vue | 4 +- .../core/xmProjectGroup/XmProjectGroupMng.vue | 16 +++---- .../xmProjectGroup/XmProjectGroupSelect.vue | 6 +-- .../XmProjectGroupStateMng.vue | 8 ++-- .../XmProjectGroupUserEdit.vue | 4 +- .../XmProjectGroupUserMng.vue | 6 +-- .../XmProjectGroupUserCandidateAdd.vue | 2 +- .../XmProjectGroupUserCandidateEdit.vue | 2 +- .../XmProjectGroupUserCandidateMng.vue | 6 +-- .../xm/core/xmProjectKpi/XmProjectKpiAdd.vue | 2 +- .../xm/core/xmProjectKpi/XmProjectKpiEdit.vue | 2 +- .../xm/core/xmProjectKpi/XmProjectKpiMng.vue | 6 +-- .../xmProjectKpiHis/XmProjectKpiHisAdd.vue | 2 +- .../xmProjectKpiHis/XmProjectKpiHisEdit.vue | 2 +- .../xmProjectKpiHis/XmProjectKpiHisMng.vue | 6 +-- .../XmProjectMBudgetCostNouserAdd.vue | 4 +- .../XmProjectMBudgetCostNouserEdit.vue | 2 +- .../XmProjectMBudgetCostNouserMng.vue | 10 ++-- .../XmProjectMBudgetCostUserAdd.vue | 4 +- .../XmProjectMBudgetCostUserEdit.vue | 2 +- .../XmProjectMBudgetCostUserMng.vue | 10 ++-- .../XmProjectMCostNouserAdd.vue | 2 +- .../XmProjectMCostNouserEdit.vue | 2 +- .../XmProjectMCostNouserMng.vue | 10 ++-- .../XmProjectMCostUserAdd.vue | 2 +- .../XmProjectMCostUserEdit.vue | 2 +- .../XmProjectMCostUserList.vue | 2 +- .../XmProjectMCostUserMng.vue | 10 ++-- .../xmProjectOptions/XmProjectOptionsAdd.vue | 2 +- .../xmProjectOptions/XmProjectOptionsEdit.vue | 2 +- .../xmProjectOptions/XmProjectOptionsMng.vue | 6 +-- .../core/xmProjectPhase/XmProjectPhaseAdd.vue | 10 ++-- .../xmProjectPhase/XmProjectPhaseBatch.vue | 48 +++++++++---------- .../xmProjectPhase/XmProjectPhaseEdit.vue | 10 ++-- .../core/xmProjectPhase/XmProjectPhaseMng.vue | 48 +++++++++---------- .../xmProjectPhase/XmProjectPhaseSelect.vue | 2 +- .../XmProjectPhaseBaselineAdd.vue | 2 +- .../XmProjectPhaseBaselineEdit.vue | 2 +- .../XmProjectPhaseBaselineMng.vue | 6 +-- .../XmProjectPhaseTemplateAdd.vue | 4 +- .../XmProjectPhaseTemplateEdit.vue | 2 +- .../XmProjectPhaseTemplateMng.vue | 4 +- .../xm/core/xmProjectState/XmCockpit.vue | 6 +-- .../core/xmProjectState/XmProjectStateAdd.vue | 2 +- .../xmProjectState/XmProjectStateEdit.vue | 2 +- .../core/xmProjectState/XmProjectStateMng.vue | 22 ++++----- .../XmProjectStateHisAdd.vue | 2 +- .../XmProjectStateHisEdit.vue | 2 +- .../XmProjectStateHisMng.vue | 6 +-- .../XmProjectTaskTypeStateAdd.vue | 2 +- .../XmProjectTaskTypeStateEdit.vue | 2 +- .../XmProjectTaskTypeStateMng.vue | 6 +-- .../XmProjectTemplateAdd.vue | 4 +- .../XmProjectTemplateEdit.vue | 8 ++-- .../XmProjectTemplateList.vue | 2 +- .../XmProjectTemplateMng.vue | 6 +-- .../xm/core/xmQuestion/XmQuestionAdd.vue | 6 +-- .../xm/core/xmQuestion/XmQuestionEdit.vue | 8 ++-- .../xm/core/xmQuestion/XmQuestionMng.vue | 18 +++---- .../xmQuestionHandle/XmQuestionHandleMng.vue | 6 +-- .../core/xmQuestionTag/XmQuestionTagAdd.vue | 2 +- .../core/xmQuestionTag/XmQuestionTagEdit.vue | 2 +- .../core/xmQuestionTag/XmQuestionTagMng.vue | 6 +-- src/views/xm/core/xmRecord/XmRecord.vue | 6 +-- src/views/xm/core/xmTask/XmTaskAdd.vue | 6 +-- src/views/xm/core/xmTask/XmTaskEdit.vue | 10 ++-- src/views/xm/core/xmTask/XmTaskList.vue | 4 +- .../xm/core/xmTask/XmTaskListForMenu.vue | 2 +- src/views/xm/core/xmTask/XmTaskMng.vue | 34 ++++++------- src/views/xm/core/xmTask/XmTaskMngBatch.vue | 34 ++++++------- .../core/xmTaskExecuser/XmTaskExecuserAdd.vue | 8 ++-- .../xmTaskExecuser/XmTaskExecuserEdit.vue | 2 +- .../core/xmTaskExecuser/XmTaskExecuserMng.vue | 38 +++++++-------- .../xm/core/xmTaskSkill/XmTaskSkillAdd.vue | 2 +- .../xm/core/xmTaskSkill/XmTaskSkillEdit.vue | 2 +- .../xm/core/xmTaskSkill/XmTaskSkillMng.vue | 8 ++-- .../core/xmTaskTemplate/XmTaskTemplateAdd.vue | 4 +- .../xmTaskTemplate/XmTaskTemplateEdit.vue | 2 +- .../core/xmTaskTemplate/XmTaskTemplateMng.vue | 14 +++--- .../xm/core/xmTestCase/XmTestCaseAdd.vue | 2 +- .../xm/core/xmTestCase/XmTestCaseEdit.vue | 4 +- .../xm/core/xmTestCase/XmTestCaseMng.vue | 16 +++---- .../core/xmTestCaseExec/XmTestCaseExecAdd.vue | 2 +- .../xmTestCaseExec/XmTestCaseExecEdit.vue | 2 +- .../core/xmTestCaseExec/XmTestCaseExecMng.vue | 38 +++++++-------- 172 files changed, 618 insertions(+), 618 deletions(-) diff --git a/src/views/xm/core/skill/skillMng.vue b/src/views/xm/core/skill/skillMng.vue index 43d194c0..9e96ce78 100644 --- a/src/views/xm/core/skill/skillMng.vue +++ b/src/views/xm/core/skill/skillMng.vue @@ -230,7 +230,7 @@ export default { this.convertSkills = convert; this.setSkillsToLocal(); } else { - this.$message({showClose: true, + this.$notify({showClose: true, message: tips.msg, type: "error", }); @@ -248,7 +248,7 @@ export default { (i) => i.categoryName == this.needAddTagCategoryNameInputValue ) ) { - this.$message({showClose: true, + this.$notify({showClose: true, message: "技能分类已经存在", type: "error", }); @@ -281,7 +281,7 @@ export default { this.convertSkills.push(json); this.setSkillsToLocal(); } - this.$message({showClose: true, + this.$notify({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", }); @@ -319,7 +319,7 @@ export default { this.setSkillsToLocal(); /*this.getTags();*/ } - this.$message({showClose: true, + this.$notify({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", }); @@ -344,7 +344,7 @@ export default { ); }) ) { - this.$message({showClose: true, + this.$notify({showClose: true, message: "技能已经存在", type: "error", }); @@ -352,7 +352,7 @@ export default { } if (!this.convertSkills[index].pubc) { if (this.isPub == "1") { - this.$message({showClose: true, + this.$notify({showClose: true, message: "该分类不是公共分类，不能添加公共技能", type: "error", }); @@ -392,7 +392,7 @@ export default { this.convertSkills[index].values.push(json); this.setSkillsToLocal(); } - this.$message({showClose: true, + this.$notify({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", }); @@ -427,7 +427,7 @@ export default { this.setSkillsToLocal(); /*this.getTags();*/ } - this.$message({showClose: true, + this.$notify({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", }); diff --git a/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue b/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue index 630d1cc1..80b89cb3 100644 --- a/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue +++ b/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue @@ -98,7 +98,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue b/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue index 5880034a..b7cd1670 100644 --- a/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue +++ b/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue @@ -96,7 +96,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmAttachment/XmAttachmentMng.vue b/src/views/xm/core/xmAttachment/XmAttachmentMng.vue index 26fd3997..ba170d84 100644 --- a/src/views/xm/core/xmAttachment/XmAttachmentMng.vue +++ b/src/views/xm/core/xmAttachment/XmAttachmentMng.vue @@ -144,7 +144,7 @@ this.pageInfo.count=false; this.xmAttachments = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -186,7 +186,7 @@ this.pageInfo.count=true; this.getXmAttachments(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -204,7 +204,7 @@ this.pageInfo.count=true; this.getXmAttachments(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue index 414e9846..7bc85c90 100644 --- a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue +++ b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue @@ -233,7 +233,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue index b4de4463..0afc4aed 100644 --- a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue +++ b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue @@ -231,7 +231,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue index 3a7b111d..796360b2 100644 --- a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue +++ b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue @@ -194,7 +194,7 @@ this.pageInfo.count=false; this.xmBranchStates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -236,7 +236,7 @@ this.pageInfo.count=true; this.getXmBranchStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -254,7 +254,7 @@ this.pageInfo.count=true; this.getXmBranchStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -269,7 +269,7 @@ if(tips.isOk){ this.getXmBranchStates() } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ) }, diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue index 97528960..9ac0c715 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue @@ -137,7 +137,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue index a7b145c5..ece4c929 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue @@ -135,7 +135,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue index 83616344..e6af4559 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue @@ -159,7 +159,7 @@ this.pageInfo.count=false; this.xmBranchTaskTypeStates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -201,7 +201,7 @@ this.pageInfo.count=true; this.getXmBranchTaskTypeStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -219,7 +219,7 @@ this.pageInfo.count=true; this.getXmBranchTaskTypeStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue index b79ddd09..a8194867 100644 --- a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue +++ b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue @@ -181,7 +181,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue index a8c679a1..91b9bba9 100644 --- a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue +++ b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue @@ -134,7 +134,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue index af1f6cdb..d7521f15 100644 --- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue +++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue @@ -175,7 +175,7 @@ this.pageInfo.count=false; this.xmEnvLists = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -218,7 +218,7 @@ this.pageInfo.count=true; this.getXmEnvLists(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -236,7 +236,7 @@ this.pageInfo.count=true; this.getXmEnvLists(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmExchange/TaskUserEditor.vue b/src/views/xm/core/xmExchange/TaskUserEditor.vue index 648e2c2b..d222702e 100644 --- a/src/views/xm/core/xmExchange/TaskUserEditor.vue +++ b/src/views/xm/core/xmExchange/TaskUserEditor.vue @@ -37,7 +37,7 @@ export default { content: this.content, } if(!this.content){ - this.$message.error("请输入内容再提交"); + this.$notify.error("请输入内容再提交"); return; } this.$emit('publish',params); diff --git a/src/views/xm/core/xmExchange/XmExchangeAdd.vue b/src/views/xm/core/xmExchange/XmExchangeAdd.vue index 18c86325..080d1f97 100644 --- a/src/views/xm/core/xmExchange/XmExchangeAdd.vue +++ b/src/views/xm/core/xmExchange/XmExchangeAdd.vue @@ -146,7 +146,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmExchange/XmExchangeEdit.vue b/src/views/xm/core/xmExchange/XmExchangeEdit.vue index 0a366a33..4097017f 100644 --- a/src/views/xm/core/xmExchange/XmExchangeEdit.vue +++ b/src/views/xm/core/xmExchange/XmExchangeEdit.vue @@ -144,7 +144,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmExchange/XmExchangeMng.vue b/src/views/xm/core/xmExchange/XmExchangeMng.vue index f155b1e3..514d4263 100644 --- a/src/views/xm/core/xmExchange/XmExchangeMng.vue +++ b/src/views/xm/core/xmExchange/XmExchangeMng.vue @@ -154,7 +154,7 @@ this.pageInfo.count=false; this.xmExchanges = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -196,7 +196,7 @@ this.pageInfo.count=true; this.getXmExchanges(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -214,7 +214,7 @@ this.pageInfo.count=true; this.getXmExchanges(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -247,7 +247,7 @@ if(tips.isOk){ this.xmExchanges.push(params); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) } /**end 自定义函数请在上面加**/ diff --git a/src/views/xm/core/xmFile/XmFileAdd.vue b/src/views/xm/core/xmFile/XmFileAdd.vue index eca5eb63..6880789e 100644 --- a/src/views/xm/core/xmFile/XmFileAdd.vue +++ b/src/views/xm/core/xmFile/XmFileAdd.vue @@ -96,7 +96,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmFile/XmFileEdit.vue b/src/views/xm/core/xmFile/XmFileEdit.vue index e7d8799f..44659640 100644 --- a/src/views/xm/core/xmFile/XmFileEdit.vue +++ b/src/views/xm/core/xmFile/XmFileEdit.vue @@ -96,7 +96,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmFile/XmFileMng.vue b/src/views/xm/core/xmFile/XmFileMng.vue index f200bcce..64183c0c 100644 --- a/src/views/xm/core/xmFile/XmFileMng.vue +++ b/src/views/xm/core/xmFile/XmFileMng.vue @@ -185,7 +185,7 @@ this.pageInfo.count=false; this.selProject.file = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -230,7 +230,7 @@ this.pageInfo.count=true; this.getXmFiles(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -247,7 +247,7 @@ this.pageInfo.count=true; this.getXmFiles(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue index a8db034e..e0fdf2a2 100644 --- a/src/views/xm/core/xmIteration/XmIterationAdd.vue +++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue @@ -114,7 +114,7 @@ //新增提交XmIteration 迭代定义 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({showClose: true, message: "只有迭代管理员可以修改迭代", type: 'error' }); + this.$notify({showClose: true, message: "只有迭代管理员可以修改迭代", type: 'error' }); return ; } this.$refs.addForm.validate((valid) => { @@ -130,7 +130,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit',res.data.data);// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } @@ -140,7 +140,7 @@ onUserSelected: function(users) { if(users.length>1){ - this.$message.error("只能选一个人"); + this.$notify.error("只能选一个人"); return; } var user=users[0] diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue index 899475f9..66cec03d 100644 --- a/src/views/xm/core/xmIteration/XmIterationEdit.vue +++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue @@ -93,7 +93,7 @@ //新增提交XmIteration 迭代定义 父组件监听@submit="afterAddSubmit" editSubmit: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({showClose: true, message: "只有迭代管理员可以修改迭代", type: 'error' }); + this.$notify({showClose: true, message: "只有迭代管理员可以修改迭代", type: 'error' }); return ; } this.$refs.editForm.validate((valid) => { @@ -109,7 +109,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } @@ -119,7 +119,7 @@ onUserSelected: function(users) { if(users.length>1){ - this.$message.error("只能选一个人"); + this.$notify.error("只能选一个人"); return; } var user=users[0] diff --git a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue index 5a310aa3..403742e3 100644 --- a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue +++ b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue @@ -147,7 +147,7 @@ delXmIterationProductLink(params).then(res=>{ var tips = res.data.tips; if(tips.isOk){ - this.$message({showClose: true, message:"移出成功", type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message:"移出成功", type: tips.isOk?'success':'error' }); } }) }) diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue index 432135d3..867490ae 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -286,7 +286,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; params.queryScope=this.filters.queryScope if(this.filters.queryScope=='iterationId'){ if(!this.filters.id){ - this.$message({showClose: true, message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' }); + this.$notify({showClose: true, message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' }); return; } params.id=this.filters.id @@ -310,7 +310,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; this.pageInfo.count=false; this.xmIterations = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -324,7 +324,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; //显示新增界面 XmIteration 迭代定义 showAdd: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({showClose: true, message: "只有迭代管理员可以新增迭代", type: 'error' }); + this.$notify({showClose: true, message: "只有迭代管理员可以新增迭代", type: 'error' }); return ; } this.parentIteration=null @@ -362,7 +362,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; //删除xmIteration handleDel: function (row,index) { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' }); + this.$notify({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' }); return ; } this.$confirm('确认删除该记录吗?', '提示', { @@ -377,14 +377,14 @@ import XmIterationSelect from './XmIterationSelect.vue'; this.pageInfo.count=true; this.getXmIterations(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmIteration batchDel: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' }); + this.$notify({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' }); return ; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -398,7 +398,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; this.pageInfo.count=true; this.getXmIterations(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -471,7 +471,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; if(tips.isOk){ this.getXmIterations(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, showIterationState(row){ @@ -496,7 +496,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; if(tips.isOk){ this.getXmIterations(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -511,7 +511,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; if(tips.isOk){ this.getXmIterations(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }) } diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue index a625747d..abd083a2 100644 --- a/src/views/xm/core/xmIteration/XmIterationSelect.vue +++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue @@ -218,7 +218,7 @@ params.queryScope=this.filters.queryScope if(this.filters.queryScope=='iterationId'){ if(!this.filters.id){ - this.$message({showClose: true, message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' }); + this.$notify({showClose: true, message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' }); return; } params.id=this.filters.id @@ -245,7 +245,7 @@ this.pageInfo.count=false; this.xmIterations = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -342,7 +342,7 @@ if(tips.isOk){ this.getXmIterations(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, },//end methods diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue index 486a57ac..cb702488 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue @@ -82,7 +82,7 @@ //新增提交XmIterationMenu 迭代定义 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); + this.$notify({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); return ; } this.$refs.addForm.validate((valid) => { @@ -98,7 +98,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue index d4fdad9b..c937f0f3 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue @@ -82,7 +82,7 @@ //编辑提交XmIterationMenu 迭代定义父组件监听@submit="afterEditSubmit" editSubmit: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); + this.$notify({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); return ; } this.$refs.editForm.validate((valid) => { @@ -97,7 +97,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue index 71d6609d..13ca26a8 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue @@ -157,7 +157,7 @@ if(this.iteration){ params.iterationId=this.iteration.id }else{ - this.$message({showClose: true, message: "请先在左边选择迭代", type: 'success' }); + this.$notify({showClose: true, message: "请先在左边选择迭代", type: 'success' }); return; } this.load.list = true; @@ -168,7 +168,7 @@ this.pageInfo.count=false; this.xmIterationMenus = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -182,7 +182,7 @@ //显示新增界面 XmIterationMenu 迭代定义 showAdd: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); + this.$notify({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); return ; } this.menuVisible = true; @@ -214,14 +214,14 @@ this.pageInfo.count=true; this.getXmIterationMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmIterationMenu batchDel: function () { if(this.sels.length<=0){ - this.$message({showClose: true, message:"请先选择一个或者多个需求", type: 'error' }); + this.$notify({showClose: true, message:"请先选择一个或者多个需求", type: 'error' }); return ; } this.$confirm('确认将需求移出迭代吗？', '提示', { @@ -238,7 +238,7 @@ this.pageInfo.count=true; this.getXmIterationMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -305,7 +305,7 @@ if(tips.isOk){ this.getXmIterationMenus() } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }, onIterationRowClick(iteration){ diff --git a/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkAdd.vue b/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkAdd.vue index 083de18a..0901ff9d 100644 --- a/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkAdd.vue +++ b/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkAdd.vue @@ -95,7 +95,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkEdit.vue b/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkEdit.vue index a9d9bb73..d6afc557 100644 --- a/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkEdit.vue +++ b/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkEdit.vue @@ -93,7 +93,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue b/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue index 1998e5de..b945d018 100644 --- a/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue +++ b/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue @@ -159,7 +159,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue'; this.pageInfo.count=false; this.xmIterationProductLinks = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$notify({ message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -201,7 +201,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue'; this.pageInfo.count=true; this.getXmIterationProductLinks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -219,7 +219,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue'; this.pageInfo.count=true; this.getXmIterationProductLinks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -241,7 +241,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue'; this.pageInfo.count=true; this.getXmIterationProductLinks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -259,7 +259,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue'; this.pageInfo.count=true; this.getXmIterationProductLinks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); } diff --git a/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue b/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue index 9518e3ce..51e4f8bd 100644 --- a/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue +++ b/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue @@ -140,7 +140,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue b/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue index fd1282a7..efd7aa4a 100644 --- a/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue +++ b/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue @@ -138,7 +138,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue index 0292b49f..a76b2ad6 100644 --- a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue +++ b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue @@ -162,7 +162,7 @@ this.pageInfo.count=false; this.xmIterationStates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -204,7 +204,7 @@ this.pageInfo.count=true; this.getXmIterationStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -222,7 +222,7 @@ this.pageInfo.count=true; this.getXmIterationStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue index 0292b49f..a76b2ad6 100644 --- a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue +++ b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue @@ -162,7 +162,7 @@ this.pageInfo.count=false; this.xmIterationStates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -204,7 +204,7 @@ this.pageInfo.count=true; this.getXmIterationStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -222,7 +222,7 @@ this.pageInfo.count=true; this.getXmIterationStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue index 9a25f014..3fca20cd 100644 --- a/src/views/xm/core/xmMenu/XmMenuAdd.vue +++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue @@ -127,11 +127,11 @@ //新增提交XmMenu 项目需求表 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.parentMenu==null && this.product ==null ){ - this.$message({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' }); + this.$notify({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' }); return; } if(this.parentMenu && this.parentMenu.ntype=="0"){ - this.$message({showClose: true, message: '需求集下不能再建立子需求', type:'error' }); + this.$notify({showClose: true, message: '需求集下不能再建立子需求', type:'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -147,7 +147,7 @@ params.productId=this.product.id } if(params.productId==null|| params.productId==''){ - this.$message({showClose: true, message: '产品编号不能为空', type:'error' }); + this.$notify({showClose: true, message: '产品编号不能为空', type:'error' }); return; } addXmMenu(params).then((res) => { @@ -156,7 +156,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index 416e4346..9a42b853 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -152,7 +152,7 @@ import XmMenuOverview from './XmMenuOverview.vue'; editSubmit: function () { if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } this.$refs.editForm.validate((valid) => { @@ -167,7 +167,7 @@ import XmMenuOverview from './XmMenuOverview.vue'; if(tips.isOk){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index a3d04413..ff49c118 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -464,7 +464,7 @@ if( this.filters.product && this.filters.product.id){ params.productId=this.filters.product.id }else { - this.$message({showClose: true, message: "请先选择产品", type: 'success' }); + this.$notify({showClose: true, message: "请先选择产品", type: 'success' }); return; } @@ -478,7 +478,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; } @@ -498,11 +498,11 @@ //显示新增界面 XmMenu xm_project_menu showAdd: function () { if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } if(this.filters.product==null){ - this.$message({showClose: true, message: "请先选择产品", type: 'error' }); + this.$notify({showClose: true, message: "请先选择产品", type: 'error' }); return; } this.parentMenu=null; @@ -511,7 +511,7 @@ }, showSubAdd:function(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } this.editForm=row @@ -545,7 +545,7 @@ //删除xmMenu handleDel: function (row,index) { if(row.mmUserid!=this.userInfo.userid){ - this.$message({showClose: true, message: "只能操作你负责的需求", type: 'error'}); + this.$notify({showClose: true, message: "只能操作你负责的需求", type: 'error'}); return false; } this.$confirm('确认删除该记录吗?', '提示', { @@ -560,7 +560,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -568,7 +568,7 @@ batchDel: function () { var mmSels=this.sels.filter(i=>i.mmUserid!=this.userInfo.userid) if(mmSels.length>0){ - this.$message({showClose: true, message: "只能操作你负责的需求", type: 'error'}); + this.$notify({showClose: true, message: "只能操作你负责的需求", type: 'error'}); return false; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -582,7 +582,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -678,11 +678,11 @@ showImportFromMenuTemplate(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } if(!this.filters.product){ - this.$message.error("请选择产品模板") + this.$notify.error("请选择产品模板") return; } this.parentMenu=row @@ -749,14 +749,14 @@ if(tips.isOk){ this.getXmMenus() }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } }).catch( err => this.load.add=false ); }, toBatchEdit(){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } this.batchEditVisible=true; @@ -770,7 +770,7 @@ showTaskList(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } this.editForm=row @@ -781,7 +781,7 @@ if(xmTasks==null || xmTasks.length==0){ - this.$message.error("请最少选择一个任务进行关联"); + this.$notify.error("请最少选择一个任务进行关联"); return; } var menu=this.editForm @@ -798,7 +798,7 @@ if(tips.isOk){ this.getXmMenus() } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, showMenuExchange:function(row){ @@ -826,7 +826,7 @@ loadTasksToXmMenuState: function () { this.load.edit=true; if(!this.filters.product){ - this.$message.error("请先选择产品"); + this.$notify.error("请先选择产品"); } let params = { productId: this.filters.product.id }; loadTasksToXmMenuState(params).then((res) => { @@ -836,7 +836,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, selectUser(row){ diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue index e31292c6..54f75be2 100644 --- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue +++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue @@ -350,7 +350,7 @@ if( this.filters.product!==null && this.filters.product.id!=''){ params.productId=this.filters.product.id }else { - this.$message({showClose: true, message: "请先选择产品", type: 'success' }); + this.$notify({showClose: true, message: "请先选择产品", type: 'success' }); return; //params.xxx=xxxxx } @@ -384,7 +384,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; } @@ -400,11 +400,11 @@ //显示新增界面 XmMenu xm_project_menu showAdd: function () { if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } if(this.filters.product==null){ - this.$message({showClose: true, message: "请先选择产品", type: 'error' }); + this.$notify({showClose: true, message: "请先选择产品", type: 'error' }); return; } this.parentMenu=null; @@ -413,7 +413,7 @@ }, showSubAdd:function(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } this.editForm=row @@ -444,7 +444,7 @@ //删除xmMenu handleDel: function (row,index) { if(row.mmUserid!=this.userInfo.userid){ - this.$message({showClose: true, message: "只能操作你负责的需求", type: 'error'}); + this.$notify({showClose: true, message: "只能操作你负责的需求", type: 'error'}); return false; } this.$confirm('确认删除该记录吗?', '提示', { @@ -459,7 +459,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -467,7 +467,7 @@ batchDel: function () { var mmSels=this.sels.filter(i=>i.mmUserid!=this.userInfo.userid) if(mmSels.length>0){ - this.$message({showClose: true, message: "只能操作你负责的需求", type: 'error'}); + this.$notify({showClose: true, message: "只能操作你负责的需求", type: 'error'}); return false; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -481,7 +481,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -758,11 +758,11 @@ showImportFromMenuTemplate(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } if(!this.filters.product){ - this.$message.error("请选择产品模板") + this.$notify.error("请选择产品模板") return; } this.parentMenu=row @@ -829,14 +829,14 @@ if(tips.isOk){ this.getXmMenus() }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } }).catch( err => this.load.add=false ); }, toBatchEdit(){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } this.valueChangeRows=[]; @@ -851,11 +851,11 @@ batchSaveMenu(){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } if(this.valueChangeRows.length==0){ - this.$message.success("没有数据被修改"); + this.$notify.success("没有数据被修改"); return } batchEditXmMenu(this.valueChangeRows).then(res=>{ @@ -864,7 +864,7 @@ this.valueChangeRows=[] this.getXmMenus() } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, fieldChange:function(row,fieldName,nextReplace){ @@ -900,7 +900,7 @@ showTaskList(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } this.editForm=row @@ -911,7 +911,7 @@ if(xmTasks==null || xmTasks.length==0){ - this.$message.error("请最少选择一个任务进行关联"); + this.$notify.error("请最少选择一个任务进行关联"); return; } var menu=this.editForm @@ -928,7 +928,7 @@ if(tips.isOk){ this.getXmMenus() } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, showMenuExchange:function(row){ @@ -976,7 +976,7 @@ }else if('delete'==opType){ if(row.opType && (row.opType=='addSub' || row.opType=='add')){ if(row.children && row.children.length>0){ - this.$message.error("请先删除子元素"); + this.$notify.error("请先删除子元素"); return; }else{ @@ -986,7 +986,7 @@ this.xmMenus.splice(index,1); } }else{ - this.$message.error("只能删除未保存的行"); + this.$notify.error("只能删除未保存的行"); return; } @@ -1006,7 +1006,7 @@ loadTasksToXmMenuState: function () { this.load.edit=true; if(!this.filters.product){ - this.$message.error("请先选择产品"); + this.$notify.error("请先选择产品"); } let params = { productId: this.filters.product.id }; loadTasksToXmMenuState(params).then((res) => { @@ -1016,7 +1016,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, selectUser(row){ diff --git a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue index 5e57121d..1e66adda 100644 --- a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue +++ b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue @@ -123,7 +123,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue index aea18829..9fd3e5c1 100644 --- a/src/views/xm/core/xmMenu/XmMenuSelect.vue +++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue @@ -296,7 +296,7 @@ if( this.filters.product!==null && this.filters.product.id!=''){ params.productId=this.filters.product.id }else { - this.$message({showClose: true, message: "请先选择产品", type: 'success' }); + this.$notify({showClose: true, message: "请先选择产品", type: 'success' }); return; //params.xxx=xxxxx } @@ -311,7 +311,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue index fec1af9e..904857dd 100644 --- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue +++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue @@ -362,7 +362,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -383,7 +383,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, //删除xmMenu @@ -397,13 +397,13 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false ); }, //批量删除xmMenu batchDel: function () { if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } @@ -418,7 +418,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -497,11 +497,11 @@ }, showBatchEdit:function(){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } if(this.xmMenus.length==0 ){ - this.$message({showClose: true, message:"没有数据可以修改", type: 'error'}); + this.$notify({showClose: true, message:"没有数据可以修改", type: 'error'}); return ; } @@ -509,7 +509,7 @@ }, saveBatchEdit:function(){ if(this.valueChangeRows.length==0){ - this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { @@ -521,7 +521,7 @@ this.valueChangeRows=[] this.getXmMenus() } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmMenuExchange/MenuUserEditor.vue b/src/views/xm/core/xmMenuExchange/MenuUserEditor.vue index 08713965..26cd4c80 100644 --- a/src/views/xm/core/xmMenuExchange/MenuUserEditor.vue +++ b/src/views/xm/core/xmMenuExchange/MenuUserEditor.vue @@ -37,7 +37,7 @@ export default { content: this.content, } if(!this.content){ - this.$message.error("请输入内容再提交"); + this.$notify.error("请输入内容再提交"); return; } this.$emit('publish',params); diff --git a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue index 38bb7bfd..88fc154d 100644 --- a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue +++ b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue @@ -188,7 +188,7 @@ this.pageInfo.count=false; this.xmMenuExchanges = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -230,7 +230,7 @@ this.pageInfo.count=true; this.getXmMenuExchanges(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -248,7 +248,7 @@ this.pageInfo.count=true; this.getXmMenuExchanges(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -263,7 +263,7 @@ params.remark=editor.content; if(!parentXmMenuExchange && !this.xmMenu && !this.filters.xmMenu){ - this.$message.error("请选择需求再发表评论") + this.$notify.error("请选择需求再发表评论") return; } params.id=sn() @@ -301,7 +301,7 @@ if(tips.isOk){ this.xmMenuExchanges.unshift(res.data.data); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }, /**end 自定义函数请在上面加**/ diff --git a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue index 96d1c87d..ed986b02 100644 --- a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue +++ b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue @@ -215,7 +215,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue b/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue index 36ddc008..bfd60f48 100644 --- a/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue +++ b/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue @@ -213,7 +213,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue index 5ea30f9c..710c92cb 100644 --- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue +++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue @@ -276,7 +276,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -297,7 +297,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, //删除xmMenu @@ -311,7 +311,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false ); }, //批量删除xmMenu @@ -328,7 +328,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -407,7 +407,7 @@ }, showBatchEdit:function(){ if(this.xmMenus.length==0 ){ - this.$message({showClose: true, message:"没有数据可以修改", type: 'error'}); + this.$notify({showClose: true, message:"没有数据可以修改", type: 'error'}); return ; } @@ -415,7 +415,7 @@ }, saveBatchEdit:function(){ if(this.valueChangeRows.length==0){ - this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { @@ -427,7 +427,7 @@ this.valueChangeRows=[] this.getXmMenus() } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue index 4d3c8a7a..816c1d2e 100644 --- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue +++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue @@ -79,7 +79,7 @@ //新增提交XmMenuTemplate 项目需求表 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.parentMenu==null && this.product ==null ){ - this.$message({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' }); + this.$notify({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -95,7 +95,7 @@ params.productId=this.product.id } if(params.productId==null|| params.productId==''){ - this.$message({showClose: true, message: '产品编号不能为空', type:'error' }); + this.$notify({showClose: true, message: '产品编号不能为空', type:'error' }); return; } addXmMenuTemplate(params).then((res) => { @@ -105,7 +105,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue index a5831cc3..93015a58 100644 --- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue +++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue @@ -93,7 +93,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue index e81b73b5..d3e96919 100644 --- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue +++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue @@ -215,7 +215,7 @@ if( this.filters.product!==null && this.filters.product.id!=''){ params.productId=this.filters.product.id }else { - this.$message({showClose: true, message: "请先选择产品", type: 'error' }); + this.$notify({showClose: true, message: "请先选择产品", type: 'error' }); return; //params.xxx=xxxxx } @@ -229,7 +229,7 @@ this.pageInfo.count=false; this.xmMenuTemplates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -243,7 +243,7 @@ //显示新增界面 XmMenuTemplate xm_project_menu showAdd: function () { if(this.filters.product==null){ - this.$message({showClose: true, message: "请先选择产品", type: 'error' }); + this.$notify({showClose: true, message: "请先选择产品", type: 'error' }); return; } this.addFormVisible = true; @@ -288,7 +288,7 @@ this.pageInfo.count=true; this.getXmMenuTemplates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -306,7 +306,7 @@ this.pageInfo.count=true; this.getXmMenuTemplates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -362,7 +362,7 @@ }, selectedMenusConfirm:function(){ if(this.sels.length==0){ - this.$message.error("请选择需求"); + this.$notify.error("请选择需求"); return; } this.$emit("selected-menus",this.sels) @@ -378,7 +378,7 @@ }, batchSaveMenu(){ if(this.valueChangeRows.length==0){ - this.$message.success("没有数据被修改"); + this.$notify.success("没有数据被修改"); return } batchEditXmMenuTemplate(this.valueChangeRows).then(res=>{ @@ -387,7 +387,7 @@ this.valueChangeRows=[] this.getXmMenuTemplates() } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, fieldChange:function(row,fieldName, nextReplace){ diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue index 637f9d44..aa1b0248 100644 --- a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue +++ b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue @@ -101,7 +101,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue b/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue index 1e2c6c9f..06d0f913 100644 --- a/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue +++ b/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue @@ -99,7 +99,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue b/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue index 0827b6e1..2ac45f20 100644 --- a/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue +++ b/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue @@ -145,7 +145,7 @@ this.pageInfo.count=false; this.xmMyFocuss = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -187,7 +187,7 @@ this.pageInfo.count=true; this.getXmMyFocuss(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -205,7 +205,7 @@ this.pageInfo.count=true; this.getXmMyFocuss(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProduct/XmProductAdd.vue b/src/views/xm/core/xmProduct/XmProductAdd.vue index d541a4c1..4cf4e603 100644 --- a/src/views/xm/core/xmProduct/XmProductAdd.vue +++ b/src/views/xm/core/xmProduct/XmProductAdd.vue @@ -101,7 +101,7 @@ //新增提交XmProduct 产品表 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({showClose: true, message: "只有产品经理能够创建产品", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理能够创建产品", type: 'error'}); return false; } @@ -119,7 +119,7 @@ //this.$refs['addForm'].resetFields(); this.$emit('submit',res.data.data);// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue index 797fa4ff..0b9c4be1 100644 --- a/src/views/xm/core/xmProduct/XmProductEdit.vue +++ b/src/views/xm/core/xmProduct/XmProductEdit.vue @@ -126,7 +126,7 @@ //新增提交XmProduct 产品表 父组件监听@submit="afterAddSubmit" editSubmit: function () { if(this.userInfo.userid!=this.editForm.pmUserid){ - this.$message({showClose: true, message: "你不是该产品负责人，不能修改产品信息", type: 'error' }); + this.$notify({showClose: true, message: "你不是该产品负责人，不能修改产品信息", type: 'error' }); return; } this.$refs.editForm.validate((valid) => { @@ -143,7 +143,7 @@ //this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } @@ -151,7 +151,7 @@ }, selectUser(){ if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({showClose: true, message: "你不是产品经理，不能修改产品负责人", type: 'error' }); + this.$notify({showClose: true, message: "你不是产品经理，不能修改产品负责人", type: 'error' }); return; } this.userSelectVisible=true; @@ -165,7 +165,7 @@ }, clearPmUser:function(){ if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({showClose: true, message: "你不是产品经理，不能修改产品负责人", type: 'error' }); + this.$notify({showClose: true, message: "你不是产品经理，不能修改产品负责人", type: 'error' }); return; } this.editForm.pmUserid='' diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue index 8e0dcbd0..c5e1ab72 100644 --- a/src/views/xm/core/xmProduct/XmProductMng.vue +++ b/src/views/xm/core/xmProduct/XmProductMng.vue @@ -368,7 +368,7 @@ import XmProductSelect from './XmProductSelect.vue'; this.pageInfo.count=true; this.getXmProducts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, //获取列表 XmProduct 产品表 @@ -389,7 +389,7 @@ import XmProductSelect from './XmProductSelect.vue'; params.queryScope=this.filters.queryScope if(this.filters.queryScope=='productId'){ if(!this.filters.id){ - this.$message({showClose: true, message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); + this.$notify({showClose: true, message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); return; } params.id=this.filters.id @@ -428,7 +428,7 @@ import XmProductSelect from './XmProductSelect.vue'; this.templateVisible=false; } }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -442,7 +442,7 @@ import XmProductSelect from './XmProductSelect.vue'; //显示新增界面 XmProduct 产品表 showAdd: function () { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({showClose: true, message: "只有产品经理能够创建产品", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理能够创建产品", type: 'error'}); return false; } this.addFormVisible = true; @@ -475,7 +475,7 @@ import XmProductSelect from './XmProductSelect.vue'; //删除xmProduct handleDel: function (row,index) { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理能够删除产品", type: 'error'}); return false; } this.$confirm('确认删除该记录吗?', '提示', { @@ -490,19 +490,19 @@ import XmProductSelect from './XmProductSelect.vue'; this.pageInfo.count=true; this.getXmProducts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmProduct batchDel: function () { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理能够删除产品", type: 'error'}); return false; } var mmSels=this.sels.filter(i=>i.pmUserid!=this.userInfo.userid) if(mmSels.length>0){ - this.$message({showClose: true, message: "只能删除你负责的产品", type: 'error'}); + this.$notify({showClose: true, message: "只能删除你负责的产品", type: 'error'}); return false; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -516,7 +516,7 @@ import XmProductSelect from './XmProductSelect.vue'; this.pageInfo.count=true; this.getXmProducts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -577,7 +577,7 @@ import XmProductSelect from './XmProductSelect.vue'; if(tips.isOk){ this.getXmProducts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -592,7 +592,7 @@ import XmProductSelect from './XmProductSelect.vue'; if(tips.isOk){ this.getXmProducts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -616,7 +616,7 @@ import XmProductSelect from './XmProductSelect.vue'; this.$refs.xmProductTplMngRef.searchXmProducts() } } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, diff --git a/src/views/xm/core/xmProduct/XmProductProjectForLink.vue b/src/views/xm/core/xmProduct/XmProductProjectForLink.vue index 28a45a7d..0fdac62e 100644 --- a/src/views/xm/core/xmProduct/XmProductProjectForLink.vue +++ b/src/views/xm/core/xmProduct/XmProductProjectForLink.vue @@ -48,7 +48,7 @@ delXmProductProjectLink(params).then(res=>{ var tips = res.data.tips; if(tips.isOk){ - this.$message({showClose: true, message: "脱钩成功", type: 'success' }); + this.$notify({showClose: true, message: "脱钩成功", type: 'success' }); } }); }) diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue index 45429c36..ac34058c 100644 --- a/src/views/xm/core/xmProduct/XmProductSelect.vue +++ b/src/views/xm/core/xmProduct/XmProductSelect.vue @@ -218,7 +218,7 @@ params.queryScope=this.filters.queryScope if(this.filters.queryScope=='productId'){ if(!this.filters.id){ - this.$message({showClose: true, message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); + this.$notify({showClose: true, message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); return; } params.id=this.filters.id @@ -244,7 +244,7 @@ this.pageInfo.count=false; this.xmProducts = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -295,7 +295,7 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, },//end methods diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue index facc2d38..01896e8f 100644 --- a/src/views/xm/core/xmProduct/XmProductTplMng.vue +++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue @@ -192,7 +192,7 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, //获取列表 XmProduct 产品表 @@ -225,7 +225,7 @@ this.pageInfo.count=false; this.xmProducts = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -239,7 +239,7 @@ //显示新增界面 XmProduct 产品表 showAdd: function () { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({showClose: true, message: "只有产品经理能够创建产品", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理能够创建产品", type: 'error'}); return false; } this.addFormVisible = true; @@ -283,19 +283,19 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmProduct batchDel: function () { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'}); + this.$notify({showClose: true, message: "只有产品经理能够删除产品", type: 'error'}); return false; } var mmSels=this.sels.filter(i=>i.pmUserid!=this.userInfo.userid) if(mmSels.length>0){ - this.$message({showClose: true, message: "只能删除你负责的产品", type: 'error'}); + this.$notify({showClose: true, message: "只能删除你负责的产品", type: 'error'}); return false; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -309,7 +309,7 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -370,7 +370,7 @@ if(tips.isOk){ this.getXmProducts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -385,7 +385,7 @@ if(tips.isOk){ this.getXmProducts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -409,7 +409,7 @@ this.$emit("copy",res.data.data) } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue index caeb1003..5e33648c 100644 --- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue +++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue @@ -95,7 +95,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue index d0951ebf..b62897d6 100644 --- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue +++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue @@ -93,7 +93,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue index fa4667f2..2e50c409 100644 --- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue +++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue @@ -157,7 +157,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue'; this.pageInfo.count=false; this.xmProductProjectLinks = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$notify({ message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -199,7 +199,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue'; this.pageInfo.count=true; this.getXmProductProjectLinks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -217,7 +217,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue'; this.pageInfo.count=true; this.getXmProductProjectLinks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -241,7 +241,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue'; this.pageInfo.count=true; this.getXmProductProjectLinks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -259,7 +259,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue'; this.pageInfo.count=true; this.getXmProductProjectLinks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); } diff --git a/src/views/xm/core/xmProductState/XmProductStateAdd.vue b/src/views/xm/core/xmProductState/XmProductStateAdd.vue index 5f5dc6c4..28d5eac5 100644 --- a/src/views/xm/core/xmProductState/XmProductStateAdd.vue +++ b/src/views/xm/core/xmProductState/XmProductStateAdd.vue @@ -185,7 +185,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProductState/XmProductStateEdit.vue b/src/views/xm/core/xmProductState/XmProductStateEdit.vue index 1851fe1b..d79c64f3 100644 --- a/src/views/xm/core/xmProductState/XmProductStateEdit.vue +++ b/src/views/xm/core/xmProductState/XmProductStateEdit.vue @@ -183,7 +183,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProductState/XmProductStateMng.vue b/src/views/xm/core/xmProductState/XmProductStateMng.vue index f39b2bcc..946eb4ad 100644 --- a/src/views/xm/core/xmProductState/XmProductStateMng.vue +++ b/src/views/xm/core/xmProductState/XmProductStateMng.vue @@ -146,7 +146,7 @@ this.pageInfo.count=false; this.xmProductStates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -188,7 +188,7 @@ this.pageInfo.count=true; this.getXmProductStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -206,7 +206,7 @@ this.pageInfo.count=true; this.getXmProductStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue index 8bf5930a..573f93b1 100644 --- a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue +++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue @@ -92,7 +92,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue index f865d89a..415fa629 100644 --- a/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue +++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue @@ -88,7 +88,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue index da9474ad..a44ea50b 100644 --- a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue +++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue @@ -160,7 +160,7 @@ this.pageInfo.count=false; this.xmProductTemplates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -202,7 +202,7 @@ this.pageInfo.count=true; this.getXmProductTemplates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -220,7 +220,7 @@ this.pageInfo.count=true; this.getXmProductTemplates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProject/XmProjectAdd.vue b/src/views/xm/core/xmProject/XmProjectAdd.vue index 6ee9fe1b..01915277 100644 --- a/src/views/xm/core/xmProject/XmProjectAdd.vue +++ b/src/views/xm/core/xmProject/XmProjectAdd.vue @@ -335,7 +335,7 @@ //编辑提交XmProject xm_project父组件监听@submit="afterEditSubmit" addSubmit: function () { if(!this.roles.some(i=>i.roleid=='projectAdmin')){ - this.$message({showClose: true, message: "只有项目经理可以建立项目", type: 'error' }); + this.$notify({showClose: true, message: "只有项目经理可以建立项目", type: 'error' }); return; } if ( @@ -345,7 +345,7 @@ this.addForm.startTime = this.dateRanger[0] this.addForm.endTime = this.dateRanger[1] }else{ - this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); + this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -364,7 +364,7 @@ if(tips.isOk){ this.$emit('submit',params);// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.add=false); }); } diff --git a/src/views/xm/core/xmProject/XmProjectAssess.vue b/src/views/xm/core/xmProject/XmProjectAssess.vue index ccfd5829..a52c15a0 100644 --- a/src/views/xm/core/xmProject/XmProjectAssess.vue +++ b/src/views/xm/core/xmProject/XmProjectAssess.vue @@ -129,7 +129,7 @@ this.xmProjects = res.data.data; console.log(this.xmProjects); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -143,7 +143,7 @@ var tips=res.data.tips; if(tips.isOk){ } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.list = false); }, //显示新增界面 XmProject xm_project diff --git a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue index b7da6970..e1d37622 100644 --- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue +++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue @@ -259,7 +259,7 @@ import { months } from 'moment'; // }, updateBudget() { if(this.selProject.planTotalCost==undefined){ - this.$message({showClose: true, message:"不允许修改", type: 'success'}); + this.$notify({showClose: true, message:"不允许修改", type: 'success'}); return; } var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost) @@ -282,7 +282,7 @@ import { months } from 'moment'; }else{ this.selProjectBudget=Object.assign({},this.selProject) } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); this.load.edit = false; }).catch( err => this.load.edut = false ); }).catch(() => { diff --git a/src/views/xm/core/xmProject/XmProjectCost.vue b/src/views/xm/core/xmProject/XmProjectCost.vue index 4b0d8aa5..a5c38e2b 100644 --- a/src/views/xm/core/xmProject/XmProjectCost.vue +++ b/src/views/xm/core/xmProject/XmProjectCost.vue @@ -256,7 +256,7 @@ import { months } from 'moment'; // }, updateBudget() { if(this.selProject.planTotalCost==undefined){ - this.$message({showClose: true, message:"不允许修改", type: 'success'}); + this.$notify({showClose: true, message:"不允许修改", type: 'success'}); return; } var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost) @@ -279,7 +279,7 @@ import { months } from 'moment'; }else{ this.selProjectBudget=Object.assign({},this.selProject) } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); this.load.edit = false; }).catch( err => this.load.edut = false ); }).catch(() => { diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue index d6c09c69..84e10f43 100644 --- a/src/views/xm/core/xmProject/XmProjectEdit.vue +++ b/src/views/xm/core/xmProject/XmProjectEdit.vue @@ -401,11 +401,11 @@ //编辑提交XmProject xm_project父组件监听@submit="afterEditSubmit" editSubmit: function () { if(!this.roles.some(i=>i.roleid=='projectAdmin')){ - this.$message({showClose: true, message: "只有项目经理可以修改项目", type: 'error' }); + this.$notify({showClose: true, message: "只有项目经理可以修改项目", type: 'error' }); return; } if("0" != this.selProject.status){ - this.$message({showClose: true, message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); + this.$notify({showClose: true, message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); return; } if ( @@ -415,7 +415,7 @@ this.editForm.startTime = this.dateRanger[0] ; this.editForm.endTime = this.dateRanger[1] ; }else{ - this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); + this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } this.$refs.editForm.validate((valid) => { @@ -433,7 +433,7 @@ this.selProject=Object.assign(this.selProject,res.data.data) this.$emit('submit',res.data.data);// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } @@ -449,7 +449,7 @@ if(tips.isOk){ this.xmProjectGroups = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -531,12 +531,12 @@ }, sendToProcessApprova:function(row,bizKey){ if(!this.roles.some(i=>i.roleid=='projectAdmin')){ - this.$message({showClose: true, message: "只有项目经理可以发起流程", type: 'error' }); + this.$notify({showClose: true, message: "只有项目经理可以发起流程", type: 'error' }); return; } // 传过来的参数格式 if(row.flowState=='1'){ - this.$message.error("审核中，不允许重复发审"); + this.$notify.error("审核中，不允许重复发审"); return; } @@ -633,7 +633,7 @@ //this.html2canvas(document.querySelector(".editForm"),row,params); this.$router.push({name:'ProcdefListForBizStart',params:params}); }else { - this.$message.error("不支持的审批事项"); + this.$notify.error("不支持的审批事项"); return; } diff --git a/src/views/xm/core/xmProject/XmProjectForLink.vue b/src/views/xm/core/xmProject/XmProjectForLink.vue index 32fdd6c8..8dec55e8 100644 --- a/src/views/xm/core/xmProject/XmProjectForLink.vue +++ b/src/views/xm/core/xmProject/XmProjectForLink.vue @@ -159,7 +159,7 @@ import XmProjectList from './XmProjectList.vue'; this.pageInfo.count=false; this.xmProjects = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -180,7 +180,7 @@ import XmProjectList from './XmProjectList.vue'; if(tips.isOk){ this.getXmProjects(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -196,7 +196,7 @@ import XmProjectList from './XmProjectList.vue'; var tips = res.data.tips; if(tips.isOk){ this.getXmProjects(); - this.$message({showClose: true, message: "移出成功", type: 'success' }); + this.$notify({showClose: true, message: "移出成功", type: 'success' }); } }); }) diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue index b750a6fb..ec76ec48 100644 --- a/src/views/xm/core/xmProject/XmProjectList.vue +++ b/src/views/xm/core/xmProject/XmProjectList.vue @@ -135,7 +135,7 @@ this.pageInfo.count=false; this.xmProjects = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index e335eccf..5707a58c 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -418,7 +418,7 @@ this.templateVisible=false; } }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -496,7 +496,7 @@ this.pageInfo.count=true; this.getXmProjects(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -513,7 +513,7 @@ this.pageInfo.count=true; this.getXmProjects(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -553,7 +553,7 @@ this.ScreenData[scope.$index].status = val; this.status = val; } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); this.load.edit = false; }).catch( err => this.load.edut = false ); }, @@ -586,7 +586,7 @@ sendToProcessApprova:function(row,bizKey){ if(row.bizFlowState=='1'){ - this.$message.error("审核中，不允许重新发起"); + this.$notify.error("审核中，不允许重新发起"); return; } @@ -604,14 +604,14 @@ if(bizKey=='xm_project_delete_approva'){ if(row.status!='0'){ - this.$message.error("只有状态为初始化的项目可以删除"); + this.$notify.error("只有状态为初始化的项目可以删除"); return; } mainTitle='关于删除项目【'+titleNames+"】的审批" mainContext=mainTitle+',删除原因：'; } else if(bizKey=='xm_project_over_approva'){ if(row.status!='1'){ - this.$message.error("只有状态为执行中的项目可以进行结项操作"); + this.$notify.error("只有状态为执行中的项目可以进行结项操作"); return; } mainTitle='关于项目【'+titleNames+"】结项的审批" @@ -619,34 +619,34 @@ } else if(bizKey=='xm_project_restart_approva'){ if(row.status!='3'){ - this.$message.error("只有状态为暂停的项目可以进行重新启动操作"); + this.$notify.error("只有状态为暂停的项目可以进行重新启动操作"); return; } mainTitle='关于项目【'+titleNames+"】重新启动的审批" mainContext=mainTitle; } else if(bizKey=='xm_project_start_approva'){ if(row.status!='0'){ - this.$message.error("只有状态为初始化的项目可以进行立项审批操作"); + this.$notify.error("只有状态为初始化的项目可以进行立项审批操作"); return; } mainTitle='关于项目【'+titleNames+"】的立项审批" mainContext=mainTitle } else if(bizKey=='xm_project_suspension_approva'){ if(row.status!='1'){ - this.$message.error("只有状态为执行中的项目可以进行挂起操作"); + this.$notify.error("只有状态为执行中的项目可以进行挂起操作"); return; } mainTitle='关于项目【'+titleNames+"】暂停的审批" mainContext=mainTitle+''; } else if(bizKey=='xm_project_budget_change_approva'){ if(row.status!='1'){ - this.$message.error("只有状态为执行中的项目可以进行预算变更操作"); + this.$notify.error("只有状态为执行中的项目可以进行预算变更操作"); return; } mainTitle='关于项目【'+titleNames+"】的预算变更审批" mainContext=mainTitle+''; } else{ - this.$message.error("暂不支持的业务审批"); + this.$notify.error("暂不支持的业务审批"); return; } @@ -680,12 +680,12 @@ if(tips.isOk){ this.getXmProjects(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }else{ addXmMyFocus({projectId:row.id,focusType:'project',projectName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{ var tips=res.data.tips; - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) } }, @@ -721,7 +721,7 @@ this.$refs.xmProjectTplMngRef.searchXmProjects() } } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, diff --git a/src/views/xm/core/xmProject/XmProjectSelect.vue b/src/views/xm/core/xmProject/XmProjectSelect.vue index e587f8a0..0c6f5f42 100644 --- a/src/views/xm/core/xmProject/XmProjectSelect.vue +++ b/src/views/xm/core/xmProject/XmProjectSelect.vue @@ -139,7 +139,7 @@ this.pageInfo.count=false; this.xmProjects = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue index 5c82228d..f64f9a6c 100644 --- a/src/views/xm/core/xmProject/XmProjectTplMng.vue +++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue @@ -237,7 +237,7 @@ this.pageInfo.count=false; this.xmProjects = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -315,7 +315,7 @@ this.pageInfo.count=true; this.getXmProjects(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -332,7 +332,7 @@ this.pageInfo.count=true; this.getXmProjects(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -359,7 +359,7 @@ } this.$emit("copy",res.data.data) } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -394,7 +394,7 @@ this.ScreenData[scope.$index].status = val; this.status = val; } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); this.load.edit = false; }).catch( err => this.load.edut = false ); }, @@ -426,7 +426,7 @@ sendToProcessApprova:function(row,bizKey){ if(row.bizFlowState=='1'){ - this.$message.error("审核中，不允许重新发起"); + this.$notify.error("审核中，不允许重新发起"); return; } @@ -444,14 +444,14 @@ if(bizKey=='xm_project_delete_approva'){ if(row.status!='0'){ - this.$message.error("只有状态为初始化的项目可以删除"); + this.$notify.error("只有状态为初始化的项目可以删除"); return; } mainTitle='关于删除项目【'+titleNames+"】的审批" mainContext=mainTitle+',删除原因：'; } else if(bizKey=='xm_project_over_approva'){ if(row.status!='1'){ - this.$message.error("只有状态为执行中的项目可以进行结项操作"); + this.$notify.error("只有状态为执行中的项目可以进行结项操作"); return; } mainTitle='关于项目【'+titleNames+"】结项的审批" @@ -459,34 +459,34 @@ } else if(bizKey=='xm_project_restart_approva'){ if(row.status!='3'){ - this.$message.error("只有状态为暂停的项目可以进行重新启动操作"); + this.$notify.error("只有状态为暂停的项目可以进行重新启动操作"); return; } mainTitle='关于项目【'+titleNames+"】重新启动的审批" mainContext=mainTitle; } else if(bizKey=='xm_project_start_approva'){ if(row.status!='0'){ - this.$message.error("只有状态为初始化的项目可以进行立项审批操作"); + this.$notify.error("只有状态为初始化的项目可以进行立项审批操作"); return; } mainTitle='关于项目【'+titleNames+"】的立项审批" mainContext=mainTitle } else if(bizKey=='xm_project_suspension_approva'){ if(row.status!='1'){ - this.$message.error("只有状态为执行中的项目可以进行挂起操作"); + this.$notify.error("只有状态为执行中的项目可以进行挂起操作"); return; } mainTitle='关于项目【'+titleNames+"】暂停的审批" mainContext=mainTitle+''; } else if(bizKey=='xm_project_budget_change_approva'){ if(row.status!='1'){ - this.$message.error("只有状态为执行中的项目可以进行预算变更操作"); + this.$notify.error("只有状态为执行中的项目可以进行预算变更操作"); return; } mainTitle='关于项目【'+titleNames+"】的预算变更审批" mainContext=mainTitle+''; } else{ - this.$message.error("暂不支持的业务审批"); + this.$notify.error("暂不支持的业务审批"); return; } @@ -520,12 +520,12 @@ if(tips.isOk){ this.getXmProjects(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }else{ addXmMyFocus({projectId:row.id,focusType:'project',projectName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{ var tips=res.data.tips; - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) } }, diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue index da8c5f66..f0c13a7d 100644 --- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue +++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue @@ -197,7 +197,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue index 56fbded1..e918ed91 100644 --- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue +++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue @@ -195,7 +195,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue index bc6069ff..9085b9ec 100644 --- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue +++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue @@ -177,7 +177,7 @@ this.pageInfo.count=false; this.xmProjectBaselines = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -219,7 +219,7 @@ this.pageInfo.count=true; this.getXmProjectBaselines(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -237,7 +237,7 @@ this.pageInfo.count=true; this.getXmProjectBaselines(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue b/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue index 61bc3190..979b8288 100644 --- a/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue +++ b/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue @@ -83,7 +83,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue b/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue index 12751a7b..64ff60f9 100644 --- a/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue +++ b/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue @@ -81,7 +81,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue index 10fdde86..d6603396 100644 --- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue +++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue @@ -155,7 +155,7 @@ this.xmProjectContracts = res.data.data; console.log(res.data.data); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -197,7 +197,7 @@ this.pageInfo.count=true; this.getXmProjectContracts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -215,7 +215,7 @@ this.pageInfo.count=true; this.getXmProjectContracts(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue index 45423c58..2d758266 100644 --- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue +++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue @@ -116,7 +116,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue index 6a72d63d..7491eef8 100644 --- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue +++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue @@ -114,7 +114,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue index 5ce484c0..5fa5de7f 100644 --- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue +++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue @@ -196,7 +196,7 @@ this.pageInfo.count=false; this.xmProjectEnvLists = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -238,7 +238,7 @@ this.pageInfo.count=true; this.getXmProjectEnvLists(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -255,7 +255,7 @@ this.pageInfo.count=true; this.getXmProjectEnvLists(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -278,7 +278,7 @@ // console.log(this.envList); // this.getXmProjectEnvLists(); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -302,7 +302,7 @@ this.importVisible = false; this.getXmProjectEnvLists(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue index 4922a9f8..cd0d08d2 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue @@ -125,11 +125,11 @@ this.currOpType="edit"; this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }else{ - this.$message({ showClose:true, message: "表单验证不通过，请修改表单数据再提交", type: 'error' }); + this.$notify({ showClose:true, message: "表单验证不通过，请修改表单数据再提交", type: 'error' }); } }); }, diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue index 685d9bbd..1500642f 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue @@ -388,7 +388,7 @@ this.pageInfo.count=false; this.xmProjectGroups = res.data.data; }else{ - this.$message({ showClose:true, message: tips.msg, type: 'error' }); + this.$notify({ showClose:true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -474,7 +474,7 @@ this.pageInfo.count=true; this.getXmProjectGroups(); } - this.$message({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -493,7 +493,7 @@ this.pageInfo.count=true; this.getXmProjectGroups(); } - this.$message({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -510,7 +510,7 @@ if(tips.isOk){ this.imGroups=res.data.data; } - this.$message({showClose: true, + this.$notify({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -542,13 +542,13 @@ params.id=params.groupId this.imGroups.push(params); } - this.$message({showClose: true, + this.$notify({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); }) }else{ - that.$message({ + that.$notify({ message: "组员为空，不允许绑定", type: 'error' }); @@ -589,7 +589,7 @@ if(tips.isOk){ this.searchXmProjectGroups() } - this.$message({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }, @@ -646,7 +646,7 @@ this.pageInfo.count=true; this.getXmProjectGroups(); } - this.$message({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue index 82e433b9..b1b7dd1d 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue @@ -122,7 +122,7 @@ if(this.isSelectSingleUser=='1'){ if(users.length>1){ - this.$message({showClose: true, + this.$notify({showClose: true, message: '只能选中一个用户', type: 'error' }); @@ -137,7 +137,7 @@ params.projectId=this.filters.selProject.id }else{ this.selectProjectVisible=true; - this.$message({showClose: true, + this.$notify({showClose: true, message: '请选中项目', type: 'success' }); @@ -148,7 +148,7 @@ if(tips.isOk){ this.selGroups=res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } }) }, diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue index d900e808..0d1f28d4 100644 --- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue +++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue @@ -176,7 +176,7 @@ import XmProjectGroupStateOverview from './XmProjectGroupStateOverview.vue'; this.pageInfo.count=false; this.xmProjectGroupStates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -218,7 +218,7 @@ import XmProjectGroupStateOverview from './XmProjectGroupStateOverview.vue'; this.pageInfo.count=true; this.getXmProjectGroupStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -236,7 +236,7 @@ import XmProjectGroupStateOverview from './XmProjectGroupStateOverview.vue'; this.pageInfo.count=true; this.getXmProjectGroupStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -250,7 +250,7 @@ import XmProjectGroupStateOverview from './XmProjectGroupStateOverview.vue'; if(tips.isOk){ this.getXmProjectGroupStates(); }else{ - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); } }) diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue index 8afb0c72..a99a87d7 100644 --- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue +++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue @@ -114,11 +114,11 @@ this.currOpType="edit"; this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }else{ - this.$message({ showClose:true, message: "表单验证不通过，请修改表单数据再提交", type: 'error' }); + this.$notify({ showClose:true, message: "表单验证不通过，请修改表单数据再提交", type: 'error' }); } }); }, diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue index 5539cf5f..5de6e35d 100644 --- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue +++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue @@ -172,7 +172,7 @@ this.pageInfo.count=false; this.xmProjectGroupUsers = res.data.data; }else{ - this.$message({ showClose:true, message: tips.msg, type: 'error' }); + this.$notify({ showClose:true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -214,7 +214,7 @@ this.pageInfo.count=true; this.getXmProjectGroupUsers(); } - this.$message({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -232,7 +232,7 @@ this.pageInfo.count=true; this.getXmProjectGroupUsers(); } - this.$message({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue index 490b80f6..f5c4ec85 100644 --- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue +++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue @@ -101,7 +101,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue index d5e0832b..19931385 100644 --- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue +++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue @@ -99,7 +99,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue index ba96090f..5216e8ac 100644 --- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue +++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue @@ -146,7 +146,7 @@ this.pageInfo.count=false; this.xmProjectGroupUserCandidates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -188,7 +188,7 @@ this.pageInfo.count=true; this.getXmProjectGroupUserCandidates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -206,7 +206,7 @@ this.pageInfo.count=true; this.getXmProjectGroupUserCandidates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue index 5f584a17..72efce0d 100644 --- a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue +++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue @@ -122,7 +122,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue index 604aa5cf..9199ab2e 100644 --- a/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue +++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue @@ -120,7 +120,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue index 6161568e..06cc026d 100644 --- a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue +++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue @@ -169,7 +169,7 @@ this.pageInfo.count=false; this.xmProjectKpis = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -211,7 +211,7 @@ this.pageInfo.count=true; this.getXmProjectKpis(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -229,7 +229,7 @@ this.pageInfo.count=true; this.getXmProjectKpis(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue index 002c1bb6..8c625ca1 100644 --- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue +++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue @@ -128,7 +128,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue index 49b7845d..5eb6f261 100644 --- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue +++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue @@ -126,7 +126,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue index b1ce95e6..9c6b80b9 100644 --- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue +++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue @@ -154,7 +154,7 @@ this.pageInfo.count=false; this.xmProjectKpiHiss = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -196,7 +196,7 @@ this.pageInfo.count=true; this.getXmProjectKpiHiss(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -214,7 +214,7 @@ this.pageInfo.count=true; this.getXmProjectKpiHiss(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue index 0688ab08..a082b7b6 100644 --- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue +++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue @@ -149,7 +149,7 @@ //新增提交XmProjectMBudgetCostNouser xm_project_m_budget_cost_user 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.bizzYear==null || this.bizzYear==''){ - this.$message({showClose: true, message:"请选择需要分摊的年份", type: 'error' }); + this.$notify({showClose: true, message:"请选择需要分摊的年份", type: 'error' }); return; } @@ -169,7 +169,7 @@ batchAddXmProjectMBudgetCostNouser(list).then((res) => { this.load.add=false var tips=res.data.tips; - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue index 3ba95ad8..3667a2d0 100644 --- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue +++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue @@ -117,7 +117,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue index 58630ae0..53b7096e 100644 --- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue +++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue @@ -224,7 +224,7 @@ this.xmProjectMBudgetCostNousers = res.data.data; this.valueChangeRows=[]; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -266,7 +266,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostNousers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -284,7 +284,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostNousers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -296,7 +296,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -307,7 +307,7 @@ this.valueChangeRows=[] this.getXmProjectMBudgetCostNousers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue index b0f85b27..9c55e24c 100644 --- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue +++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue @@ -151,7 +151,7 @@ //新增提交XmProjectMBudgetCostUser xm_project_m_budget_cost_user 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.bizzYear==null || this.bizzYear==''){ - this.$message({showClose: true, message:"请选择需要分摊的年份", type: 'error' }); + this.$notify({showClose: true, message:"请选择需要分摊的年份", type: 'error' }); return; } @@ -170,7 +170,7 @@ batchAddXmProjectMBudgetCostUser(list).then((res) => { this.load.add=false var tips=res.data.tips; - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue index b2913675..dd064bee 100644 --- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue +++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue @@ -123,7 +123,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue index 2d793eef..ad7e663d 100644 --- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue +++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue @@ -229,7 +229,7 @@ this.xmProjectMBudgetCostUsers = res.data.data; this.valueChangeRows=[]; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -271,7 +271,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostUsers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -289,7 +289,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostUsers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -301,7 +301,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -312,7 +312,7 @@ this.valueChangeRows=[] this.getXmProjectMBudgetCostUsers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue index 602100a5..791358ea 100644 --- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue +++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue @@ -117,7 +117,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue index 1f1c7397..4a51f209 100644 --- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue +++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue @@ -141,7 +141,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue index 04931ae7..fb050bfb 100644 --- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue +++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue @@ -225,7 +225,7 @@ this.xmProjectMCostNousers = res.data.data; this.valueChangeRows=[]; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -267,7 +267,7 @@ this.pageInfo.count=true; this.getXmProjectMCostNousers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -285,7 +285,7 @@ this.pageInfo.count=true; this.getXmProjectMCostNousers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -297,7 +297,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -308,7 +308,7 @@ this.valueChangeRows=[] this.getXmProjectMCostNousers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue index 779c09b2..f3509dd0 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue @@ -139,7 +139,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue index 920539d0..85216d95 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue @@ -144,7 +144,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue index 6c669554..edb6c883 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue @@ -197,7 +197,7 @@ this.pageInfo.count=false; this.xmProjectMCostUsers = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue index 3cc8b461..70715d5d 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue @@ -230,7 +230,7 @@ this.xmProjectMCostUsers = res.data.data; this.valueChangeRows=[]; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -272,7 +272,7 @@ this.pageInfo.count=true; this.getXmProjectMCostUsers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -290,7 +290,7 @@ this.pageInfo.count=true; this.getXmProjectMCostUsers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -302,7 +302,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -313,7 +313,7 @@ this.valueChangeRows=[] this.getXmProjectMCostUsers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue index 1b63e423..58af58eb 100644 --- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue +++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue @@ -89,7 +89,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue index e8f7be08..5a269093 100644 --- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue +++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue @@ -87,7 +87,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue index 6c458b7b..9fc9d9f0 100644 --- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue +++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue @@ -141,7 +141,7 @@ this.pageInfo.count=false; this.xmProjectOptionss = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -183,7 +183,7 @@ this.pageInfo.count=true; this.getXmProjectOptionss(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -201,7 +201,7 @@ this.pageInfo.count=true; this.getXmProjectOptionss(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue index 5ecc4f36..525abd45 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue @@ -265,20 +265,20 @@ } }else{ - this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); + this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } if(!this.addForm.phaseBudgetInnerUserCnt){ - this.$message({showClose: true, message: "内购人员数不能为空", type: 'error' }); + this.$notify({showClose: true, message: "内购人员数不能为空", type: 'error' }); return; } if(!this.addForm.phaseBudgetHours){ - this.$message({showClose: true, message: "工期不能为空", type: 'error' }); + this.$notify({showClose: true, message: "工期不能为空", type: 'error' }); return; } if(!this.addForm.phaseBudgetInnerUserPrice){ - this.$message({showClose: true, message: "内购单价不能为空", type: 'error' }); + this.$notify({showClose: true, message: "内购单价不能为空", type: 'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -312,7 +312,7 @@ //this.$refs['addForm'].resetFields(); this.$emit('submit',res.data.data);// @submit="afteraddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue index 309dde0e..b62529e3 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue @@ -659,7 +659,7 @@ export default { this.pageInfo.count = false; this.xmProjectPhases = res.data.data; } else { - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: "error", @@ -676,7 +676,7 @@ export default { !this.roles.some((i) => i.roleid == "projectAdmin") && !this.roles.some((i) => i.roleid == "teamAdmin") ) { - this.$message({ + this.$notify({ showClose: true, message: "只有项目经理、小组组长可以操作计划", type: "error", @@ -692,7 +692,7 @@ export default { !this.roles.some((i) => i.roleid == "projectAdmin") && !this.roles.some((i) => i.roleid == "teamAdmin") ) { - this.$message({ + this.$notify({ showClose: true, message: "只有项目经理、小组组长可以操作计划", type: "error", @@ -711,7 +711,7 @@ export default { !this.roles.some((i) => i.roleid == "projectAdmin") && !this.roles.some((i) => i.roleid == "teamAdmin") ) { - this.$message({ + this.$notify({ showClose: true, message: "只有项目经理、小组组长可以操作计划", type: "error", @@ -826,7 +826,7 @@ export default { if (tips.isOk) { this.getXmProjectPhases(); } else { - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: "error", @@ -845,7 +845,7 @@ export default { !this.roles.some((i) => i.roleid == "projectAdmin") && !this.roles.some((i) => i.roleid == "teamAdmin") ) { - this.$message({ + this.$notify({ showClose: true, message: "只有项目经理、小组组长可以操作计划", type: "error", @@ -853,7 +853,7 @@ export default { return; } if (!!row.bizFlowState) { - this.$message({ + this.$notify({ showClose: true, message: "初始状态的计划可以直接删除，其它状态请发起审核流程进行删除", type: "error", @@ -862,7 +862,7 @@ export default { } if (command.data.children && command.data.length > 0) { - this.$message({ + this.$notify({ showClose: true, message: "该计划存在子计划，不允许删除", type: "error", @@ -882,7 +882,7 @@ export default { this.pageInfo.count = true; this.getXmProjectPhases(); } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -897,7 +897,7 @@ export default { !this.roles.some((i) => i.roleid == "projectAdmin") && !this.roles.some((i) => i.roleid == "teamAdmin") ) { - this.$message({ + this.$notify({ showClose: true, message: "只有项目经理、小组组长可以操作计划", type: "error", @@ -939,7 +939,7 @@ export default { this.pageInfo.count = true; this.getXmProjectPhases(); } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -953,7 +953,7 @@ export default { !this.roles.some((i) => i.roleid == "projectAdmin") && !this.roles.some((i) => i.roleid == "teamAdmin") ) { - this.$message({ + this.$notify({ showClose: true, message: "只有项目经理、小组组长可以操作计划", type: "error", @@ -1040,7 +1040,7 @@ export default { if (tips.isOk) { this.getXmProjectPhases(); } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -1223,7 +1223,7 @@ export default { !this.roles.some((i) => i.roleid == "projectAdmin") && !this.roles.some((i) => i.roleid == "teamAdmin") ) { - this.$message({ + this.$notify({ showClose: true, message: "只有项目经理、小组组长可以操作计划", type: "error", @@ -1231,7 +1231,7 @@ export default { return; } if (this.valueChangeRows.length == 0) { - this.$message({ + this.$notify({ showClose: true, message: "没有改变任何数据，无需保存", type: "success", @@ -1239,7 +1239,7 @@ export default { return; } else { if (this.phaseBudgetData.surplusPlanInnerUserAt < 0) { - this.$message({ + this.$notify({ showClose: true, message: "内部人力预算不足，请调整", type: "error", @@ -1247,7 +1247,7 @@ export default { return; } if (this.phaseBudgetData.surplusPlanOutUserAt < 0) { - this.$message({ + this.$notify({ showClose: true, message: "外购人力预算不足，请调整", type: "error", @@ -1255,7 +1255,7 @@ export default { return; } if (this.phaseBudgetData.surplusPlanNouserAt < 0) { - this.$message({ + this.$notify({ showClose: true, message: "非人力预算不足请调整", type: "error", @@ -1272,7 +1272,7 @@ export default { this.valueChangeRows = []; this.getXmProjectPhases(); } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -1638,7 +1638,7 @@ export default { !this.roles.some((i) => i.roleid == "projectAdmin") && !this.roles.some((i) => i.roleid == "teamAdmin") ) { - this.$message({ + this.$notify({ showClose: true, message: "只有项目经理、小组组长可以操作计划", type: "error", @@ -1668,7 +1668,7 @@ export default { !this.roles.some((i) => i.roleid == "projectAdmin") && !this.roles.some((i) => i.roleid == "teamAdmin") ) { - this.$message({ + this.$notify({ showClose: true, message: "只有项目经理、小组组长可以操作计划", type: "error", @@ -1713,7 +1713,7 @@ export default { this.xmProjectPhases.unshift(subRow); } else if ("addSub" == opType) { if (row.ntype != "1") { - this.$message.error( + this.$notify.error( "【" + row.phaseName + "】不是计划集，不允许在其下增加子计划" ); return; @@ -1738,7 +1738,7 @@ export default { } else if ("delete" == opType) { if (row.opType && (row.opType == "addSub" || row.opType == "add")) { if (row.children && row.children.length > 0) { - this.$message.error("请先删除子元素"); + this.$notify.error("请先删除子元素"); return; } else { var index = this.xmProjectPhases.findIndex((i) => i.id == row.id); @@ -1759,7 +1759,7 @@ export default { }); } } else { - this.$message.error("只能删除未保存的行"); + this.$notify.error("只能删除未保存的行"); return; } }, diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue index 6a03b756..ffa465c9 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue @@ -284,20 +284,20 @@ } }else{ - this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); + this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } if(!this.editForm.phaseBudgetInnerUserCnt){ - this.$message({showClose: true, message: "内购人员数不能为空", type: 'error' }); + this.$notify({showClose: true, message: "内购人员数不能为空", type: 'error' }); return; } if(!this.editForm.phaseBudgetHours){ - this.$message({showClose: true, message: "工期不能为空", type: 'error' }); + this.$notify({showClose: true, message: "工期不能为空", type: 'error' }); return; } if(!this.editForm.phaseBudgetInnerUserPrice){ - this.$message({showClose: true, message: "内购单价不能为空", type: 'error' }); + this.$notify({showClose: true, message: "内购单价不能为空", type: 'error' }); return; } this.$refs.editForm.validate((valid) => { @@ -326,7 +326,7 @@ //this.$refs['editForm'].resetFields(); this.$emit('submit',res.data.data);// @submit="aftereditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue index b41d4bf3..54e134a6 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue @@ -458,7 +458,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; this.pageInfo.count=false; this.xmProjectPhases = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -590,7 +590,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; treeTool.reloadChildren(this.$refs.table,this.maps,this.parentProjectPhase.id,'parentPhaseId',this.loadXmProjectPhaseLazy) } }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } }).catch( err => this.load.add=false ); }, @@ -616,7 +616,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; treeTool.reloadChildren(this.$refs.table,this.maps,row.parentPhaseId,'parentPhaseId',this.loadXmProjectPhaseLazy) } } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -656,7 +656,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; }) } } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -718,7 +718,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; sendToProcessApprova:function(row,bizKey){ if(row.bizFlowState=='1'){ - this.$message.error("审核中，不允许重新发起"); + this.$notify.error("审核中，不允许重新发起"); return; } @@ -736,14 +736,14 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; if(bizKey=='xm_project_delete_approva'){ if(row.status!='0'){ - this.$message.error("只有状态为初始化的项目可以删除"); + this.$notify.error("只有状态为初始化的项目可以删除"); return; } mainTitle='关于删除项目【'+titleNames+"】的审批" mainContext=mainTitle+',删除原因：'; } else if(bizKey=='xm_project_over_approva'){ if(row.status!='1'){ - this.$message.error("只有状态为执行中的项目可以进行结项操作"); + this.$notify.error("只有状态为执行中的项目可以进行结项操作"); return; } mainTitle='关于项目【'+titleNames+"】结项的审批" @@ -751,34 +751,34 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; } else if(bizKey=='xm_project_restart_approva'){ if(row.status!='3'){ - this.$message.error("只有状态为暂停的项目可以进行重新启动操作"); + this.$notify.error("只有状态为暂停的项目可以进行重新启动操作"); return; } mainTitle='关于项目【'+titleNames+"】重新启动的审批" mainContext=mainTitle; } else if(bizKey=='xm_project_start_approva'){ if(row.status!='0'){ - this.$message.error("只有状态为初始化的项目可以进行立项审批操作"); + this.$notify.error("只有状态为初始化的项目可以进行立项审批操作"); return; } mainTitle='关于项目【'+titleNames+"】的立项审批" mainContext=mainTitle } else if(bizKey=='xm_project_suspension_approva'){ if(row.status!='1'){ - this.$message.error("只有状态为执行中的项目可以进行挂起操作"); + this.$notify.error("只有状态为执行中的项目可以进行挂起操作"); return; } mainTitle='关于项目【'+titleNames+"】暂停的审批" mainContext=mainTitle+''; } else if(bizKey=='xm_project_budget_change_approva'){ if(row.status!='1'){ - this.$message.error("只有状态为执行中的项目可以进行预算变更操作"); + this.$notify.error("只有状态为执行中的项目可以进行预算变更操作"); return; } mainTitle='关于项目【'+titleNames+"】的预算变更审批" mainContext=mainTitle+''; } else{ - this.$message.error("暂不支持的业务审批"); + this.$notify.error("暂不支持的业务审批"); return; } @@ -835,7 +835,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; if(tips.isOk){ this.getXmProjectPhases() } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }, calcKeyPaths(){ @@ -849,7 +849,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; if(tips.isOk){ this.getXmProjectPhases() } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }, getFloatValue(value,digit){ @@ -975,19 +975,19 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; }, saveBatchEdit:function(){ if(this.valueChangeRows.length==0){ - this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { if(this.phaseBudgetData.surplusPlanInnerUserAt<0){ - this.$message({showClose: true, message:"内部人力预算不足，请调整", type: 'error'}); + this.$notify({showClose: true, message:"内部人力预算不足，请调整", type: 'error'}); return; } if(this.phaseBudgetData.surplusPlanOutUserAt<0){ - this.$message({showClose: true, message:"外购人力预算不足，请调整", type: 'error'}); + this.$notify({showClose: true, message:"外购人力预算不足，请调整", type: 'error'}); return; } if(this.phaseBudgetData.surplusPlanNouserAt<0){ - this.$message({showClose: true, message:"非人力预算不足请调整",type: 'error'}); + this.$notify({showClose: true, message:"非人力预算不足请调整",type: 'error'}); return; } @@ -999,7 +999,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; this.valueChangeRows=[] this.getXmProjectPhases(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } @@ -1231,7 +1231,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; }else if('delete'==opType){ if(row.opType && (row.opType=='addSub' || row.opType=='add')){ if(row.children && row.children.length>0){ - this.$message.error("请先删除子元素"); + this.$notify.error("请先删除子元素"); return; }else{ @@ -1251,7 +1251,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; }); } }else{ - this.$message.error("只能删除未保存的行"); + this.$notify.error("只能删除未保存的行"); return; } @@ -1274,10 +1274,10 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; setPhaseMngUser(this.editForm).then(res=>{ var tips = res.data.tips; if(tips.isOk){ - this.$message.success("设置成功"); + this.$notify.success("设置成功"); this.groupUserSelectVisible=false; }else{ - this.$message.error(tips.msg); + this.$notify.error(tips.msg); } }) }, @@ -1287,7 +1287,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; if(tips.isOk){ this.totalProjectAndPhaseBudgetCost=res.data.data; } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) } },//end methods diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue index ef81ae27..2376d13c 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue @@ -221,7 +221,7 @@ this.pageInfo.count=false; this.xmProjectPhases = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue index ee07ce0b..a03956a9 100644 --- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue +++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue @@ -143,7 +143,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue index 7bc3bb11..29e18976 100644 --- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue +++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue @@ -141,7 +141,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue index 13878e17..f4ab6fa8 100644 --- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue +++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue @@ -159,7 +159,7 @@ this.pageInfo.count=false; this.xmProjectPhaseBaselines = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -201,7 +201,7 @@ this.pageInfo.count=true; this.getXmProjectPhaseBaselines(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -219,7 +219,7 @@ this.pageInfo.count=true; this.getXmProjectPhaseBaselines(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue index fdbfae3f..dece2a0e 100644 --- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue +++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue @@ -142,7 +142,7 @@ //新增提交XmProjectPhaseTemplate xm_phase_template 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(!this.selProjectTemplate){ - this.$message.error("模板不能为空，请先选择项目模板") + this.$notify.error("模板不能为空，请先选择项目模板") return; } this.$refs.addForm.validate((valid) => { @@ -164,7 +164,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue index 36f7f7d3..37aaa5cf 100644 --- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue +++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue @@ -155,7 +155,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue index 1d26153c..c178d69e 100644 --- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue +++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue @@ -202,7 +202,7 @@ } this.getParams(params) if(!params.projectId && !params.productId){ - this.$message({showClose: true, message: "请选择项目模板/产品模板", type: 'error' }); + this.$notify({showClose: true, message: "请选择项目模板/产品模板", type: 'error' }); return; } params.isTop="1" @@ -214,7 +214,7 @@ this.pageInfo.count=false; this.xmProjectPhases = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProjectState/XmCockpit.vue b/src/views/xm/core/xmProjectState/XmCockpit.vue index 2edbb01c..39a08ff0 100644 --- a/src/views/xm/core/xmProjectState/XmCockpit.vue +++ b/src/views/xm/core/xmProjectState/XmCockpit.vue @@ -210,7 +210,7 @@ this.pageInfo.count=false; this.xmProjectStates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -252,7 +252,7 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -270,7 +270,7 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue index 8a782bca..8c25aedb 100644 --- a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue +++ b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue @@ -245,7 +245,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue index 2921faa1..00b9436f 100644 --- a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue +++ b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue @@ -243,7 +243,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue index 002cd7ef..5f9e1f0c 100644 --- a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue +++ b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue @@ -232,7 +232,7 @@ this.pageInfo.count=false; this.xmProjectStates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -274,7 +274,7 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -292,13 +292,13 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, loadProjectToXmProjectState: function () { if(!this.filters.selProject){ - this.$message({showClose: true, message: '请选择一个项目', type: 'error'}); + this.$notify({showClose: true, message: '请选择一个项目', type: 'error'}); return; } @@ -311,12 +311,12 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ); }, loadBugsToXmProjectState: function () { if(!this.filters.selProject){ - this.$message({showClose: true, message: '请选择一个项目', type: 'error'}); + this.$notify({showClose: true, message: '请选择一个项目', type: 'error'}); return; } @@ -329,12 +329,12 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ); }, loadTasksToXmProjectState: function () { if(!this.filters.selProject){ - this.$message({showClose: true, message: '请选择一个项目', type: 'error'}); + this.$notify({showClose: true, message: '请选择一个项目', type: 'error'}); return; } @@ -347,12 +347,12 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ); }, loadTasksSettleToXmProjectState: function () { if(!this.filters.selProject){ - this.$message({showClose: true, message: '请选择一个项目', type: 'error'}); + this.$notify({showClose: true, message: '请选择一个项目', type: 'error'}); return; } @@ -365,7 +365,7 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ); }, rowClick: function(row, event, column){ diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue index 167edf84..4e72092e 100644 --- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue +++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue @@ -170,7 +170,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue index b59db251..4ad9e988 100644 --- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue +++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue @@ -168,7 +168,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue index c8156170..ef5e9f1f 100644 --- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue +++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue @@ -168,7 +168,7 @@ this.pageInfo.count=false; this.xmProjectStateHiss = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -210,7 +210,7 @@ this.pageInfo.count=true; this.getXmProjectStateHiss(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -228,7 +228,7 @@ this.pageInfo.count=true; this.getXmProjectStateHiss(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue index 2b1f5eba..ddcfc93b 100644 --- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue +++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue @@ -140,7 +140,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue index c4cd8eb7..19a42dbe 100644 --- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue +++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue @@ -138,7 +138,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue index ffc15ac3..4e466903 100644 --- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue +++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue @@ -160,7 +160,7 @@ this.pageInfo.count=false; this.xmProjectTaskTypeStates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -202,7 +202,7 @@ this.pageInfo.count=true; this.getXmProjectTaskTypeStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -220,7 +220,7 @@ this.pageInfo.count=true; this.getXmProjectTaskTypeStates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue index 4f36c5fe..f58dd831 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue @@ -318,7 +318,7 @@ this.addForm.startTime = this.dateRanger[0] ; this.addForm.endTime = this.dateRanger[1] ; }else{ - this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); + this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -337,7 +337,7 @@ if(tips.isOk){ this.$emit('submit',params);// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue index 022d1c7e..e6555517 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue @@ -319,7 +319,7 @@ //编辑提交XmProjectTemplate xm_project父组件监听@submit="afterEditSubmit" editSubmit: function () { if("0" != this.selProjectTemplate.status){ - this.$message({showClose: true, message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); + this.$notify({showClose: true, message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); return; } if ( @@ -329,12 +329,12 @@ this.editForm.startTime = this.dateRanger[0] ; this.editForm.endTime = this.dateRanger[1] ; }else{ - this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); + this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } if(!this.editForm.productId){ - this.$message({showClose: true, message: "请选择归属产品", type: 'error' }); + this.$notify({showClose: true, message: "请选择归属产品", type: 'error' }); return; } this.$refs.editForm.validate((valid) => { @@ -352,7 +352,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit',params);// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue index e1764763..d4fea2df 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue @@ -153,7 +153,7 @@ this.pageInfo.count=false; this.xmProjectTemplates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue index 79aa5464..5b814a1e 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue @@ -166,7 +166,7 @@ this.pageInfo.count=false; this.xmProjectTemplates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -208,7 +208,7 @@ this.pageInfo.count=true; this.getXmProjectTemplates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -226,7 +226,7 @@ this.pageInfo.count=true; this.getXmProjectTemplates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue index 8a47235c..ac4c730c 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue @@ -229,7 +229,7 @@ this.$emit('submit');// @submit="afterAddSubmit" this.handleCancel(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } @@ -305,7 +305,7 @@ }, showSelectTask:function(){ if(this.filters.selProject==null){ - this.$message({showClose: true, message: "请先选项目", type: 'error' }); + this.$notify({showClose: true, message: "请先选项目", type: 'error' }); return ; } this.selectTaskVisible=true; @@ -325,7 +325,7 @@ }, showSelectMenu:function(){ if(this.filters.selProject==null){ - this.$message({showClose: true, message: "请先选项目", type: 'error' }); + this.$notify({showClose: true, message: "请先选项目", type: 'error' }); return ; } this.selectMenuVisible=true; diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index b75fc011..db1e6efb 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -262,7 +262,7 @@ this.$emit('submit');// @submit="afterAddSubmit" this.handleCancel(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } @@ -323,7 +323,7 @@ var oldBugStatus=this.editForm.bugStatus; if(tardgetBugStatus=="closed"){ if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以关闭bug",type:"error"}); + this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以关闭bug",type:"error"}); return ; } } @@ -358,7 +358,7 @@ }, showSelectTask:function(){ if(this.selProject==null){ - this.$message({showClose: true, message: "请先选项目", type: 'error' }); + this.$notify({showClose: true, message: "请先选项目", type: 'error' }); return ; } this.selectTaskVisible=true; @@ -384,7 +384,7 @@ showSelectMenu:function(){ if(this.selProject==null){ - this.$message({showClose: true, message: "请先选项目", type: 'error' }); + this.$notify({showClose: true, message: "请先选项目", type: 'error' }); return ; } this.selectMenuVisible=true; diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index b628ae69..f92ece6d 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -427,7 +427,7 @@ if(this.filters.hisHandleStatus){ params.hisHandlerUserid=this.filters.hisHandler.userid; }else{ - this.$message({showClose: true, message: "请选择曾经的缺陷状态", type: 'error' }); + this.$notify({showClose: true, message: "请选择曾经的缺陷状态", type: 'error' }); return; } @@ -436,7 +436,7 @@ if(this.filters.hisHandler){ params.hisHandleStatus=this.filters.hisHandleStatus }else{ - this.$message({showClose: true, message: "请选择曾经的执行人", type: 'error' }); + this.$notify({showClose: true, message: "请选择曾经的执行人", type: 'error' }); return; } @@ -475,7 +475,7 @@ this.pageInfo.count=false; this.xmQuestions = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -526,7 +526,7 @@ showAdd: function () { if(this.filters.selProject==null){ - this.$message({showClose: true, message: "请先选中项目", type: 'success' }); + this.$notify({showClose: true, message: "请先选中项目", type: 'success' }); this.nextAction="showAdd" this.showProjectList(); return; @@ -560,7 +560,7 @@ this.pageInfo.count=true; this.getXmQuestions(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -577,7 +577,7 @@ this.pageInfo.count=true; this.getXmQuestions(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -668,7 +668,7 @@ showGroupUsers:function(userType){ this.userType=userType; if(this.filters.selProject==null || this.filters.selProject.id==''){ - this.$message({showClose: true, message: "请先选中项目", type: 'success' }); + this.$notify({showClose: true, message: "请先选中项目", type: 'success' }); this.nextAction="showGroupUsers" this.showProjectList(); return; @@ -802,7 +802,7 @@ sendToProcessApprova:function(row,bizKey){ // 传过来的参数格式 if(row.flowState=='1'){ - this.$message.error("已经发起，不允许重复发起"); + this.$notify.error("已经发起，不允许重复发起"); return; } let extVars={projectId:row.projectId,branchId:this.userInfo.branchId,questionId:row.id} @@ -840,7 +840,7 @@ this.$router.push({name:'ProcdefListForBizStart',params:params}); }else { - this.$message.error("不支持的审批事项"); + this.$notify.error("不支持的审批事项"); return; } //this.$store.dispatch('addVisitedViews', {path:'/mdp/workflow/re/procdef/ProcdefListForBizStart',query:{params:jsonParmas}}) diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue index 450bfe75..55e7b5c9 100644 --- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue +++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue @@ -149,7 +149,7 @@ this.pageInfo.count=false; this.xmQuestionHandles = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -191,7 +191,7 @@ this.pageInfo.count=true; this.getXmQuestionHandles(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -209,7 +209,7 @@ this.pageInfo.count=true; this.getXmQuestionHandles(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue index e2fcbf46..72305ab6 100644 --- a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue +++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue @@ -92,7 +92,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue index 49f7f149..31b97f22 100644 --- a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue +++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue @@ -90,7 +90,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue index 5dd4db88..c38bc941 100644 --- a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue +++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue @@ -142,7 +142,7 @@ this.pageInfo.count=false; this.xmQuestionTags = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -184,7 +184,7 @@ this.pageInfo.count=true; this.getXmQuestionTags(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -202,7 +202,7 @@ this.pageInfo.count=true; this.getXmQuestionTags(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue index bc0ca3e6..a2fbce29 100644 --- a/src/views/xm/core/xmRecord/XmRecord.vue +++ b/src/views/xm/core/xmRecord/XmRecord.vue @@ -168,7 +168,7 @@ this.pageInfo.count=false; this.xmRecords = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -210,7 +210,7 @@ this.pageInfo.count=true; this.getXmRecords(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -228,7 +228,7 @@ this.pageInfo.count=true; this.getXmRecords(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue index 22b1e9f5..ec6c93f7 100644 --- a/src/views/xm/core/xmTask/XmTaskAdd.vue +++ b/src/views/xm/core/xmTask/XmTaskAdd.vue @@ -357,7 +357,7 @@ //this.$refs['addForm'].resetFields(); this.$emit('submit',res.data.data);// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } @@ -399,7 +399,7 @@ this.skillVisible = false; // this.getXmTasks(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }, @@ -498,7 +498,7 @@ toJoin(){ if(this.addForm.exeUserids && this.addForm.exeUserids.indexOf(this.userInfo.userid)>=0){ - this.$message.success("你已经加入该任务了"); + this.$notify.success("你已经加入该任务了"); return; } this.execUserVisible=true; diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index 082a1962..30ea3151 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -368,7 +368,7 @@ //this.$refs['editForm'].resetFields(); this.$emit('submit',res.data.data);// @submit="aftereditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } @@ -413,7 +413,7 @@ // this.getXmTasks(); this.$emit("submit",this.editForm) } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }, @@ -512,7 +512,7 @@ toJoin(){ if(this.editForm.exeUserids && this.editForm.exeUserids.indexOf(this.userInfo.userid)>=0){ - this.$message.success("你已经加入该任务了"); + this.$notify.success("你已经加入该任务了"); return; } this.execUserVisible=true; @@ -536,11 +536,11 @@ setTaskCreateUser(this.editForm).then(res=>{ var tips = res.data.tips; if(tips.isOk){ - this.$message.success("设置成功"); + this.$notify.success("设置成功"); this.groupUserSelectVisible=false; this.$emit("submit",this.editForm) }else{ - this.$message.error(tips.msg); + this.$notify.error(tips.msg); } }) }, diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue index f230acf3..9bb2d711 100644 --- a/src/views/xm/core/xmTask/XmTaskList.vue +++ b/src/views/xm/core/xmTask/XmTaskList.vue @@ -251,7 +251,7 @@ if(this.filters.selProject){ params.projectId=this.filters.selProject.id }else{ - this.$message({showClose: true, message: "请选择项目", type: 'error' }); + this.$notify({showClose: true, message: "请选择项目", type: 'error' }); this.load.list=false; this.selectProjectVisible=true; return; @@ -273,7 +273,7 @@ var xmTasks=res.data.data; this.xmTasks=xmTasks; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue index 278df89f..05c96fc3 100644 --- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue +++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue @@ -230,7 +230,7 @@ var xmTasks=res.data.data; this.xmTasks=xmTasks; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 28b9afda..6159ea0e 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -1447,7 +1447,7 @@ export default { } } } else { - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: "error", @@ -1535,7 +1535,7 @@ export default { parentTaskid: this.editForm.parentTaskid, }; if (rate == 0) { - this.$message({ + this.$notify({ showClose: true, message: "不允许更新为0", type: "error", @@ -1551,7 +1551,7 @@ export default { this.getXmTasks() treeTool.reloadChildren(this.$refs.table,this.maps,row.parentTaskid,'parentTaskid',this.loadXmTaskLazy) } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -1587,14 +1587,14 @@ export default { } } if (!this.projectPhase||!this.projectPhase.id) { - this.$message({ + this.$notify({ showClose: true, message: "请在左边计划树中选择一个项目计划(不包括计划集)", type: "error", }); return false; }else if(this.projectPhase.ntype=='1'){ - this.$message({ + this.$notify({ showClose: true, message: "您当前选中的计划【"+this.projectPhase.phaseName+"】是计划集，计划集下不能创建任务，请重新在右边计划树中选择一个计划", type: "error", @@ -1650,7 +1650,7 @@ export default { this.getXmTasks() treeTool.reloadChildren(this.$refs.table,this.maps,row.parentTaskid,'parentTaskid',this.loadXmTaskLazy) } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -1665,7 +1665,7 @@ export default { !this.roles.some((i) => i.roleid == "projectAdmin") && !this.roles.some((i) => i.roleid == "teamAdmin") ) { - this.$message.error("只有项目经理、小组长可以操作"); + this.$notify.error("只有项目经理、小组长可以操作"); return; } this.$confirm("确认删除选中记录吗？", "提示", { @@ -1687,7 +1687,7 @@ export default { }) } } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -1893,7 +1893,7 @@ export default { } this.taskTemplateVisible = false; - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -1924,7 +1924,7 @@ export default { this.skillVisible = false; this.getXmTasks(); } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -2039,7 +2039,7 @@ export default { if (tips.isOk) { this.getXmTasks(); } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -2056,7 +2056,7 @@ export default { username: this.userInfo.username, }).then((res) => { var tips = res.data.tips; - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -2066,7 +2066,7 @@ export default { }, showBatchEdit: function () { if (this.projectPhase == null) { - this.$message({ + this.$notify({ showClose: true, message: "请在左边选择计划再编辑", type: "error", @@ -2160,7 +2160,7 @@ export default { this.editForm.exeUserids && this.editForm.exeUserids.indexOf(this.userInfo.userid) >= 0 ) { - this.$message.success("你已经加入该任务了"); + this.$notify.success("你已经加入该任务了"); return; } this.execUserVisible = true; @@ -2186,10 +2186,10 @@ export default { setTaskCreateUser(this.editForm).then((res) => { var tips = res.data.tips; if (tips.isOk) { - this.$message.success("设置成功"); + this.$notify.success("设置成功"); this.groupUserSelectVisible = false; } else { - this.$message.error(tips.msg); + this.$notify.error(tips.msg); } }); }, @@ -2287,7 +2287,7 @@ export default { editTime(params) .then((res) => { var tips = res.data.tips; - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue index 45cba844..810d899c 100644 --- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue +++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue @@ -624,7 +624,7 @@ export default { } } } else { - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: "error", @@ -649,7 +649,7 @@ export default { showTaskTemplate: function () { if (this.currentProjectPhase == null) { - this.$message({ + this.$notify({ showClose: true, message: "请先选择项目计划", type: "error", @@ -666,7 +666,7 @@ export default { //显示新增界面 XmTask xm_task showAdd: function () { if (!this.currentProjectPhase) { - this.$message({ + this.$notify({ showClose: true, message: "请先选择项目计划", type: "error", @@ -703,7 +703,7 @@ export default { this.pageInfo.count = true; this.getXmTasks(); } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -734,7 +734,7 @@ export default { }) } } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -873,7 +873,7 @@ export default { this.getXmTasks(); } this.taskTemplateVisible = false; - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -899,7 +899,7 @@ export default { this.skillVisible = false; this.getXmTasks(); } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -1059,7 +1059,7 @@ export default { if (tips.isOk) { this.getXmTasks(); } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -1076,7 +1076,7 @@ export default { username: this.userInfo.username, }).then((res) => { var tips = res.data.tips; - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -1086,7 +1086,7 @@ export default { }, saveBatchEdit: function () { if (this.valueChangeRows.length == 0) { - this.$message({ + this.$notify({ showClose: true, message: "没有改变任何数据，无需保存", type: "success", @@ -1094,7 +1094,7 @@ export default { return; } else { if (this.taskBudgetData.surplusPhaseBudgetInnerUserAt < 0) { - this.$message({ + this.$notify({ showClose: true, message: "内部人力预算不足，请调整", type: "error", @@ -1102,7 +1102,7 @@ export default { return; } if (this.taskBudgetData.surplusPhaseBudgetOutUserAt < 0) { - this.$message({ + this.$notify({ showClose: true, message: "外购人力预算不足，请调整", type: "error", @@ -1110,7 +1110,7 @@ export default { return; } if (this.taskBudgetData.surplusPhaseBudgetNouserAt < 0) { - this.$message({ + this.$notify({ showClose: true, message: "非人力预算不足请调整", type: "error", @@ -1133,7 +1133,7 @@ export default { this.xmTasks=[] this.getXmTasks(); } - this.$message({ + this.$notify({ showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", @@ -1360,7 +1360,7 @@ export default { } else if ("delete" == opType) { if (row.opType && (row.opType == "addSub" || row.opType == "add")) { if (row.children && row.children.length > 0) { - this.$message.error("请先删除子元素"); + this.$notify.error("请先删除子元素"); return; } else { var index = this.xmTasks.findIndex((i) => i.id == row.id); @@ -1377,7 +1377,7 @@ export default { } } } else { - this.$message.error("只能删除未保存的行"); + this.$notify.error("只能删除未保存的行"); return; } } else if ("highestPmenuId" === opType) { @@ -1399,7 +1399,7 @@ export default { this.editForm.exeUserids && this.editForm.exeUserids.indexOf(this.userInfo.userid) >= 0 ) { - this.$message.success("你已经加入该任务了"); + this.$notify.success("你已经加入该任务了"); return; } this.execUserVisible = true; diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue index ea467367..468ecaae 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue @@ -128,13 +128,13 @@ //新增提交XmTaskExecuser xm_task_execuser 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(!this.addForm.userid){ - this.$message.error("请选择一个人"); + this.$notify.error("请选择一个人"); return } const tf = this.execUserList.some(i=>{return i.userid == this.addForm.userid;}); const that = this; if(tf){ - this.$message.error(this.addForm.username+"已在任务中"); + this.$notify.error(this.addForm.username+"已在任务中"); return; } @@ -159,7 +159,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } @@ -173,7 +173,7 @@ //选择接收人 onUserSelected: function(users) { if(users.length>1){ - this.$message({showClose: true, message: "只能选择一个人", type:'error' }); + this.$notify({showClose: true, message: "只能选择一个人", type:'error' }); return; } if(users==null || users.length ==0 ){ diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue index 23c1987d..a58cb819 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue @@ -131,7 +131,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue index 2811a8a3..b8cfc1c4 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue @@ -350,7 +350,7 @@ this.xmTaskExecusers = res.data.data; this.$emit("loadExecUserList",this.xmTaskExecusers); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -431,7 +431,7 @@ this.pageInfo.count=true; this.afterDeleteSubmit(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -448,7 +448,7 @@ this.pageInfo.count=true; this.afterDeleteSubmit(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -473,7 +473,7 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } @@ -489,17 +489,17 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }else if(row.status=="1"){ - this.$message.error("已是执行人，无需变更"); + this.$notify.error("已是执行人，无需变更"); }else if(row.status=="7"){ - this.$message.error("已离开任务，不允许变更执行人"); + this.$notify.error("已离开任务，不允许变更执行人"); }else if(row.status=="8"){ - this.$message.error("黑名单，不允许参与该任务"); + this.$notify.error("黑名单，不允许参与该任务"); }else{ - this.$message.error("已是执行人，无需变更"); + this.$notify.error("已是执行人，无需变更"); } }, settle(row) { @@ -522,7 +522,7 @@ this.$refs['settleForm'].resetFields(); this.afterEditSubmit(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }, @@ -541,7 +541,7 @@ this.quotePriceVisible = false; this.afterEditSubmit(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }, @@ -597,7 +597,7 @@ if(tips.isOk){ this.getXmTaskExecusers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -609,7 +609,7 @@ if(tips.isOk){ this.getXmTaskExecusers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -621,7 +621,7 @@ if(tips.isOk){ this.getXmTaskExecusers(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -652,11 +652,11 @@ sendToProcessApprova:function(row,bizKey){ // 传过来的参数格式 if(this.settleForm.settleAmount==0||this.settleForm.settleAmount==''){ - this.$message.error("结算金额为空/0，不允许发审"); + this.$notify.error("结算金额为空/0，不允许发审"); return; } if(row.flowState=='1'){ - this.$message.error("审核中，不允许重复发审"); + this.$notify.error("审核中，不允许重复发审"); return; } @@ -705,7 +705,7 @@ this.$router.push({name:'ProcdefListForBizStart',params:params}); //this.html2canvas(document.querySelector(".settleForm"),row,params); }else { - this.$message.error("不支持的审批事项"); + this.$notify.error("不支持的审批事项"); return; } @@ -767,7 +767,7 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -781,7 +781,7 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue index 6657152d..23759c04 100644 --- a/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue +++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue @@ -92,7 +92,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue index 94cc378d..dd2f634d 100644 --- a/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue +++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue @@ -90,7 +90,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue index 09d2e346..382ce405 100644 --- a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue +++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue @@ -164,7 +164,7 @@ this.skillIds = ids; this.$emit("getSkill",this.xmTaskSkills); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -209,7 +209,7 @@ this.pageInfo.count=true; this.getXmTaskSkills(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -227,7 +227,7 @@ this.pageInfo.count=true; this.getXmTaskSkills(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -255,7 +255,7 @@ this.skillVisible = false; this.getXmTaskSkills(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }, diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue index b30ad06d..31983168 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.$notify.error("任务归属的项目计划不能为空"); return; } } @@ -240,7 +240,7 @@ this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue index eccdefe6..0d6d382a 100644 --- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue +++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue @@ -218,7 +218,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue index 1ae25662..23bc3fcb 100644 --- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue +++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue @@ -153,11 +153,11 @@ if(!params.projectId){ - this.$message({showClose: true, message: "选择一个模板项目", type: 'error' }); + this.$notify({showClose: true, message: "选择一个模板项目", type: 'error' }); return; } if(!params.projectPhaseId){ - this.$message({showClose: true, message: "请在左边计划列表中选择一个计划", type: 'error' }); + this.$notify({showClose: true, message: "请在左边计划列表中选择一个计划", type: 'error' }); return; } params.isTpl="1" @@ -169,7 +169,7 @@ this.pageInfo.count=false; this.xmTaskTemplates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -183,12 +183,12 @@ //显示新增界面 XmTaskTemplate xm_task_template showAdd: function () { if(!this.filters.projectTemplate){ - this.$message.error("请选择模板") + this.$notify.error("请选择模板") return; } if(!this.projectPhaseTemplate){ - this.$message.error("请选择计划") + this.$notify.error("请选择计划") return; } this.addFormVisible = true; @@ -226,7 +226,7 @@ this.pageInfo.count=true; this.getXmTaskTemplates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -244,7 +244,7 @@ this.pageInfo.count=true; this.getXmTaskTemplates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue index 181ee0df..0c9c9b9e 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue @@ -114,7 +114,7 @@ if(tips.isOk && next!=true){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue index f1f8c4fc..c808a9ac 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue @@ -99,7 +99,7 @@ editSubmit: function () { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } this.$refs.editForm.validate((valid) => { @@ -116,7 +116,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue index e8a26669..366ca1d1 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue @@ -272,7 +272,7 @@ this.pageInfo.count=false; this.xmTestCases = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -286,7 +286,7 @@ //显示新增界面 XmTestCase 测试用例 showAdd: function () { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } this.addFormVisible = true; @@ -307,11 +307,11 @@ //删除xmTestCase handleDel: function (row,index) { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } if(!this.roles.some(i=>i.roleid=='testAdmin')){ - this.$message({showClose: true, message: "只有测试管理员才能删除测试用例", type: 'error' }); + this.$notify({showClose: true, message: "只有测试管理员才能删除测试用例", type: 'error' }); return; } this.$confirm('确认删除该记录吗?', '提示', { @@ -326,18 +326,18 @@ this.pageInfo.count=true; this.getXmTestCases(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmTestCase batchDel: function () { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } if(!this.roles.some(i=>i.roleid=='testAdmin')){ - this.$message({showClose: true, message: "只有测试管理员才能删除测试用例", type: 'error' }); + this.$notify({showClose: true, message: "只有测试管理员才能删除测试用例", type: 'error' }); return; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -351,7 +351,7 @@ this.pageInfo.count=true; this.getXmTestCases(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue index ab81ac9d..d9860a4e 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue @@ -134,7 +134,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue index 3a595ec4..378a8de3 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue @@ -132,7 +132,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue index 454dde04..9bb243d1 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue @@ -388,7 +388,7 @@ this.pageInfo.count=false; this.xmTestCaseExecs = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -419,7 +419,7 @@ //删除xmTestCaseExec handleDel: function (row,index) { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); + this.$notify({showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); return ; } this.$confirm('确认删除该记录吗?', '提示', { @@ -434,14 +434,14 @@ this.pageInfo.count=true; this.getXmTestCaseExecs(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmTestCaseExec batchDel: function () { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); + this.$notify({showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); return ; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -455,7 +455,7 @@ this.pageInfo.count=true; this.getXmTestCaseExecs(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -492,7 +492,7 @@ this.pageInfo.count=true; this.getXmTestCaseExecs(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }else{ this.xmTestCaseMngVisible=false; @@ -501,11 +501,11 @@ }, showCase(){ if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); + this.$notify({showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); return ; } if(!this.filters.selProject){ - this.$message({showClose: true,message:"请先选择项目",type:"success"}); + this.$notify({showClose: true,message:"请先选择项目",type:"success"}); this.nextAction="showCase" this.showProjectList(); return; @@ -588,11 +588,11 @@ }, showBatchEdit:function(){ if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } if( !this.filters.selProject ){ - this.$message({showClose: true, message:"请先选择项目", type: 'success'}); + this.$notify({showClose: true, message:"请先选择项目", type: 'success'}); this.nextAction="showBatchEdit" this.showProjectList(); return ; @@ -602,11 +602,11 @@ batchEditXmTestCaseExec:function(){ if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } if(this.valueChangeRows.length==0){ - this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -617,7 +617,7 @@ this.valueChangeRows=[] this.getXmTestCaseExecs(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } @@ -685,7 +685,7 @@ showSelectTask:function(row){ this.editForm=row if(this.filters.selProject==null){ - this.$message({showClose: true, message: "请先选项目", type: 'success' }); + this.$notify({showClose: true, message: "请先选项目", type: 'success' }); this.nextAction="showSelectTask" this.showProjectList(); @@ -707,14 +707,14 @@ this.xmTestCase=xmTestCase this.caseVisible=true; }else{ - this.$message.success("该用例已不存在") + this.$notify.success("该用例已不存在") } }, showBugs(row){ this.editForm=row if(!this.filters.selProject){ - this.$message({showClose: true, message: "请先选项目", type: 'success' }); + this.$notify({showClose: true, message: "请先选项目", type: 'success' }); this.showProjectList(); this.nextAction="showBugs" return ; @@ -725,14 +725,14 @@ this.xmTestCase=xmTestCase this.bugsVisible=true; }else{ - this.$message.success("该用例已不存在") + this.$notify.success("该用例已不存在") } }, showAddBug(row){ this.editForm=row if(!this.filters.selProject){ - this.$message({showClose: true, message: "请先选项目", type: 'success' }); + this.$notify({showClose: true, message: "请先选项目", type: 'success' }); this.nextAction="showAddBug" this.showProjectList(); return ; @@ -743,7 +743,7 @@ this.xmTestCase=xmTestCase this.addBugVisible=true; }else{ - this.$message.success("该用例已不存在") + this.$notify.success("该用例已不存在") } }, /**end 自定义函数请在上面加**/