Browse Source

消息优化

master
陈裕财 4 years ago
parent
commit
fafdfd4bb8
  1. 16
      src/views/xm/core/skill/skillMng.vue
  2. 2
      src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
  3. 2
      src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
  4. 6
      src/views/xm/core/xmAttachment/XmAttachmentMng.vue
  5. 2
      src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
  6. 2
      src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
  7. 8
      src/views/xm/core/xmBranchState/XmBranchStateMng.vue
  8. 2
      src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
  9. 2
      src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
  10. 6
      src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
  11. 2
      src/views/xm/core/xmEnvList/XmEnvListAdd.vue
  12. 2
      src/views/xm/core/xmEnvList/XmEnvListEdit.vue
  13. 6
      src/views/xm/core/xmEnvList/XmEnvListMng.vue
  14. 2
      src/views/xm/core/xmExchange/TaskUserEditor.vue
  15. 2
      src/views/xm/core/xmExchange/XmExchangeAdd.vue
  16. 2
      src/views/xm/core/xmExchange/XmExchangeEdit.vue
  17. 8
      src/views/xm/core/xmExchange/XmExchangeMng.vue
  18. 2
      src/views/xm/core/xmFile/XmFileAdd.vue
  19. 2
      src/views/xm/core/xmFile/XmFileEdit.vue
  20. 6
      src/views/xm/core/xmFile/XmFileMng.vue
  21. 6
      src/views/xm/core/xmIteration/XmIterationAdd.vue
  22. 6
      src/views/xm/core/xmIteration/XmIterationEdit.vue
  23. 2
      src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
  24. 20
      src/views/xm/core/xmIteration/XmIterationMng.vue
  25. 6
      src/views/xm/core/xmIteration/XmIterationSelect.vue
  26. 4
      src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue
  27. 4
      src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue
  28. 14
      src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
  29. 2
      src/views/xm/core/xmIterationProductLink/XmIterationProductLinkAdd.vue
  30. 2
      src/views/xm/core/xmIterationProductLink/XmIterationProductLinkEdit.vue
  31. 10
      src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue
  32. 2
      src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
  33. 2
      src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
  34. 6
      src/views/xm/core/xmIterationState/XmIterationStateMng.vue
  35. 6
      src/views/xm/core/xmIterationState/XmIterationStateShow.vue
  36. 8
      src/views/xm/core/xmMenu/XmMenuAdd.vue
  37. 4
      src/views/xm/core/xmMenu/XmMenuEdit.vue
  38. 36
      src/views/xm/core/xmMenu/XmMenuMng.vue
  39. 46
      src/views/xm/core/xmMenu/XmMenuMngBatch.vue
  40. 2
      src/views/xm/core/xmMenu/XmMenuRichDetail.vue
  41. 4
      src/views/xm/core/xmMenu/XmMenuSelect.vue
  42. 18
      src/views/xm/core/xmMenu/XmMenuWithPlan.vue
  43. 2
      src/views/xm/core/xmMenuExchange/MenuUserEditor.vue
  44. 10
      src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
  45. 2
      src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
  46. 2
      src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
  47. 14
      src/views/xm/core/xmMenuState/XmMenuStateMng.vue
  48. 6
      src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue
  49. 2
      src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue
  50. 16
      src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
  51. 2
      src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue
  52. 2
      src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
  53. 6
      src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
  54. 4
      src/views/xm/core/xmProduct/XmProductAdd.vue
  55. 8
      src/views/xm/core/xmProduct/XmProductEdit.vue
  56. 24
      src/views/xm/core/xmProduct/XmProductMng.vue
  57. 2
      src/views/xm/core/xmProduct/XmProductProjectForLink.vue
  58. 6
      src/views/xm/core/xmProduct/XmProductSelect.vue
  59. 20
      src/views/xm/core/xmProduct/XmProductTplMng.vue
  60. 2
      src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue
  61. 2
      src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue
  62. 10
      src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
  63. 2
      src/views/xm/core/xmProductState/XmProductStateAdd.vue
  64. 2
      src/views/xm/core/xmProductState/XmProductStateEdit.vue
  65. 6
      src/views/xm/core/xmProductState/XmProductStateMng.vue
  66. 2
      src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue
  67. 2
      src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue
  68. 6
      src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
  69. 6
      src/views/xm/core/xmProject/XmProjectAdd.vue
  70. 4
      src/views/xm/core/xmProject/XmProjectAssess.vue
  71. 4
      src/views/xm/core/xmProject/XmProjectBudgetCost.vue
  72. 4
      src/views/xm/core/xmProject/XmProjectCost.vue
  73. 16
      src/views/xm/core/xmProject/XmProjectEdit.vue
  74. 6
      src/views/xm/core/xmProject/XmProjectForLink.vue
  75. 2
      src/views/xm/core/xmProject/XmProjectList.vue
  76. 30
      src/views/xm/core/xmProject/XmProjectMng.vue
  77. 2
      src/views/xm/core/xmProject/XmProjectSelect.vue
  78. 30
      src/views/xm/core/xmProject/XmProjectTplMng.vue
  79. 2
      src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
  80. 2
      src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
  81. 6
      src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
  82. 2
      src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue
  83. 2
      src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue
  84. 6
      src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
  85. 2
      src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
  86. 2
      src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
  87. 10
      src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
  88. 4
      src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
  89. 16
      src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
  90. 6
      src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
  91. 8
      src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
  92. 4
      src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
  93. 6
      src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
  94. 2
      src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue
  95. 2
      src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue
  96. 6
      src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
  97. 2
      src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue
  98. 2
      src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue
  99. 6
      src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
  100. 2
      src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue

16
src/views/xm/core/skill/skillMng.vue

