diff --git a/src/views/example/table/complexTable.vue b/src/views/example/table/complexTable.vue index d4300f54..6ac66f0f 100644 --- a/src/views/example/table/complexTable.vue +++ b/src/views/example/table/complexTable.vue @@ -237,10 +237,7 @@ export default { this.getList() }, handleModifyStatus(row, status) { - this.$message({showClose: true, - message: '操作成功', - type: 'success' - }) + this.$notify({position:'bottom-left',showClose: true,message: '操作成功',type: 'success'}) row.status = status }, resetTemp() { diff --git a/src/views/example/table/inlineEditTable.vue b/src/views/example/table/inlineEditTable.vue index 99939cf7..ec445c2d 100644 --- a/src/views/example/table/inlineEditTable.vue +++ b/src/views/example/table/inlineEditTable.vue @@ -100,7 +100,7 @@ export default { cancelEdit(row) { row.title = row.originalTitle row.edit = false - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: 'The title has been restored to the original value', type: 'warning' }) @@ -108,7 +108,7 @@ export default { confirmEdit(row) { row.edit = false row.originalTitle = row.title - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: 'The title has been edited', type: 'success' }) diff --git a/src/views/login/BranchAdd.vue b/src/views/login/BranchAdd.vue index 6b718a57..a2854514 100644 --- a/src/views/login/BranchAdd.vue +++ b/src/views/login/BranchAdd.vue @@ -181,16 +181,16 @@ if(tips.isOk){ this.$emit('submit',res.data.data );// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => this.load.add=false); }else{ - this.$message({showClose: true, message: "该公司名已注册，不可以使用", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "该公司名已注册，不可以使用", type: 'error' }); return; } } }) }else{ - this.$message({showClose: true, message: "公司名必须6个字以上", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "公司名必须6个字以上", type: 'error' }); return; } @@ -219,7 +219,7 @@ }) }else{ this.load.list=false; - this.$message({showClose: true, message: "最少输入两个字", type: 'info' }); + this.$notify({position:'bottom-left',showClose:true,message: "最少输入两个字", type: 'info' }); return; } }, @@ -231,11 +231,11 @@ addUserJoinBranchRequire(params).then(res=>{ var tips = res.data.tips; if(tips.isOk){ - this.$message({showClose: true, message:tips.msg, type: 'success' }); + this.$notify({position:'bottom-left',showClose:true,message:tips.msg, type: 'success' }); //this.$emit('submit',res.data.data );// @submit="afterAddSubmit" return; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } }) @@ -251,16 +251,16 @@ listBranchNoAuth(params).then(res=>{ if(res.data.tips.isOk){ if(res.data.data.length<=0){ - this.$message({showClose: true, message: "该公司名未注册，可以使用", type: 'success' }); + this.$notify({position:'bottom-left',showClose:true,message: "该公司名未注册，可以使用", type: 'success' }); return; }else{ - this.$message({showClose: true, message: "该公司名已注册，不可以使用", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "该公司名已注册，不可以使用", type: 'error' }); return; } } }) }else{ - this.$message({showClose: true, message: "最少输入两个字", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "最少输入两个字", type: 'error' }); return; } } diff --git a/src/views/mdp/arc/archiveAttachment/AttachmentUpload.vue b/src/views/mdp/arc/archiveAttachment/AttachmentUpload.vue index 9dcf72c9..a0023903 100644 --- a/src/views/mdp/arc/archiveAttachment/AttachmentUpload.vue +++ b/src/views/mdp/arc/archiveAttachment/AttachmentUpload.vue @@ -249,12 +249,12 @@ export default { handleBeforeUpload(file) { let files = this.fileList.filter(i => i.name == file.name); if (files.length > 0) { - this.$message({showClose: true, message: "文件已经存在", type: "warning" }); + this.$notify({position:'bottom-left',showClose:true,message: "文件已经存在", type: "warning" }); return false; } else { if (file.size > 1024 * 1024 * 4) { //4M - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "文件大小为" + file.size / (1024 * 1024) + diff --git a/src/views/mdp/arc/category/CategoryTree.vue b/src/views/mdp/arc/category/CategoryTree.vue index 87724c6a..b6329d11 100644 --- a/src/views/mdp/arc/category/CategoryTree.vue +++ b/src/views/mdp/arc/category/CategoryTree.vue @@ -288,7 +288,7 @@ this.treeData=res.data.data; console.log("this.treeData----"+JSON.stringify(this.treeData)); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error'}); } this.listLoading = false; }).catch(() => { diff --git a/src/views/mdp/arc/tag/TagMng.vue b/src/views/mdp/arc/tag/TagMng.vue index 4d98c314..737f293c 100644 --- a/src/views/mdp/arc/tag/TagMng.vue +++ b/src/views/mdp/arc/tag/TagMng.vue @@ -325,7 +325,7 @@ } this.convertTags = convert; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: 'error' }); @@ -378,7 +378,7 @@ this.pageInfo.count = true; this.getTags(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -399,7 +399,7 @@ this.pageInfo.count = true; this.getTags(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -421,7 +421,7 @@ addTagMethod(index) { if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) { if (this.isPub == '1') { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "不是平台管理员，不允许增加公共标签", type: 'error' }); @@ -431,7 +431,7 @@ if (this.convertTags.some(i => { return i.values.some(tag => tag.tagName == this.convertTags[index].showAddButtonInputValue) })) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "标签已经存在", type: 'error' }); @@ -439,7 +439,7 @@ } if (!this.convertTags[index].pubc) { if (this.isPub == '1') { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "该分类不是公共分类，不能添加公共标签", type: 'error' }); @@ -477,7 +477,7 @@ this.convertTags[index].showAddButtonInputValue = ''; this.convertTags[index].values.push(json); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -487,7 +487,7 @@ delTagMethod(tagId, index, valueIndex) { if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) { if (this.convertTags[index].values.some(i => i.pubTag == '1' && i.tagId == tagId)) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "公共标签不允许删除", type: 'error' }); @@ -517,7 +517,7 @@ this.convertTags[index].values.splice(valueIndex, 1); /*this.getTags();*/ } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -535,7 +535,7 @@ let that = this; if (!(this.userInfo.isPlatformAdmin || this.userInfo.isSuperAdmin)) { if (this.isPub == '1') { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "你不是平台管理员不能添加公共标签分类", type: 'error' }); @@ -544,7 +544,7 @@ } if (this.convertTags.some(i => i.categoryName == this.needAddTagCategoryNameInputValue)) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "标签分类已经存在", type: 'error' }); @@ -575,7 +575,7 @@ } this.convertTags.push(json); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -610,7 +610,7 @@ } if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) { if (this.convertTags.some(i => i.pubc == '1' && i.categoryId == categoryId)) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "公共分类不允许删除", type: 'error' }); @@ -630,7 +630,7 @@ this.convertTags.splice(index, 1); /*this.getTags();*/ } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); diff --git a/src/views/mdp/form/formData/FormData.vue b/src/views/mdp/form/formData/FormData.vue index 7160bdd6..03bfa016 100644 --- a/src/views/mdp/form/formData/FormData.vue +++ b/src/views/mdp/form/formData/FormData.vue @@ -307,7 +307,7 @@ let deptids=this.$refs['dept_'+item.fieldIdCamel][0].$refs.deptTree.getCheckedKeys(); if(item.isRequired=='1'){ if(!deptids||deptids.length<=0){ - this.$message({showClose: true, message: item.fieldTitle+'不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: item.fieldTitle+'不能为空', type: 'error' }); checkOk=false; return; } @@ -316,7 +316,7 @@ if(item.isMultiple=='1' && item.extFieldType!='dept'){ if(item.isRequired=='1'){ if(!this.multipleFieldsData[item.fieldIdCamel]||this.multipleFieldsData[item.fieldIdCamel].length<=0){ - this.$message({showClose: true, message: item.fieldTitle+'不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: item.fieldTitle+'不能为空', type: 'error' }); checkOk=false; return; } @@ -422,7 +422,7 @@ } this.$emit('submit',params);// @submit="afterAddSubmit" - //this.$message({showClose: true, message: "检查通过2", type: 'success' }); + //this.$notify({position:'bottom-left',showClose:true,message: "检查通过2", type: 'success' }); //console.log("params----------"+JSON.stringify(params)); //return params; @@ -434,7 +434,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.editLoading = false; }); diff --git a/src/views/mdp/form/formData/FormDataAdd.vue b/src/views/mdp/form/formData/FormDataAdd.vue index 35721c14..654971c9 100644 --- a/src/views/mdp/form/formData/FormDataAdd.vue +++ b/src/views/mdp/form/formData/FormDataAdd.vue @@ -88,7 +88,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit',formData);// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.addLoading = false; }); diff --git a/src/views/mdp/form/formData/FormDataEdit.vue b/src/views/mdp/form/formData/FormDataEdit.vue index 988355be..65ab3441 100644 --- a/src/views/mdp/form/formData/FormDataEdit.vue +++ b/src/views/mdp/form/formData/FormDataEdit.vue @@ -78,7 +78,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit',formData);// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.editLoading = false; }); diff --git a/src/views/mdp/form/formData/FormDataMng.vue b/src/views/mdp/form/formData/FormDataMng.vue index e1894cd4..83f13325 100644 --- a/src/views/mdp/form/formData/FormDataMng.vue +++ b/src/views/mdp/form/formData/FormDataMng.vue @@ -430,7 +430,7 @@ } else{ if(this.formDefSelected==null){ - this.$message({showClose: true, message: '请先选择表单', type: 'info' }); + this.$notify({position:'bottom-left',showClose:true,message: '请先选择表单', type: 'info' }); return; } @@ -460,7 +460,7 @@ let tips=this.checkFormQueryQx(this.formQx,params.userid,params.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } @@ -484,7 +484,7 @@ this.pageInfo.count = false; this.formDatas = res.data.data }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -497,7 +497,7 @@ showEdit: function ( row,index ) { let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } this.editFormVisible = true; @@ -523,16 +523,16 @@ //删除formData handleDel: function (row,index) { if(row.flowState=='1'){ - this.$message({showClose: true, message: '数据审核中，不允许删除', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '数据审核中，不允许删除', type: 'error' }); return; } if(row.flowState=='2'){ - this.$message({showClose: true, message: '数据已审核通过，不允许删除', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '数据已审核通过，不允许删除', type: 'error' }); return; } let tips=this.checkFormDelQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } this.$confirm('确认删除该记录吗?', '提示', { @@ -547,7 +547,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -569,7 +569,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }).catch(() => { this.listLoading = false; @@ -612,7 +612,7 @@ this.formFields = res.data.data; this.getOptions2(); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }).catch(() => { diff --git a/src/views/mdp/form/formData/FormDataMngForFlow.vue b/src/views/mdp/form/formData/FormDataMngForFlow.vue index 56adda79..2aea3c53 100644 --- a/src/views/mdp/form/formData/FormDataMngForFlow.vue +++ b/src/views/mdp/form/formData/FormDataMngForFlow.vue @@ -189,14 +189,14 @@ that.$emit("submit",formDatas) return; }else{ - this.$message({showClose: true, message: '请补充智能表单数据', type: 'info' }); + this.$notify({position:'bottom-left',showClose:true,message: '请补充智能表单数据', type: 'info' }); return; } }); return; }else{ if(formDatas.length<=0){ - this.$message({showClose: true, message: '请先选择要加入审批流的智能表单数据', type: 'info' }); + this.$notify({position:'bottom-left',showClose:true,message: '请先选择要加入审批流的智能表单数据', type: 'info' }); }else{ formDatas.forEach(i=>{ i.flowAction="join" @@ -358,7 +358,7 @@ this.editForm=this.procFormDatas[0]; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -496,7 +496,7 @@ if(this.formDefSelected!=null){ params.formId=this.formDefSelected.id; }else{ - this.$message({showClose: true, message: '没有关联智能表单，无法查询表单数据', type: 'info' }); + this.$notify({position:'bottom-left',showClose:true,message: '没有关联智能表单，无法查询表单数据', type: 'info' }); return; } if(this.formDataIds){ @@ -508,7 +508,7 @@ } let tips=this.checkFormQueryQx(this.formQx,params.userid,params.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } //params.flowState="0" @@ -534,7 +534,7 @@ }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -547,7 +547,7 @@ showEdit: function ( row,index ) { let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } this.editFormVisible = true; @@ -560,7 +560,7 @@ }, startProc: function() { if(this.sels.length<1){ - this.$message({showClose: true, message: "请至少选择一条数据发审", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请至少选择一条数据发审", type: 'error' }); return; } let extVars={ids:this.sels.map(i=>i.id),formId:this.formDefSelected.id} @@ -578,17 +578,17 @@ joinToProc: function(row,index){ let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } if(this.procFormDatas.some(i=>i.id==row.id)){ - this.$message({showClose: true, message: '该数据已在审核单中', type: 'info'}); + this.$notify({position:'bottom-left',showClose:true,message: '该数据已在审核单中', type: 'info'}); }else{ this.$nextTick(() => { this.formDatas.splice(index, 1); this.delProcFormDatas=this.delProcFormDatas.filter(i=>i.id!=row.id) this.procFormDatas.push(row) - this.$message({showClose: true, message: '添加成功', type: 'info'}); + this.$notify({position:'bottom-left',showClose:true,message: '添加成功', type: 'info'}); }); } @@ -596,7 +596,7 @@ removeFromProc: function(row,index){ let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } if(this.procFormDatas.some(i=>i.id==row.id)){ @@ -606,11 +606,11 @@ this.delProcFormDatas.push(row) } this.formDatas.push(row); - this.$message({showClose: true, message: '移除成功', type: 'info'}); + this.$notify({position:'bottom-left',showClose:true,message: '移除成功', type: 'info'}); }); }else{ - this.$message({showClose: true, message: '没有该条数据', type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message: '没有该条数据', type: 'error'}); } }, afterAddSubmit(){ @@ -633,7 +633,7 @@ handleDel: function (row,index) { let tips=this.checkFormDelQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } this.$confirm('确认删除该记录吗?', '提示', { @@ -648,7 +648,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -670,7 +670,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }).catch(() => { this.listLoading = false; @@ -726,7 +726,7 @@ this.getOptions2(); this.$emit('formFieldsLoad',this.formFields); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }).catch(() => { this.listLoading=false; diff --git a/src/views/mdp/form/formData/FormDataMngForFlowForm.vue b/src/views/mdp/form/formData/FormDataMngForFlowForm.vue index 38d56d61..e891ce7e 100644 --- a/src/views/mdp/form/formData/FormDataMngForFlowForm.vue +++ b/src/views/mdp/form/formData/FormDataMngForFlowForm.vue @@ -141,7 +141,7 @@ this.editForm=res.data.data[0] }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -169,7 +169,7 @@ this.getOptions2(); this.$emit('formFieldsLoad',this.formFields); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }).catch(() => { this.listLoading=false; diff --git a/src/views/mdp/form/formData/FormDataMngForFlowTable.vue b/src/views/mdp/form/formData/FormDataMngForFlowTable.vue index c954ee25..292388d6 100644 --- a/src/views/mdp/form/formData/FormDataMngForFlowTable.vue +++ b/src/views/mdp/form/formData/FormDataMngForFlowTable.vue @@ -189,14 +189,14 @@ that.$emit("submit",formDatas) return; }else{ - this.$message({showClose: true, message: '请补充智能表单数据', type: 'info' }); + this.$notify({position:'bottom-left',showClose:true,message: '请补充智能表单数据', type: 'info' }); return; } }); return; }else{ if(formDatas.length<=0){ - this.$message({showClose: true, message: '请先选择要加入审批流的智能表单数据', type: 'info' }); + this.$notify({position:'bottom-left',showClose:true,message: '请先选择要加入审批流的智能表单数据', type: 'info' }); }else{ formDatas.forEach(i=>{ i.flowAction="join" @@ -358,7 +358,7 @@ this.editForm=this.procFormDatas[0]; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -496,7 +496,7 @@ if(this.formDefSelected!=null){ params.formId=this.formDefSelected.id; }else{ - this.$message({showClose: true, message: '没有关联智能表单，无法查询表单数据', type: 'info' }); + this.$notify({position:'bottom-left',showClose:true,message: '没有关联智能表单，无法查询表单数据', type: 'info' }); return; } if(this.formDataIds){ @@ -508,7 +508,7 @@ } let tips=this.checkFormQueryQx(this.formQx,params.userid,params.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } //params.flowState="0" @@ -534,7 +534,7 @@ }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -547,7 +547,7 @@ showEdit: function ( row,index ) { let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } this.editFormVisible = true; @@ -560,7 +560,7 @@ }, startProc: function() { if(this.sels.length<1){ - this.$message({showClose: true, message: "请至少选择一条数据发审", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请至少选择一条数据发审", type: 'error' }); return; } let extVars={ids:this.sels.map(i=>i.id),formId:this.formDefSelected.id} @@ -578,17 +578,17 @@ joinToProc: function(row,index){ let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } if(this.procFormDatas.some(i=>i.id==row.id)){ - this.$message({showClose: true, message: '该数据已在审核单中', type: 'info'}); + this.$notify({position:'bottom-left',showClose:true,message: '该数据已在审核单中', type: 'info'}); }else{ this.$nextTick(() => { this.formDatas.splice(index, 1); this.delProcFormDatas=this.delProcFormDatas.filter(i=>i.id!=row.id) this.procFormDatas.push(row) - this.$message({showClose: true, message: '添加成功', type: 'info'}); + this.$notify({position:'bottom-left',showClose:true,message: '添加成功', type: 'info'}); }); } @@ -596,7 +596,7 @@ removeFromProc: function(row,index){ let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } if(this.procFormDatas.some(i=>i.id==row.id)){ @@ -606,11 +606,11 @@ this.delProcFormDatas.push(row) } this.formDatas.push(row); - this.$message({showClose: true, message: '移除成功', type: 'info'}); + this.$notify({position:'bottom-left',showClose:true,message: '移除成功', type: 'info'}); }); }else{ - this.$message({showClose: true, message: '没有该条数据', type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message: '没有该条数据', type: 'error'}); } }, afterAddSubmit(){ @@ -633,7 +633,7 @@ handleDel: function (row,index) { let tips=this.checkFormDelQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) if(tips.isOk==false){ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); return; } this.$confirm('确认删除该记录吗?', '提示', { @@ -648,7 +648,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -670,7 +670,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }).catch(() => { this.listLoading = false; @@ -726,7 +726,7 @@ this.getOptions2(); this.$emit('formFieldsLoad',this.formFields); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }).catch(() => { this.listLoading=false; diff --git a/src/views/mdp/form/formData/FormDataSet.vue b/src/views/mdp/form/formData/FormDataSet.vue index 77de99ce..5ea88f91 100644 --- a/src/views/mdp/form/formData/FormDataSet.vue +++ b/src/views/mdp/form/formData/FormDataSet.vue @@ -106,7 +106,7 @@ if(tips.isOk){ this.formFields = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.addLoading=false; }).catch(() => { @@ -127,7 +127,7 @@ if(tips.isOk){ this.addForm = res.data.data[0]; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }).catch(() => { diff --git a/src/views/mdp/form/formDef/FormDefAdd.vue b/src/views/mdp/form/formDef/FormDefAdd.vue index 1e187118..8df477c9 100644 --- a/src/views/mdp/form/formDef/FormDefAdd.vue +++ b/src/views/mdp/form/formDef/FormDefAdd.vue @@ -74,11 +74,11 @@ this.$refs.addForm.validate((valid) => { if (valid) { if(this.addForm.formName==''){ - this.$message({showClose: true, message: '表单名称不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '表单名称不能为空', type: 'error' }); return; } if(this.addForm.categoryId==null || this.addForm.categoryId=='' ){ - this.$message({showClose: true, message: '归属分类不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '归属分类不能为空', type: 'error' }); return; } this.$confirm('确认提交吗？', '提示', {}).then(() => { @@ -97,7 +97,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.addLoading = false; }); diff --git a/src/views/mdp/form/formDef/FormDefEdit.vue b/src/views/mdp/form/formDef/FormDefEdit.vue index 1f18b550..e6e21a2c 100644 --- a/src/views/mdp/form/formDef/FormDefEdit.vue +++ b/src/views/mdp/form/formDef/FormDefEdit.vue @@ -78,16 +78,16 @@ this.$refs.editForm.validate((valid) => { if (valid) { if(this.editForm.formName==''){ - this.$message({showClose: true, message: '表单名称不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '表单名称不能为空', type: 'error' }); return; } if(this.editForm.formName==''){ - this.$message({showClose: true, message: '表单名称不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '表单名称不能为空', type: 'error' }); return; } if(this.editForm.categoryId==null || this.editForm.categoryId=='' ){ - this.$message({showClose: true, message: '归属分类不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '归属分类不能为空', type: 'error' }); return; } this.$confirm('确认提交吗？', '提示', {}).then(() => { @@ -100,7 +100,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.addLoading = false; }); @@ -113,26 +113,26 @@ this.$refs.editForm.validate((valid) => { if (valid) { if(this.editForm.formName==''){ - this.$message({showClose: true, message: '表单名称不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '表单名称不能为空', type: 'error' }); return; } if(this.editForm.formName==''){ - this.$message({showClose: true, message: '表单名称不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '表单名称不能为空', type: 'error' }); return; } if(this.editForm.categoryId==null || this.editForm.categoryId=='' ){ - this.$message({showClose: true, message: '归属分类不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '归属分类不能为空', type: 'error' }); return; } if(this.fields.length==0 ){ - this.$message({showClose: true, message: '最少需要定义一个字段', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '最少需要定义一个字段', type: 'error' }); return; } if(this.fields.length>15){ - this.$message({showClose: true, message: '最多支持15个字段', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '最多支持15个字段', type: 'error' }); return; } this.$confirm('确认提交吗？', '提示', {}).then(() => { @@ -151,7 +151,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.addLoading = false; }); diff --git a/src/views/mdp/form/formDef/FormDefList.vue b/src/views/mdp/form/formDef/FormDefList.vue index 18da95b5..de71d728 100644 --- a/src/views/mdp/form/formDef/FormDefList.vue +++ b/src/views/mdp/form/formDef/FormDefList.vue @@ -177,7 +177,7 @@ this.rowClick(this.formDefs[0], null, null); } }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { diff --git a/src/views/mdp/form/formDef/FormDefMng.vue b/src/views/mdp/form/formDef/FormDefMng.vue index f400833a..363639dc 100644 --- a/src/views/mdp/form/formDef/FormDefMng.vue +++ b/src/views/mdp/form/formDef/FormDefMng.vue @@ -257,7 +257,7 @@ this.pageInfo.total = res.data.total; this.formDefs = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -302,7 +302,7 @@ this.pageInfo.total=0; this.getFormDefs(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -323,7 +323,7 @@ this.pageInfo.total=0; this.getFormDefs(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }).catch(() => { this.listLoading = false; diff --git a/src/views/mdp/form/formField/FormField.vue b/src/views/mdp/form/formField/FormField.vue index 5b77ab81..debd4275 100644 --- a/src/views/mdp/form/formField/FormField.vue +++ b/src/views/mdp/form/formField/FormField.vue @@ -612,7 +612,7 @@ this.selectedFields = res.data.data; } }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.addLoading=false; }).catch(() => { diff --git a/src/views/mdp/form/formQx/FormQxSet.vue b/src/views/mdp/form/formQx/FormQxSet.vue index 9b4f9fc5..88f4e4f1 100644 --- a/src/views/mdp/form/formQx/FormQxSet.vue +++ b/src/views/mdp/form/formQx/FormQxSet.vue @@ -167,7 +167,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }else{ editFormQx(params).then((res) => { @@ -177,7 +177,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); } @@ -236,7 +236,7 @@ } }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/mdp/form/formView/FormViewAdd.vue b/src/views/mdp/form/formView/FormViewAdd.vue index 4e366b7d..3a6a12db 100644 --- a/src/views/mdp/form/formView/FormViewAdd.vue +++ b/src/views/mdp/form/formView/FormViewAdd.vue @@ -92,7 +92,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.addLoading = false; }); diff --git a/src/views/mdp/form/formView/FormViewEdit.vue b/src/views/mdp/form/formView/FormViewEdit.vue index 1c6c2c61..4c9e0016 100644 --- a/src/views/mdp/form/formView/FormViewEdit.vue +++ b/src/views/mdp/form/formView/FormViewEdit.vue @@ -92,7 +92,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.editLoading = false; }); diff --git a/src/views/mdp/form/formView/FormViewMng.vue b/src/views/mdp/form/formView/FormViewMng.vue index 54f5966e..58688406 100644 --- a/src/views/mdp/form/formView/FormViewMng.vue +++ b/src/views/mdp/form/formView/FormViewMng.vue @@ -158,7 +158,7 @@ this.pageInfo.total = res.data.total; this.formViews = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -203,7 +203,7 @@ this.pageInfo.total=0; this.getFormViews(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -225,7 +225,7 @@ this.pageInfo.total=0; this.getFormViews(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }).catch(() => { this.listLoading = false; diff --git a/src/views/mdp/meta/category/CategoryAdd.vue b/src/views/mdp/meta/category/CategoryAdd.vue index 99778ff3..c97d48f0 100644 --- a/src/views/mdp/meta/category/CategoryAdd.vue +++ b/src/views/mdp/meta/category/CategoryAdd.vue @@ -93,7 +93,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.load.add=false }); diff --git a/src/views/mdp/meta/category/CategoryEdit.vue b/src/views/mdp/meta/category/CategoryEdit.vue index 9fb38be4..dfa1e5fb 100644 --- a/src/views/mdp/meta/category/CategoryEdit.vue +++ b/src/views/mdp/meta/category/CategoryEdit.vue @@ -93,7 +93,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.load.edit=false }); diff --git a/src/views/mdp/meta/category/CategoryMng.vue b/src/views/mdp/meta/category/CategoryMng.vue index 22deeb77..f22ad8b7 100644 --- a/src/views/mdp/meta/category/CategoryMng.vue +++ b/src/views/mdp/meta/category/CategoryMng.vue @@ -146,12 +146,12 @@ this.pageInfo.total = res.data.data.total;this.pageInfo.count=false; this.categorys = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({showClose: true, message: '通讯错误', type: 'error' }); + //this.$notify({position:'bottom-left',showClose:true,message: '通讯错误', type: 'error' }); }); }, @@ -192,7 +192,7 @@ this.pageInfo.count=true; this.getCategorys(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { this.load.del=false; @@ -212,7 +212,7 @@ this.pageInfo.count=true; this.getCategorys(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }).catch(() => { this.load.del=false; diff --git a/src/views/mdp/meta/item/ItemAdd.vue b/src/views/mdp/meta/item/ItemAdd.vue index 0f229faf..8aa2073f 100644 --- a/src/views/mdp/meta/item/ItemAdd.vue +++ b/src/views/mdp/meta/item/ItemAdd.vue @@ -104,7 +104,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.load.add=false }); diff --git a/src/views/mdp/meta/item/ItemEdit.vue b/src/views/mdp/meta/item/ItemEdit.vue index 04f6d201..3de52a7b 100644 --- a/src/views/mdp/meta/item/ItemEdit.vue +++ b/src/views/mdp/meta/item/ItemEdit.vue @@ -104,7 +104,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.load.edit=false }); diff --git a/src/views/mdp/meta/item/ItemMng.vue b/src/views/mdp/meta/item/ItemMng.vue index 7b1c4ef6..3bdeba15 100644 --- a/src/views/mdp/meta/item/ItemMng.vue +++ b/src/views/mdp/meta/item/ItemMng.vue @@ -152,12 +152,12 @@ this.pageInfo.total = res.data.data.total;this.pageInfo.count=false; this.items = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({showClose: true, message: '通讯错误', type: 'error' }); + //this.$notify({position:'bottom-left',showClose:true,message: '通讯错误', type: 'error' }); }); }, @@ -203,7 +203,7 @@ this.pageInfo.count=true; this.getItems(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { this.load.del=false; @@ -223,7 +223,7 @@ this.pageInfo.count=true; this.getItems(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }).catch(() => { this.load.del=false; diff --git a/src/views/mdp/meta/itemOption/ItemOptionAdd.vue b/src/views/mdp/meta/itemOption/ItemOptionAdd.vue index d787b76e..6a7a4bab 100644 --- a/src/views/mdp/meta/itemOption/ItemOptionAdd.vue +++ b/src/views/mdp/meta/itemOption/ItemOptionAdd.vue @@ -117,7 +117,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.load.add=false }); diff --git a/src/views/mdp/meta/itemOption/ItemOptionEdit.vue b/src/views/mdp/meta/itemOption/ItemOptionEdit.vue index 09b28719..a5b27cbf 100644 --- a/src/views/mdp/meta/itemOption/ItemOptionEdit.vue +++ b/src/views/mdp/meta/itemOption/ItemOptionEdit.vue @@ -121,7 +121,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.load.edit=false }); diff --git a/src/views/mdp/meta/itemOption/ItemOptionMng.vue b/src/views/mdp/meta/itemOption/ItemOptionMng.vue index 7fc4c421..50f8a0b0 100644 --- a/src/views/mdp/meta/itemOption/ItemOptionMng.vue +++ b/src/views/mdp/meta/itemOption/ItemOptionMng.vue @@ -157,12 +157,12 @@ this.pageInfo.total = res.data.data.total;this.pageInfo.count=false; this.itemOptions = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({showClose: true, message: '通讯错误', type: 'error' }); + //this.$notify({position:'bottom-left',showClose:true,message: '通讯错误', type: 'error' }); }); }, @@ -204,7 +204,7 @@ this.pageInfo.count=true; this.getItemOptions(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { this.load.del=false; @@ -224,7 +224,7 @@ this.pageInfo.count=true; this.getItemOptions(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }).catch(() => { this.load.del=false; @@ -259,7 +259,7 @@ if(tips.isOk){ this.itemOptions.push(res.data.data); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.load.add=false }); diff --git a/src/views/mdp/meta/sysParam/ItemOptionAdd.vue b/src/views/mdp/meta/sysParam/ItemOptionAdd.vue index 19b0bdba..43e4a35f 100644 --- a/src/views/mdp/meta/sysParam/ItemOptionAdd.vue +++ b/src/views/mdp/meta/sysParam/ItemOptionAdd.vue @@ -109,7 +109,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.load.add=false }); diff --git a/src/views/mdp/meta/sysParam/ItemOptionEdit.vue b/src/views/mdp/meta/sysParam/ItemOptionEdit.vue index 79c75b75..3fd9af27 100644 --- a/src/views/mdp/meta/sysParam/ItemOptionEdit.vue +++ b/src/views/mdp/meta/sysParam/ItemOptionEdit.vue @@ -109,7 +109,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.load.edit=false }); diff --git a/src/views/mdp/meta/sysParam/SysParamMng.vue b/src/views/mdp/meta/sysParam/SysParamMng.vue index ce588330..8a98ba96 100644 --- a/src/views/mdp/meta/sysParam/SysParamMng.vue +++ b/src/views/mdp/meta/sysParam/SysParamMng.vue @@ -152,12 +152,12 @@ this.pageInfo.total = res.data.data.total;this.pageInfo.count=false; this.itemOptions = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({showClose: true, message: '通讯错误', type: 'error' }); + //this.$notify({position:'bottom-left',showClose:true,message: '通讯错误', type: 'error' }); }); }, @@ -199,7 +199,7 @@ this.pageInfo.count=true; this.getItemOptions(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { this.load.del=false; @@ -219,7 +219,7 @@ this.pageInfo.count=true; this.getItemOptions(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }).catch(() => { this.load.del=false; @@ -248,7 +248,7 @@ if(tips.isOk){ this.itemOptions.push(res.data.data); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.load.add=false }); diff --git a/src/views/mdp/sms/SendSms.vue b/src/views/mdp/sms/SendSms.vue index bfa94cb5..9ac5f774 100644 --- a/src/views/mdp/sms/SendSms.vue +++ b/src/views/mdp/sms/SendSms.vue @@ -192,21 +192,21 @@ sendSmsMethod() { let that = this; if (!this.smsTemplatesSelectValue) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "请选择某个模板", type: 'error' }); return; } if (!this.smsSignsSelectValue) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "请选择某个签名", type: 'error' }); return; } if (!this.mobilesStr) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "发送对象不能为空", type: 'error' }); @@ -223,7 +223,7 @@ var mobileArr = this.mobilesStr.split(","); if (mobileArr.length > 10) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "发送的对象不能超过10个", type: 'error' }); @@ -232,14 +232,14 @@ for (let i = 0; i < mobileArr.length; i++) { if (!/^[1](([3][0-9])|([4][5-9])|([5][0-3,5-9])|([6][5,6])|([7][0-8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$/.test( mobileArr[i])) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: mobileArr[i] + "手机号码不对", type: 'error' }); return; } if (this.mobilesStr.lastIndexOf(mobileArr[i]) != this.mobilesStr.indexOf(mobileArr[i])) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "请填写不同的手机号码进行发送", type: 'error' }); @@ -251,21 +251,21 @@ var reg = /\{\d\}/; let smsTemplateVariableCount = this.smsTemplatesSelectValue.text.split(reg).length - 1; if (templateParamsArr.length != smsTemplateVariableCount) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "输入的短信模板参数与短信模板的变量的数目不一致", type: 'error' }); return; } if (this.userNeedReplySmsRadio === '1' && !this.replyEndDay) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "如果勾选需要用户回复，必须填写天数", type: 'error' }); return; } if (this.userNeedReplySmsRadio === '1' && !/^\d+$/.test(this.replyEndDay)) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "天数必须是正整数", type: 'error' }); @@ -301,7 +301,7 @@ this.sendResultVisible = true; that.sendResult = res.data.data; }; - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -326,7 +326,7 @@ if (tips.isOk) { this.smsTemplatesOptions = res.data.data; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: 'error' }); @@ -346,7 +346,7 @@ if (tips.isOk) { this.smsSignsOptions = res.data.data; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: 'error' }); diff --git a/src/views/mdp/sys/branch/BranchSelect.vue b/src/views/mdp/sys/branch/BranchSelect.vue index bdbd4247..4a52e1e3 100644 --- a/src/views/mdp/sys/branch/BranchSelect.vue +++ b/src/views/mdp/sys/branch/BranchSelect.vue @@ -133,12 +133,12 @@ this.pageInfo.total = res.data.data.total;this.pageInfo.countSql=false; this.branchs = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({showClose: true, message: '通讯错误', type: 'error' }); + //this.$notify({position:'bottom-left',showClose:true,message: '通讯错误', type: 'error' }); }); }, //选择行branch diff --git a/src/views/mdp/sys/dept/DeptTree.vue b/src/views/mdp/sys/dept/DeptTree.vue index 101bd336..c43ec2ce 100644 --- a/src/views/mdp/sys/dept/DeptTree.vue +++ b/src/views/mdp/sys/dept/DeptTree.vue @@ -239,7 +239,7 @@ } }else{ - this.$message({showClose: true, message: tips.msg, type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error'}); } this.listLoading = false; }).catch(() => { diff --git a/src/views/mdp/sys/post/PostSelectCommon.vue b/src/views/mdp/sys/post/PostSelectCommon.vue index 0c2e547b..ef28d53e 100644 --- a/src/views/mdp/sys/post/PostSelectCommon.vue +++ b/src/views/mdp/sys/post/PostSelectCommon.vue @@ -138,7 +138,7 @@ this.pageInfo.count=false; this.posts = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -179,7 +179,7 @@ confirmPostSelect(){ if(this.sels.length<=0){ - this.$message({showClose: true, message:'请选择角色', type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message:'请选择角色', type: 'error'}); return; } this.load.add=true; diff --git a/src/views/mdp/sys/user/UpdateUserInfo.vue b/src/views/mdp/sys/user/UpdateUserInfo.vue index 355d4ebc..557ef36a 100644 --- a/src/views/mdp/sys/user/UpdateUserInfo.vue +++ b/src/views/mdp/sys/user/UpdateUserInfo.vue @@ -185,7 +185,7 @@ import md5 from "js-md5"; if(tips.isOk){ 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(() => { this.editLoading = false; }); @@ -198,7 +198,7 @@ import md5 from "js-md5"; if (valid) { changePassword({oldPassword:md5(this.passwordForm.oldPassword),newPassword:md5(this.passwordForm.newPassword)}).then(res=>{ var tips = res.data.tips; - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error' }); }) } }) diff --git a/src/views/mdp/sys/user/UsersSelect.vue b/src/views/mdp/sys/user/UsersSelect.vue index 6be8a2f4..39daa5ab 100644 --- a/src/views/mdp/sys/user/UsersSelect.vue +++ b/src/views/mdp/sys/user/UsersSelect.vue @@ -169,7 +169,7 @@ searchUsers(){ //判断是否需要通过部门查询 if(this.isSelectByDept && Object.keys(this.deptTree.deptNodeSelected).length === 0) { - this.$message({showClose: true, message: "必须先选择一个部门", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "必须先选择一个部门", type: 'error' }); return; } @@ -218,7 +218,7 @@ this.pageInfo.total = res.data.total;this.pageInfo.count=false; this.users = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } if(this.needSetTableUserChecked==true){ this.setTableUserChecked(); @@ -228,7 +228,7 @@ this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({showClose: true, message: '通讯错误', type: 'error' }); + //this.$notify({position:'bottom-left',showClose:true,message: '通讯错误', type: 'error' }); }); }, @@ -270,12 +270,12 @@ }, confirmUsers: function(){ if(this.sels.length<1){ - this.$message({showClose: true, message: "请选择一个用户", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请选择一个用户", type: 'error' }); return; } if(this.isSingleUser==true){ if(this.sels.length!=1){ - this.$message({showClose: true, message: "最多只能选择一个用户", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "最多只能选择一个用户", type: 'error' }); return; } } diff --git a/src/views/mdp/sys/userDept/UserDeptEdit.vue b/src/views/mdp/sys/userDept/UserDeptEdit.vue index 63fd6bd7..9623aa0d 100644 --- a/src/views/mdp/sys/userDept/UserDeptEdit.vue +++ b/src/views/mdp/sys/userDept/UserDeptEdit.vue @@ -147,7 +147,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch((e) => { console.log(e) this.load.edit=false diff --git a/src/views/mdp/workflow/biz/bizModel/BizModelAdd.vue b/src/views/mdp/workflow/biz/bizModel/BizModelAdd.vue index de8938b0..69f4fe7e 100644 --- a/src/views/mdp/workflow/biz/bizModel/BizModelAdd.vue +++ b/src/views/mdp/workflow/biz/bizModel/BizModelAdd.vue @@ -114,7 +114,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/mdp/workflow/biz/bizModel/BizModelEdit.vue b/src/views/mdp/workflow/biz/bizModel/BizModelEdit.vue index 36393b38..c3948ff3 100644 --- a/src/views/mdp/workflow/biz/bizModel/BizModelEdit.vue +++ b/src/views/mdp/workflow/biz/bizModel/BizModelEdit.vue @@ -109,7 +109,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue index a6e22894..3cde3f8e 100644 --- a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue +++ b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue @@ -163,7 +163,7 @@ this.pageInfo.count=false; this.bizModels = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -205,7 +205,7 @@ this.pageInfo.count=true; this.getBizModels(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -223,7 +223,7 @@ this.pageInfo.count=true; this.getBizModels(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/mdp/workflow/de/model/ModelMng.vue b/src/views/mdp/workflow/de/model/ModelMng.vue index 38cd4489..60c2b939 100644 --- a/src/views/mdp/workflow/de/model/ModelMng.vue +++ b/src/views/mdp/workflow/de/model/ModelMng.vue @@ -177,7 +177,7 @@ this.pageInfo.count=false this.models = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -223,7 +223,7 @@ this.pageInfo.count=true this.getModels(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -246,7 +246,7 @@ this.pageInfo.count=true this.getModels(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }).catch(() => { this.listLoading = false; @@ -266,7 +266,7 @@ if(tips.isOk){ this.getModels(); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }); @@ -284,7 +284,7 @@ if(tips.isOk){ this.getModels(); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }); diff --git a/src/views/mdp/workflow/hi/comment/commentStep.vue b/src/views/mdp/workflow/hi/comment/commentStep.vue index 33b82d0c..05ffa9b2 100644 --- a/src/views/mdp/workflow/hi/comment/commentStep.vue +++ b/src/views/mdp/workflow/hi/comment/commentStep.vue @@ -101,7 +101,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.addLoading = false; }); @@ -130,7 +130,7 @@ this.$emit('get-comments',this.comments) }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }).catch(() => { diff --git a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue index e08f1a22..13f2b911 100644 --- a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue +++ b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue @@ -497,7 +497,7 @@ this.pageInfo.count = false; this.procinsts = res.data.data; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: "error" }); @@ -551,7 +551,7 @@ this.pageInfo.count = true; this.getProcinsts(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); @@ -576,7 +576,7 @@ this.pageInfo.total = 0; this.getProcinsts(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); diff --git a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue index 5840ad9a..05b7b36a 100644 --- a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue +++ b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue @@ -222,7 +222,7 @@ export default { this.pageInfo.total = res.data.total; this.deployments = res.data.data; } else { - this.$message({showClose: true, message: tips.msg, type: "error" }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: "error" }); } this.listLoading = false; }) @@ -272,7 +272,7 @@ export default { this.pageInfo.total = 0; this.getDeployments(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); @@ -297,7 +297,7 @@ export default { this.pageInfo.total = 0; this.getDeployments(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue index c202b6a7..8660ceb4 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue @@ -390,7 +390,7 @@ export default { this.pageInfo.total = res.data.total; this.procdefs = res.data.data; } else { - this.$message({showClose: true, message: tips.msg, type: "error" }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: "error" }); } this.listLoading = false; }) @@ -419,7 +419,7 @@ export default { this.pageInfo.total = 0; this.getProcdefs(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); @@ -444,7 +444,7 @@ export default { this.pageInfo.total = 0; this.getProcdefs(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue index 301b85c3..febea119 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue @@ -275,7 +275,7 @@ } } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: 'error' }); diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue index 315442a0..632c0702 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue @@ -401,7 +401,7 @@ this.pageInfo.count = false; this.procdefs = res.data.data; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: "error" }); @@ -436,7 +436,7 @@ this.pageInfo.count = true; this.getProcdefs(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); diff --git a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue index df824f61..8d7a2350 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefMng.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefMng.vue @@ -285,7 +285,7 @@ this.pageInfo.count=false this.procdefs = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -314,7 +314,7 @@ this.pageInfo.count=true this.getProcdefs(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -337,7 +337,7 @@ this.pageInfo.count=true this.getProcdefs(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { diff --git a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue index a8c0370a..62dc21df 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue @@ -375,7 +375,7 @@ export default { this.pageInfo.count = false; this.procdefs = res.data.data; } else { - this.$message({showClose: true, message: tips.msg, type: "error" }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: "error" }); } this.listLoading = false; }) @@ -405,7 +405,7 @@ export default { this.pageInfo.count = true; this.getProcdefs(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); @@ -431,7 +431,7 @@ export default { this.pageInfo.count = true; this.getProcdefs(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); diff --git a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue index ce6c3865..3180579f 100644 --- a/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue +++ b/src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue @@ -389,7 +389,7 @@ addOrUpdateTemplate(params).then(res=>{ var tips=res.data.tips; this.addLoading = false; - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(e=>this.addLoading=false); return; } @@ -401,7 +401,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.addLoading = false; }); @@ -421,7 +421,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => { this.addLoading = false; }); @@ -452,7 +452,7 @@ console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxx"); console.log(this.nodeInfosSelectOptions); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -568,12 +568,12 @@ if(tips.isOk){ this.formDefs = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { this.listLoading = false; - this.$message({showClose: true, message: '访问错误', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '访问错误', type: 'error' }); }); }, handleCategoryCheckChange(data, checked, indeterminate){ @@ -596,7 +596,7 @@ this.nodeInfos=res.data.data; this.nodeInfosSelectOptions=this.nodeInfos; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }); }, diff --git a/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue b/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue index 1f237fb2..d1df311b 100644 --- a/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue +++ b/src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue @@ -148,7 +148,7 @@ this.pageInfo.count=false; this.procdefParamesTemplates = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -190,7 +190,7 @@ this.pageInfo.count=true; this.getProcdefParamesTemplates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -208,7 +208,7 @@ this.pageInfo.count=true; this.getProcdefParamesTemplates(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue index a25a7737..2c7be3d3 100644 --- a/src/views/mdp/workflow/ru/execution/ExecutionMng.vue +++ b/src/views/mdp/workflow/ru/execution/ExecutionMng.vue @@ -604,7 +604,7 @@ this.pageInfo.count = false; this.executions = res.data.data; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: 'error' }); @@ -664,7 +664,7 @@ this.pageInfo.total = 0; this.getExecutions(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -703,7 +703,7 @@ this.pageInfo.total = 0; this.getExecutions(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -730,7 +730,7 @@ this.pageInfo.total = 0; this.getExecutions(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -847,12 +847,12 @@ showSendSms: function() { if (this.sels.length > 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: '一次只能给一个人发短信', type: 'error' }); } else if (this.sels.length < 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: '请选择一条任务', type: 'error' }); @@ -868,14 +868,14 @@ }, showWeixinTask: function() { if (this.sels.length > 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: '一次只能给一个人发信', type: 'error' }); this.weixinContentVisible = false; return false; } else if (this.sels.length < 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: '请选择一条任务', type: 'error' }); @@ -896,7 +896,7 @@ this.weixinContent = task.assigneeName + "您好，您有任务【" + task.mainTitle + "-" + task.taskName + "】待处理，请登陆OA系统或者点击以下链接处理。" + url + "?userToken=" + userToken; this.$copyText(this.weixinContent).then(e => { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: '已拷贝内容，您可黏贴到微信中', type: 'success' }); @@ -908,14 +908,14 @@ }, showWeixin: function() { if (this.sels.length > 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: '一次只能给一个人发信', type: 'error' }); this.weixinContentVisible = false; return false; } else if (this.sels.length < 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: '请选择一条任务', type: 'error' }); @@ -945,13 +945,13 @@ }, showOaMsg: function() { if (this.sels.length > 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: '一次只能给一个人发信', type: 'error' }); return false; } else if (this.sels.length < 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: '请选择一条任务', type: 'error' }); diff --git a/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue b/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue index a9239489..98d20c55 100644 --- a/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue +++ b/src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue @@ -274,7 +274,7 @@ this.pageInfo.count=false; this.executions = res.data.data; }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -318,7 +318,7 @@ this.pageInfo.total=0; this.getTasks(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -352,7 +352,7 @@ this.pageInfo.total=0; this.getExecutions(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -374,7 +374,7 @@ this.pageInfo.total=0; this.getExecutions(); } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -454,9 +454,9 @@ showSendSms:function(){ if(this.sels.length>1){ - this.$message({showClose: true, message: '一次只能给一个人发短信', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '一次只能给一个人发短信', type: 'error' }); }else if(this.sels.length<1){ - this.$message({showClose: true, message: '请选择一条任务', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '请选择一条任务', type: 'error' }); }else{ let task=this.sels[0]; this.smsBodyParams=[task.assigneeName,task.mainTitle+"-"+task.taskName,task.createTime,task.userid] @@ -467,11 +467,11 @@ }, showWeixinTask:function(){ if(this.sels.length>1){ - this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '一次只能给一个人发信', type: 'error' }); this.weixinContentVisible=false; return false; }else if(this.sels.length<1){ - this.$message({showClose: true, message: '请选择一条任务', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '请选择一条任务', type: 'error' }); this.weixinContentVisible=false; return false; }else{ @@ -484,7 +484,7 @@ var userToken=res.data.userToken; this.weixinContent=task.assigneeName+"您好，您有任务【"+task.mainTitle+"-"+task.taskName +"】待处理，请登陆OA系统或者点击以下链接处理。"+url+"?userToken="+userToken; this.$copyText(this.weixinContent).then(e=>{ - this.$message({showClose: true, message: '已拷贝内容，您可黏贴到微信中', type: 'success' }); + this.$notify({position:'bottom-left',showClose:true,message: '已拷贝内容，您可黏贴到微信中', type: 'success' }); }); } }); @@ -493,11 +493,11 @@ }, showWeixin:function(){ if(this.sels.length>1){ - this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '一次只能给一个人发信', type: 'error' }); this.weixinContentVisible=false; return false; }else if(this.sels.length<1){ - this.$message({showClose: true, message: '请选择一条任务', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '请选择一条任务', type: 'error' }); this.weixinContentVisible=false; return false; }else{ @@ -519,10 +519,10 @@ }, showOaMsg:function(){ if(this.sels.length>1){ - this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '一次只能给一个人发信', type: 'error' }); return false; }else if(this.sels.length<1){ - this.$message({showClose: true, message: '请选择一条任务', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '请选择一条任务', type: 'error' }); return false; }else{ let task=this.sels[0]; diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstNodeInfoSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstNodeInfoSet.vue index 9b6c391b..ceaa699b 100644 --- a/src/views/mdp/workflow/ru/procinstParames/ProcinstNodeInfoSet.vue +++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstNodeInfoSet.vue @@ -203,7 +203,7 @@ this.nodeInfoList=res.data.data; this.nodeInfoListOld=JSON.parse(JSON.stringify(this.nodeInfoList)); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }); }else{ @@ -216,7 +216,7 @@ this.nodeInfoList=res.data.data; this.nodeInfoListOld=JSON.parse(JSON.stringify(this.nodeInfoList)); }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }); } diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue index d3f31e59..ee0e8f58 100644 --- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue +++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue @@ -677,7 +677,7 @@ addComment:function(){ if(this.task.commentMsg==''){ - this.$message({showClose: true, message: "办理意见不能为空", type:'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "办理意见不能为空", type:'error' }); return; } this.addLoading = true; @@ -688,11 +688,11 @@ this.refreshCommentList=true this.addLoading=false; this.addForm.commentMsg="" - this.$message({showClose: true, message:'保存办理意见成功', type:'success' }); + this.$notify({position:'bottom-left',showClose:true,message:'保存办理意见成功', type:'success' }); }else{ this.refreshCommentList=false this.addLoading=false; - this.$message({showClose: true, message: res.data.tips.msg, type:'error' }); + this.$notify({position:'bottom-left',showClose:true,message: res.data.tips.msg, type:'error' }); } }).catch(e=>{ this.addLoading = false; @@ -746,7 +746,7 @@ this.needAssignee='' this.needAssigneeMsg='' this.needAssigneeNum=-1 - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.handleCancel(); }else if(tips.tipscode=='need-mulit-assignee'){//need-mulit-assignee 需要一个或者多个 need-single-assignee 只需要一个 this.needAssignee=tips.tipscode @@ -759,7 +759,7 @@ this.needAssigneeNum=1; this.$refs.addForm.validateField('needAssignee'); }else{ - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); } }).catch(() => { @@ -816,7 +816,7 @@ this.addForm=Object.assign(this.addForm,this.defaultAddForm); } }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -883,7 +883,7 @@ newImg.src = dataUrl; var printWindow=window.open(newImg.src,"_blank"); if(printWindow==null){ - this.$message({showClose: true, message: '无法打开打印窗口，请检查是否浏览器阻止弹出框', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '无法打开打印窗口，请检查是否浏览器阻止弹出框', type: 'error' }); }else{ this.$nextTick(() => { @@ -1057,7 +1057,7 @@ this.nodeInfos=res.data.data; this.nodeInfoVisible=false; } - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, diff --git a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue index f1c12713..0ed9bf46 100644 --- a/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue +++ b/src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue @@ -402,7 +402,7 @@ this.needAssignee=''; this.needAssigneeMsg=''; this.$emit('submit');// @submit="afterAddSubmit" - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.handleCancel(); }else if(tips.tipscode=='need-mulit-assignee'){//need-mulit-assignee 需要一个或者多个 need-single-assignee 只需要一个 this.needAssignee=tips.tipscode @@ -415,7 +415,7 @@ this.needAssigneeNum=1; this.$refs.addForm.validateField('needAssignee'); }else{ - this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); } }).catch(() => { @@ -631,7 +631,7 @@ this.nodeInfoVisible=true } }else{ - this.$message({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }); }, diff --git a/src/views/mdp/workflow/ru/task/TaskMng.vue b/src/views/mdp/workflow/ru/task/TaskMng.vue index 039b1186..b346ee26 100644 --- a/src/views/mdp/workflow/ru/task/TaskMng.vue +++ b/src/views/mdp/workflow/ru/task/TaskMng.vue @@ -522,7 +522,7 @@ this.pageInfo.count = true; this.filters.taskType = "1"; if (this.filters.candidateUser == "") { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "请先选择用户", type: "error" }); @@ -536,7 +536,7 @@ this.pageInfo.count = true; this.filters.taskType = "2"; if (this.filters.candidateGroups.length <= 0) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "请先选择部门", type: "error" }); @@ -550,7 +550,7 @@ this.pageInfo.count = true; this.filters.taskType = "2"; if (this.filters.candidateGroups.length <= 0) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "请先选择部门", type: "error" }); @@ -650,12 +650,12 @@ }, showSendSms: function() { if (this.sels.length > 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "一次只能给一个人发短信", type: "error" }); } else if (this.sels.length < 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "请选择一条任务", type: "error" }); @@ -675,14 +675,14 @@ }, showWeixin: function() { if (this.sels.length > 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "一次只能给一个人发信", type: "error" }); this.weixinContentVisible = false; return false; } else if (this.sels.length < 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "请选择一条任务", type: "error" }); @@ -722,13 +722,13 @@ }, showOaMsg: function() { if (this.sels.length > 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "一次只能给一个人发信", type: "error" }); return false; } else if (this.sels.length < 1) { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "请选择一条任务", type: "error" }); @@ -858,7 +858,7 @@ }); this.tasks = taskList; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: "error" }); @@ -886,7 +886,7 @@ }); this.tasks = taskList; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: "error" }); @@ -913,7 +913,7 @@ }); this.tasks = taskList; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: "error" }); @@ -941,7 +941,7 @@ }); this.tasks = taskList; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: "error" }); @@ -968,7 +968,7 @@ }); this.tasks = taskList; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: "error" }); @@ -995,7 +995,7 @@ }); this.tasks = taskList; } else { - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: "error" }); @@ -1059,7 +1059,7 @@ this.pageInfo.total = 0; this.getTasks(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); @@ -1084,7 +1084,7 @@ this.pageInfo.total = 0; this.getTasks(); } - this.$message({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); diff --git a/src/views/myWork/set/index.vue b/src/views/myWork/set/index.vue index 08c64fc7..8be2738f 100644 --- a/src/views/myWork/set/index.vue +++ b/src/views/myWork/set/index.vue @@ -237,7 +237,7 @@ import md5 from "js-md5"; if(tips.isOk){ 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(() => { this.editLoading = false; }); @@ -253,7 +253,7 @@ import md5 from "js-md5"; this.setLoading = true changePassword({oldPassword:md5(this.passwordForm.oldPassword),newPassword:md5(this.passwordForm.newPassword)}).then(res=>{ var tips = res.data.tips; - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({ message: tips.msg, type: tips.isOk?'success':'error' }); }).finally(r => this.setLoading = false) } }) diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue index 87421b4b..9efdd6eb 100644 --- a/src/views/xm/core/components/XmIterationSelect.vue +++ b/src/views/xm/core/components/XmIterationSelect.vue @@ -216,7 +216,7 @@ this.clearSelectIteration() } }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue index d4b99bcc..d29256ae 100644 --- a/src/views/xm/core/components/XmProductSelect.vue +++ b/src/views/xm/core/components/XmProductSelect.vue @@ -225,7 +225,7 @@ this.rowClick(row); } }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue index 8908e1cc..bfa6275f 100644 --- a/src/views/xm/core/components/XmProjectSelect.vue +++ b/src/views/xm/core/components/XmProjectSelect.vue @@ -227,7 +227,7 @@ this.rowClick(row); } }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/skill/skillMng.vue b/src/views/xm/core/skill/skillMng.vue index 25bd06b8..2eef7d0e 100644 --- a/src/views/xm/core/skill/skillMng.vue +++ b/src/views/xm/core/skill/skillMng.vue @@ -228,7 +228,7 @@ export default { this.convertSkills = convert; this.setSkillsToLocal(); } else { - this.$notify({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: "error", }); @@ -246,7 +246,7 @@ export default { (i) => i.categoryName == this.needAddTagCategoryNameInputValue ) ) { - this.$notify({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "技能分类已经存在", type: "error", }); @@ -279,7 +279,7 @@ export default { this.convertSkills.push(json); this.setSkillsToLocal(); } - this.$notify({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", }); @@ -317,7 +317,7 @@ export default { this.setSkillsToLocal(); /*this.getTags();*/ } - this.$notify({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", }); @@ -342,7 +342,7 @@ export default { ); }) ) { - this.$notify({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "技能已经存在", type: "error", }); @@ -350,7 +350,7 @@ export default { } if (!this.convertSkills[index].pubc) { if (this.isPub == "1") { - this.$notify({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: "该分类不是公共分类，不能添加公共技能", type: "error", }); @@ -390,7 +390,7 @@ export default { this.convertSkills[index].values.push(json); this.setSkillsToLocal(); } - this.$notify({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", }); @@ -425,7 +425,7 @@ export default { this.setSkillsToLocal(); /*this.getTags();*/ } - this.$notify({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", }); diff --git a/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue b/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue index 67b0a16b..fe98fe29 100644 --- a/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue +++ b/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue @@ -98,7 +98,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue b/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue index a3e79ac1..232dc0b5 100644 --- a/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue +++ b/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue @@ -96,7 +96,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmAttachment/XmAttachmentMng.vue b/src/views/xm/core/xmAttachment/XmAttachmentMng.vue index afb4b8b3..981d6373 100644 --- a/src/views/xm/core/xmAttachment/XmAttachmentMng.vue +++ b/src/views/xm/core/xmAttachment/XmAttachmentMng.vue @@ -144,7 +144,7 @@ this.pageInfo.count=false; this.xmAttachments = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -186,7 +186,7 @@ this.pageInfo.count=true; this.getXmAttachments(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -204,7 +204,7 @@ this.pageInfo.count=true; this.getXmAttachments(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue index 46454373..2200a847 100644 --- a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue +++ b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue @@ -233,7 +233,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue index 5f79bdfb..927be327 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue @@ -137,7 +137,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue index 2c937deb..6b4d9d38 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue @@ -135,7 +135,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue index 3eb5449f..bd3afc78 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue @@ -159,7 +159,7 @@ this.pageInfo.count=false; this.xmBranchTaskTypeStates = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -201,7 +201,7 @@ this.pageInfo.count=true; this.getXmBranchTaskTypeStates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -219,7 +219,7 @@ this.pageInfo.count=true; this.getXmBranchTaskTypeStates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmContract/XmContractMng.vue b/src/views/xm/core/xmContract/XmContractMng.vue index d831a6a5..b1fc45cf 100644 --- a/src/views/xm/core/xmContract/XmContractMng.vue +++ b/src/views/xm/core/xmContract/XmContractMng.vue @@ -196,7 +196,7 @@ this.xmContracts = res.data.data; console.log(res.data.data); }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -243,7 +243,7 @@ this.pageInfo.count=true; this.getXmContracts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -261,7 +261,7 @@ this.pageInfo.count=true; this.getXmContracts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue index 26daad30..5efd9abd 100644 --- a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue +++ b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue @@ -181,7 +181,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue index 2937fc44..bd128d56 100644 --- a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue +++ b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue @@ -134,7 +134,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue index e591cb58..ea3f3068 100644 --- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue +++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue @@ -175,7 +175,7 @@ this.pageInfo.count=false; this.xmEnvLists = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -218,7 +218,7 @@ this.pageInfo.count=true; this.getXmEnvLists(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -236,7 +236,7 @@ this.pageInfo.count=true; this.getXmEnvLists(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmExchange/XmExchangeAdd.vue b/src/views/xm/core/xmExchange/XmExchangeAdd.vue index 36c88029..c13458dd 100644 --- a/src/views/xm/core/xmExchange/XmExchangeAdd.vue +++ b/src/views/xm/core/xmExchange/XmExchangeAdd.vue @@ -146,7 +146,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmExchange/XmExchangeEdit.vue b/src/views/xm/core/xmExchange/XmExchangeEdit.vue index 09080c0f..044a4813 100644 --- a/src/views/xm/core/xmExchange/XmExchangeEdit.vue +++ b/src/views/xm/core/xmExchange/XmExchangeEdit.vue @@ -144,7 +144,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmExchange/XmExchangeMng.vue b/src/views/xm/core/xmExchange/XmExchangeMng.vue index 057dc044..4c3655ed 100644 --- a/src/views/xm/core/xmExchange/XmExchangeMng.vue +++ b/src/views/xm/core/xmExchange/XmExchangeMng.vue @@ -154,7 +154,7 @@ this.pageInfo.count=false; this.xmExchanges = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -196,7 +196,7 @@ this.pageInfo.count=true; this.getXmExchanges(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -214,7 +214,7 @@ this.pageInfo.count=true; this.getXmExchanges(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -247,7 +247,7 @@ if(tips.isOk){ this.xmExchanges.push(params); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) } /**end 自定义函数请在上面加**/ diff --git a/src/views/xm/core/xmFile/XmFileAdd.vue b/src/views/xm/core/xmFile/XmFileAdd.vue index 890b963d..ede1c483 100644 --- a/src/views/xm/core/xmFile/XmFileAdd.vue +++ b/src/views/xm/core/xmFile/XmFileAdd.vue @@ -96,7 +96,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmFile/XmFileEdit.vue b/src/views/xm/core/xmFile/XmFileEdit.vue index 2903247d..f6e2576a 100644 --- a/src/views/xm/core/xmFile/XmFileEdit.vue +++ b/src/views/xm/core/xmFile/XmFileEdit.vue @@ -96,7 +96,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmFile/XmFileMng.vue b/src/views/xm/core/xmFile/XmFileMng.vue index c4ad7a04..a76caed1 100644 --- a/src/views/xm/core/xmFile/XmFileMng.vue +++ b/src/views/xm/core/xmFile/XmFileMng.vue @@ -185,7 +185,7 @@ this.pageInfo.count=false; this.selProject.file = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -230,7 +230,7 @@ this.pageInfo.count=true; this.getXmFiles(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -247,7 +247,7 @@ this.pageInfo.count=true; this.getXmFiles(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue index a988e0c5..1f29191e 100644 --- a/src/views/xm/core/xmGroup/XmGroupMng.vue +++ b/src/views/xm/core/xmGroup/XmGroupMng.vue @@ -609,7 +609,7 @@ XmProductSelect,XmProjectSelect, if(tips.isOk){ this.imGroups=res.data.data; } - this.$notify({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -641,7 +641,7 @@ XmProductSelect,XmProjectSelect, params.id=params.groupId this.imGroups.push(params); } - this.$notify({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); diff --git a/src/views/xm/core/xmGroup/XmGroupSelect.vue b/src/views/xm/core/xmGroup/XmGroupSelect.vue index 4b5c851a..834c9e2a 100644 --- a/src/views/xm/core/xmGroup/XmGroupSelect.vue +++ b/src/views/xm/core/xmGroup/XmGroupSelect.vue @@ -122,7 +122,7 @@ import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue' if(this.isSelectSingleUser=='1'){ if(users.length>1){ - this.$notify({showClose: true, + this.$notify({position:'bottom-left',showClose: true, message: '只能选中一个用户', type: 'error' }); @@ -153,7 +153,7 @@ import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue' if(tips.isOk){ this.selGroups=res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }) }, diff --git a/src/views/xm/core/xmGroupState/XmGroupStateMng.vue b/src/views/xm/core/xmGroupState/XmGroupStateMng.vue index 6ca4fd3e..14c1bdda 100644 --- a/src/views/xm/core/xmGroupState/XmGroupStateMng.vue +++ b/src/views/xm/core/xmGroupState/XmGroupStateMng.vue @@ -176,7 +176,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue'; this.pageInfo.count=false; this.xmGroupStates = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -218,7 +218,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue'; this.pageInfo.count=true; this.getXmGroupStates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -236,7 +236,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue'; this.pageInfo.count=true; this.getXmGroupStates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -250,7 +250,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue'; if(tips.isOk){ this.getXmGroupStates(); }else{ - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); } }) diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue index 1cfa1f3f..1569ca44 100644 --- a/src/views/xm/core/xmIteration/XmIterationAdd.vue +++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue @@ -134,11 +134,11 @@ if(tips.isOk){ this.$emit('submit',res.data.data);// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); }else{ - this.$notify({showClose: true, message: "表单验证不通过", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "表单验证不通过", type: 'error' }); } }); }, diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue index 10f01adb..34a81e12 100644 --- a/src/views/xm/core/xmIteration/XmIterationEdit.vue +++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue @@ -118,7 +118,7 @@ //新增提交XmIteration 迭代定义 父组件监听@submit="afterAddSubmit" editSubmit: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$notify({showClose: true, message: "只有迭代管理员可以修改迭代", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "只有迭代管理员可以修改迭代", type: 'error' }); return ; } this.$refs.editForm.validate((valid) => { @@ -133,7 +133,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue index f671c5c9..e68efdcb 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -264,7 +264,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue' params.queryScope=this.filters.queryScope if(this.filters.queryScope=='iterationId'){ if(!this.filters.id){ - this.$notify({showClose: true, message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' }); return; } params.id=this.filters.id @@ -288,7 +288,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue' this.pageInfo.count=false; this.xmIterations = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -302,7 +302,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue' //显示新增界面 XmIteration 迭代定义 showAdd: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$notify({showClose: true, message: "只有迭代管理员可以新增迭代", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "只有迭代管理员可以新增迭代", type: 'error' }); return ; } this.parentIteration=null @@ -340,7 +340,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue' //删除xmIteration handleDel: function (row,index) { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$notify({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "只有迭代管理员可以删除迭代", type: 'error' }); return ; } this.$confirm('确认删除该记录吗?', '提示', { @@ -355,14 +355,14 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue' this.pageInfo.count=true; this.getXmIterations(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmIteration batchDel: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$notify({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "只有迭代管理员可以删除迭代", type: 'error' }); return ; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -376,7 +376,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue' this.pageInfo.count=true; this.getXmIterations(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -406,7 +406,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue' if(tips.isOk){ this.getXmIterations(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }, showIterationState(row){ @@ -431,7 +431,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue' if(tips.isOk){ this.getXmIterations(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -446,7 +446,7 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue' if(tips.isOk){ this.getXmIterations(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }) } diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue index bcf000fd..49e1ae7b 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue @@ -82,7 +82,7 @@ //新增提交XmIterationMenu 迭代定义 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$notify({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "只有迭代管理员可以操作", type: 'error' }); return ; } this.$refs.addForm.validate((valid) => { @@ -98,7 +98,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue index 7420cbf3..f893d1ca 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue @@ -82,7 +82,7 @@ //编辑提交XmIterationMenu 迭代定义父组件监听@submit="afterEditSubmit" editSubmit: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$notify({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "只有迭代管理员可以操作", type: 'error' }); return ; } this.$refs.editForm.validate((valid) => { @@ -97,7 +97,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue index b88cd198..d997a37d 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue @@ -167,7 +167,7 @@ if(this.iteration){ params.iterationId=this.iteration.id }else{ - this.$notify({showClose: true, message: "请先在左边选择迭代", type: 'success' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先在左边选择迭代", type: 'success' }); return; } this.load.list = true; @@ -178,7 +178,7 @@ this.pageInfo.count=false; this.xmIterationMenus = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -222,14 +222,14 @@ this.$refs.menusSelect.reloadChildren([row]); this.getXmIterationMenus(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmIterationMenu batchDel: function () { if(this.sels.length<=0){ - this.$notify({showClose: true, message:"请先选择一个或者多个需求", type: 'warning' }); + this.$notify({position:'bottom-left',showClose:true,message:"请先选择一个或者多个需求", type: 'warning' }); return ; } this.$confirm('确认将需求移出迭代吗？', '提示', { @@ -247,7 +247,7 @@ this.pageInfo.count=true; this.getXmIterationMenus(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -271,7 +271,7 @@ this.getXmIterationMenus() this.$refs.menusSelect.reloadChildren(menus); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }, onIterationRowClick(iteration){ diff --git a/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue b/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue index 05a6a4a2..f686d705 100644 --- a/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue +++ b/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue @@ -140,7 +140,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue index c6f6db76..cada39d8 100644 --- a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue +++ b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue @@ -162,7 +162,7 @@ this.pageInfo.count=false; this.xmIterationStates = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -204,7 +204,7 @@ this.pageInfo.count=true; this.getXmIterationStates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -222,7 +222,7 @@ this.pageInfo.count=true; this.getXmIterationStates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue index 6659c692..a444a75a 100644 --- a/src/views/xm/core/xmMenu/XmMenuAdd.vue +++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue @@ -296,7 +296,7 @@ //新增提交XmMenu 项目需求表 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.addForm.productId==null){ - this.$notify({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '请选择产品/或者上级需求进行新增', type:'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -310,7 +310,7 @@ params.pmenuId=this.parentMenu.menuId } if(params.productId==null|| params.productId==''){ - this.$notify({showClose: true, message: '产品编号不能为空', type:'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '产品编号不能为空', type:'error' }); return; } if(params.remark=='作为 ，我需要 ，以便我能够 。'){ @@ -327,11 +327,11 @@ if(tips.isOk){ this.$emit('submit',res.data.data);// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); }else{ - this.$notify({showClose: true, message:"表单检查不通过，请修改后提交", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message:"表单检查不通过，请修改后提交", type: 'error' }); } }); }, diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index f62ee0ff..506075ed 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -354,11 +354,11 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; if(tips.isOk){ this.$emit('submit',res.data.data);// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); }else{ - this.$notify({showClose: true, message:"表单检查不通过，请修改后提交", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message:"表单检查不通过，请修改后提交", type: 'error' }); } }); }, @@ -473,7 +473,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue'; this.dateRanger.push(this.editForm.endTime) } }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; } diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index f1eebf35..3648c2bb 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -687,7 +687,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; } @@ -722,7 +722,7 @@ this.addFormVisible = true; }else{ this.$refs.xmProductSelect1.productVisible=true; - this.$notify({showClose: true, message: "请先选择一个产品", type: 'warning'}); + this.$notify({position:'bottom-left',showClose:true,message: "请先选择一个产品", type: 'warning'}); } //this.addForm=Object.assign({}, this.editForm); @@ -811,14 +811,14 @@ this.getXmMenus(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmMenu batchDel: function () { if(this.sels.length==0){ - this.$notify({showClose: true, message: "请先选择要删除的需求", type: 'warning'}); + this.$notify({position:'bottom-left',showClose:true,message: "请先选择要删除的需求", type: 'warning'}); return; } this.$confirm('确认删除选中的'+this.sels.length+'条数据吗？删除后数据不可恢复', '提示', { @@ -833,7 +833,7 @@ this.getXmMenus(); treeTool.reloadAllChildren(this.$refs.table,this.maps,this.sels,'pmenuId',this.loadXmMenusLazy) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -951,7 +951,7 @@ treeTool.reloadAllChildren(this.$refs.table,this.maps,this.parentMenu.menuId,'pmenuId',this.loadXmMenusLazy) } }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }).catch( err => this.load.add=false ); }, @@ -981,7 +981,7 @@ if(tips.isOk){ //this.getXmMenus() } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }, @@ -1014,7 +1014,7 @@ this.xmMenus=[]; this.getXmMenus(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, onGroupUserSelect(users,option){ diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue index c77e939e..5971227c 100644 --- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue +++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue @@ -154,7 +154,7 @@ batchSaveMenu(){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } if(this.valueChangeRows.length==0){ @@ -166,7 +166,7 @@ if(tips.isOk){ this.valueChangeRows=[] } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }, fieldChange:function(row,fieldName,nextReplace){ diff --git a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue index b3763512..cf116ea9 100644 --- a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue +++ b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue @@ -97,7 +97,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue index 0839b733..2c4cdc69 100644 --- a/src/views/xm/core/xmMenu/XmMenuSelect.vue +++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue @@ -432,7 +432,7 @@ params=this.getParams(params) if(!params.productId && !params.iterationId && !params.linkIterationId){ - this.$notify({showClose: true, message: "请先选择产品", type: 'warning' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先选择产品", type: 'warning' }); return; } params.withParents="1" @@ -444,7 +444,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue index d64df5ec..86811f29 100644 --- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue +++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue @@ -372,7 +372,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -393,7 +393,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, //删除xmMenu @@ -407,13 +407,13 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false ); }, //批量删除xmMenu batchDel: function () { if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } @@ -428,7 +428,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -507,11 +507,11 @@ }, showBatchEdit:function(){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理、产品组长能够修改需求", type: 'error'}); return false; } if(this.xmMenus.length==0 ){ - this.$notify({showClose: true, message:"没有数据可以修改", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message:"没有数据可以修改", type: 'error'}); return ; } @@ -519,7 +519,7 @@ }, saveBatchEdit:function(){ if(this.valueChangeRows.length==0){ - this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({position:'bottom-left',showClose:true,message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { @@ -531,7 +531,7 @@ this.valueChangeRows=[] this.getXmMenus() } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue index e162d828..ba29ba72 100644 --- a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue +++ b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue @@ -180,7 +180,7 @@ data.forEach(i=>i.showEditor=false) this.xmMenuExchanges = data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -222,7 +222,7 @@ this.pageInfo.count=true; this.getXmMenuExchanges(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -240,7 +240,7 @@ this.pageInfo.count=true; this.getXmMenuExchanges(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -297,7 +297,7 @@ this.editForm.showEditor=false; this.headEditorVisible=false; } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }, /**end 自定义函数请在上面加**/ diff --git a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue index a9676940..21c94736 100644 --- a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue +++ b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue @@ -215,7 +215,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue b/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue index e0748fe3..9f391802 100644 --- a/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue +++ b/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue @@ -213,7 +213,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue index fd6eb067..6fbc7bd4 100644 --- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue +++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue @@ -276,7 +276,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -297,7 +297,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, //删除xmMenu @@ -311,7 +311,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false ); }, //批量删除xmMenu @@ -328,7 +328,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -407,7 +407,7 @@ }, showBatchEdit:function(){ if(this.xmMenus.length==0 ){ - this.$notify({showClose: true, message:"没有数据可以修改", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message:"没有数据可以修改", type: 'error'}); return ; } @@ -415,7 +415,7 @@ }, saveBatchEdit:function(){ if(this.valueChangeRows.length==0){ - this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({position:'bottom-left',showClose:true,message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { @@ -427,7 +427,7 @@ this.valueChangeRows=[] this.getXmMenus() } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue index a111dd28..ff0be76b 100644 --- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue +++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue @@ -79,7 +79,7 @@ //新增提交XmMenuTemplate 项目需求表 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.parentMenu==null && this.product ==null ){ - this.$notify({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '请选择产品/或者上级需求进行新增', type:'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -95,7 +95,7 @@ params.productId=this.product.id } if(params.productId==null|| params.productId==''){ - this.$notify({showClose: true, message: '产品编号不能为空', type:'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '产品编号不能为空', type:'error' }); return; } addXmMenuTemplate(params).then((res) => { @@ -105,7 +105,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue index ab7120ef..abb30866 100644 --- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue +++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue @@ -93,7 +93,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue index d3c4472b..ca992c1b 100644 --- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue +++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue @@ -154,7 +154,7 @@ if( this.filters.product!==null && this.filters.product.id!=''){ params.productId=this.filters.product.id }else { - this.$notify({showClose: true, message: "请先选择产品", type: 'warning' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先选择产品", type: 'warning' }); return; //params.xxx=xxxxx } @@ -168,7 +168,7 @@ this.pageInfo.count=false; this.xmMenuTemplates = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -182,7 +182,7 @@ //显示新增界面 XmMenuTemplate xm_project_menu showAdd: function () { if(this.filters.product==null){ - this.$notify({showClose: true, message: "请先在左边选择产品", type: 'warning' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先在左边选择产品", type: 'warning' }); return; } this.addFormVisible = true; @@ -227,7 +227,7 @@ this.pageInfo.count=true; this.getXmMenuTemplates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -245,7 +245,7 @@ this.pageInfo.count=true; this.getXmMenuTemplates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue index 099b3140..2085cef3 100644 --- a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue +++ b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue @@ -212,7 +212,7 @@ export default { this.addFormVisible=false; this.xmBugs.push(res.data.data) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }, showAdd() { @@ -221,7 +221,7 @@ export default { batchDel: function () { if(this.sels.length<=0){ - this.$notify({showClose: true, message:"请选择要删除的缺陷", type: "error"}); + this.$notify({position:'bottom-left',showClose:true,message:"请选择要删除的缺陷", type: "error"}); return ; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -234,7 +234,7 @@ export default { if( tips.isOk ){ this.getXmBugs(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue index 9262cec2..9c0434c2 100644 --- a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue +++ b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue @@ -294,7 +294,7 @@ export default { this.addFormVisible=false; this.xmMenus.push(res.data.data) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }, showAdd() { @@ -364,7 +364,7 @@ export default { //批量删除xmMenu batchDel: function () { if(this.sels.length==0){ - this.$notify({showClose: true, message: "请先选择要删除的需求", type: 'warning'}); + this.$notify({position:'bottom-left',showClose:true,message: "请先选择要删除的需求", type: 'warning'}); return; } this.$confirm('确认删除选中的'+this.sels.length+'条数据吗？删除后数据不可恢复', '提示', { @@ -377,7 +377,7 @@ export default { if( tips.isOk ){ this.getXmMenus(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue index d933826c..924b4183 100644 --- a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue +++ b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue @@ -220,7 +220,7 @@ export default { this.xmTasks.push(res.data.data) this.addFormVisible=false; } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }, showAdd() { diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue index 8a42ac00..fa30a28d 100644 --- a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue +++ b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue @@ -101,7 +101,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue b/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue index 54291c5f..edfc1a13 100644 --- a/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue +++ b/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue @@ -99,7 +99,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue b/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue index ace9f09e..cc2c81c0 100644 --- a/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue +++ b/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue @@ -145,7 +145,7 @@ this.pageInfo.count=false; this.xmMyFocuss = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -187,7 +187,7 @@ this.pageInfo.count=true; this.getXmMyFocuss(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -205,7 +205,7 @@ this.pageInfo.count=true; this.getXmMyFocuss(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmPhase/XmPhaseAdd.vue b/src/views/xm/core/xmPhase/XmPhaseAdd.vue index b14fbcb2..f481f1fb 100644 --- a/src/views/xm/core/xmPhase/XmPhaseAdd.vue +++ b/src/views/xm/core/xmPhase/XmPhaseAdd.vue @@ -257,20 +257,20 @@ } }else{ - this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请输入开始日期和结束日期", type: 'error' }); return; } if(!this.addForm.budgetIuserCnt){ - this.$notify({showClose: true, message: "内购人员数不能为空", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "内购人员数不能为空", type: 'error' }); return; } if(!this.addForm.budgetHours){ - this.$notify({showClose: true, message: "工期不能为空", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "工期不能为空", type: 'error' }); return; } if(!this.addForm.budgetIuserPrice){ - this.$notify({showClose: true, message: "内购单价不能为空", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "内购单价不能为空", type: 'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -308,7 +308,7 @@ //this.$refs['addForm'].resetFields(); this.$emit('submit',res.data.data);// @submit="afteraddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmPhase/XmPhaseEdit.vue b/src/views/xm/core/xmPhase/XmPhaseEdit.vue index d5ceb10f..791c0391 100644 --- a/src/views/xm/core/xmPhase/XmPhaseEdit.vue +++ b/src/views/xm/core/xmPhase/XmPhaseEdit.vue @@ -273,20 +273,20 @@ } }else{ - this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请输入开始日期和结束日期", type: 'error' }); return; } if(!this.editForm.budgetIuserCnt){ - this.$notify({showClose: true, message: "内购人员数不能为空", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "内购人员数不能为空", type: 'error' }); return; } if(!this.editForm.budgetHours){ - this.$notify({showClose: true, message: "工期不能为空", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "工期不能为空", type: 'error' }); return; } if(!this.editForm.budgetIuserPrice){ - this.$notify({showClose: true, message: "内购单价不能为空", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "内购单价不能为空", type: 'error' }); return; } this.$refs.editForm.validate((valid) => { @@ -319,7 +319,7 @@ //this.$refs['editForm'].resetFields(); this.$emit('submit',res.data.data);// @submit="aftereditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmPhase/XmPhaseForProduct.vue b/src/views/xm/core/xmPhase/XmPhaseForProduct.vue index 8feb95ea..519120ee 100644 --- a/src/views/xm/core/xmPhase/XmPhaseForProduct.vue +++ b/src/views/xm/core/xmPhase/XmPhaseForProduct.vue @@ -427,7 +427,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; this.pageInfo.count=false; this.xmPhases = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -553,7 +553,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; treeTool.reloadChildren(this.$refs.table,this.maps,this.parentProjectPhase.id,'parentPhaseId',this.loadXmPhaseLazy) } }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }).catch( err => this.load.add=false ); }, @@ -576,7 +576,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; this.searchXmPhases() treeTool.reloadChildren(this.$refs.table,this.maps,row.parentPhaseId,'parentPhaseId',this.loadXmPhaseLazy) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -606,7 +606,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; treeTool.reloadAllChildren(this.$refs.table,this.maps,phases,'parentPhaseId',this.loadXmPhaseLazy) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -787,7 +787,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; if(tips.isOk){ this.getXmPhases() } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }, calcKeyPaths(){ @@ -801,7 +801,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; if(tips.isOk){ this.getXmPhases() } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }, getFloatValue(value,digit){ @@ -927,19 +927,19 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; }, saveBatchEdit:function(){ if(this.valueChangeRows.length==0){ - this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({position:'bottom-left',showClose:true,message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { if(this.budgetData.surplusPlanIuserAt<0){ - this.$notify({showClose: true, message:"内部人力预算不足，请调整", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message:"内部人力预算不足，请调整", type: 'error'}); return; } if(this.budgetData.surplusPlanOuserAt<0){ - this.$notify({showClose: true, message:"外购人力预算不足，请调整", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message:"外购人力预算不足，请调整", type: 'error'}); return; } if(this.budgetData.surplusPlanNouserAt<0){ - this.$notify({showClose: true, message:"非人力预算不足请调整",type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message:"非人力预算不足请调整",type: 'error'}); return; } @@ -951,7 +951,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; this.valueChangeRows=[] this.getXmPhases(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } @@ -1260,7 +1260,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; if(tips.isOk){ this.totalProjectAndPhaseBudgetCost=res.data.data; } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) } },//end methods diff --git a/src/views/xm/core/xmPhase/XmPhaseMng.vue b/src/views/xm/core/xmPhase/XmPhaseMng.vue index 59089c87..258f9f44 100644 --- a/src/views/xm/core/xmPhase/XmPhaseMng.vue +++ b/src/views/xm/core/xmPhase/XmPhaseMng.vue @@ -463,7 +463,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; this.pageInfo.count=false; this.xmPhases = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -588,7 +588,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; treeTool.reloadChildren(this.$refs.table,this.maps,this.parentProjectPhase.id,'parentPhaseId',this.loadXmPhaseLazy) } }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } }).catch( err => this.load.add=false ); }, @@ -611,7 +611,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; this.searchXmPhases() treeTool.reloadChildren(this.$refs.table,this.maps,row.parentPhaseId,'parentPhaseId',this.loadXmPhaseLazy) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -641,7 +641,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; treeTool.reloadAllChildren(this.$refs.table,this.maps,phases,'parentPhaseId',this.loadXmPhaseLazy) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -822,7 +822,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; if(tips.isOk){ this.getXmPhases() } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }, calcKeyPaths(){ @@ -836,7 +836,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; if(tips.isOk){ this.getXmPhases() } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }, getFloatValue(value,digit){ @@ -962,19 +962,19 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; }, saveBatchEdit:function(){ if(this.valueChangeRows.length==0){ - this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({position:'bottom-left',showClose:true,message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { if(this.budgetData.surplusPlanIuserAt<0){ - this.$notify({showClose: true, message:"内部人力预算不足，请调整", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message:"内部人力预算不足，请调整", type: 'error'}); return; } if(this.budgetData.surplusPlanOuserAt<0){ - this.$notify({showClose: true, message:"外购人力预算不足，请调整", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message:"外购人力预算不足，请调整", type: 'error'}); return; } if(this.budgetData.surplusPlanNouserAt<0){ - this.$notify({showClose: true, message:"非人力预算不足请调整",type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message:"非人力预算不足请调整",type: 'error'}); return; } @@ -986,7 +986,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; this.valueChangeRows=[] this.getXmPhases(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } @@ -1298,7 +1298,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue'; if(tips.isOk){ this.totalProjectAndPhaseBudgetCost=res.data.data; } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) } },//end methods diff --git a/src/views/xm/core/xmPhase/XmPhaseSelect.vue b/src/views/xm/core/xmPhase/XmPhaseSelect.vue index 16424855..2a6cf7cc 100644 --- a/src/views/xm/core/xmPhase/XmPhaseSelect.vue +++ b/src/views/xm/core/xmPhase/XmPhaseSelect.vue @@ -222,7 +222,7 @@ this.pageInfo.count=false; this.xmPhases = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue index 4cdda5e0..3b9971ff 100644 --- a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue +++ b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue @@ -164,7 +164,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue index 0ebc4cc9..92fa7114 100644 --- a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue +++ b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue @@ -155,7 +155,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue index a9a9e797..e6a9c511 100644 --- a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue +++ b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue @@ -203,7 +203,7 @@ } this.getParams(params) if(!params.projectId && !params.productId){ - this.$notify({showClose: true, message: "请选择项目模板/产品模板", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请选择项目模板/产品模板", type: 'error' }); return; } params.isTop="1" @@ -215,7 +215,7 @@ this.pageInfo.count=false; this.xmPhases = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProduct/XmProductAdd.vue b/src/views/xm/core/xmProduct/XmProductAdd.vue index 707cd8b0..a87ac6a2 100644 --- a/src/views/xm/core/xmProduct/XmProductAdd.vue +++ b/src/views/xm/core/xmProduct/XmProductAdd.vue @@ -137,11 +137,11 @@ //this.$refs['addForm'].resetFields(); this.$emit('submit',res.data.data);// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); }else{ - this.$notify({showClose: true, message: "表单检查不通过", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "表单检查不通过", type: 'error' }); } }); }, @@ -151,7 +151,7 @@ if(tips.isOk){ this.addForm.code=res.data.data } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, showUserVisible(userType){ diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue index 0e2c9203..786074e7 100644 --- a/src/views/xm/core/xmProduct/XmProductEdit.vue +++ b/src/views/xm/core/xmProduct/XmProductEdit.vue @@ -159,7 +159,7 @@ //this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue index c621c50b..47c9e215 100644 --- a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue +++ b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue @@ -118,7 +118,7 @@ import XmProductEdit from './XmProductEdit.vue'; tabClick(tab){ if(this.xmProduct==null || !this.xmProduct.id){ this.productVisible=true; - this.$notify({showClose: true, message:"请先选中左边产品", type: 'warning'}); + this.$notify({position:'bottom-left',showClose:true,message:"请先选中左边产品", type: 'warning'}); } this.showPanel=tab.name } diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue index 96b13ce4..bb5a8bcf 100644 --- a/src/views/xm/core/xmProduct/XmProductMng.vue +++ b/src/views/xm/core/xmProduct/XmProductMng.vue @@ -436,7 +436,7 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, //获取列表 XmProduct 产品表 @@ -457,7 +457,7 @@ params.queryScope=this.filters.queryScope if(this.filters.queryScope=='productId'){ if(!this.filters.id){ - this.$notify({showClose: true, message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); return; } params.id=this.filters.id @@ -494,7 +494,7 @@ this.pageInfo.count=false; this.xmProducts = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } if(callBack){ this.$nextTick(()=>{ @@ -513,7 +513,7 @@ //显示新增界面 XmProduct 产品表 showAdd: function () { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$notify({showClose: true, message: "只有产品经理能够创建产品", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理能够创建产品", type: 'error'}); return false; } this.addFormVisible = true; @@ -559,10 +559,10 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }else{ - this.$notify({showClose: true, message: "产品代号不正确", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "产品代号不正确", type: 'error' }); } }).catch(() => { return; @@ -571,12 +571,12 @@ //批量删除xmProduct batchDel: function () { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$notify({showClose: true, message: "只有产品经理能够删除产品", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理能够删除产品", type: 'error'}); return false; } var mmSels=this.sels.filter(i=>i.pmUserid!=this.userInfo.userid) if(mmSels.length>0){ - this.$notify({showClose: true, message: "只能删除你负责的产品", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message: "只能删除你负责的产品", type: 'error'}); return false; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -590,7 +590,7 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -651,7 +651,7 @@ if(tips.isOk){ this.getXmProducts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -666,7 +666,7 @@ if(tips.isOk){ this.getXmProducts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -679,7 +679,7 @@ }, onCopyToConfirm(){ if(!this.xmProductCopy.code){ - this.$notify({showClose: true, message: '产品代号不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '产品代号不能为空', type: 'error' }); return; } this.load.add=true; @@ -694,7 +694,7 @@ this.$refs.xmProductTplMngRef.searchXmProducts() } } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -712,7 +712,7 @@ if(tips.isOk){ this.xmProductCopy.code=res.data.data } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, /**end 自定义函数请在上面加**/ diff --git a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue index 74b6a42d..c7f8f885 100644 --- a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue +++ b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue @@ -85,7 +85,7 @@ export default { loadTasksToXmProductState(params).then((res) => { this.load.calcProduct=false; var tips=res.data.tips; - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.calcProduct=false ); }, @@ -96,7 +96,7 @@ export default { loadTasksToXmMenuState(params).then((res) => { this.load.calcMenu=false; var tips=res.data.tips; - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.calcMenu=false ); }, onMenuToolBarSelect(menuIndex){ diff --git a/src/views/xm/core/xmProduct/XmProductProjectForLink.vue b/src/views/xm/core/xmProduct/XmProductProjectForLink.vue index 6863c3f3..5508d5c5 100644 --- a/src/views/xm/core/xmProduct/XmProductProjectForLink.vue +++ b/src/views/xm/core/xmProduct/XmProductProjectForLink.vue @@ -48,7 +48,7 @@ delXmProductProjectLink(params).then(res=>{ var tips = res.data.tips; if(tips.isOk){ - this.$notify({showClose: true, message: "脱钩成功", type: 'success' }); + this.$notify({position:'bottom-left',showClose:true,message: "脱钩成功", type: 'success' }); } }); }) diff --git a/src/views/xm/core/xmProduct/XmProductRecycle.vue b/src/views/xm/core/xmProduct/XmProductRecycle.vue index c7c73cdd..22d059f8 100644 --- a/src/views/xm/core/xmProduct/XmProductRecycle.vue +++ b/src/views/xm/core/xmProduct/XmProductRecycle.vue @@ -258,7 +258,7 @@ params.queryScope=this.filters.queryScope if(this.filters.queryScope=='productId'){ if(!this.filters.id){ - this.$notify({showClose: true, message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); return; } params.id=this.filters.id @@ -284,7 +284,7 @@ this.pageInfo.count=false; this.xmProducts = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -335,10 +335,10 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }else{ - this.$notify({showClose: true, message: "产品代号不正确", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "产品代号不正确", type: 'error' }); } }).catch(() => { return; diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue index ef2b6151..186f8ab2 100644 --- a/src/views/xm/core/xmProduct/XmProductTplMng.vue +++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue @@ -238,7 +238,7 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, //获取列表 XmProduct 产品表 @@ -271,7 +271,7 @@ this.pageInfo.count=false; this.xmProducts = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -285,7 +285,7 @@ //显示新增界面 XmProduct 产品表 showAdd: function () { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$notify({showClose: true, message: "只有产品经理能够创建产品", type: 'error'}); + this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理能够创建产品", type: 'error'}); return false; } this.addFormVisible = true; @@ -330,10 +330,10 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }else{ - this.$notify({showClose: true, message: "产品代号不正确", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "产品代号不正确", type: 'error' }); } }).catch(() => { return; @@ -352,7 +352,7 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -413,7 +413,7 @@ if(tips.isOk){ this.getXmProducts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -428,7 +428,7 @@ if(tips.isOk){ this.getXmProducts(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -441,7 +441,7 @@ }, onCopyToConfirm(){ if(!this.xmProductCopy.code){ - this.$notify({showClose: true, message: '产品代号不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '产品代号不能为空', type: 'error' }); return; } @@ -457,7 +457,7 @@ this.$emit("copy",res.data.data) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -468,7 +468,7 @@ if(tips.isOk){ this.xmProductCopy.code=res.data.data } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, /**end 自定义函数请在上面加**/ diff --git a/src/views/xm/core/xmProductState/XmProductStateAdd.vue b/src/views/xm/core/xmProductState/XmProductStateAdd.vue index 1dc26abf..8438ec9b 100644 --- a/src/views/xm/core/xmProductState/XmProductStateAdd.vue +++ b/src/views/xm/core/xmProductState/XmProductStateAdd.vue @@ -185,7 +185,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue index dfd2986a..799308ec 100644 --- a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue +++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue @@ -92,7 +92,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue index 97f3d8d1..9f34dc7f 100644 --- a/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue +++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue @@ -88,7 +88,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue index 0b7c457a..b6ec34d5 100644 --- a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue +++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue @@ -153,7 +153,7 @@ this.pageInfo.count=false; this.xmProductTemplates = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -195,7 +195,7 @@ this.pageInfo.count=true; this.getXmProductTemplates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -213,7 +213,7 @@ this.pageInfo.count=true; this.getXmProductTemplates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProject/XmProjectAssess.vue b/src/views/xm/core/xmProject/XmProjectAssess.vue index c3217175..502981e8 100644 --- a/src/views/xm/core/xmProject/XmProjectAssess.vue +++ b/src/views/xm/core/xmProject/XmProjectAssess.vue @@ -129,7 +129,7 @@ this.xmProjects = res.data.data; console.log(this.xmProjects); }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -143,7 +143,7 @@ var tips=res.data.tips; if(tips.isOk){ } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.list = false); }, //显示新增界面 XmProject xm_project diff --git a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue index d97cdc54..47797319 100644 --- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue +++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue @@ -260,7 +260,7 @@ import { months } from 'moment'; // }, updateBudget() { if(this.selProject.planTotalCost==undefined){ - this.$notify({showClose: true, message:"不允许修改", type: 'success'}); + this.$notify({position:'bottom-left',showClose:true,message:"不允许修改", type: 'success'}); return; } var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost) @@ -283,7 +283,7 @@ import { months } from 'moment'; }else{ this.selProjectBudget=Object.assign({},this.selProject) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.load.edit = false; }).catch( err => this.load.edut = false ); }).catch(() => { diff --git a/src/views/xm/core/xmProject/XmProjectCost.vue b/src/views/xm/core/xmProject/XmProjectCost.vue index 280da81f..732206e4 100644 --- a/src/views/xm/core/xmProject/XmProjectCost.vue +++ b/src/views/xm/core/xmProject/XmProjectCost.vue @@ -258,7 +258,7 @@ import { months } from 'moment'; // }, updateBudget() { if(this.selProject.planTotalCost==undefined){ - this.$notify({showClose: true, message:"不允许修改", type: 'success'}); + this.$notify({position:'bottom-left',showClose:true,message:"不允许修改", type: 'success'}); return; } var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost) @@ -281,7 +281,7 @@ import { months } from 'moment'; }else{ this.selProjectBudget=Object.assign({},this.selProject) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.load.edit = false; }).catch( err => this.load.edut = false ); }).catch(() => { diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue index df4719a6..f460381a 100644 --- a/src/views/xm/core/xmProject/XmProjectEdit.vue +++ b/src/views/xm/core/xmProject/XmProjectEdit.vue @@ -509,7 +509,7 @@ //编辑提交XmProject xm_project父组件监听@submit="afterEditSubmit" editSubmit: function () { if(this.opType!=='add' && "0" != this.selProject.status){ - this.$notify({showClose: true, message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); return; } var msg=this.xmProduct&&this.xmProduct.id?'将自动关联产品【'+this.xmProduct.productName+'】':''; @@ -544,11 +544,11 @@ } this.$emit('submit',res.data.data);// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }else{ - this.$notify({showClose: true, message: "表单检查不通过，请修改后提交", type:'error'}); + this.$notify({position:'bottom-left',showClose:true,message: "表单检查不通过，请修改后提交", type:'error'}); } }); }, @@ -562,7 +562,7 @@ if(tips.isOk){ this.xmGroups = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -810,7 +810,7 @@ if(tips.isOk){ this.$set(this.editForm,'code',res.data.data) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, initData(){ diff --git a/src/views/xm/core/xmProject/XmProjectForLink.vue b/src/views/xm/core/xmProject/XmProjectForLink.vue index c91c92e6..ac1dc9aa 100644 --- a/src/views/xm/core/xmProject/XmProjectForLink.vue +++ b/src/views/xm/core/xmProject/XmProjectForLink.vue @@ -159,7 +159,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'; this.pageInfo.count=false; this.xmProjects = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -180,7 +180,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'; if(tips.isOk){ this.getXmProjects(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, @@ -196,7 +196,7 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect.vue'; var tips = res.data.tips; if(tips.isOk){ this.getXmProjects(); - this.$notify({showClose: true, message: "移出成功", type: 'success' }); + this.$notify({position:'bottom-left',showClose:true,message: "移出成功", type: 'success' }); } }); }) diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index efbc948d..2c44ab66 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -492,7 +492,7 @@ this.pageInfo.count=false; this.xmProjects = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } if(callBack){ this.$nextTick(()=>{ @@ -577,10 +577,10 @@ this.pageInfo.count=true; this.getXmProjects(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }else{ - this.$notify({showClose: true, message: "项目代号不正确", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "项目代号不正确", type: 'error' }); } }).catch(() => { return; @@ -601,7 +601,7 @@ this.pageInfo.count=true; this.getXmProjects(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -641,7 +641,7 @@ this.ScreenData[scope.$index].status = val; this.status = val; } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.load.edit = false; }).catch( err => this.load.edut = false ); }, @@ -768,12 +768,12 @@ if(tips.isOk){ this.getXmProjects(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }else{ addXmMyFocus({projectId:row.id,focusType:'project',projectName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{ var tips=res.data.tips; - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) } }, @@ -799,7 +799,7 @@ onCopyToConfirm(){ if(!this.xmProjectCopy.code){ - this.$notify({showClose: true, message: '项目代号不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '项目代号不能为空', type: 'error' }); return; } this.load.add=true; @@ -814,7 +814,7 @@ this.$refs.xmProjectTplMngRef.searchXmProjects() } } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -824,7 +824,7 @@ if(tips.isOk){ this.xmProjectCopy.code=res.data.data } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, formatProjectStatus(status){ @@ -854,7 +854,7 @@ this.pageInfo.count=true; this.searchXmProjects(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ); }, diff --git a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue index 9a8c1eab..b94bc5ad 100644 --- a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue +++ b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue @@ -91,7 +91,7 @@ export default { loadTasksToXmProjectState(params).then((res) => { this.load.calcProject=false; var tips=res.data.tips; - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.calcProject=false ); }, loadTasksSettleToXmProjectState(){ @@ -100,7 +100,7 @@ export default { loadTasksSettleToXmProjectState(params).then((res) => { this.load.calcProject=false; var tips=res.data.tips; - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.calcProject=false ); }, diff --git a/src/views/xm/core/xmProject/XmProjectRecycle.vue b/src/views/xm/core/xmProject/XmProjectRecycle.vue index e15723d2..a834e251 100644 --- a/src/views/xm/core/xmProject/XmProjectRecycle.vue +++ b/src/views/xm/core/xmProject/XmProjectRecycle.vue @@ -151,7 +151,7 @@ this.pageInfo.count=false; this.xmProjects = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -175,10 +175,10 @@ this.pageInfo.count=true; this.getXmProjects(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }else{ - this.$notify({showClose: true, message: "项目代号不正确", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "项目代号不正确", type: 'error' }); } }).catch(() => { return; diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue index ec0e966a..8961873c 100644 --- a/src/views/xm/core/xmProject/XmProjectTplMng.vue +++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue @@ -232,7 +232,7 @@ this.pageInfo.count=false; this.xmProjects = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -285,10 +285,10 @@ this.pageInfo.count=true; this.getXmProjects(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }else{ - this.$notify({showClose: true, message: "项目代号不正确", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "项目代号不正确", type: 'error' }); } }).catch(() => { return; @@ -309,7 +309,7 @@ this.pageInfo.count=true; this.getXmProjects(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -325,7 +325,7 @@ }, onCopyToConfirm(){ if(!this.xmProjectCopy.code){ - this.$notify({showClose: true, message: '项目代号不能为空', type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: '项目代号不能为空', type: 'error' }); return; } this.load.add=true; @@ -339,7 +339,7 @@ } this.$emit("copy",res.data.data) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -374,7 +374,7 @@ this.ScreenData[scope.$index].status = val; this.status = val; } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.load.edit = false; }).catch( err => this.load.edut = false ); }, @@ -500,12 +500,12 @@ if(tips.isOk){ this.getXmProjects(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }else{ addXmMyFocus({projectId:row.id,focusType:'project',projectName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{ var tips=res.data.tips; - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) } }, @@ -527,7 +527,7 @@ if(tips.isOk){ this.xmProjectCopy.code=res.data.data } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) } /**end 自定义函数请在上面加**/ diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue index 9129e668..0a17a289 100644 --- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue +++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue @@ -116,7 +116,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue index ee1c8ad9..9bfb3e1c 100644 --- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue +++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue @@ -114,7 +114,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue index ee310dcc..6395d422 100644 --- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue +++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue @@ -196,7 +196,7 @@ this.pageInfo.count=false; this.xmProjectEnvLists = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -238,7 +238,7 @@ this.pageInfo.count=true; this.getXmProjectEnvLists(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -255,7 +255,7 @@ this.pageInfo.count=true; this.getXmProjectEnvLists(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -278,7 +278,7 @@ // console.log(this.envList); // this.getXmProjectEnvLists(); }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -302,7 +302,7 @@ this.importVisible = false; this.getXmProjectEnvLists(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue index b4059aa2..faac43cf 100644 --- a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue +++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue @@ -122,7 +122,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue index c0cda8cd..fb14d56c 100644 --- a/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue +++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue @@ -120,7 +120,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue index 0b7d8c78..972ce3f1 100644 --- a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue +++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue @@ -169,7 +169,7 @@ this.pageInfo.count=false; this.xmProjectKpis = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -211,7 +211,7 @@ this.pageInfo.count=true; this.getXmProjectKpis(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -229,7 +229,7 @@ this.pageInfo.count=true; this.getXmProjectKpis(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue index 16099819..b4ffdd12 100644 --- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue +++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue @@ -128,7 +128,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue index fa4a588a..4c8c6d1e 100644 --- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue +++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue @@ -126,7 +126,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue index e31b1e9a..c4a3fabc 100644 --- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue +++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue @@ -154,7 +154,7 @@ this.pageInfo.count=false; this.xmProjectKpiHiss = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -196,7 +196,7 @@ this.pageInfo.count=true; this.getXmProjectKpiHiss(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -214,7 +214,7 @@ this.pageInfo.count=true; this.getXmProjectKpiHiss(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue index 5c7dce0a..f172b463 100644 --- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue +++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue @@ -149,7 +149,7 @@ //新增提交XmProjectMBudgetCostNouser xm_project_m_budget_cost_user 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.bizzYear==null || this.bizzYear==''){ - this.$notify({showClose: true, message:"请选择需要分摊的年份", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message:"请选择需要分摊的年份", type: 'error' }); return; } @@ -169,7 +169,7 @@ batchAddXmProjectMBudgetCostNouser(list).then((res) => { this.load.add=false var tips=res.data.tips; - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue index fa842297..589c32d9 100644 --- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue +++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue @@ -117,7 +117,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue index fb590f3f..e67c49e5 100644 --- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue +++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue @@ -224,7 +224,7 @@ this.xmProjectMBudgetCostNousers = res.data.data; this.valueChangeRows=[]; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -266,7 +266,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostNousers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -284,7 +284,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostNousers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -296,7 +296,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({position:'bottom-left',showClose:true,message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -307,7 +307,7 @@ this.valueChangeRows=[] this.getXmProjectMBudgetCostNousers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue index 3558c82e..c22385e5 100644 --- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue +++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue @@ -151,7 +151,7 @@ //新增提交XmProjectMBudgetCostUser xm_project_m_budget_cost_user 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.bizzYear==null || this.bizzYear==''){ - this.$notify({showClose: true, message:"请选择需要分摊的年份", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message:"请选择需要分摊的年份", type: 'error' }); return; } @@ -170,7 +170,7 @@ batchAddXmProjectMBudgetCostUser(list).then((res) => { this.load.add=false var tips=res.data.tips; - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue index 2097d920..433b8c97 100644 --- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue +++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue @@ -123,7 +123,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue index 2692c7a3..cfca4627 100644 --- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue +++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue @@ -229,7 +229,7 @@ this.xmProjectMBudgetCostUsers = res.data.data; this.valueChangeRows=[]; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -271,7 +271,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostUsers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -289,7 +289,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostUsers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -301,7 +301,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({position:'bottom-left',showClose:true,message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -312,7 +312,7 @@ this.valueChangeRows=[] this.getXmProjectMBudgetCostUsers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue index 8885053a..ab204e3b 100644 --- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue +++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue @@ -117,7 +117,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue index 3a1ed64b..ba7f343f 100644 --- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue +++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue @@ -141,7 +141,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue index 2809b779..08e1288b 100644 --- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue +++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue @@ -225,7 +225,7 @@ this.xmProjectMCostNousers = res.data.data; this.valueChangeRows=[]; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -267,7 +267,7 @@ this.pageInfo.count=true; this.getXmProjectMCostNousers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -285,7 +285,7 @@ this.pageInfo.count=true; this.getXmProjectMCostNousers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -297,7 +297,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({position:'bottom-left',showClose:true,message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -308,7 +308,7 @@ this.valueChangeRows=[] this.getXmProjectMCostNousers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue index b56d12c2..5b983cee 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue @@ -139,7 +139,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue index c437b80e..c355ddc9 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue @@ -144,7 +144,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue index 1bc21daf..6787b189 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue @@ -197,7 +197,7 @@ this.pageInfo.count=false; this.xmProjectMCostUsers = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue index 305c16fb..007f9452 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue @@ -224,7 +224,7 @@ this.xmProjectMCostUsers = res.data.data; this.valueChangeRows=[]; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -266,7 +266,7 @@ this.pageInfo.count=true; this.getXmProjectMCostUsers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -284,7 +284,7 @@ this.pageInfo.count=true; this.getXmProjectMCostUsers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -296,7 +296,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({position:'bottom-left',showClose:true,message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -307,7 +307,7 @@ this.valueChangeRows=[] this.getXmProjectMCostUsers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmProjectState/XmCockpit.vue b/src/views/xm/core/xmProjectState/XmCockpit.vue index 623a4521..0f10891d 100644 --- a/src/views/xm/core/xmProjectState/XmCockpit.vue +++ b/src/views/xm/core/xmProjectState/XmCockpit.vue @@ -210,7 +210,7 @@ this.pageInfo.count=false; this.xmProjectStates = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -252,7 +252,7 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -270,7 +270,7 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue index 9861860c..765785b8 100644 --- a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue +++ b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue @@ -245,7 +245,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue index 3df8fac5..08cab36a 100644 --- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue +++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue @@ -170,7 +170,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue index b218ff01..bb567f89 100644 --- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue +++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue @@ -140,7 +140,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue index 6735478c..8f6a009e 100644 --- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue +++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue @@ -138,7 +138,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue index c14e5485..3a7f002e 100644 --- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue +++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue @@ -161,7 +161,7 @@ this.pageInfo.count=false; this.xmProjectTaskTypeStates = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -203,7 +203,7 @@ this.pageInfo.count=true; this.getXmProjectTaskTypeStates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -221,7 +221,7 @@ this.pageInfo.count=true; this.getXmProjectTaskTypeStates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue index d15a984b..56820905 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue @@ -310,7 +310,7 @@ this.addForm.startTime = this.dateRanger[0] ; this.addForm.endTime = this.dateRanger[1] ; }else{ - this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请输入开始日期和结束日期", type: 'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -329,7 +329,7 @@ if(tips.isOk){ this.$emit('submit',params);// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue index a4caf851..18113835 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue @@ -311,7 +311,7 @@ //编辑提交XmProjectTemplate xm_project父组件监听@submit="afterEditSubmit" editSubmit: function () { if("0" != this.selProjectTemplate.status){ - this.$notify({showClose: true, message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); return; } if ( @@ -321,12 +321,12 @@ this.editForm.startTime = this.dateRanger[0] ; this.editForm.endTime = this.dateRanger[1] ; }else{ - this.$notify({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请输入开始日期和结束日期", type: 'error' }); return; } if(!this.editForm.productId){ - this.$notify({showClose: true, message: "请选择归属产品", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请选择归属产品", type: 'error' }); return; } this.$refs.editForm.validate((valid) => { @@ -344,7 +344,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit',params);// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue index 31d0bb9e..ecca371a 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue @@ -154,7 +154,7 @@ this.pageInfo.count=false; this.xmProjectTemplates = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue index 18d1b8b3..a94198f6 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue @@ -167,7 +167,7 @@ this.pageInfo.count=false; this.xmProjectTemplates = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -209,7 +209,7 @@ this.pageInfo.count=true; this.getXmProjectTemplates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -227,7 +227,7 @@ this.pageInfo.count=true; this.getXmProjectTemplates(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue index 1235a398..45d6f9b3 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue @@ -290,7 +290,7 @@ this.$emit('submit');// @submit="afterAddSubmit" this.handleCancel(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } @@ -366,7 +366,7 @@ }, showSelectTask:function(){ if(this.filters.selProject==null){ - this.$notify({showClose: true, message: "请先选项目", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先选项目", type: 'error' }); return ; } this.selectTaskVisible=true; @@ -390,7 +390,7 @@ }, showSelectMenu:function(){ if(this.filters.selProject==null){ - this.$notify({showClose: true, message: "请先选项目", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先选项目", type: 'error' }); this.$refs.xmProjectSelect.projectVisible=true; return ; } diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index 821a8ddd..bf104596 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -343,7 +343,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } @@ -431,14 +431,14 @@ }, showSelectTask:function(){ if(this.selProject==null){ - this.$notify({showClose: true, message: "请先选项目", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先选项目", type: 'error' }); return ; } this.selectTaskVisible=true; }, onSelectedTask(task){ if(task.ntype=='1'){ - this.$notify({showClose: true, message: "您选择的【"+task.name+"】属于任务集，请重新选择。建议选择树中叶子节点", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "您选择的【"+task.name+"】属于任务集，请重新选择。建议选择树中叶子节点", type: 'error' }); return; } this.editForm.taskId=task.id @@ -468,14 +468,14 @@ showSelectMenu:function(){ if(this.selProject==null){ - this.$notify({showClose: true, message: "请先选项目", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先选项目", type: 'error' }); return ; } this.selectMenuVisible=true; }, onSelectedMenu(menu){ if(menu.ntype=='1'){ - this.$notify({showClose: true, message: "您选择的【"+menu.menuName+"】属于需求池，请重新选择。建议选择树中叶子节点", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "您选择的【"+menu.menuName+"】属于需求池，请重新选择。建议选择树中叶子节点", type: 'error' }); return; } this.editForm.menuId=menu.menuId diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index 79b96e9d..4deb2a77 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -481,7 +481,7 @@ if(this.filters.hisHandleStatus){ params.hisHandlerUserid=this.filters.hisHandler.userid; }else{ - this.$notify({showClose: true, message: "请选择曾经的缺陷状态", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请选择曾经的缺陷状态", type: 'error' }); return; } @@ -490,7 +490,7 @@ if(this.filters.hisHandler){ params.hisHandleStatus=this.filters.hisHandleStatus }else{ - this.$notify({showClose: true, message: "请选择曾经的执行人", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "请选择曾经的执行人", type: 'error' }); return; } @@ -529,7 +529,7 @@ this.pageInfo.count=false; this.xmQuestions = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -579,7 +579,7 @@ //显示新增界面 XmQuestion xm_question showAdd: function () { if(!this.filters.selProject){ - this.$notify({showClose: true, message: "请先选中项目", type: 'warning' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先选中项目", type: 'warning' }); this.$refs.xmProjectSelect.projectVisible=true; this.nextAction="showAdd" return; @@ -619,14 +619,14 @@ this.pageInfo.count=true; this.getXmQuestions(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmQuestion batchDel: function () { if(this.sels.length<=0){ - this.$notify({showClose: true, message:"请选择要删除的缺陷", type: "error"}); + this.$notify({position:'bottom-left',showClose:true,message:"请选择要删除的缺陷", type: "error"}); return ; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -640,7 +640,7 @@ this.pageInfo.count=true; this.getXmQuestions(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue index 54c30ced..588b9d1f 100644 --- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue +++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue @@ -150,7 +150,7 @@ this.pageInfo.count=false; this.xmQuestionHandles = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -192,7 +192,7 @@ this.pageInfo.count=true; this.getXmQuestionHandles(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -210,7 +210,7 @@ this.pageInfo.count=true; this.getXmQuestionHandles(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue index 027ec037..4fd9df83 100644 --- a/src/views/xm/core/xmRecord/XmRecord.vue +++ b/src/views/xm/core/xmRecord/XmRecord.vue @@ -168,7 +168,7 @@ this.pageInfo.count=false; this.xmRecords = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -210,7 +210,7 @@ this.pageInfo.count=true; this.getXmRecords(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -228,7 +228,7 @@ this.pageInfo.count=true; this.getXmRecords(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue index 3f286eff..fbd40176 100644 --- a/src/views/xm/core/xmTask/XmTaskAdd.vue +++ b/src/views/xm/core/xmTask/XmTaskAdd.vue @@ -411,11 +411,11 @@ if(tips.isOk){ this.$emit('submit',res.data.data);// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); }else{ - this.$notify({showClose: true, message:"表单检查不通过，请修改后提交", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message:"表单检查不通过，请修改后提交", type: 'error' }); } }); }, diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index 911313c9..3741f349 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -397,11 +397,11 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; //this.$refs['editForm'].resetFields(); this.$emit('submit',res.data.data);// @submit="aftereditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); }else{ - this.$notify({showClose: true, message: "表单验证不通过，请修改后提交", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "表单验证不通过，请修改后提交", type: 'error' }); } }); }, @@ -445,7 +445,7 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; // this.getXmTasks(); this.$emit("submit",this.editForm) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }, diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue index 8a86a147..0b38d95c 100644 --- a/src/views/xm/core/xmTask/XmTaskList.vue +++ b/src/views/xm/core/xmTask/XmTaskList.vue @@ -271,7 +271,7 @@ var xmTasks=res.data.data; this.xmTasks=xmTasks; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue index b663507b..fc2bf1b7 100644 --- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue +++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue @@ -233,7 +233,7 @@ var xmTasks=res.data.data; this.xmTasks=xmTasks; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue index d4ce3a44..5182d178 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue @@ -159,7 +159,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } @@ -173,7 +173,7 @@ //选择接收人 onUserSelected: function(users) { if(users.length>1){ - this.$notify({showClose: true, message: "只能选择一个人", type:'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "只能选择一个人", type:'error' }); return; } if(users==null || users.length ==0 ){ diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue index a1e67ba6..fc20b8e4 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue @@ -131,7 +131,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue index 0f0d2708..65021bce 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue @@ -350,7 +350,7 @@ this.xmTaskExecusers = res.data.data; this.$emit("loadExecUserList",this.xmTaskExecusers); }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -431,7 +431,7 @@ this.pageInfo.count=true; this.afterDeleteSubmit(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -448,7 +448,7 @@ this.pageInfo.count=true; this.afterDeleteSubmit(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -473,7 +473,7 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } @@ -489,7 +489,7 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }else if(row.status=="1"){ @@ -522,7 +522,7 @@ this.$refs['settleForm'].resetFields(); this.afterEditSubmit(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }, @@ -541,7 +541,7 @@ this.quotePriceVisible = false; this.afterEditSubmit(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }, @@ -597,7 +597,7 @@ if(tips.isOk){ this.getXmTaskExecusers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -609,7 +609,7 @@ if(tips.isOk){ this.getXmTaskExecusers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -621,7 +621,7 @@ if(tips.isOk){ this.getXmTaskExecusers(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -767,7 +767,7 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -781,7 +781,7 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }) }, diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue index 8082036f..4e6c0bbe 100644 --- a/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue +++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue @@ -92,7 +92,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue index e1ca6df6..1578cdbd 100644 --- a/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue +++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue @@ -90,7 +90,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue index f40d235b..c4dadfa1 100644 --- a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue +++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue @@ -165,7 +165,7 @@ this.skillIds = ids; this.$emit("getSkill",this.xmTaskSkills); }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -210,7 +210,7 @@ this.pageInfo.count=true; this.getXmTaskSkills(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -228,7 +228,7 @@ this.pageInfo.count=true; this.getXmTaskSkills(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -256,7 +256,7 @@ this.skillVisible = false; this.getXmTaskSkills(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }, diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue index e0f35f8b..e6dd4f1f 100644 --- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue +++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue @@ -240,7 +240,7 @@ this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue index b830c40f..58f17bf0 100644 --- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue +++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue @@ -218,7 +218,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue index e5ab3b8e..77da28cc 100644 --- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue +++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue @@ -158,7 +158,7 @@ } if(!params.productId && !params.projectId){ - this.$notify({showClose: true, message: "选择一个模板", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "选择一个模板", type: 'error' }); return; } params.isTpl="1" @@ -170,7 +170,7 @@ this.pageInfo.count=false; this.xmTaskTemplates = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue index db58d861..2e56c721 100644 --- a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue +++ b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue @@ -206,7 +206,7 @@ export default { this.addFormVisible=false; this.xmTasks.push(res.data.data) } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }, showAdd(ntype) { diff --git a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue index 19a4408d..bf22a063 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue @@ -114,7 +114,7 @@ if(tips.isOk && next!=true){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue index 81e19a83..86c37cd9 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue @@ -96,12 +96,7 @@ this.$emit('cancel'); }, //新增提交XmTestCase 测试用例 父组件监听@submit="afterAddSubmit" - editSubmit: function () { - - if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); - return ; - } + editSubmit: function () { this.$refs.editForm.validate((valid) => { if (valid) { @@ -116,7 +111,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue index 71adbb7e..3904dc79 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue @@ -265,7 +265,7 @@ this.pageInfo.count=false; this.xmTestCases = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -277,11 +277,7 @@ this.editForm = Object.assign({}, row); }, //显示新增界面 XmTestCase 测试用例 - showAdd: function () { - if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); - return ; - } + showAdd: function () { this.addFormVisible = true; //this.addForm=Object.assign({}, this.editForm); }, @@ -300,11 +296,11 @@ //删除xmTestCase handleDel: function (row,index) { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$notify({position:'bottom-left',showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } if(!this.roles.some(i=>i.roleid=='testAdmin')){ - this.$notify({showClose: true, message: "只有测试管理员才能删除测试用例", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "只有测试管理员才能删除测试用例", type: 'error' }); return; } this.$confirm('确认删除该记录吗?', '提示', { @@ -319,18 +315,18 @@ this.pageInfo.count=true; this.getXmTestCases(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmTestCase batchDel: function () { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$notify({position:'bottom-left',showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } if(!this.roles.some(i=>i.roleid=='testAdmin')){ - this.$notify({showClose: true, message: "只有测试管理员才能删除测试用例", type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: "只有测试管理员才能删除测试用例", type: 'error' }); return; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -344,7 +340,7 @@ this.pageInfo.count=true; this.getXmTestCases(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue index 9575495d..cd0a1081 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue @@ -134,7 +134,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue index 842d9987..3572d9fc 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue @@ -132,7 +132,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue index 99c69316..c2b843d1 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue @@ -379,7 +379,7 @@ this.pageInfo.count=false; this.xmTestCaseExecs = res.data.data; }else{ - this.$notify({showClose: true, message: tips.msg, type: 'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -408,11 +408,7 @@ this.sels = sels; }, //删除xmTestCaseExec - handleDel: function (row,index) { - if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$notify({showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); - return ; - } + handleDel: function (row,index) { this.$confirm('确认删除该记录吗?', '提示', { type: 'warning' }).then(() => { @@ -425,14 +421,14 @@ this.pageInfo.count=true; this.getXmTestCaseExecs(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmTestCaseExec batchDel: function () { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$notify({showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); + this.$notify({position:'bottom-left',showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); return ; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -446,7 +442,7 @@ this.pageInfo.count=true; this.getXmTestCaseExecs(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -483,7 +479,7 @@ this.pageInfo.count=true; this.getXmTestCaseExecs(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }else{ this.xmTestCaseMngVisible=false; @@ -492,7 +488,7 @@ }, showCase(){ if(!this.filters.selProject){ - this.$notify({showClose: true,message:"请先选择项目",type:"warning"}); + this.$notify({position:'bottom-left',showClose: true,message:"请先选择项目",type:"warning"}); nextAction="showCase" this.showProjectList(); return; @@ -575,11 +571,11 @@ }, showBatchEdit:function(){ if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$notify({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$notify({position:'bottom-left',showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } if( !this.filters.selProject ){ - this.$notify({showClose: true, message:"请先选择项目", type: 'warning'}); + this.$notify({position:'bottom-left',showClose:true,message:"请先选择项目", type: 'warning'}); nextAction="showBatchEdit" this.showProjectList(); return ; @@ -588,7 +584,7 @@ }, batchEditXmTestCaseExec:function(){ if(this.valueChangeRows.length==0){ - this.$notify({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); + this.$notify({position:'bottom-left',showClose:true,message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -599,7 +595,7 @@ this.valueChangeRows=[] this.getXmTestCaseExecs(); } - this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } @@ -667,7 +663,7 @@ showSelectTask:function(row){ this.editForm=row if(this.filters.selProject==null){ - this.$notify({showClose: true, message: "请先选项目", type: 'success' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先选项目", type: 'success' }); nextAction="showSelectTask" this.showProjectList(); @@ -696,7 +692,7 @@ showBugs(row){ this.editForm=row if(!this.filters.selProject){ - this.$notify({showClose: true, message: "请先选项目", type: 'success' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先选项目", type: 'success' }); this.showProjectList(); nextAction="showBugs" return ; @@ -714,7 +710,7 @@ this.editForm=row if(!this.filters.selProject){ - this.$notify({showClose: true, message: "请先选项目", type: 'success' }); + this.$notify({position:'bottom-left',showClose:true,message: "请先选项目", type: 'success' }); nextAction="showAddBug" this.showProjectList(); return ;