@ -230,7 +230,7 @@ export default {
this.convertSkills = convert; this.convertSkills = convert;
this.setSkillsToLocal(); this.setSkillsToLocal();
} else { } else {
this.$message({showClose: true,
this.$notify({showClose: true,
message: tips.msg, message: tips.msg,
type: "error", type: "error",
}); });
@ -248,7 +248,7 @@ export default {
(i) => i.categoryName == this.needAddTagCategoryNameInputValue (i) => i.categoryName == this.needAddTagCategoryNameInputValue
) )
) { ) {
this.$message({showClose: true,
this.$notify({showClose: true,
message: "技能分类已经存在", message: "技能分类已经存在",
type: "error", type: "error",
}); });
@ -281,7 +281,7 @@ export default {
this.convertSkills.push(json); this.convertSkills.push(json);
this.setSkillsToLocal(); this.setSkillsToLocal();
} }
this.$message({showClose: true,
this.$notify({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error", type: tips.isOk ? "success" : "error",
}); });
@ -319,7 +319,7 @@ export default {
this.setSkillsToLocal(); this.setSkillsToLocal();
/*this.getTags();*/ /*this.getTags();*/
} }
this.$message({showClose: true,
this.$notify({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error", type: tips.isOk ? "success" : "error",
}); });
@ -344,7 +344,7 @@ export default {
); );
}) })
) { ) {
this.$message({showClose: true,
this.$notify({showClose: true,
message: "技能已经存在", message: "技能已经存在",
type: "error", type: "error",
}); });
@ -352,7 +352,7 @@ export default {
} }
if (!this.convertSkills[index].pubc) { if (!this.convertSkills[index].pubc) {
if (this.isPub == "1") { if (this.isPub == "1") {
this.$message({showClose: true,
this.$notify({showClose: true,
message: "该分类不是公共分类,不能添加公共技能", message: "该分类不是公共分类,不能添加公共技能",
type: "error", type: "error",
}); });
@ -392,7 +392,7 @@ export default {
this.convertSkills[index].values.push(json); this.convertSkills[index].values.push(json);
this.setSkillsToLocal(); this.setSkillsToLocal();
} }
this.$message({showClose: true,
this.$notify({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error", type: tips.isOk ? "success" : "error",
}); });
@ -427,7 +427,7 @@ export default {
this.setSkillsToLocal(); this.setSkillsToLocal();
/*this.getTags();*/ /*this.getTags();*/
} }
this.$message({showClose: true,
this.$notify({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error", type: tips.isOk ? "success" : "error",
}); });

2
src/views/xm/core/xmAttachment/XmAttachmentAdd.vue

@ -98,7 +98,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmAttachment/XmAttachmentEdit.vue

@ -96,7 +96,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/xm/core/xmAttachment/XmAttachmentMng.vue

@ -144,7 +144,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmAttachments = res.data.data; this.xmAttachments = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -186,7 +186,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmAttachments(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -204,7 +204,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmAttachments(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

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

@ -233,7 +233,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

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

@ -231,7 +231,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

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

@ -194,7 +194,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmBranchStates = res.data.data; this.xmBranchStates = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -236,7 +236,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmBranchStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -254,7 +254,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmBranchStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -269,7 +269,7 @@
if(tips.isOk){ if(tips.isOk){
this.getXmBranchStates() 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 ) }).catch( err => this.load.edit=false )
}, },

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

@ -137,7 +137,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

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

@ -135,7 +135,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

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

@ -159,7 +159,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmBranchTaskTypeStates = res.data.data; this.xmBranchTaskTypeStates = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -201,7 +201,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmBranchTaskTypeStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -219,7 +219,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmBranchTaskTypeStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

2
src/views/xm/core/xmEnvList/XmEnvListAdd.vue

@ -181,7 +181,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmEnvList/XmEnvListEdit.vue

@ -134,7 +134,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/xm/core/xmEnvList/XmEnvListMng.vue

@ -175,7 +175,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmEnvLists = res.data.data; this.xmEnvLists = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -218,7 +218,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmEnvLists(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -236,7 +236,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmEnvLists(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

2
src/views/xm/core/xmExchange/TaskUserEditor.vue

@ -37,7 +37,7 @@ export default {
content: this.content, content: this.content,
} }
if(!this.content){ if(!this.content){
this.$message.error("请输入内容再提交");
this.$notify.error("请输入内容再提交");
return; return;
} }
this.$emit('publish',params); this.$emit('publish',params);

2
src/views/xm/core/xmExchange/XmExchangeAdd.vue

@ -146,7 +146,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmExchange/XmExchangeEdit.vue

@ -144,7 +144,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

8
src/views/xm/core/xmExchange/XmExchangeMng.vue

@ -154,7 +154,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmExchanges = res.data.data; this.xmExchanges = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -196,7 +196,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmExchanges(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -214,7 +214,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmExchanges(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -247,7 +247,7 @@
if(tips.isOk){ if(tips.isOk){
this.xmExchanges.push(params); 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 自定义函数请在上面加**/ /**end 自定义函数请在上面加**/

2
src/views/xm/core/xmFile/XmFileAdd.vue

@ -96,7 +96,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmFile/XmFileEdit.vue

@ -96,7 +96,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/xm/core/xmFile/XmFileMng.vue

@ -185,7 +185,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.selProject.file = res.data.data; this.selProject.file = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -230,7 +230,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmFiles(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -247,7 +247,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmFiles(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

6
src/views/xm/core/xmIteration/XmIterationAdd.vue

@ -114,7 +114,7 @@
//XmIteration @submit="afterAddSubmit" //XmIteration @submit="afterAddSubmit"
addSubmit: function () { addSubmit: function () {
if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
this.$message({showClose: true, message: "只有迭代管理员可以修改迭代", type: 'error' });
this.$notify({showClose: true, message: "只有迭代管理员可以修改迭代", type: 'error' });
return ; return ;
} }
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
@ -130,7 +130,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit',res.data.data);// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }
@ -140,7 +140,7 @@
onUserSelected: function(users) { onUserSelected: function(users) {
if(users.length>1){ if(users.length>1){
this.$message.error("只能选一个人");
this.$notify.error("只能选一个人");
return; return;
} }
var user=users[0] var user=users[0]

6
src/views/xm/core/xmIteration/XmIterationEdit.vue

@ -93,7 +93,7 @@
//XmIteration @submit="afterAddSubmit" //XmIteration @submit="afterAddSubmit"
editSubmit: function () { editSubmit: function () {
if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
this.$message({showClose: true, message: "只有迭代管理员可以修改迭代", type: 'error' });
this.$notify({showClose: true, message: "只有迭代管理员可以修改迭代", type: 'error' });
return ; return ;
} }
this.$refs.editForm.validate((valid) => { this.$refs.editForm.validate((valid) => {
@ -109,7 +109,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.edit=false);
}); });
} }
@ -119,7 +119,7 @@
onUserSelected: function(users) { onUserSelected: function(users) {
if(users.length>1){ if(users.length>1){
this.$message.error("只能选一个人");
this.$notify.error("只能选一个人");
return; return;
} }
var user=users[0] var user=users[0]

2
src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue

@ -147,7 +147,7 @@
delXmIterationProductLink(params).then(res=>{ delXmIterationProductLink(params).then(res=>{
var tips = res.data.tips; var tips = res.data.tips;
if(tips.isOk){ if(tips.isOk){
this.$message({showClose: true, message:"移出成功", type: tips.isOk?'success':'error' });
this.$notify({showClose: true, message:"移出成功", type: tips.isOk?'success':'error' });
} }
}) })
}) })

20
src/views/xm/core/xmIteration/XmIterationMng.vue

@ -286,7 +286,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
params.queryScope=this.filters.queryScope params.queryScope=this.filters.queryScope
if(this.filters.queryScope=='iterationId'){ if(this.filters.queryScope=='iterationId'){
if(!this.filters.id){ if(!this.filters.id){
this.$message({showClose: true, message:"您选择了按迭代编号精确查找模式,请输入迭代编号", type: 'error' });
this.$notify({showClose: true, message:"您选择了按迭代编号精确查找模式,请输入迭代编号", type: 'error' });
return; return;
} }
params.id=this.filters.id params.id=this.filters.id
@ -310,7 +310,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmIterations = res.data.data; this.xmIterations = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -324,7 +324,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
// XmIteration // XmIteration
showAdd: function () { showAdd: function () {
if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
this.$message({showClose: true, message: "只有迭代管理员可以新增迭代", type: 'error' });
this.$notify({showClose: true, message: "只有迭代管理员可以新增迭代", type: 'error' });
return ; return ;
} }
this.parentIteration=null this.parentIteration=null
@ -362,7 +362,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
//xmIteration //xmIteration
handleDel: function (row,index) { handleDel: function (row,index) {
if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
this.$message({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' });
this.$notify({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' });
return ; return ;
} }
this.$confirm('确认删除该记录吗?', '提示', { this.$confirm('确认删除该记录吗?', '提示', {
@ -377,14 +377,14 @@ import XmIterationSelect from './XmIterationSelect.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterations(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
//xmIteration //xmIteration
batchDel: function () { batchDel: function () {
if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
this.$message({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' });
this.$notify({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' });
return ; return ;
} }
this.$confirm('确认删除选中记录吗?', '提示', { this.$confirm('确认删除选中记录吗?', '提示', {
@ -398,7 +398,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterations(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -471,7 +471,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
if(tips.isOk){ if(tips.isOk){
this.getXmIterations(); 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){ showIterationState(row){
@ -496,7 +496,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
if(tips.isOk){ if(tips.isOk){
this.getXmIterations(); 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){ if(tips.isOk){
this.getXmIterations(); 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'});
}) })
}) })
} }

6
src/views/xm/core/xmIteration/XmIterationSelect.vue

@ -218,7 +218,7 @@
params.queryScope=this.filters.queryScope params.queryScope=this.filters.queryScope
if(this.filters.queryScope=='iterationId'){ if(this.filters.queryScope=='iterationId'){
if(!this.filters.id){ if(!this.filters.id){
this.$message({showClose: true, message:"您选择了按迭代编号精确查找模式,请输入迭代编号", type: 'error' });
this.$notify({showClose: true, message:"您选择了按迭代编号精确查找模式,请输入迭代编号", type: 'error' });
return; return;
} }
params.id=this.filters.id params.id=this.filters.id
@ -245,7 +245,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmIterations = res.data.data; this.xmIterations = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -342,7 +342,7 @@
if(tips.isOk){ if(tips.isOk){
this.getXmIterations(); 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 },//end methods

4
src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue

@ -82,7 +82,7 @@
//XmIterationMenu @submit="afterAddSubmit" //XmIterationMenu @submit="afterAddSubmit"
addSubmit: function () { addSubmit: function () {
if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
this.$message({showClose: true, message: "只有迭代管理员可以操作", type: 'error' });
this.$notify({showClose: true, message: "只有迭代管理员可以操作", type: 'error' });
return ; return ;
} }
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
@ -98,7 +98,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

4
src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue

@ -82,7 +82,7 @@
//XmIterationMenu @submit="afterEditSubmit" //XmIterationMenu @submit="afterEditSubmit"
editSubmit: function () { editSubmit: function () {
if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
this.$message({showClose: true, message: "只有迭代管理员可以操作", type: 'error' });
this.$notify({showClose: true, message: "只有迭代管理员可以操作", type: 'error' });
return ; return ;
} }
this.$refs.editForm.validate((valid) => { this.$refs.editForm.validate((valid) => {
@ -97,7 +97,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

14
src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue

@ -157,7 +157,7 @@
if(this.iteration){ if(this.iteration){
params.iterationId=this.iteration.id params.iterationId=this.iteration.id
}else{ }else{
this.$message({showClose: true, message: "请先在左边选择迭代", type: 'success' });
this.$notify({showClose: true, message: "请先在左边选择迭代", type: 'success' });
return; return;
} }
this.load.list = true; this.load.list = true;
@ -168,7 +168,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmIterationMenus = res.data.data; this.xmIterationMenus = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -182,7 +182,7 @@
// XmIterationMenu // XmIterationMenu
showAdd: function () { showAdd: function () {
if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
this.$message({showClose: true, message: "只有迭代管理员可以操作", type: 'error' });
this.$notify({showClose: true, message: "只有迭代管理员可以操作", type: 'error' });
return ; return ;
} }
this.menuVisible = true; this.menuVisible = true;
@ -214,14 +214,14 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterationMenus(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
//xmIterationMenu //xmIterationMenu
batchDel: function () { batchDel: function () {
if(this.sels.length<=0){ if(this.sels.length<=0){
this.$message({showClose: true, message:"请先选择一个或者多个需求", type: 'error' });
this.$notify({showClose: true, message:"请先选择一个或者多个需求", type: 'error' });
return ; return ;
} }
this.$confirm('确认将需求移出迭代吗?', '提示', { this.$confirm('确认将需求移出迭代吗?', '提示', {
@ -238,7 +238,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterationMenus(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -305,7 +305,7 @@
if(tips.isOk){ if(tips.isOk){
this.getXmIterationMenus() 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){ onIterationRowClick(iteration){

2
src/views/xm/core/xmIterationProductLink/XmIterationProductLinkAdd.vue

@ -95,7 +95,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmIterationProductLink/XmIterationProductLinkEdit.vue

@ -93,7 +93,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

10
src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue

@ -159,7 +159,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue';
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmIterationProductLinks = res.data.data; this.xmIterationProductLinks = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$notify({ message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => 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.pageInfo.count=true;
this.getXmIterationProductLinks(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -219,7 +219,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterationProductLinks(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -241,7 +241,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterationProductLinks(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -259,7 +259,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterationProductLinks(); 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 ); }).catch( err => this.load.del=false );
}); });
} }

2
src/views/xm/core/xmIterationState/XmIterationStateAdd.vue

@ -140,7 +140,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmIterationState/XmIterationStateEdit.vue

@ -138,7 +138,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/xm/core/xmIterationState/XmIterationStateMng.vue

@ -162,7 +162,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmIterationStates = res.data.data; this.xmIterationStates = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -204,7 +204,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterationStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -222,7 +222,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterationStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

6
src/views/xm/core/xmIterationState/XmIterationStateShow.vue

@ -162,7 +162,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmIterationStates = res.data.data; this.xmIterationStates = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -204,7 +204,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterationStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -222,7 +222,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterationStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

8
src/views/xm/core/xmMenu/XmMenuAdd.vue

@ -127,11 +127,11 @@
//XmMenu @submit="afterAddSubmit" //XmMenu @submit="afterAddSubmit"
addSubmit: function () { addSubmit: function () {
if(this.parentMenu==null && this.product ==null ){ if(this.parentMenu==null && this.product ==null ){
this.$message({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' });
this.$notify({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' });
return; return;
} }
if(this.parentMenu && this.parentMenu.ntype=="0"){ if(this.parentMenu && this.parentMenu.ntype=="0"){
this.$message({showClose: true, message: '需求集下不能再建立子需求', type:'error' });
this.$notify({showClose: true, message: '需求集下不能再建立子需求', type:'error' });
return; return;
} }
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
@ -147,7 +147,7 @@
params.productId=this.product.id params.productId=this.product.id
} }
if(params.productId==null|| params.productId==''){ if(params.productId==null|| params.productId==''){
this.$message({showClose: true, message: '产品编号不能为空', type:'error' });
this.$notify({showClose: true, message: '产品编号不能为空', type:'error' });
return; return;
} }
addXmMenu(params).then((res) => { addXmMenu(params).then((res) => {
@ -156,7 +156,7 @@
if(tips.isOk){ if(tips.isOk){
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

4
src/views/xm/core/xmMenu/XmMenuEdit.vue

@ -152,7 +152,7 @@ import XmMenuOverview from './XmMenuOverview.vue';
editSubmit: function () { editSubmit: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
this.$refs.editForm.validate((valid) => { this.$refs.editForm.validate((valid) => {
@ -167,7 +167,7 @@ import XmMenuOverview from './XmMenuOverview.vue';
if(tips.isOk){ if(tips.isOk){
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.edit=false);
}); });
} }

36
src/views/xm/core/xmMenu/XmMenuMng.vue

@ -464,7 +464,7 @@
if( this.filters.product && this.filters.product.id){ if( this.filters.product && this.filters.product.id){
params.productId=this.filters.product.id params.productId=this.filters.product.id
}else { }else {
this.$message({showClose: true, message: "请先选择产品", type: 'success' });
this.$notify({showClose: true, message: "请先选择产品", type: 'success' });
return; return;
} }
@ -478,7 +478,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmMenus = res.data.data; this.xmMenus = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
} }
@ -498,11 +498,11 @@
// XmMenu xm_project_menu // XmMenu xm_project_menu
showAdd: function () { showAdd: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
if(this.filters.product==null){ if(this.filters.product==null){
this.$message({showClose: true, message: "请先选择产品", type: 'error' });
this.$notify({showClose: true, message: "请先选择产品", type: 'error' });
return; return;
} }
this.parentMenu=null; this.parentMenu=null;
@ -511,7 +511,7 @@
}, },
showSubAdd:function(row){ showSubAdd:function(row){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
this.editForm=row this.editForm=row
@ -545,7 +545,7 @@
//xmMenu //xmMenu
handleDel: function (row,index) { handleDel: function (row,index) {
if(row.mmUserid!=this.userInfo.userid){ if(row.mmUserid!=this.userInfo.userid){
this.$message({showClose: true, message: "只能操作你负责的需求", type: 'error'});
this.$notify({showClose: true, message: "只能操作你负责的需求", type: 'error'});
return false; return false;
} }
this.$confirm('确认删除该记录吗?', '提示', { this.$confirm('确认删除该记录吗?', '提示', {
@ -560,7 +560,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -568,7 +568,7 @@
batchDel: function () { batchDel: function () {
var mmSels=this.sels.filter(i=>i.mmUserid!=this.userInfo.userid) var mmSels=this.sels.filter(i=>i.mmUserid!=this.userInfo.userid)
if(mmSels.length>0){ if(mmSels.length>0){
this.$message({showClose: true, message: "只能操作你负责的需求", type: 'error'});
this.$notify({showClose: true, message: "只能操作你负责的需求", type: 'error'});
return false; return false;
} }
this.$confirm('确认删除选中记录吗?', '提示', { this.$confirm('确认删除选中记录吗?', '提示', {
@ -582,7 +582,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -678,11 +678,11 @@
showImportFromMenuTemplate(row){ showImportFromMenuTemplate(row){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
if(!this.filters.product){ if(!this.filters.product){
this.$message.error("请选择产品模板")
this.$notify.error("请选择产品模板")
return; return;
} }
this.parentMenu=row this.parentMenu=row
@ -749,14 +749,14 @@
if(tips.isOk){ if(tips.isOk){
this.getXmMenus() this.getXmMenus()
}else{ }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 ); }).catch( err => this.load.add=false );
}, },
toBatchEdit(){ toBatchEdit(){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
this.batchEditVisible=true; this.batchEditVisible=true;
@ -770,7 +770,7 @@
showTaskList(row){ showTaskList(row){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
this.editForm=row this.editForm=row
@ -781,7 +781,7 @@
if(xmTasks==null || xmTasks.length==0){ if(xmTasks==null || xmTasks.length==0){
this.$message.error("请最少选择一个任务进行关联");
this.$notify.error("请最少选择一个任务进行关联");
return; return;
} }
var menu=this.editForm var menu=this.editForm
@ -798,7 +798,7 @@
if(tips.isOk){ if(tips.isOk){
this.getXmMenus() 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){ showMenuExchange:function(row){
@ -826,7 +826,7 @@
loadTasksToXmMenuState: function () { loadTasksToXmMenuState: function () {
this.load.edit=true; this.load.edit=true;
if(!this.filters.product){ if(!this.filters.product){
this.$message.error("请先选择产品");
this.$notify.error("请先选择产品");
} }
let params = { productId: this.filters.product.id }; let params = { productId: this.filters.product.id };
loadTasksToXmMenuState(params).then((res) => { loadTasksToXmMenuState(params).then((res) => {
@ -836,7 +836,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.edit=false );
}, },
selectUser(row){ selectUser(row){

46
src/views/xm/core/xmMenu/XmMenuMngBatch.vue

@ -350,7 +350,7 @@
if( this.filters.product!==null && this.filters.product.id!=''){ if( this.filters.product!==null && this.filters.product.id!=''){
params.productId=this.filters.product.id params.productId=this.filters.product.id
}else { }else {
this.$message({showClose: true, message: "请先选择产品", type: 'success' });
this.$notify({showClose: true, message: "请先选择产品", type: 'success' });
return; return;
//params.xxx=xxxxx //params.xxx=xxxxx
} }
@ -384,7 +384,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmMenus = res.data.data; this.xmMenus = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
} }
@ -400,11 +400,11 @@
// XmMenu xm_project_menu // XmMenu xm_project_menu
showAdd: function () { showAdd: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
if(this.filters.product==null){ if(this.filters.product==null){
this.$message({showClose: true, message: "请先选择产品", type: 'error' });
this.$notify({showClose: true, message: "请先选择产品", type: 'error' });
return; return;
} }
this.parentMenu=null; this.parentMenu=null;
@ -413,7 +413,7 @@
}, },
showSubAdd:function(row){ showSubAdd:function(row){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
this.editForm=row this.editForm=row
@ -444,7 +444,7 @@
//xmMenu //xmMenu
handleDel: function (row,index) { handleDel: function (row,index) {
if(row.mmUserid!=this.userInfo.userid){ if(row.mmUserid!=this.userInfo.userid){
this.$message({showClose: true, message: "只能操作你负责的需求", type: 'error'});
this.$notify({showClose: true, message: "只能操作你负责的需求", type: 'error'});
return false; return false;
} }
this.$confirm('确认删除该记录吗?', '提示', { this.$confirm('确认删除该记录吗?', '提示', {
@ -459,7 +459,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -467,7 +467,7 @@
batchDel: function () { batchDel: function () {
var mmSels=this.sels.filter(i=>i.mmUserid!=this.userInfo.userid) var mmSels=this.sels.filter(i=>i.mmUserid!=this.userInfo.userid)
if(mmSels.length>0){ if(mmSels.length>0){
this.$message({showClose: true, message: "只能操作你负责的需求", type: 'error'});
this.$notify({showClose: true, message: "只能操作你负责的需求", type: 'error'});
return false; return false;
} }
this.$confirm('确认删除选中记录吗?', '提示', { this.$confirm('确认删除选中记录吗?', '提示', {
@ -481,7 +481,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -758,11 +758,11 @@
showImportFromMenuTemplate(row){ showImportFromMenuTemplate(row){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
if(!this.filters.product){ if(!this.filters.product){
this.$message.error("请选择产品模板")
this.$notify.error("请选择产品模板")
return; return;
} }
this.parentMenu=row this.parentMenu=row
@ -829,14 +829,14 @@
if(tips.isOk){ if(tips.isOk){
this.getXmMenus() this.getXmMenus()
}else{ }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 ); }).catch( err => this.load.add=false );
}, },
toBatchEdit(){ toBatchEdit(){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
this.valueChangeRows=[]; this.valueChangeRows=[];
@ -851,11 +851,11 @@
batchSaveMenu(){ batchSaveMenu(){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
if(this.valueChangeRows.length==0){ if(this.valueChangeRows.length==0){
this.$message.success("没有数据被修改");
this.$notify.success("没有数据被修改");
return return
} }
batchEditXmMenu(this.valueChangeRows).then(res=>{ batchEditXmMenu(this.valueChangeRows).then(res=>{
@ -864,7 +864,7 @@
this.valueChangeRows=[] this.valueChangeRows=[]
this.getXmMenus() 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){ fieldChange:function(row,fieldName,nextReplace){
@ -900,7 +900,7 @@
showTaskList(row){ showTaskList(row){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
this.editForm=row this.editForm=row
@ -911,7 +911,7 @@
if(xmTasks==null || xmTasks.length==0){ if(xmTasks==null || xmTasks.length==0){
this.$message.error("请最少选择一个任务进行关联");
this.$notify.error("请最少选择一个任务进行关联");
return; return;
} }
var menu=this.editForm var menu=this.editForm
@ -928,7 +928,7 @@
if(tips.isOk){ if(tips.isOk){
this.getXmMenus() 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){ showMenuExchange:function(row){
@ -976,7 +976,7 @@
}else if('delete'==opType){ }else if('delete'==opType){
if(row.opType && (row.opType=='addSub' || row.opType=='add')){ if(row.opType && (row.opType=='addSub' || row.opType=='add')){
if(row.children && row.children.length>0){ if(row.children && row.children.length>0){
this.$message.error("请先删除子元素");
this.$notify.error("请先删除子元素");
return; return;
}else{ }else{
@ -986,7 +986,7 @@
this.xmMenus.splice(index,1); this.xmMenus.splice(index,1);
} }
}else{ }else{
this.$message.error("只能删除未保存的行");
this.$notify.error("只能删除未保存的行");
return; return;
} }
@ -1006,7 +1006,7 @@
loadTasksToXmMenuState: function () { loadTasksToXmMenuState: function () {
this.load.edit=true; this.load.edit=true;
if(!this.filters.product){ if(!this.filters.product){
this.$message.error("请先选择产品");
this.$notify.error("请先选择产品");
} }
let params = { productId: this.filters.product.id }; let params = { productId: this.filters.product.id };
loadTasksToXmMenuState(params).then((res) => { loadTasksToXmMenuState(params).then((res) => {
@ -1016,7 +1016,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.edit=false );
}, },
selectUser(row){ selectUser(row){

2
src/views/xm/core/xmMenu/XmMenuRichDetail.vue

@ -123,7 +123,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

4
src/views/xm/core/xmMenu/XmMenuSelect.vue

@ -296,7 +296,7 @@
if( this.filters.product!==null && this.filters.product.id!=''){ if( this.filters.product!==null && this.filters.product.id!=''){
params.productId=this.filters.product.id params.productId=this.filters.product.id
}else { }else {
this.$message({showClose: true, message: "请先选择产品", type: 'success' });
this.$notify({showClose: true, message: "请先选择产品", type: 'success' });
return; return;
//params.xxx=xxxxx //params.xxx=xxxxx
} }
@ -311,7 +311,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmMenus = res.data.data; this.xmMenus = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );

18
src/views/xm/core/xmMenu/XmMenuWithPlan.vue

@ -362,7 +362,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmMenus = res.data.data; this.xmMenus = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -383,7 +383,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.edit=false );
}, },
//xmMenu //xmMenu
@ -397,13 +397,13 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.add=false );
}, },
//xmMenu //xmMenu
batchDel: function () { batchDel: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
@ -418,7 +418,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -497,11 +497,11 @@
}, },
showBatchEdit:function(){ showBatchEdit:function(){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ 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; return false;
} }
if(this.xmMenus.length==0 ){ if(this.xmMenus.length==0 ){
this.$message({showClose: true, message:"没有数据可以修改", type: 'error'});
this.$notify({showClose: true, message:"没有数据可以修改", type: 'error'});
return ; return ;
} }
@ -509,7 +509,7 @@
}, },
saveBatchEdit:function(){ saveBatchEdit:function(){
if(this.valueChangeRows.length==0){ if(this.valueChangeRows.length==0){
this.$message({showClose: true, message:"没有改变任何数据,无需保存", type: 'success'});
this.$notify({showClose: true, message:"没有改变任何数据,无需保存", type: 'success'});
return; return;
}else { }else {
@ -521,7 +521,7 @@
this.valueChangeRows=[] this.valueChangeRows=[]
this.getXmMenus() 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); }).catch(e=>this.load.edit=false);
} }

2
src/views/xm/core/xmMenuExchange/MenuUserEditor.vue

@ -37,7 +37,7 @@ export default {
content: this.content, content: this.content,
} }
if(!this.content){ if(!this.content){
this.$message.error("请输入内容再提交");
this.$notify.error("请输入内容再提交");
return; return;
} }
this.$emit('publish',params); this.$emit('publish',params);

10
src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue

@ -188,7 +188,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmMenuExchanges = res.data.data; this.xmMenuExchanges = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -230,7 +230,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenuExchanges(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -248,7 +248,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenuExchanges(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -263,7 +263,7 @@
params.remark=editor.content; params.remark=editor.content;
if(!parentXmMenuExchange && !this.xmMenu && !this.filters.xmMenu){ if(!parentXmMenuExchange && !this.xmMenu && !this.filters.xmMenu){
this.$message.error("请选择需求再发表评论")
this.$notify.error("请选择需求再发表评论")
return; return;
} }
params.id=sn() params.id=sn()
@ -301,7 +301,7 @@
if(tips.isOk){ if(tips.isOk){
this.xmMenuExchanges.unshift(res.data.data); 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 自定义函数请在上面加**/ /**end 自定义函数请在上面加**/

2
src/views/xm/core/xmMenuState/XmMenuStateAdd.vue

@ -215,7 +215,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmMenuState/XmMenuStateEdit.vue

@ -213,7 +213,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

14
src/views/xm/core/xmMenuState/XmMenuStateMng.vue

@ -276,7 +276,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmMenus = res.data.data; this.xmMenus = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -297,7 +297,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.edit=false );
}, },
//xmMenu //xmMenu
@ -311,7 +311,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.add=false );
}, },
//xmMenu //xmMenu
@ -328,7 +328,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenus(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -407,7 +407,7 @@
}, },
showBatchEdit:function(){ showBatchEdit:function(){
if(this.xmMenus.length==0 ){ if(this.xmMenus.length==0 ){
this.$message({showClose: true, message:"没有数据可以修改", type: 'error'});
this.$notify({showClose: true, message:"没有数据可以修改", type: 'error'});
return ; return ;
} }
@ -415,7 +415,7 @@
}, },
saveBatchEdit:function(){ saveBatchEdit:function(){
if(this.valueChangeRows.length==0){ if(this.valueChangeRows.length==0){
this.$message({showClose: true, message:"没有改变任何数据,无需保存", type: 'success'});
this.$notify({showClose: true, message:"没有改变任何数据,无需保存", type: 'success'});
return; return;
}else { }else {
@ -427,7 +427,7 @@
this.valueChangeRows=[] this.valueChangeRows=[]
this.getXmMenus() 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); }).catch(e=>this.load.edit=false);
} }

6
src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue

@ -79,7 +79,7 @@
//XmMenuTemplate @submit="afterAddSubmit" //XmMenuTemplate @submit="afterAddSubmit"
addSubmit: function () { addSubmit: function () {
if(this.parentMenu==null && this.product ==null ){ if(this.parentMenu==null && this.product ==null ){
this.$message({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' });
this.$notify({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' });
return; return;
} }
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
@ -95,7 +95,7 @@
params.productId=this.product.id params.productId=this.product.id
} }
if(params.productId==null|| params.productId==''){ if(params.productId==null|| params.productId==''){
this.$message({showClose: true, message: '产品编号不能为空', type:'error' });
this.$notify({showClose: true, message: '产品编号不能为空', type:'error' });
return; return;
} }
addXmMenuTemplate(params).then((res) => { addXmMenuTemplate(params).then((res) => {
@ -105,7 +105,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue

@ -93,7 +93,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

16
src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue

@ -215,7 +215,7 @@
if( this.filters.product!==null && this.filters.product.id!=''){ if( this.filters.product!==null && this.filters.product.id!=''){
params.productId=this.filters.product.id params.productId=this.filters.product.id
}else { }else {
this.$message({showClose: true, message: "请先选择产品", type: 'error' });
this.$notify({showClose: true, message: "请先选择产品", type: 'error' });
return; return;
//params.xxx=xxxxx //params.xxx=xxxxx
} }
@ -229,7 +229,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmMenuTemplates = res.data.data; this.xmMenuTemplates = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -243,7 +243,7 @@
// XmMenuTemplate xm_project_menu // XmMenuTemplate xm_project_menu
showAdd: function () { showAdd: function () {
if(this.filters.product==null){ if(this.filters.product==null){
this.$message({showClose: true, message: "请先选择产品", type: 'error' });
this.$notify({showClose: true, message: "请先选择产品", type: 'error' });
return; return;
} }
this.addFormVisible = true; this.addFormVisible = true;
@ -288,7 +288,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenuTemplates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -306,7 +306,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMenuTemplates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -362,7 +362,7 @@
}, },
selectedMenusConfirm:function(){ selectedMenusConfirm:function(){
if(this.sels.length==0){ if(this.sels.length==0){
this.$message.error("请选择需求");
this.$notify.error("请选择需求");
return; return;
} }
this.$emit("selected-menus",this.sels) this.$emit("selected-menus",this.sels)
@ -378,7 +378,7 @@
}, },
batchSaveMenu(){ batchSaveMenu(){
if(this.valueChangeRows.length==0){ if(this.valueChangeRows.length==0){
this.$message.success("没有数据被修改");
this.$notify.success("没有数据被修改");
return return
} }
batchEditXmMenuTemplate(this.valueChangeRows).then(res=>{ batchEditXmMenuTemplate(this.valueChangeRows).then(res=>{
@ -387,7 +387,7 @@
this.valueChangeRows=[] this.valueChangeRows=[]
this.getXmMenuTemplates() 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){ fieldChange:function(row,fieldName, nextReplace){

2
src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue

@ -101,7 +101,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue

@ -99,7 +99,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/xm/core/xmMyFocus/XmMyFocusMng.vue

@ -145,7 +145,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmMyFocuss = res.data.data; this.xmMyFocuss = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -187,7 +187,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMyFocuss(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -205,7 +205,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmMyFocuss(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

4
src/views/xm/core/xmProduct/XmProductAdd.vue

@ -101,7 +101,7 @@
//XmProduct @submit="afterAddSubmit" //XmProduct @submit="afterAddSubmit"
addSubmit: function () { addSubmit: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin')){ if(!this.roles.some(i=>i.roleid=='productAdmin')){
this.$message({showClose: true, message: "只有产品经理能够创建产品", type: 'error'});
this.$notify({showClose: true, message: "只有产品经理能够创建产品", type: 'error'});
return false; return false;
} }
@ -119,7 +119,7 @@
//this.$refs['addForm'].resetFields(); //this.$refs['addForm'].resetFields();
this.$emit('submit',res.data.data);// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

8
src/views/xm/core/xmProduct/XmProductEdit.vue

@ -126,7 +126,7 @@
//XmProduct @submit="afterAddSubmit" //XmProduct @submit="afterAddSubmit"
editSubmit: function () { editSubmit: function () {
if(this.userInfo.userid!=this.editForm.pmUserid){ if(this.userInfo.userid!=this.editForm.pmUserid){
this.$message({showClose: true, message: "你不是该产品负责人,不能修改产品信息", type: 'error' });
this.$notify({showClose: true, message: "你不是该产品负责人,不能修改产品信息", type: 'error' });
return; return;
} }
this.$refs.editForm.validate((valid) => { this.$refs.editForm.validate((valid) => {
@ -143,7 +143,7 @@
//this.$refs['editForm'].resetFields(); //this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.edit=false);
}); });
} }
@ -151,7 +151,7 @@
}, },
selectUser(){ selectUser(){
if(!this.roles.some(i=>i.roleid=='productAdmin')){ if(!this.roles.some(i=>i.roleid=='productAdmin')){
this.$message({showClose: true, message: "你不是产品经理,不能修改产品负责人", type: 'error' });
this.$notify({showClose: true, message: "你不是产品经理,不能修改产品负责人", type: 'error' });
return; return;
} }
this.userSelectVisible=true; this.userSelectVisible=true;
@ -165,7 +165,7 @@
}, },
clearPmUser:function(){ clearPmUser:function(){
if(!this.roles.some(i=>i.roleid=='productAdmin')){ if(!this.roles.some(i=>i.roleid=='productAdmin')){
this.$message({showClose: true, message: "你不是产品经理,不能修改产品负责人", type: 'error' });
this.$notify({showClose: true, message: "你不是产品经理,不能修改产品负责人", type: 'error' });
return; return;
} }
this.editForm.pmUserid='' this.editForm.pmUserid=''

24
src/views/xm/core/xmProduct/XmProductMng.vue

@ -368,7 +368,7 @@ import XmProductSelect from './XmProductSelect.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProducts(); 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 ); }).catch( err => this.load.edit=false );
}, },
// XmProduct // XmProduct
@ -389,7 +389,7 @@ import XmProductSelect from './XmProductSelect.vue';
params.queryScope=this.filters.queryScope params.queryScope=this.filters.queryScope
if(this.filters.queryScope=='productId'){ if(this.filters.queryScope=='productId'){
if(!this.filters.id){ if(!this.filters.id){
this.$message({showClose: true, message:"您选择了按产品编号精确查找模式,请输入产品编号", type: 'error' });
this.$notify({showClose: true, message:"您选择了按产品编号精确查找模式,请输入产品编号", type: 'error' });
return; return;
} }
params.id=this.filters.id params.id=this.filters.id
@ -428,7 +428,7 @@ import XmProductSelect from './XmProductSelect.vue';
this.templateVisible=false; this.templateVisible=false;
} }
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -442,7 +442,7 @@ import XmProductSelect from './XmProductSelect.vue';
// XmProduct // XmProduct
showAdd: function () { showAdd: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin')){ if(!this.roles.some(i=>i.roleid=='productAdmin')){
this.$message({showClose: true, message: "只有产品经理能够创建产品", type: 'error'});
this.$notify({showClose: true, message: "只有产品经理能够创建产品", type: 'error'});
return false; return false;
} }
this.addFormVisible = true; this.addFormVisible = true;
@ -475,7 +475,7 @@ import XmProductSelect from './XmProductSelect.vue';
//xmProduct //xmProduct
handleDel: function (row,index) { handleDel: function (row,index) {
if(!this.roles.some(i=>i.roleid=='productAdmin')){ if(!this.roles.some(i=>i.roleid=='productAdmin')){
this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'});
this.$notify({showClose: true, message: "只有产品经理能够删除产品", type: 'error'});
return false; return false;
} }
this.$confirm('确认删除该记录吗?', '提示', { this.$confirm('确认删除该记录吗?', '提示', {
@ -490,19 +490,19 @@ import XmProductSelect from './XmProductSelect.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProducts(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
//xmProduct //xmProduct
batchDel: function () { batchDel: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin')){ if(!this.roles.some(i=>i.roleid=='productAdmin')){
this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'});
this.$notify({showClose: true, message: "只有产品经理能够删除产品", type: 'error'});
return false; return false;
} }
var mmSels=this.sels.filter(i=>i.pmUserid!=this.userInfo.userid) var mmSels=this.sels.filter(i=>i.pmUserid!=this.userInfo.userid)
if(mmSels.length>0){ if(mmSels.length>0){
this.$message({showClose: true, message: "只能删除你负责的产品", type: 'error'});
this.$notify({showClose: true, message: "只能删除你负责的产品", type: 'error'});
return false; return false;
} }
this.$confirm('确认删除选中记录吗?', '提示', { this.$confirm('确认删除选中记录吗?', '提示', {
@ -516,7 +516,7 @@ import XmProductSelect from './XmProductSelect.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProducts(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -577,7 +577,7 @@ import XmProductSelect from './XmProductSelect.vue';
if(tips.isOk){ if(tips.isOk){
this.getXmProducts(); 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){ if(tips.isOk){
this.getXmProducts(); 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.$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' });
}) })
}, },

2
src/views/xm/core/xmProduct/XmProductProjectForLink.vue

@ -48,7 +48,7 @@
delXmProductProjectLink(params).then(res=>{ delXmProductProjectLink(params).then(res=>{
var tips = res.data.tips; var tips = res.data.tips;
if(tips.isOk){ if(tips.isOk){
this.$message({showClose: true, message: "脱钩成功", type: 'success' });
this.$notify({showClose: true, message: "脱钩成功", type: 'success' });
} }
}); });
}) })

6
src/views/xm/core/xmProduct/XmProductSelect.vue

@ -218,7 +218,7 @@
params.queryScope=this.filters.queryScope params.queryScope=this.filters.queryScope
if(this.filters.queryScope=='productId'){ if(this.filters.queryScope=='productId'){
if(!this.filters.id){ if(!this.filters.id){
this.$message({showClose: true, message:"您选择了按产品编号精确查找模式,请输入产品编号", type: 'error' });
this.$notify({showClose: true, message:"您选择了按产品编号精确查找模式,请输入产品编号", type: 'error' });
return; return;
} }
params.id=this.filters.id params.id=this.filters.id
@ -244,7 +244,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProducts = res.data.data; this.xmProducts = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -295,7 +295,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProducts(); 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 ); }).catch( err => this.load.edit=false );
}, },
},//end methods },//end methods

20
src/views/xm/core/xmProduct/XmProductTplMng.vue

@ -192,7 +192,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProducts(); 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 ); }).catch( err => this.load.edit=false );
}, },
// XmProduct // XmProduct
@ -225,7 +225,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProducts = res.data.data; this.xmProducts = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -239,7 +239,7 @@
// XmProduct // XmProduct
showAdd: function () { showAdd: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin')){ if(!this.roles.some(i=>i.roleid=='productAdmin')){
this.$message({showClose: true, message: "只有产品经理能够创建产品", type: 'error'});
this.$notify({showClose: true, message: "只有产品经理能够创建产品", type: 'error'});
return false; return false;
} }
this.addFormVisible = true; this.addFormVisible = true;
@ -283,19 +283,19 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProducts(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
//xmProduct //xmProduct
batchDel: function () { batchDel: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin')){ if(!this.roles.some(i=>i.roleid=='productAdmin')){
this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'});
this.$notify({showClose: true, message: "只有产品经理能够删除产品", type: 'error'});
return false; return false;
} }
var mmSels=this.sels.filter(i=>i.pmUserid!=this.userInfo.userid) var mmSels=this.sels.filter(i=>i.pmUserid!=this.userInfo.userid)
if(mmSels.length>0){ if(mmSels.length>0){
this.$message({showClose: true, message: "只能删除你负责的产品", type: 'error'});
this.$notify({showClose: true, message: "只能删除你负责的产品", type: 'error'});
return false; return false;
} }
this.$confirm('确认删除选中记录吗?', '提示', { this.$confirm('确认删除选中记录吗?', '提示', {
@ -309,7 +309,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProducts(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -370,7 +370,7 @@
if(tips.isOk){ if(tips.isOk){
this.getXmProducts(); 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){ if(tips.isOk){
this.getXmProducts(); 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.$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' });
}) })
}, },

2
src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue

@ -95,7 +95,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue

@ -93,7 +93,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

10
src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue

@ -157,7 +157,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProductProjectLinks = res.data.data; this.xmProductProjectLinks = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$notify({ message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => 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.pageInfo.count=true;
this.getXmProductProjectLinks(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -217,7 +217,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProductProjectLinks(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -241,7 +241,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProductProjectLinks(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -259,7 +259,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProductProjectLinks(); 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 ); }).catch( err => this.load.del=false );
}); });
} }

2
src/views/xm/core/xmProductState/XmProductStateAdd.vue

@ -185,7 +185,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmProductState/XmProductStateEdit.vue

@ -183,7 +183,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/xm/core/xmProductState/XmProductStateMng.vue

@ -146,7 +146,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProductStates = res.data.data; this.xmProductStates = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -188,7 +188,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProductStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -206,7 +206,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProductStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

2
src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue

@ -92,7 +92,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue

@ -88,7 +88,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue

@ -160,7 +160,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProductTemplates = res.data.data; this.xmProductTemplates = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -202,7 +202,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProductTemplates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -220,7 +220,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProductTemplates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

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

@ -335,7 +335,7 @@
//XmProject xm_project@submit="afterEditSubmit" //XmProject xm_project@submit="afterEditSubmit"
addSubmit: function () { addSubmit: function () {
if(!this.roles.some(i=>i.roleid=='projectAdmin')){ if(!this.roles.some(i=>i.roleid=='projectAdmin')){
this.$message({showClose: true, message: "只有项目经理可以建立项目", type: 'error' });
this.$notify({showClose: true, message: "只有项目经理可以建立项目", type: 'error' });
return; return;
} }
if ( if (
@ -345,7 +345,7 @@
this.addForm.startTime = this.dateRanger[0] this.addForm.startTime = this.dateRanger[0]
this.addForm.endTime = this.dateRanger[1] this.addForm.endTime = this.dateRanger[1]
}else{ }else{
this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
return; return;
} }
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
@ -364,7 +364,7 @@
if(tips.isOk){ if(tips.isOk){
this.$emit('submit',params);// @submit="afterEditSubmit" 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); }).catch( err =>this.load.add=false);
}); });
} }

4
src/views/xm/core/xmProject/XmProjectAssess.vue

@ -129,7 +129,7 @@
this.xmProjects = res.data.data; this.xmProjects = res.data.data;
console.log(this.xmProjects); console.log(this.xmProjects);
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -143,7 +143,7 @@
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ 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); }).catch( err => this.load.list = false);
}, },
// XmProject xm_project // XmProject xm_project

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

@ -259,7 +259,7 @@ import { months } from 'moment';
// }, // },
updateBudget() { updateBudget() {
if(this.selProject.planTotalCost==undefined){ if(this.selProject.planTotalCost==undefined){
this.$message({showClose: true, message:"不允许修改", type: 'success'});
this.$notify({showClose: true, message:"不允许修改", type: 'success'});
return; return;
} }
var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost) var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost)
@ -282,7 +282,7 @@ import { months } from 'moment';
}else{ }else{
this.selProjectBudget=Object.assign({},this.selProject) 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; this.load.edit = false;
}).catch( err => this.load.edut = false ); }).catch( err => this.load.edut = false );
}).catch(() => { }).catch(() => {

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

@ -256,7 +256,7 @@ import { months } from 'moment';
// }, // },
updateBudget() { updateBudget() {
if(this.selProject.planTotalCost==undefined){ if(this.selProject.planTotalCost==undefined){
this.$message({showClose: true, message:"不允许修改", type: 'success'});
this.$notify({showClose: true, message:"不允许修改", type: 'success'});
return; return;
} }
var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost) var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost)
@ -279,7 +279,7 @@ import { months } from 'moment';
}else{ }else{
this.selProjectBudget=Object.assign({},this.selProject) 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; this.load.edit = false;
}).catch( err => this.load.edut = false ); }).catch( err => this.load.edut = false );
}).catch(() => { }).catch(() => {

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

@ -401,11 +401,11 @@
//XmProject xm_project@submit="afterEditSubmit" //XmProject xm_project@submit="afterEditSubmit"
editSubmit: function () { editSubmit: function () {
if(!this.roles.some(i=>i.roleid=='projectAdmin')){ if(!this.roles.some(i=>i.roleid=='projectAdmin')){
this.$message({showClose: true, message: "只有项目经理可以修改项目", type: 'error' });
this.$notify({showClose: true, message: "只有项目经理可以修改项目", type: 'error' });
return; return;
} }
if("0" != this.selProject.status){ if("0" != this.selProject.status){
this.$message({showClose: true, message: "只有初始状态的项目可以修改,如确实需要修改,请进行项目变更审批", type: 'error' });
this.$notify({showClose: true, message: "只有初始状态的项目可以修改,如确实需要修改,请进行项目变更审批", type: 'error' });
return; return;
} }
if ( if (
@ -415,7 +415,7 @@
this.editForm.startTime = this.dateRanger[0] ; this.editForm.startTime = this.dateRanger[0] ;
this.editForm.endTime = this.dateRanger[1] ; this.editForm.endTime = this.dateRanger[1] ;
}else{ }else{
this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' });
return; return;
} }
this.$refs.editForm.validate((valid) => { this.$refs.editForm.validate((valid) => {
@ -433,7 +433,7 @@
this.selProject=Object.assign(this.selProject,res.data.data) this.selProject=Object.assign(this.selProject,res.data.data)
this.$emit('submit',res.data.data);// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }
@ -449,7 +449,7 @@
if(tips.isOk){ if(tips.isOk){
this.xmProjectGroups = res.data.data; this.xmProjectGroups = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -531,12 +531,12 @@
}, },
sendToProcessApprova:function(row,bizKey){ sendToProcessApprova:function(row,bizKey){
if(!this.roles.some(i=>i.roleid=='projectAdmin')){ if(!this.roles.some(i=>i.roleid=='projectAdmin')){
this.$message({showClose: true, message: "只有项目经理可以发起流程", type: 'error' });
this.$notify({showClose: true, message: "只有项目经理可以发起流程", type: 'error' });
return; return;
} }
// //
if(row.flowState=='1'){ if(row.flowState=='1'){
this.$message.error("审核中,不允许重复发审");
this.$notify.error("审核中,不允许重复发审");
return; return;
} }
@ -633,7 +633,7 @@
//this.html2canvas(document.querySelector(".editForm"),row,params); //this.html2canvas(document.querySelector(".editForm"),row,params);
this.$router.push({name:'ProcdefListForBizStart',params:params}); this.$router.push({name:'ProcdefListForBizStart',params:params});
}else { }else {
this.$message.error("不支持的审批事项");
this.$notify.error("不支持的审批事项");
return; return;
} }

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

@ -159,7 +159,7 @@ import XmProjectList from './XmProjectList.vue';
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProjects = res.data.data; this.xmProjects = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -180,7 +180,7 @@ import XmProjectList from './XmProjectList.vue';
if(tips.isOk){ if(tips.isOk){
this.getXmProjects(); 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; var tips = res.data.tips;
if(tips.isOk){ if(tips.isOk){
this.getXmProjects(); this.getXmProjects();
this.$message({showClose: true, message: "移出成功", type: 'success' });
this.$notify({showClose: true, message: "移出成功", type: 'success' });
} }
}); });
}) })

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

@ -135,7 +135,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProjects = res.data.data; this.xmProjects = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );

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

@ -418,7 +418,7 @@
this.templateVisible=false; this.templateVisible=false;
} }
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -496,7 +496,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjects(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -513,7 +513,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjects(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -553,7 +553,7 @@
this.ScreenData[scope.$index].status = val; this.ScreenData[scope.$index].status = val;
this.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; this.load.edit = false;
}).catch( err => this.load.edut = false ); }).catch( err => this.load.edut = false );
}, },
@ -586,7 +586,7 @@
sendToProcessApprova:function(row,bizKey){ sendToProcessApprova:function(row,bizKey){
if(row.bizFlowState=='1'){ if(row.bizFlowState=='1'){
this.$message.error("审核中,不允许重新发起");
this.$notify.error("审核中,不允许重新发起");
return; return;
} }
@ -604,14 +604,14 @@
if(bizKey=='xm_project_delete_approva'){ if(bizKey=='xm_project_delete_approva'){
if(row.status!='0'){ if(row.status!='0'){
this.$message.error("只有状态为初始化的项目可以删除");
this.$notify.error("只有状态为初始化的项目可以删除");
return; return;
} }
mainTitle='关于删除项目【'+titleNames+"】的审批" mainTitle='关于删除项目【'+titleNames+"】的审批"
mainContext=mainTitle+',删除原因:'; mainContext=mainTitle+',删除原因:';
} else if(bizKey=='xm_project_over_approva'){ } else if(bizKey=='xm_project_over_approva'){
if(row.status!='1'){ if(row.status!='1'){
this.$message.error("只有状态为执行中的项目可以进行结项操作");
this.$notify.error("只有状态为执行中的项目可以进行结项操作");
return; return;
} }
mainTitle='关于项目【'+titleNames+"】结项的审批" mainTitle='关于项目【'+titleNames+"】结项的审批"
@ -619,34 +619,34 @@
} else if(bizKey=='xm_project_restart_approva'){ } else if(bizKey=='xm_project_restart_approva'){
if(row.status!='3'){ if(row.status!='3'){
this.$message.error("只有状态为暂停的项目可以进行重新启动操作");
this.$notify.error("只有状态为暂停的项目可以进行重新启动操作");
return; return;
} }
mainTitle='关于项目【'+titleNames+"】重新启动的审批" mainTitle='关于项目【'+titleNames+"】重新启动的审批"
mainContext=mainTitle; mainContext=mainTitle;
} else if(bizKey=='xm_project_start_approva'){ } else if(bizKey=='xm_project_start_approva'){
if(row.status!='0'){ if(row.status!='0'){
this.$message.error("只有状态为初始化的项目可以进行立项审批操作");
this.$notify.error("只有状态为初始化的项目可以进行立项审批操作");
return; return;
} }
mainTitle='关于项目【'+titleNames+"】的立项审批" mainTitle='关于项目【'+titleNames+"】的立项审批"
mainContext=mainTitle mainContext=mainTitle
} else if(bizKey=='xm_project_suspension_approva'){ } else if(bizKey=='xm_project_suspension_approva'){
if(row.status!='1'){ if(row.status!='1'){
this.$message.error("只有状态为执行中的项目可以进行挂起操作");
this.$notify.error("只有状态为执行中的项目可以进行挂起操作");
return; return;
} }
mainTitle='关于项目【'+titleNames+"】暂停的审批" mainTitle='关于项目【'+titleNames+"】暂停的审批"
mainContext=mainTitle+''; mainContext=mainTitle+'';
} else if(bizKey=='xm_project_budget_change_approva'){ } else if(bizKey=='xm_project_budget_change_approva'){
if(row.status!='1'){ if(row.status!='1'){
this.$message.error("只有状态为执行中的项目可以进行预算变更操作");
this.$notify.error("只有状态为执行中的项目可以进行预算变更操作");
return; return;
} }
mainTitle='关于项目【'+titleNames+"】的预算变更审批" mainTitle='关于项目【'+titleNames+"】的预算变更审批"
mainContext=mainTitle+''; mainContext=mainTitle+'';
} else{ } else{
this.$message.error("暂不支持的业务审批");
this.$notify.error("暂不支持的业务审批");
return; return;
} }
@ -680,12 +680,12 @@
if(tips.isOk){ if(tips.isOk){
this.getXmProjects(); 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{ }else{
addXmMyFocus({projectId:row.id,focusType:'project',projectName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{ addXmMyFocus({projectId:row.id,focusType:'project',projectName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{
var tips=res.data.tips; 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.$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' });
}) })
}, },

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

@ -139,7 +139,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProjects = res.data.data; this.xmProjects = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );

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

@ -237,7 +237,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProjects = res.data.data; this.xmProjects = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -315,7 +315,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjects(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -332,7 +332,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjects(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -359,7 +359,7 @@
} }
this.$emit("copy",res.data.data) 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.ScreenData[scope.$index].status = val;
this.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; this.load.edit = false;
}).catch( err => this.load.edut = false ); }).catch( err => this.load.edut = false );
}, },
@ -426,7 +426,7 @@
sendToProcessApprova:function(row,bizKey){ sendToProcessApprova:function(row,bizKey){
if(row.bizFlowState=='1'){ if(row.bizFlowState=='1'){
this.$message.error("审核中,不允许重新发起");
this.$notify.error("审核中,不允许重新发起");
return; return;
} }
@ -444,14 +444,14 @@
if(bizKey=='xm_project_delete_approva'){ if(bizKey=='xm_project_delete_approva'){
if(row.status!='0'){ if(row.status!='0'){
this.$message.error("只有状态为初始化的项目可以删除");
this.$notify.error("只有状态为初始化的项目可以删除");
return; return;
} }
mainTitle='关于删除项目【'+titleNames+"】的审批" mainTitle='关于删除项目【'+titleNames+"】的审批"
mainContext=mainTitle+',删除原因:'; mainContext=mainTitle+',删除原因:';
} else if(bizKey=='xm_project_over_approva'){ } else if(bizKey=='xm_project_over_approva'){
if(row.status!='1'){ if(row.status!='1'){
this.$message.error("只有状态为执行中的项目可以进行结项操作");
this.$notify.error("只有状态为执行中的项目可以进行结项操作");
return; return;
} }
mainTitle='关于项目【'+titleNames+"】结项的审批" mainTitle='关于项目【'+titleNames+"】结项的审批"
@ -459,34 +459,34 @@
} else if(bizKey=='xm_project_restart_approva'){ } else if(bizKey=='xm_project_restart_approva'){
if(row.status!='3'){ if(row.status!='3'){
this.$message.error("只有状态为暂停的项目可以进行重新启动操作");
this.$notify.error("只有状态为暂停的项目可以进行重新启动操作");
return; return;
} }
mainTitle='关于项目【'+titleNames+"】重新启动的审批" mainTitle='关于项目【'+titleNames+"】重新启动的审批"
mainContext=mainTitle; mainContext=mainTitle;
} else if(bizKey=='xm_project_start_approva'){ } else if(bizKey=='xm_project_start_approva'){
if(row.status!='0'){ if(row.status!='0'){
this.$message.error("只有状态为初始化的项目可以进行立项审批操作");
this.$notify.error("只有状态为初始化的项目可以进行立项审批操作");
return; return;
} }
mainTitle='关于项目【'+titleNames+"】的立项审批" mainTitle='关于项目【'+titleNames+"】的立项审批"
mainContext=mainTitle mainContext=mainTitle
} else if(bizKey=='xm_project_suspension_approva'){ } else if(bizKey=='xm_project_suspension_approva'){
if(row.status!='1'){ if(row.status!='1'){
this.$message.error("只有状态为执行中的项目可以进行挂起操作");
this.$notify.error("只有状态为执行中的项目可以进行挂起操作");
return; return;
} }
mainTitle='关于项目【'+titleNames+"】暂停的审批" mainTitle='关于项目【'+titleNames+"】暂停的审批"
mainContext=mainTitle+''; mainContext=mainTitle+'';
} else if(bizKey=='xm_project_budget_change_approva'){ } else if(bizKey=='xm_project_budget_change_approva'){
if(row.status!='1'){ if(row.status!='1'){
this.$message.error("只有状态为执行中的项目可以进行预算变更操作");
this.$notify.error("只有状态为执行中的项目可以进行预算变更操作");
return; return;
} }
mainTitle='关于项目【'+titleNames+"】的预算变更审批" mainTitle='关于项目【'+titleNames+"】的预算变更审批"
mainContext=mainTitle+''; mainContext=mainTitle+'';
} else{ } else{
this.$message.error("暂不支持的业务审批");
this.$notify.error("暂不支持的业务审批");
return; return;
} }
@ -520,12 +520,12 @@
if(tips.isOk){ if(tips.isOk){
this.getXmProjects(); 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{ }else{
addXmMyFocus({projectId:row.id,focusType:'project',projectName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{ addXmMyFocus({projectId:row.id,focusType:'project',projectName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{
var tips=res.data.tips; 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' });
}) })
} }
}, },

2
src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue

@ -197,7 +197,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue

@ -195,7 +195,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue

@ -177,7 +177,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProjectBaselines = res.data.data; this.xmProjectBaselines = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -219,7 +219,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectBaselines(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -237,7 +237,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectBaselines(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

2
src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue

@ -83,7 +83,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue

@ -81,7 +81,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/xm/core/xmProjectContract/XmProjectContractMng.vue

@ -155,7 +155,7 @@
this.xmProjectContracts = res.data.data; this.xmProjectContracts = res.data.data;
console.log(res.data.data); console.log(res.data.data);
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -197,7 +197,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectContracts(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -215,7 +215,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectContracts(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

2
src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue

@ -116,7 +116,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue

@ -114,7 +114,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

10
src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue

@ -196,7 +196,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProjectEnvLists = res.data.data; this.xmProjectEnvLists = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -238,7 +238,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectEnvLists(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -255,7 +255,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectEnvLists(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -278,7 +278,7 @@
// console.log(this.envList); // console.log(this.envList);
// this.getXmProjectEnvLists(); // this.getXmProjectEnvLists();
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -302,7 +302,7 @@
this.importVisible = false; this.importVisible = false;
this.getXmProjectEnvLists(); 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); }).catch( err => this.load.add=false);
}); });
} }

4
src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue

@ -125,11 +125,11 @@
this.currOpType="edit"; this.currOpType="edit";
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
}else{ }else{
this.$message({ showClose:true, message: "表单验证不通过,请修改表单数据再提交", type: 'error' });
this.$notify({ showClose:true, message: "表单验证不通过,请修改表单数据再提交", type: 'error' });
} }
}); });
}, },

16
src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue

@ -388,7 +388,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProjectGroups = res.data.data; this.xmProjectGroups = res.data.data;
}else{ }else{
this.$message({ showClose:true, message: tips.msg, type: 'error' });
this.$notify({ showClose:true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -474,7 +474,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectGroups(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -493,7 +493,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectGroups(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -510,7 +510,7 @@
if(tips.isOk){ if(tips.isOk){
this.imGroups=res.data.data; this.imGroups=res.data.data;
} }
this.$message({showClose: true,
this.$notify({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });
@ -542,13 +542,13 @@
params.id=params.groupId params.id=params.groupId
this.imGroups.push(params); this.imGroups.push(params);
} }
this.$message({showClose: true,
this.$notify({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });
}) })
}else{ }else{
that.$message({
that.$notify({
message: "组员为空,不允许绑定", message: "组员为空,不允许绑定",
type: 'error' type: 'error'
}); });
@ -589,7 +589,7 @@
if(tips.isOk){ if(tips.isOk){
this.searchXmProjectGroups() 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.pageInfo.count=true;
this.getXmProjectGroups(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

6
src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue

@ -122,7 +122,7 @@
if(this.isSelectSingleUser=='1'){ if(this.isSelectSingleUser=='1'){
if(users.length>1){ if(users.length>1){
this.$message({showClose: true,
this.$notify({showClose: true,
message: '只能选中一个用户', message: '只能选中一个用户',
type: 'error' type: 'error'
}); });
@ -137,7 +137,7 @@
params.projectId=this.filters.selProject.id params.projectId=this.filters.selProject.id
}else{ }else{
this.selectProjectVisible=true; this.selectProjectVisible=true;
this.$message({showClose: true,
this.$notify({showClose: true,
message: '请选中项目', message: '请选中项目',
type: 'success' type: 'success'
}); });
@ -148,7 +148,7 @@
if(tips.isOk){ if(tips.isOk){
this.selGroups=res.data.data; this.selGroups=res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
}) })
}, },

8
src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue

@ -176,7 +176,7 @@ import XmProjectGroupStateOverview from './XmProjectGroupStateOverview.vue';
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProjectGroupStates = res.data.data; this.xmProjectGroupStates = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -218,7 +218,7 @@ import XmProjectGroupStateOverview from './XmProjectGroupStateOverview.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectGroupStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -236,7 +236,7 @@ import XmProjectGroupStateOverview from './XmProjectGroupStateOverview.vue';
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectGroupStates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -250,7 +250,7 @@ import XmProjectGroupStateOverview from './XmProjectGroupStateOverview.vue';
if(tips.isOk){ if(tips.isOk){
this.getXmProjectGroupStates(); this.getXmProjectGroupStates();
}else{ }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'});
} }
}) })

4
src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue

@ -114,11 +114,11 @@
this.currOpType="edit"; this.currOpType="edit";
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
}else{ }else{
this.$message({ showClose:true, message: "表单验证不通过,请修改表单数据再提交", type: 'error' });
this.$notify({ showClose:true, message: "表单验证不通过,请修改表单数据再提交", type: 'error' });
} }
}); });
}, },

6
src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue

@ -172,7 +172,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProjectGroupUsers = res.data.data; this.xmProjectGroupUsers = res.data.data;
}else{ }else{
this.$message({ showClose:true, message: tips.msg, type: 'error' });
this.$notify({ showClose:true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -214,7 +214,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectGroupUsers(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -232,7 +232,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectGroupUsers(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

2
src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue

@ -101,7 +101,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue

@ -99,7 +99,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue

@ -146,7 +146,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProjectGroupUserCandidates = res.data.data; this.xmProjectGroupUserCandidates = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -188,7 +188,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectGroupUserCandidates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -206,7 +206,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectGroupUserCandidates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

2
src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue

@ -122,7 +122,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue

@ -120,7 +120,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" 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); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue

@ -169,7 +169,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmProjectKpis = res.data.data; this.xmProjectKpis = res.data.data;
}else{ }else{
this.$message({showClose: true, message: tips.msg, type: 'error' });
this.$notify({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -211,7 +211,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectKpis(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -229,7 +229,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmProjectKpis(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

2
src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue

@ -128,7 +128,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}); });
} }

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save