diff --git a/src/components/Image/ImageCategoryTree.vue b/src/components/Image/ImageCategoryTree.vue index bf0362a4..482e5bd2 100644 --- a/src/components/Image/ImageCategoryTree.vue +++ b/src/components/Image/ImageCategoryTree.vue @@ -168,7 +168,7 @@ this.categoryTreeData=[res.data.data]; this.$refs.categoryTree.setCurrentKey(this.currentKey); }else{ - this.$message({ message: tips.msg, type: 'error'}); + this.$message({showClose: true, message: tips.msg, type: 'error'}); } this.listLoading = false; }).catch(() => { diff --git a/src/components/Image/More/Index.vue b/src/components/Image/More/Index.vue index fdab0b8d..d9ac04f2 100644 --- a/src/components/Image/More/Index.vue +++ b/src/components/Image/More/Index.vue @@ -126,7 +126,7 @@ }, addImg(){ if(parseInt(this.limit)<=this.imageLists.length){ - this.$message({ message: "图片数量已经超过", type: 'error' }); + this.$message({showClose: true, message: "图片数量已经超过", type: 'error' }); return; } this.addFormVisible = true; diff --git a/src/components/Image/More/IndexOneUpdate.vue b/src/components/Image/More/IndexOneUpdate.vue index 2f1d0848..3f64b0a0 100644 --- a/src/components/Image/More/IndexOneUpdate.vue +++ b/src/components/Image/More/IndexOneUpdate.vue @@ -127,7 +127,7 @@ }, addImg(){ if(parseInt(this.limit)<=this.imageLists.length){ - this.$message({ message: "图片数量已经超过", type: 'error' }); + this.$message({showClose: true, message: "图片数量已经超过", type: 'error' }); return; } this.addFormVisible = true; diff --git a/src/components/Image/More/sizeimg.vue b/src/components/Image/More/sizeimg.vue index 154bc5f5..75772235 100644 --- a/src/components/Image/More/sizeimg.vue +++ b/src/components/Image/More/sizeimg.vue @@ -124,7 +124,7 @@ }, addImg(){ if(parseInt(this.limit)<=this.imageLists.length){ - this.$message({ message: "图片数量已经超过", type: 'error' }); + this.$message({showClose: true, message: "图片数量已经超过", type: 'error' }); return; } this.addFormVisible = true; diff --git a/src/components/Image/ShearSelectUpload.vue b/src/components/Image/ShearSelectUpload.vue index f3d45b3f..7fbac129 100644 --- a/src/components/Image/ShearSelectUpload.vue +++ b/src/components/Image/ShearSelectUpload.vue @@ -205,15 +205,15 @@ export default { }, plusCjbk(){ if(this.crap==false){ - this.$message({ message: "请先开始裁剪", type: "warning" }); + this.$message({showClose: true, message: "请先开始裁剪", type: "warning" }); return; } if(this.option.autoCropWidth+this.defaultImgHeight*0.1>800){ - this.$message({ message: "不能再放大", type: "warning" }); + this.$message({showClose: true, message: "不能再放大", type: "warning" }); return; } if(this.option.autoCropHeight+this.defaultImgHeight*0.1>800){ - this.$message({ message: "不能再放大", type: "warning" }); + this.$message({showClose: true, message: "不能再放大", type: "warning" }); return; } @@ -223,16 +223,16 @@ export default { }, reduceCjbk(){ if(this.crap==false){ - this.$message({ message: "请先开始裁剪", type: "warning" }); + this.$message({showClose: true, message: "请先开始裁剪", type: "warning" }); return; } if(this.option.autoCropWidth-this.defaultImgWidth*0.1<=0){ - this.$message({ message: "不能再缩小", type: "warning" }); + this.$message({showClose: true, message: "不能再缩小", type: "warning" }); return; } if(this.option.autoCropHeight-this.defaultImgHeight*0.1<=0){ - this.$message({ message: "不能再缩小", type: "warning" }); + this.$message({showClose: true, message: "不能再缩小", type: "warning" }); return; } this.option.autoCropWidth=this.option.autoCropWidth-this.defaultImgWidth*0.1 @@ -241,7 +241,7 @@ export default { }, recoveryCjbk(){ if(this.crap==false){ - this.$message({ message: "请先开始裁剪", type: "warning" }); + this.$message({showClose: true, message: "请先开始裁剪", type: "warning" }); return; } @@ -277,7 +277,7 @@ export default { } //var parm= this.$options.computed.uploadParams(); if(params.categoryId==''||params.categoryId==undefined){ - this.$message({ message: "分类不能为空", type: "warning" }); + this.$message({showClose: true, message: "分类不能为空", type: "warning" }); return; } if (type === 'blob') { @@ -310,13 +310,13 @@ export default { //this.refreshCrop (); this.$emit('upload-success',image); }else{ - this.$message({ message: "上传错误", type: "warning" }); + this.$message({showClose: true, message: "上传错误", type: "warning" }); } }).catch(()=>{ this.$message.warning("上传失败"); }); }).catch(() => { - this.$message({ + this.$message({showClose: true, type: 'info', message: '已取消' }); @@ -332,13 +332,13 @@ export default { //this.refreshCrop (); this.$emit('upload-success',image); }else{ - this.$message({ message: "上传错误", type: "warning" }); + this.$message({showClose: true, message: "上传错误", type: "warning" }); } }).catch(()=>{ this.$message.warning("上传失败"); }); }else{ - this.$message({ message: "图片太大,不允许上传，请重新裁剪后上传", type: "warning" }); + this.$message({showClose: true, message: "图片太大,不允许上传，请重新裁剪后上传", type: "warning" }); } } @@ -353,9 +353,9 @@ export default { imgLoad(info){ this.imgLoading=false if(info=='success'){ - this.$message({ message: "加载图片成功", type: "success" }); + this.$message({showClose: true, message: "加载图片成功", type: "success" }); }else{ - this.$message({ message: "加载图片失败", type: "error" }); + this.$message({showClose: true, message: "加载图片失败", type: "error" }); } }, @@ -398,13 +398,13 @@ export default { //alert(jsonData); /* var tips= res.tips; if(tips.isOk){ - this.$message({ message: '上传成功', type: 'info' }); + this.$message({showClose: true, message: '上传成功', type: 'info' }); }else{ if(tips.msg=='该图片不支持'){ - this.$message({ message: '该图片不支持', type: 'info' }); + this.$message({showClose: true, message: '该图片不支持', type: 'info' }); }else{ - this.$message({ message: '未知异常', type: 'info' }); + this.$message({showClose: true, message: '未知异常', type: 'info' }); } } */ diff --git a/src/components/Image/UploadImage.vue b/src/components/Image/UploadImage.vue index 50dba1da..4b08ef04 100644 --- a/src/components/Image/UploadImage.vue +++ b/src/components/Image/UploadImage.vue @@ -173,7 +173,7 @@ if(this.branchId != undefined && this.branchId!= ''){ params.branchId = this.branchId; }else{ - this.$message({ message: '请先选择分类，如果分类为空，请联系管理员添加分类', type: 'error' }); + this.$message({showClose: true, message: '请先选择分类，如果分类为空，请联系管理员添加分类', type: 'error' }); return; } this.listLoading = true; @@ -183,12 +183,12 @@ this.categorys = [res.data.data]; gcategorys=Object.assign(this.categorys) }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { this.listLoading = false; - this.$message({ message: '通讯异常', type: 'error' }); + this.$message({showClose: true, message: '通讯异常', type: 'error' }); }); }, // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名 @@ -239,13 +239,13 @@ //var jsonData = JSON.stringify(res, null, 4); var tips= res.tips; if(tips.isOk){ - this.$message({ message: '上传成功', type: 'success' }); + this.$message({showClose: true, message: '上传成功', type: 'success' }); this.getImages(); }else{ if(tips.msg=='该图片不支持'){ - this.$message({ message: '该图片不支持', type: 'info' }); + this.$message({showClose: true, message: '该图片不支持', type: 'info' }); }else{ - this.$message({ message: '未知异常', type: 'error' }); + this.$message({showClose: true, message: '未知异常', type: 'error' }); } } @@ -262,14 +262,14 @@ console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); console.log(file) if(this.uploadOptions.categoryId=='' || this.uploadOptions.categoryId==null){ - this.$message({ message: "请选择分类", type: "warning" }); + this.$message({showClose: true, message: "请选择分类", type: "warning" }); return false; } if(file.size<=1024*2024){//1M - this.$message({ message: '小于2M的文件可直接上传图片库', type: 'success' }); + this.$message({showClose: true, message: '小于2M的文件可直接上传图片库', type: 'success' }); return true; }else{ - this.$message({ message: '为了良好的客户体验，大于2M的文件需经过裁剪压缩处理', type: 'warning' }); + this.$message({showClose: true, message: '为了良好的客户体验，大于2M的文件需经过裁剪压缩处理', type: 'warning' }); return false; } @@ -279,7 +279,7 @@ var that = this; //this.imageUrl = URL.createObjectURL(file.raw); if(file.raw.size<=1024*1024){//1M - //this.$message({ message: '小于1M的文件可直接上传图片库', type: 'success' }); + //this.$message({showClose: true, message: '小于1M的文件可直接上传图片库', type: 'success' }); return true; } return true; @@ -329,7 +329,7 @@ //params.jsessionid=this.jsessionid; this.listLoading = true; if(this.branchId == undefined || this.branchId== ''){ - this.$message({ message: '机构不能为空', type: 'warning' }); + this.$message({showClose: true, message: '机构不能为空', type: 'warning' }); return; } params.branchId = this.branchId; @@ -346,12 +346,12 @@ //在获取图片的时候，对url进行转换 /* this.converUrl(this.images); */ }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { this.listLoading = false; - this.$message({ message: '通讯异常', type: 'error' }); + this.$message({showClose: true, message: '通讯异常', type: 'error' }); }); }, converUrl(url){ @@ -381,11 +381,11 @@ }, handleConfirm(){ if(this.images==null || this.images.length==0){ - this.$message({ message: '请选择图片', type: 'error' }); + this.$message({showClose: true, message: '请选择图片', type: 'error' }); return } if(this.selectImages==null || this.selectImages.length==0){ - this.$message({ message: '请选择图片', type: 'error' }); + this.$message({showClose: true, message: '请选择图片', type: 'error' }); return } if(this.multiple){ @@ -418,7 +418,7 @@ }; if(this.categoryName==''){ - this.$message({ message: '请输入分类名字', type: 'error' }); + this.$message({showClose: true, message: '请输入分类名字', type: 'error' }); return } addImageCategory(params).then(res=>{ @@ -426,7 +426,7 @@ this.showAddCategoryForm=false this.getImageCategorys() }else{ - this.$message({ message: res.data.tips.msg, type: 'error' }); + this.$message({showClose: true, message: res.data.tips.msg, type: 'error' }); } }) }, diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue index e8afa59e..c4cc1b3b 100644 --- a/src/components/LangSelect/index.vue +++ b/src/components/LangSelect/index.vue @@ -21,7 +21,7 @@ export default { handleSetLanguage(lang) { this.$i18n.locale = lang this.$store.dispatch('setLanguage', lang) - this.$message({ + this.$message({showClose: true, message: 'switch language success', type: 'success' }) diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue index 56de914e..82f64d82 100644 --- a/src/components/Screenfull/index.vue +++ b/src/components/Screenfull/index.vue @@ -41,7 +41,7 @@ export default { methods: { click() { if (!screenfull.enabled) { - this.$message({ + this.$message({showClose: true, message: 'you browser can not work', type: 'warning' }) diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue index b366d963..7af0649a 100644 --- a/src/components/ThemePicker/index.vue +++ b/src/components/ThemePicker/index.vue @@ -57,7 +57,7 @@ export default { if (typeof innerText !== 'string') return style.innerText = this.updateStyle(innerText, originalCluster, themeCluster) }) - this.$message({ + this.$message({showClose: true, message: '换肤成功', type: 'success' }) diff --git a/src/components/VueEditor/Index.vue b/src/components/VueEditor/Index.vue index c0b9e6ac..84a49d18 100644 --- a/src/components/VueEditor/Index.vue +++ b/src/components/VueEditor/Index.vue @@ -212,7 +212,7 @@ }, handleUploadError : function(err, file, fileList){ - this.$message({ message: "文件上传失败，请检查文件是否过大，建议图片文件控制在500K内", type: "warning" }); + this.$message({showClose: true, message: "文件上传失败，请检查文件是否过大，建议图片文件控制在500K内", type: "warning" }); }, /**begin 在下面加自定义方法,记得补上面的一个逗号**/ converUrl(url){ @@ -235,7 +235,7 @@ console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); console.log(file) if(file.raw.type.indexOf('image')<0){ - this.$message({ message: "请选择图片文件", type: "warning" }); + this.$message({showClose: true, message: "请选择图片文件", type: "warning" }); return false; } return true; diff --git a/src/components/excel/select-excel.vue b/src/components/excel/select-excel.vue index 05b85fb8..6d4b9c0e 100644 --- a/src/components/excel/select-excel.vue +++ b/src/components/excel/select-excel.vue @@ -93,7 +93,7 @@ export default { this.downloadLoading = false }) } else { - this.$message({ + this.$message({showClose: true, message: 'Please select at least one item', type: 'warning' }) diff --git a/src/components/excel/upload-excel.vue b/src/components/excel/upload-excel.vue index 1772b7fd..90aabc49 100644 --- a/src/components/excel/upload-excel.vue +++ b/src/components/excel/upload-excel.vue @@ -27,7 +27,7 @@ export default { return true } - this.$message({ + this.$message({showClose: true, message: 'Please do not upload files larger than 1m in size.', type: 'warning' }) diff --git a/src/components/selectShopLocation/BranchSelect.vue b/src/components/selectShopLocation/BranchSelect.vue index feeabfe8..3aaa3819 100644 --- a/src/components/selectShopLocation/BranchSelect.vue +++ b/src/components/selectShopLocation/BranchSelect.vue @@ -133,12 +133,12 @@ this.pageInfo.total = res.data.total;this.pageInfo.count=false; this.branchs = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({ message: '通讯错误', type: 'error' }); + //this.$message({showClose: true, message: '通讯错误', type: 'error' }); }); }, //选择行branch diff --git a/src/components/selectShopLocation/DeptTree.vue b/src/components/selectShopLocation/DeptTree.vue index 5d97d87b..0a8b08fd 100644 --- a/src/components/selectShopLocation/DeptTree.vue +++ b/src/components/selectShopLocation/DeptTree.vue @@ -196,7 +196,7 @@ } }else{ - this.$message({ message: tips.msg, type: 'error'}); + this.$message({showClose: true, message: tips.msg, type: 'error'}); } this.listLoading = false; }).catch(() => { diff --git a/src/components/selectShopLocation/selectManyShopLocationBySysDept.vue b/src/components/selectShopLocation/selectManyShopLocationBySysDept.vue index 2617895f..20347ef5 100644 --- a/src/components/selectShopLocation/selectManyShopLocationBySysDept.vue +++ b/src/components/selectShopLocation/selectManyShopLocationBySysDept.vue @@ -85,7 +85,7 @@ this.currentSelectDeptObject.branchId == null || this.currentSelectDeptObject.branchId == "" ) { - this.$message({ + this.$message({showClose: true, message: "请选择机构和部门", type: "error" }); @@ -154,7 +154,7 @@ this.pageInfo.count = false; that.shopLocationTable = res.data.data; } - // this.$message({ + // this.$message({showClose: true, // message: tips.msg, // type: tips.isOk ? "success" : "error" // }); diff --git a/src/components/selectShopLocation/selectShopLocationBySysDept.vue b/src/components/selectShopLocation/selectShopLocationBySysDept.vue index 9c68d98b..f25cd5af 100644 --- a/src/components/selectShopLocation/selectShopLocationBySysDept.vue +++ b/src/components/selectShopLocation/selectShopLocationBySysDept.vue @@ -72,7 +72,7 @@ methods: { selectshopLocationBySysDeptIdMethodLike(){ if(this.currentSelectDeptObject.branchId==null||this.currentSelectDeptObject.branchId==''){ - this.$message({ + this.$message({showClose: true, message: "请选择机构和部门", type: "error" }); @@ -131,7 +131,7 @@ this.pageInfo.count=false; that.shopLocationTable = res.data.data; } - // this.$message({ + // this.$message({showClose: true, // message: tips.msg, // type: tips.isOk ? 'success' : 'error' // }); @@ -148,7 +148,7 @@ }, checkSureMethod(){ if(this.multipleSelection.length<1){ - this.$message({ + this.$message({showClose: true, message: "必须选择某个门店", type: "error" }); diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss index 1af1a2bb..67bd1fa7 100644 --- a/src/styles/mdp.scss +++ b/src/styles/mdp.scss @@ -120,4 +120,18 @@ line-height: 28px; margin-right: 10px; margin-top: 2px; -} \ No newline at end of file +} + +.tips{ + position:absolute; + font-size: 10px; + bottom: 0px; + color: red; + padding-left: 10px; + flex: 0 0 auto; + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; + overflow-x: hidden; +} \ No newline at end of file diff --git a/src/views/example/table/complexTable.vue b/src/views/example/table/complexTable.vue index a5442ce1..4a41978f 100644 --- a/src/views/example/table/complexTable.vue +++ b/src/views/example/table/complexTable.vue @@ -237,7 +237,7 @@ export default { this.getList() }, handleModifyStatus(row, status) { - this.$message({ + this.$message({showClose: true, message: '操作成功', type: 'success' }) diff --git a/src/views/example/table/inlineEditTable.vue b/src/views/example/table/inlineEditTable.vue index 3d2ad00f..99939cf7 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({ + this.$message({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({ + this.$message({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 019c46f9..6b718a57 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch(() => this.load.add=false); }else{ - this.$message({ message: "该公司名已注册，不可以使用", type: 'error' }); + this.$message({showClose: true, message: "该公司名已注册，不可以使用", type: 'error' }); return; } } }) }else{ - this.$message({ message: "公司名必须6个字以上", type: 'error' }); + this.$message({showClose: true, message: "公司名必须6个字以上", type: 'error' }); return; } @@ -219,7 +219,7 @@ }) }else{ this.load.list=false; - this.$message({ message: "最少输入两个字", type: 'info' }); + this.$message({showClose: true, message: "最少输入两个字", type: 'info' }); return; } }, @@ -231,11 +231,11 @@ addUserJoinBranchRequire(params).then(res=>{ var tips = res.data.tips; if(tips.isOk){ - this.$message({ message:tips.msg, type: 'success' }); + this.$message({showClose: true, message:tips.msg, type: 'success' }); //this.$emit('submit',res.data.data );// @submit="afterAddSubmit" return; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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({ message: "该公司名未注册，可以使用", type: 'success' }); + this.$message({showClose: true, message: "该公司名未注册，可以使用", type: 'success' }); return; }else{ - this.$message({ message: "该公司名已注册，不可以使用", type: 'error' }); + this.$message({showClose: true, message: "该公司名已注册，不可以使用", type: 'error' }); return; } } }) }else{ - this.$message({ message: "最少输入两个字", type: 'error' }); + this.$message({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 eb472537..9dcf72c9 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({ message: "文件已经存在", type: "warning" }); + this.$message({showClose: true, message: "文件已经存在", type: "warning" }); return false; } else { if (file.size > 1024 * 1024 * 4) { //4M - this.$message({ + this.$message({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 182adabf..87724c6a 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({ message: tips.msg, type: 'error'}); + this.$message({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 7efdef53..8f000bfb 100644 --- a/src/views/mdp/arc/tag/TagMng.vue +++ b/src/views/mdp/arc/tag/TagMng.vue @@ -283,7 +283,7 @@ } this.convertTags = convert; } else { - this.$message({ + this.$message({showClose: true, message: tips.msg, type: 'error' }); @@ -336,7 +336,7 @@ this.pageInfo.count = true; this.getTags(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -357,7 +357,7 @@ this.pageInfo.count = true; this.getTags(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -379,7 +379,7 @@ addTagMethod(index) { if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) { if (this.isPub == '1') { - this.$message({ + this.$message({showClose: true, message: "不是平台管理员，不允许增加公共标签", type: 'error' }); @@ -389,7 +389,7 @@ if (this.convertTags.some(i => { return i.values.some(tag => tag.tagName == this.convertTags[index].showAddButtonInputValue) })) { - this.$message({ + this.$message({showClose: true, message: "标签已经存在", type: 'error' }); @@ -397,7 +397,7 @@ } if (!this.convertTags[index].pubc) { if (this.isPub == '1') { - this.$message({ + this.$message({showClose: true, message: "该分类不是公共分类，不能添加公共标签", type: 'error' }); @@ -435,7 +435,7 @@ this.convertTags[index].showAddButtonInputValue = ''; this.convertTags[index].values.push(json); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -445,7 +445,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({ + this.$message({showClose: true, message: "公共标签不允许删除", type: 'error' }); @@ -475,7 +475,7 @@ this.convertTags[index].values.splice(valueIndex, 1); /*this.getTags();*/ } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -493,7 +493,7 @@ let that = this; if (!(this.userInfo.isPlatformAdmin || this.userInfo.isSuperAdmin)) { if (this.isPub == '1') { - this.$message({ + this.$message({showClose: true, message: "你不是平台管理员不能添加公共标签分类", type: 'error' }); @@ -502,7 +502,7 @@ } if (this.convertTags.some(i => i.categoryName == this.needAddTagCategoryNameInputValue)) { - this.$message({ + this.$message({showClose: true, message: "标签分类已经存在", type: 'error' }); @@ -533,7 +533,7 @@ } this.convertTags.push(json); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -568,7 +568,7 @@ } if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) { if (this.convertTags.some(i => i.pubc == '1' && i.categoryId == categoryId)) { - this.$message({ + this.$message({showClose: true, message: "公共分类不允许删除", type: 'error' }); @@ -588,7 +588,7 @@ this.convertTags.splice(index, 1); /*this.getTags();*/ } - this.$message({ + this.$message({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 b2914e11..7160bdd6 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({ message: item.fieldTitle+'不能为空', type: 'error' }); + this.$message({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({ message: item.fieldTitle+'不能为空', type: 'error' }); + this.$message({showClose: true, message: item.fieldTitle+'不能为空', type: 'error' }); checkOk=false; return; } @@ -422,7 +422,7 @@ } this.$emit('submit',params);// @submit="afterAddSubmit" - //this.$message({ message: "检查通过2", type: 'success' }); + //this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 c0c49ec2..35721c14 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 c424dd52..988355be 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 2ffa58e5..e1894cd4 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({ message: '请先选择表单', type: 'info' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); return; } @@ -484,7 +484,7 @@ this.pageInfo.count = false; this.formDatas = res.data.data }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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({ message: '数据审核中，不允许删除', type: 'error' }); + this.$message({showClose: true, message: '数据审核中，不允许删除', type: 'error' }); return; } if(row.flowState=='2'){ - this.$message({ message: '数据已审核通过，不允许删除', type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); return; } this.$confirm('确认删除该记录吗?', '提示', { @@ -547,7 +547,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -569,7 +569,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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 9c11f58f..56adda79 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({ message: '请补充智能表单数据', type: 'info' }); + this.$message({showClose: true, message: '请补充智能表单数据', type: 'info' }); return; } }); return; }else{ if(formDatas.length<=0){ - this.$message({ message: '请先选择要加入审批流的智能表单数据', type: 'info' }); + this.$message({showClose: true, message: '请先选择要加入审批流的智能表单数据', type: 'info' }); }else{ formDatas.forEach(i=>{ i.flowAction="join" @@ -358,7 +358,7 @@ this.editForm=this.procFormDatas[0]; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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({ message: '没有关联智能表单，无法查询表单数据', type: 'info' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); return; } //params.flowState="0" @@ -534,7 +534,7 @@ }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); return; } this.editFormVisible = true; @@ -560,7 +560,7 @@ }, startProc: function() { if(this.sels.length<1){ - this.$message({ message: "请至少选择一条数据发审", type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); return; } if(this.procFormDatas.some(i=>i.id==row.id)){ - this.$message({ message: '该数据已在审核单中', type: 'info'}); + this.$message({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({ message: '添加成功', type: 'info'}); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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({ message: '移除成功', type: 'info'}); + this.$message({showClose: true, message: '移除成功', type: 'info'}); }); }else{ - this.$message({ message: '没有该条数据', type: 'error'}); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); return; } this.$confirm('确认删除该记录吗?', '提示', { @@ -648,7 +648,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -670,7 +670,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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 b7fbd1e1..38d56d61 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({ message: tips.msg, type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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 50e2336b..c954ee25 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({ message: '请补充智能表单数据', type: 'info' }); + this.$message({showClose: true, message: '请补充智能表单数据', type: 'info' }); return; } }); return; }else{ if(formDatas.length<=0){ - this.$message({ message: '请先选择要加入审批流的智能表单数据', type: 'info' }); + this.$message({showClose: true, message: '请先选择要加入审批流的智能表单数据', type: 'info' }); }else{ formDatas.forEach(i=>{ i.flowAction="join" @@ -358,7 +358,7 @@ this.editForm=this.procFormDatas[0]; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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({ message: '没有关联智能表单，无法查询表单数据', type: 'info' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); return; } //params.flowState="0" @@ -534,7 +534,7 @@ }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); return; } this.editFormVisible = true; @@ -560,7 +560,7 @@ }, startProc: function() { if(this.sels.length<1){ - this.$message({ message: "请至少选择一条数据发审", type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); return; } if(this.procFormDatas.some(i=>i.id==row.id)){ - this.$message({ message: '该数据已在审核单中', type: 'info'}); + this.$message({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({ message: '添加成功', type: 'info'}); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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({ message: '移除成功', type: 'info'}); + this.$message({showClose: true, message: '移除成功', type: 'info'}); }); }else{ - this.$message({ message: '没有该条数据', type: 'error'}); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); return; } this.$confirm('确认删除该记录吗?', '提示', { @@ -648,7 +648,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -670,7 +670,7 @@ this.pageInfo.total=0; this.getFormDatas(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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 f441af84..77de99ce 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({ message: tips.msg, type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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 1be3497a..1e187118 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({ message: '表单名称不能为空', type: 'error' }); + this.$message({showClose: true, message: '表单名称不能为空', type: 'error' }); return; } if(this.addForm.categoryId==null || this.addForm.categoryId=='' ){ - this.$message({ message: '归属分类不能为空', type: 'error' }); + this.$message({showClose: true, message: '归属分类不能为空', type: 'error' }); return; } this.$confirm('确认提交吗？', '提示', {}).then(() => { @@ -97,7 +97,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 fe921aed..1f18b550 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({ message: '表单名称不能为空', type: 'error' }); + this.$message({showClose: true, message: '表单名称不能为空', type: 'error' }); return; } if(this.editForm.formName==''){ - this.$message({ message: '表单名称不能为空', type: 'error' }); + this.$message({showClose: true, message: '表单名称不能为空', type: 'error' }); return; } if(this.editForm.categoryId==null || this.editForm.categoryId=='' ){ - this.$message({ message: '归属分类不能为空', type: 'error' }); + this.$message({showClose: true, message: '归属分类不能为空', type: 'error' }); return; } this.$confirm('确认提交吗？', '提示', {}).then(() => { @@ -100,7 +100,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: '表单名称不能为空', type: 'error' }); + this.$message({showClose: true, message: '表单名称不能为空', type: 'error' }); return; } if(this.editForm.formName==''){ - this.$message({ message: '表单名称不能为空', type: 'error' }); + this.$message({showClose: true, message: '表单名称不能为空', type: 'error' }); return; } if(this.editForm.categoryId==null || this.editForm.categoryId=='' ){ - this.$message({ message: '归属分类不能为空', type: 'error' }); + this.$message({showClose: true, message: '归属分类不能为空', type: 'error' }); return; } if(this.fields.length==0 ){ - this.$message({ message: '最少需要定义一个字段', type: 'error' }); + this.$message({showClose: true, message: '最少需要定义一个字段', type: 'error' }); return; } if(this.fields.length>15){ - this.$message({ message: '最多支持15个字段', type: 'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 ef7620b8..18da95b5 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({ message: tips.msg, type: 'error' }); + this.$message({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 3abdcd8e..f400833a 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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -302,7 +302,7 @@ this.pageInfo.total=0; this.getFormDefs(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -323,7 +323,7 @@ this.pageInfo.total=0; this.getFormDefs(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 ed9df227..e9038450 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({ message: tips.msg, type: 'error' }); + this.$message({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 bbd14bb1..9b4f9fc5 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); } @@ -236,7 +236,7 @@ } }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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 b1735165..4e366b7d 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 50533fe8..1c6c2c61 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 24f11666..54f5966e 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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -203,7 +203,7 @@ this.pageInfo.total=0; this.getFormViews(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -225,7 +225,7 @@ this.pageInfo.total=0; this.getFormViews(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 fb6c106d..99778ff3 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 6a5e2dee..9fb38be4 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 4b3fea30..22deeb77 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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({ message: '通讯错误', type: 'error' }); + //this.$message({showClose: true, message: '通讯错误', type: 'error' }); }); }, @@ -192,7 +192,7 @@ this.pageInfo.count=true; this.getCategorys(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 8985dca0..0f229faf 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 94d381dc..04f6d201 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 a9dc02bf..7b1c4ef6 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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({ message: '通讯错误', type: 'error' }); + //this.$message({showClose: true, message: '通讯错误', type: 'error' }); }); }, @@ -203,7 +203,7 @@ this.pageInfo.count=true; this.getItems(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 14445b31..d787b76e 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 255f75b0..09b28719 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 fb660835..7fc4c421 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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({ message: '通讯错误', type: 'error' }); + //this.$message({showClose: true, message: '通讯错误', type: 'error' }); }); }, @@ -204,7 +204,7 @@ this.pageInfo.count=true; this.getItemOptions(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 e6b0c41b..19b0bdba 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 5b4813a6..79c75b75 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 be030204..ce588330 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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({ message: '通讯错误', type: 'error' }); + //this.$message({showClose: true, message: '通讯错误', type: 'error' }); }); }, @@ -199,7 +199,7 @@ this.pageInfo.count=true; this.getItemOptions(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 51e88267..bfa94cb5 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({ + this.$message({showClose: true, message: "请选择某个模板", type: 'error' }); return; } if (!this.smsSignsSelectValue) { - this.$message({ + this.$message({showClose: true, message: "请选择某个签名", type: 'error' }); return; } if (!this.mobilesStr) { - this.$message({ + this.$message({showClose: true, message: "发送对象不能为空", type: 'error' }); @@ -223,7 +223,7 @@ var mobileArr = this.mobilesStr.split(","); if (mobileArr.length > 10) { - this.$message({ + this.$message({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({ + this.$message({showClose: true, message: mobileArr[i] + "手机号码不对", type: 'error' }); return; } if (this.mobilesStr.lastIndexOf(mobileArr[i]) != this.mobilesStr.indexOf(mobileArr[i])) { - this.$message({ + this.$message({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({ + this.$message({showClose: true, message: "输入的短信模板参数与短信模板的变量的数目不一致", type: 'error' }); return; } if (this.userNeedReplySmsRadio === '1' && !this.replyEndDay) { - this.$message({ + this.$message({showClose: true, message: "如果勾选需要用户回复，必须填写天数", type: 'error' }); return; } if (this.userNeedReplySmsRadio === '1' && !/^\d+$/.test(this.replyEndDay)) { - this.$message({ + this.$message({showClose: true, message: "天数必须是正整数", type: 'error' }); @@ -301,7 +301,7 @@ this.sendResultVisible = true; that.sendResult = res.data.data; }; - this.$message({ + this.$message({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({ + this.$message({showClose: true, message: tips.msg, type: 'error' }); @@ -346,7 +346,7 @@ if (tips.isOk) { this.smsSignsOptions = res.data.data; } else { - this.$message({ + this.$message({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 a0fb7fc8..bdbd4247 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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch(() => { this.load.list = false; - //this.$message({ message: '通讯错误', type: 'error' }); + //this.$message({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 02f83bff..101bd336 100644 --- a/src/views/mdp/sys/dept/DeptTree.vue +++ b/src/views/mdp/sys/dept/DeptTree.vue @@ -239,7 +239,7 @@ } }else{ - this.$message({ message: tips.msg, type: 'error'}); + this.$message({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 911ed68b..0c2e547b 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({ message: tips.msg, type: 'error' }); + this.$message({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({ message:'请选择角色', type: 'error'}); + this.$message({showClose: true, message:'请选择角色', type: 'error'}); return; } this.load.add=true; diff --git a/src/views/mdp/sys/user/UsersSelect.vue b/src/views/mdp/sys/user/UsersSelect.vue index 57d33913..6be8a2f4 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({ message: "必须先选择一个部门", type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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({ message: '通讯错误', type: 'error' }); + //this.$message({showClose: true, message: '通讯错误', type: 'error' }); }); }, @@ -270,12 +270,12 @@ }, confirmUsers: function(){ if(this.sels.length<1){ - this.$message({ message: "请选择一个用户", type: 'error' }); + this.$message({showClose: true, message: "请选择一个用户", type: 'error' }); return; } if(this.isSingleUser==true){ if(this.sels.length!=1){ - this.$message({ message: "最多只能选择一个用户", type: 'error' }); + this.$message({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 069113e8..63fd6bd7 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 8351264e..de8938b0 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 bd5e008d..36393b38 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 906388e2..6bfeca58 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({ message: tips.msg, type: 'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 d2b2bce2..dc79b89e 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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -223,7 +223,7 @@ this.pageInfo.count=true this.getModels(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -246,7 +246,7 @@ this.pageInfo.count=true this.getModels(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } }); @@ -284,7 +284,7 @@ if(tips.isOk){ this.getModels(); }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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 b2e173f1..33b82d0c 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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 de4e08ab..74fd920f 100644 --- a/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue +++ b/src/views/mdp/workflow/hi/procinst/ProcinstMng.vue @@ -487,7 +487,7 @@ this.pageInfo.count = false; this.procinsts = res.data.data; } else { - this.$message({ + this.$message({showClose: true, message: tips.msg, type: "error" }); @@ -541,7 +541,7 @@ this.pageInfo.count = true; this.getProcinsts(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); @@ -566,7 +566,7 @@ this.pageInfo.total = 0; this.getProcinsts(); } - this.$message({ + this.$message({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 871af792..e3d54bc0 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({ message: tips.msg, type: "error" }); + this.$message({showClose: true, message: tips.msg, type: "error" }); } this.listLoading = false; }) @@ -272,7 +272,7 @@ export default { this.pageInfo.total = 0; this.getDeployments(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); @@ -297,7 +297,7 @@ export default { this.pageInfo.total = 0; this.getDeployments(); } - this.$message({ + this.$message({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 486c3fe0..4a66be53 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({ message: tips.msg, type: "error" }); + this.$message({showClose: true, message: tips.msg, type: "error" }); } this.listLoading = false; }) @@ -419,7 +419,7 @@ export default { this.pageInfo.total = 0; this.getProcdefs(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); @@ -444,7 +444,7 @@ export default { this.pageInfo.total = 0; this.getProcdefs(); } - this.$message({ + this.$message({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 cfb6bbee..0820cef1 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue @@ -271,7 +271,7 @@ } this.procdefs = res.data.data; } else { - this.$message({ + this.$message({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 d410ac12..6198f610 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({ + this.$message({showClose: true, message: tips.msg, type: "error" }); @@ -436,7 +436,7 @@ this.pageInfo.count = true; this.getProcdefs(); } - this.$message({ + this.$message({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 0f1ecab8..4c0c3260 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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -314,7 +314,7 @@ this.pageInfo.count=true this.getProcdefs(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -337,7 +337,7 @@ this.pageInfo.count=true this.getProcdefs(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 86c8c019..efc49704 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({ message: tips.msg, type: "error" }); + this.$message({showClose: true, message: tips.msg, type: "error" }); } this.listLoading = false; }) @@ -405,7 +405,7 @@ export default { this.pageInfo.count = true; this.getProcdefs(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); @@ -431,7 +431,7 @@ export default { this.pageInfo.count = true; this.getProcdefs(); } - this.$message({ + this.$message({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 ef943583..6da99275 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { this.listLoading = false; - this.$message({ message: '访问错误', type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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 8b242b71..1f237fb2 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({ message: tips.msg, type: 'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 757a0acb..b0ac8442 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({ + this.$message({showClose: true, message: tips.msg, type: 'error' }); @@ -664,7 +664,7 @@ this.pageInfo.total = 0; this.getExecutions(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -703,7 +703,7 @@ this.pageInfo.total = 0; this.getExecutions(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -730,7 +730,7 @@ this.pageInfo.total = 0; this.getExecutions(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -847,12 +847,12 @@ showSendSms: function() { if (this.sels.length > 1) { - this.$message({ + this.$message({showClose: true, message: '一次只能给一个人发短信', type: 'error' }); } else if (this.sels.length < 1) { - this.$message({ + this.$message({showClose: true, message: '请选择一条任务', type: 'error' }); @@ -868,14 +868,14 @@ }, showWeixinTask: function() { if (this.sels.length > 1) { - this.$message({ + this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' }); this.weixinContentVisible = false; return false; } else if (this.sels.length < 1) { - this.$message({ + this.$message({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({ + this.$message({showClose: true, message: '已拷贝内容，您可黏贴到微信中', type: 'success' }); @@ -908,14 +908,14 @@ }, showWeixin: function() { if (this.sels.length > 1) { - this.$message({ + this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' }); this.weixinContentVisible = false; return false; } else if (this.sels.length < 1) { - this.$message({ + this.$message({showClose: true, message: '请选择一条任务', type: 'error' }); @@ -945,13 +945,13 @@ }, showOaMsg: function() { if (this.sels.length > 1) { - this.$message({ + this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' }); return false; } else if (this.sels.length < 1) { - this.$message({ + this.$message({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 8475bcf9..a9239489 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({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.listLoading = false; }).catch(() => { @@ -318,7 +318,7 @@ this.pageInfo.total=0; this.getTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -352,7 +352,7 @@ this.pageInfo.total=0; this.getExecutions(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -374,7 +374,7 @@ this.pageInfo.total=0; this.getExecutions(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }); }).catch(() => { @@ -454,9 +454,9 @@ showSendSms:function(){ if(this.sels.length>1){ - this.$message({ message: '一次只能给一个人发短信', type: 'error' }); + this.$message({showClose: true, message: '一次只能给一个人发短信', type: 'error' }); }else if(this.sels.length<1){ - this.$message({ message: '请选择一条任务', type: 'error' }); + this.$message({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({ message: '一次只能给一个人发信', type: 'error' }); + this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' }); this.weixinContentVisible=false; return false; }else if(this.sels.length<1){ - this.$message({ message: '请选择一条任务', type: 'error' }); + this.$message({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({ message: '已拷贝内容，您可黏贴到微信中', type: 'success' }); + this.$message({showClose: true, message: '已拷贝内容，您可黏贴到微信中', type: 'success' }); }); } }); @@ -493,11 +493,11 @@ }, showWeixin:function(){ if(this.sels.length>1){ - this.$message({ message: '一次只能给一个人发信', type: 'error' }); + this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' }); this.weixinContentVisible=false; return false; }else if(this.sels.length<1){ - this.$message({ message: '请选择一条任务', type: 'error' }); + this.$message({showClose: true, message: '请选择一条任务', type: 'error' }); this.weixinContentVisible=false; return false; }else{ @@ -519,10 +519,10 @@ }, showOaMsg:function(){ if(this.sels.length>1){ - this.$message({ message: '一次只能给一个人发信', type: 'error' }); + this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' }); return false; }else if(this.sels.length<1){ - this.$message({ message: '请选择一条任务', type: 'error' }); + this.$message({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 fa27d707..9b6c391b 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({ message: tips.msg, type: 'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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 45eb9a8f..e2dfe58f 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({ message: "办理意见不能为空", type:'error' }); + this.$message({showClose: true, message: "办理意见不能为空", type:'error' }); return; } this.addLoading = true; @@ -688,11 +688,11 @@ this.refreshCommentList=true this.addLoading=false; this.addForm.commentMsg="" - this.$message({ message:'保存办理意见成功', type:'success' }); + this.$message({showClose: true, message:'保存办理意见成功', type:'success' }); }else{ this.refreshCommentList=false this.addLoading=false; - this.$message({ message: res.data.tips.msg, type:'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: 'error' }); + this.$message({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({ message: '无法打开打印窗口，请检查是否浏览器阻止弹出框', type: 'error' }); + this.$message({showClose: true, message: '无法打开打印窗口，请检查是否浏览器阻止弹出框', type: 'error' }); }else{ this.$nextTick(() => { @@ -1057,7 +1057,7 @@ this.nodeInfos=res.data.data; this.nodeInfoVisible=false; } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 8edf1264..a177a65e 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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); } }).catch(() => { @@ -640,7 +640,7 @@ this.nodeInfoVisible=true } }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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 4a1dc23a..35943645 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({ + this.$message({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({ + this.$message({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({ + this.$message({showClose: true, message: "请先选择部门", type: "error" }); @@ -650,12 +650,12 @@ }, showSendSms: function() { if (this.sels.length > 1) { - this.$message({ + this.$message({showClose: true, message: "一次只能给一个人发短信", type: "error" }); } else if (this.sels.length < 1) { - this.$message({ + this.$message({showClose: true, message: "请选择一条任务", type: "error" }); @@ -675,14 +675,14 @@ }, showWeixin: function() { if (this.sels.length > 1) { - this.$message({ + this.$message({showClose: true, message: "一次只能给一个人发信", type: "error" }); this.weixinContentVisible = false; return false; } else if (this.sels.length < 1) { - this.$message({ + this.$message({showClose: true, message: "请选择一条任务", type: "error" }); @@ -722,13 +722,13 @@ }, showOaMsg: function() { if (this.sels.length > 1) { - this.$message({ + this.$message({showClose: true, message: "一次只能给一个人发信", type: "error" }); return false; } else if (this.sels.length < 1) { - this.$message({ + this.$message({showClose: true, message: "请选择一条任务", type: "error" }); @@ -849,7 +849,7 @@ }); this.tasks = taskList; } else { - this.$message({ + this.$message({showClose: true, message: tips.msg, type: "error" }); @@ -877,7 +877,7 @@ }); this.tasks = taskList; } else { - this.$message({ + this.$message({showClose: true, message: tips.msg, type: "error" }); @@ -904,7 +904,7 @@ }); this.tasks = taskList; } else { - this.$message({ + this.$message({showClose: true, message: tips.msg, type: "error" }); @@ -932,7 +932,7 @@ }); this.tasks = taskList; } else { - this.$message({ + this.$message({showClose: true, message: tips.msg, type: "error" }); @@ -959,7 +959,7 @@ }); this.tasks = taskList; } else { - this.$message({ + this.$message({showClose: true, message: tips.msg, type: "error" }); @@ -986,7 +986,7 @@ }); this.tasks = taskList; } else { - this.$message({ + this.$message({showClose: true, message: tips.msg, type: "error" }); @@ -1049,7 +1049,7 @@ this.pageInfo.total = 0; this.getTasks(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); @@ -1074,7 +1074,7 @@ this.pageInfo.total = 0; this.getTasks(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error" }); diff --git a/src/views/xm/core/skill/skillMng.vue b/src/views/xm/core/skill/skillMng.vue index 9f9501ff..f706efed 100644 --- a/src/views/xm/core/skill/skillMng.vue +++ b/src/views/xm/core/skill/skillMng.vue @@ -196,7 +196,7 @@ export default { this.convertSkills = convert; this.setSkillsToLocal(); } else { - this.$message({ + this.$message({showClose: true, message: tips.msg, type: "error", }); @@ -214,7 +214,7 @@ export default { (i) => i.categoryName == this.needAddTagCategoryNameInputValue ) ) { - this.$message({ + this.$message({showClose: true, message: "技能分类已经存在", type: "error", }); @@ -247,7 +247,7 @@ export default { this.convertSkills.push(json); this.setSkillsToLocal(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", }); @@ -285,7 +285,7 @@ export default { this.setSkillsToLocal(); /*this.getTags();*/ } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", }); @@ -310,7 +310,7 @@ export default { ); }) ) { - this.$message({ + this.$message({showClose: true, message: "技能已经存在", type: "error", }); @@ -318,7 +318,7 @@ export default { } if (!this.convertSkills[index].pubc) { if (this.isPub == "1") { - this.$message({ + this.$message({showClose: true, message: "该分类不是公共分类，不能添加公共技能", type: "error", }); @@ -358,7 +358,7 @@ export default { this.convertSkills[index].values.push(json); this.setSkillsToLocal(); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? "success" : "error", }); @@ -393,7 +393,7 @@ export default { this.setSkillsToLocal(); /*this.getTags();*/ } - this.$message({ + this.$message({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 ed8a455c..874cc2d0 100644 --- a/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue +++ b/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue @@ -98,7 +98,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 a5443a30..f1457cae 100644 --- a/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue +++ b/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue @@ -96,7 +96,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 9586f837..119770ba 100644 --- a/src/views/xm/core/xmAttachment/XmAttachmentMng.vue +++ b/src/views/xm/core/xmAttachment/XmAttachmentMng.vue @@ -144,7 +144,7 @@ this.pageInfo.count=false; this.xmAttachments = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -186,7 +186,7 @@ this.pageInfo.count=true; this.getXmAttachments(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -204,7 +204,7 @@ this.pageInfo.count=true; this.getXmAttachments(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 5f09cbc9..b932caf9 100644 --- a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue +++ b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue @@ -233,7 +233,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue index 405a9149..3c93c69c 100644 --- a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue +++ b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue @@ -231,7 +231,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue index 04815e5c..90da6432 100644 --- a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue +++ b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue @@ -194,7 +194,7 @@ this.pageInfo.count=false; this.xmBranchStates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -236,7 +236,7 @@ this.pageInfo.count=true; this.getXmBranchStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -254,7 +254,7 @@ this.pageInfo.count=true; this.getXmBranchStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -269,7 +269,7 @@ if(tips.isOk){ this.getXmBranchStates() } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ) }, diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue index 629f518e..c496eee6 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue @@ -137,7 +137,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 c9911e4a..37d65e12 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue @@ -135,7 +135,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 fb915fbc..2dff53b5 100644 --- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue +++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue @@ -159,7 +159,7 @@ this.pageInfo.count=false; this.xmBranchTaskTypeStates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -201,7 +201,7 @@ this.pageInfo.count=true; this.getXmBranchTaskTypeStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -219,7 +219,7 @@ this.pageInfo.count=true; this.getXmBranchTaskTypeStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 86628ff7..c467b0a1 100644 --- a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue +++ b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue @@ -181,7 +181,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 e06eba62..50aa0f38 100644 --- a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue +++ b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue @@ -134,7 +134,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 929c0e3d..c5e1f21d 100644 --- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue +++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue @@ -175,7 +175,7 @@ this.pageInfo.count=false; this.xmEnvLists = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -218,7 +218,7 @@ this.pageInfo.count=true; this.getXmEnvLists(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -236,7 +236,7 @@ this.pageInfo.count=true; this.getXmEnvLists(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 54473902..487fbbcb 100644 --- a/src/views/xm/core/xmExchange/XmExchangeAdd.vue +++ b/src/views/xm/core/xmExchange/XmExchangeAdd.vue @@ -146,7 +146,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 7524d7ef..06a5ee66 100644 --- a/src/views/xm/core/xmExchange/XmExchangeEdit.vue +++ b/src/views/xm/core/xmExchange/XmExchangeEdit.vue @@ -144,7 +144,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 5b8c967b..59526e72 100644 --- a/src/views/xm/core/xmExchange/XmExchangeMng.vue +++ b/src/views/xm/core/xmExchange/XmExchangeMng.vue @@ -154,7 +154,7 @@ this.pageInfo.count=false; this.xmExchanges = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -196,7 +196,7 @@ this.pageInfo.count=true; this.getXmExchanges(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -214,7 +214,7 @@ this.pageInfo.count=true; this.getXmExchanges(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -247,7 +247,7 @@ if(tips.isOk){ this.xmExchanges.push(params); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 ba969281..4f9bcf2b 100644 --- a/src/views/xm/core/xmFile/XmFileAdd.vue +++ b/src/views/xm/core/xmFile/XmFileAdd.vue @@ -96,7 +96,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 ee2863f3..f26fbcbf 100644 --- a/src/views/xm/core/xmFile/XmFileEdit.vue +++ b/src/views/xm/core/xmFile/XmFileEdit.vue @@ -96,7 +96,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 ec77dae0..341a1ff2 100644 --- a/src/views/xm/core/xmFile/XmFileMng.vue +++ b/src/views/xm/core/xmFile/XmFileMng.vue @@ -185,7 +185,7 @@ this.pageInfo.count=false; this.selProject.file = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -230,7 +230,7 @@ this.pageInfo.count=true; this.getXmFiles(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -247,7 +247,7 @@ this.pageInfo.count=true; this.getXmFiles(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue index b332a1ff..e9e236af 100644 --- a/src/views/xm/core/xmIteration/XmIterationAdd.vue +++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue @@ -114,7 +114,7 @@ //新增提交XmIteration 迭代定义 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({ message: "只有迭代管理员可以修改迭代", type: 'error' }); + this.$message({showClose: true, message: "只有迭代管理员可以修改迭代", type: 'error' }); return ; } this.$refs.addForm.validate((valid) => { @@ -130,7 +130,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue index ee669996..7a75da39 100644 --- a/src/views/xm/core/xmIteration/XmIterationEdit.vue +++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue @@ -93,7 +93,7 @@ //新增提交XmIteration 迭代定义 父组件监听@submit="afterAddSubmit" editSubmit: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({ message: "只有迭代管理员可以修改迭代", type: 'error' }); + this.$message({showClose: true, message: "只有迭代管理员可以修改迭代", type: 'error' }); return ; } this.$refs.editForm.validate((valid) => { @@ -109,7 +109,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 a15c9516..55658c27 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -257,7 +257,7 @@ count:this.pageInfo.count }; if(!this.dateRangerOnline || this.dateRangerOnline.length==0){ - this.$message({ message: "上线日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "上线日期范围不能为空", type: 'error' }); return; } if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){ @@ -280,7 +280,7 @@ params.queryScope=this.filters.queryScope if(this.filters.queryScope=='iterationId'){ if(!this.filters.id){ - this.$message({ message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' }); + this.$message({showClose: true, message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' }); return; } params.id=this.filters.id @@ -303,7 +303,7 @@ this.pageInfo.count=false; this.xmIterations = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -317,7 +317,7 @@ //显示新增界面 XmIteration 迭代定义 showAdd: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({ message: "只有迭代管理员可以新增迭代", type: 'error' }); + this.$message({showClose: true, message: "只有迭代管理员可以新增迭代", type: 'error' }); return ; } this.parentIteration=null @@ -344,7 +344,7 @@ //删除xmIteration handleDel: function (row,index) { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({ message: "只有迭代管理员可以删除迭代", type: 'error' }); + this.$message({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' }); return ; } this.$confirm('确认删除该记录吗?', '提示', { @@ -359,14 +359,14 @@ this.pageInfo.count=true; this.getXmIterations(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmIteration batchDel: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({ message: "只有迭代管理员可以删除迭代", type: 'error' }); + this.$message({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' }); return ; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -380,7 +380,7 @@ this.pageInfo.count=true; this.getXmIterations(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -453,7 +453,7 @@ if(tips.isOk){ this.getXmIterations(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, showIterationState(row){ diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue index c062b842..0f942639 100644 --- a/src/views/xm/core/xmIteration/XmIterationSelect.vue +++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue @@ -199,7 +199,7 @@ count:this.pageInfo.count }; if(!this.dateRangerOnline || this.dateRangerOnline.length==0){ - this.$message({ message: "上线日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "上线日期范围不能为空", type: 'error' }); return; } if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){ @@ -222,7 +222,7 @@ params.queryScope=this.filters.queryScope if(this.filters.queryScope=='iterationId'){ if(!this.filters.id){ - this.$message({ message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' }); + this.$message({showClose: true, message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' }); return; } params.id=this.filters.id @@ -243,7 +243,7 @@ this.pageInfo.count=false; this.xmIterations = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -340,7 +340,7 @@ if(tips.isOk){ this.getXmIterations(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, },//end methods diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue index 4966c544..3935b197 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue @@ -82,7 +82,7 @@ //新增提交XmIterationMenu 迭代定义 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({ message: "只有迭代管理员可以操作", type: 'error' }); + this.$message({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); return ; } this.$refs.addForm.validate((valid) => { @@ -98,7 +98,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 536dd701..e1fa41a3 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue @@ -82,7 +82,7 @@ //编辑提交XmIterationMenu 迭代定义父组件监听@submit="afterEditSubmit" editSubmit: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({ message: "只有迭代管理员可以操作", type: 'error' }); + this.$message({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); return ; } this.$refs.editForm.validate((valid) => { @@ -97,7 +97,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 e5a2f54c..0d59d338 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue @@ -153,7 +153,7 @@ if(this.iteration){ params.iterationId=this.iteration.id }else{ - this.$message({ message: "请先在左边选择迭代", type: 'success' }); + this.$message({showClose: true, message: "请先在左边选择迭代", type: 'success' }); return; } this.load.list = true; @@ -164,7 +164,7 @@ this.pageInfo.count=false; this.xmIterationMenus = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -178,7 +178,7 @@ //显示新增界面 XmIterationMenu 迭代定义 showAdd: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({ message: "只有迭代管理员可以操作", type: 'error' }); + this.$message({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); return ; } this.menuVisible = true; @@ -199,7 +199,7 @@ //删除xmIterationMenu handleDel: function (row,index) { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({ message: "只有迭代管理员可以操作", type: 'error' }); + this.$message({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); return ; } this.$confirm('确认删除该记录吗?', '提示', { @@ -214,14 +214,14 @@ this.pageInfo.count=true; this.getXmIterationMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmIterationMenu batchDel: function () { if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ - this.$message({ message: "只有迭代管理员可以操作", type: 'error' }); + this.$message({showClose: true, message: "只有迭代管理员可以操作", type: 'error' }); return ; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -235,7 +235,7 @@ this.pageInfo.count=true; this.getXmIterationMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -307,7 +307,7 @@ if(tips.isOk){ this.getXmIterationMenus() } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 5f93c212..6746271e 100644 --- a/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue +++ b/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue @@ -140,7 +140,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue b/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue index 87b56eeb..9ce8a69b 100644 --- a/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue +++ b/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue @@ -138,7 +138,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue index a199134a..7e5ea468 100644 --- a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue +++ b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue @@ -162,7 +162,7 @@ this.pageInfo.count=false; this.xmIterationStates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -204,7 +204,7 @@ this.pageInfo.count=true; this.getXmIterationStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -222,7 +222,7 @@ this.pageInfo.count=true; this.getXmIterationStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue index a199134a..7e5ea468 100644 --- a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue +++ b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue @@ -162,7 +162,7 @@ this.pageInfo.count=false; this.xmIterationStates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -204,7 +204,7 @@ this.pageInfo.count=true; this.getXmIterationStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -222,7 +222,7 @@ this.pageInfo.count=true; this.getXmIterationStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 ef13bb7e..737e01de 100644 --- a/src/views/xm/core/xmMenu/XmMenuAdd.vue +++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue @@ -122,7 +122,7 @@ //新增提交XmMenu 项目故事表 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.parentMenu==null && this.product ==null ){ - this.$message({ message: '请选择产品/或者上级故事进行新增', type:'error' }); + this.$message({showClose: true, message: '请选择产品/或者上级故事进行新增', type:'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -138,7 +138,7 @@ params.productId=this.product.id } if(params.productId==null|| params.productId==''){ - this.$message({ message: '产品编号不能为空', type:'error' }); + this.$message({showClose: true, message: '产品编号不能为空', type:'error' }); return; } addXmMenu(params).then((res) => { @@ -147,7 +147,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index 5261c81f..3b74acb1 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -106,7 +106,7 @@ editSubmit: function () { if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } this.$refs.editForm.validate((valid) => { @@ -121,7 +121,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index f39a7a2b..fb25ac0e 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -366,7 +366,7 @@ if( this.filters.product!==null && this.filters.product.id!=''){ params.productId=this.filters.product.id }else { - this.$message({ message: "请先选择产品", type: 'success' }); + this.$message({showClose: true, message: "请先选择产品", type: 'success' }); return; //params.xxx=xxxxx } @@ -379,7 +379,7 @@ } if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' }); return; } if(this.filters.mmUser){ @@ -407,7 +407,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; } @@ -423,11 +423,11 @@ //显示新增界面 XmMenu xm_project_menu showAdd: function () { if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } if(this.filters.product==null){ - this.$message({ message: "请先选择产品", type: 'error' }); + this.$message({showClose: true, message: "请先选择产品", type: 'error' }); return; } this.parentMenu=null; @@ -436,7 +436,7 @@ }, showSubAdd:function(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } this.editForm=row @@ -468,7 +468,7 @@ //删除xmMenu handleDel: function (row,index) { if(row.mmUserid!=this.userInfo.userid){ - this.$message({ message: "只能操作你负责的故事", type: 'error'}); + this.$message({showClose: true, message: "只能操作你负责的故事", type: 'error'}); return false; } this.$confirm('确认删除该记录吗?', '提示', { @@ -483,7 +483,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -491,7 +491,7 @@ batchDel: function () { var mmSels=this.sels.filter(i=>i.mmUserid!=this.userInfo.userid) if(mmSels.length>0){ - this.$message({ message: "只能操作你负责的故事", type: 'error'}); + this.$message({showClose: true, message: "只能操作你负责的故事", type: 'error'}); return false; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -505,7 +505,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -601,7 +601,7 @@ showImportFromMenuTemplate(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } if(!this.filters.product){ @@ -672,14 +672,14 @@ if(tips.isOk){ this.getXmMenus() }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } }).catch( err => this.load.add=false ); }, toBatchEdit(){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } this.batchEditVisible=true; @@ -693,7 +693,7 @@ showTaskList(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } this.editForm=row @@ -721,7 +721,7 @@ if(tips.isOk){ this.getXmMenus() } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, showMenuExchange:function(row){ @@ -759,7 +759,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, selectUser(row){ diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue index 9e6e338e..1f30c0fe 100644 --- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue +++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue @@ -353,7 +353,7 @@ if( this.filters.product!==null && this.filters.product.id!=''){ params.productId=this.filters.product.id }else { - this.$message({ message: "请先选择产品", type: 'success' }); + this.$message({showClose: true, message: "请先选择产品", type: 'success' }); return; //params.xxx=xxxxx } @@ -366,7 +366,7 @@ } if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' }); return; } if(this.filters.mmUser){ @@ -388,7 +388,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; } @@ -404,11 +404,11 @@ //显示新增界面 XmMenu xm_project_menu showAdd: function () { if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } if(this.filters.product==null){ - this.$message({ message: "请先选择产品", type: 'error' }); + this.$message({showClose: true, message: "请先选择产品", type: 'error' }); return; } this.parentMenu=null; @@ -417,7 +417,7 @@ }, showSubAdd:function(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } this.editForm=row @@ -448,7 +448,7 @@ //删除xmMenu handleDel: function (row,index) { if(row.mmUserid!=this.userInfo.userid){ - this.$message({ message: "只能操作你负责的故事", type: 'error'}); + this.$message({showClose: true, message: "只能操作你负责的故事", type: 'error'}); return false; } this.$confirm('确认删除该记录吗?', '提示', { @@ -463,7 +463,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -471,7 +471,7 @@ batchDel: function () { var mmSels=this.sels.filter(i=>i.mmUserid!=this.userInfo.userid) if(mmSels.length>0){ - this.$message({ message: "只能操作你负责的故事", type: 'error'}); + this.$message({showClose: true, message: "只能操作你负责的故事", type: 'error'}); return false; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -485,7 +485,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -762,7 +762,7 @@ showImportFromMenuTemplate(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } if(!this.filters.product){ @@ -833,14 +833,14 @@ if(tips.isOk){ this.getXmMenus() }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } }).catch( err => this.load.add=false ); }, toBatchEdit(){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } this.valueChangeRows=[]; @@ -855,7 +855,7 @@ batchSaveMenu(){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } if(this.valueChangeRows.length==0){ @@ -868,7 +868,7 @@ this.valueChangeRows=[] this.getXmMenus() } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, fieldChange:function(row,fieldName,nextReplace){ @@ -904,7 +904,7 @@ showTaskList(row){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } this.editForm=row @@ -932,7 +932,7 @@ if(tips.isOk){ this.getXmMenus() } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, showMenuExchange:function(row){ @@ -1020,7 +1020,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, selectUser(row){ diff --git a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue index bd57c248..0518b45a 100644 --- a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue +++ b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue @@ -123,7 +123,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 44edc4b9..e24a2b38 100644 --- a/src/views/xm/core/xmMenu/XmMenuSelect.vue +++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue @@ -246,13 +246,13 @@ if( this.filters.product!==null && this.filters.product.id!=''){ params.productId=this.filters.product.id }else { - this.$message({ message: "请先选择产品", type: 'success' }); + this.$message({showClose: true, message: "请先选择产品", type: 'success' }); return; //params.xxx=xxxxx } if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' }); return; } @@ -280,7 +280,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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 01da744c..bf301c37 100644 --- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue +++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue @@ -303,7 +303,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -324,7 +324,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, //删除xmMenu @@ -338,13 +338,13 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false ); }, //批量删除xmMenu batchDel: function () { if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } @@ -359,7 +359,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -438,11 +438,11 @@ }, showBatchEdit:function(){ if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){ - this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理、产品组长能够修改故事", type: 'error'}); return false; } if(this.xmMenus.length==0 ){ - this.$message({ message:"没有数据可以修改", type: 'error'}); + this.$message({showClose: true, message:"没有数据可以修改", type: 'error'}); return ; } @@ -450,7 +450,7 @@ }, saveBatchEdit:function(){ if(this.valueChangeRows.length==0){ - this.$message({ message:"没有改变任何数据，无需保存", type: 'success'}); + this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { @@ -462,7 +462,7 @@ this.valueChangeRows=[] this.getXmMenus() } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 aa01be8d..2585e521 100644 --- a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue +++ b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue @@ -188,7 +188,7 @@ this.pageInfo.count=false; this.xmMenuExchanges = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -230,7 +230,7 @@ this.pageInfo.count=true; this.getXmMenuExchanges(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -248,7 +248,7 @@ this.pageInfo.count=true; this.getXmMenuExchanges(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -301,7 +301,7 @@ if(tips.isOk){ this.xmMenuExchanges.unshift(res.data.data); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }, /**end 自定义函数请在上面加**/ diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue index 1a95f2de..1a4c8080 100644 --- a/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue +++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue @@ -215,7 +215,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue index 7d2b5c8a..66046dd1 100644 --- a/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue +++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue @@ -213,7 +213,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue index cf7d476d..cefcf142 100644 --- a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue +++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue @@ -185,7 +185,7 @@ this.pageInfo.count=false; this.xmMenuPlans = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -227,7 +227,7 @@ this.pageInfo.count=true; this.getXmMenuPlans(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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.getXmMenuPlans(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue index bd11ca0e..92276010 100644 --- a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue +++ b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue @@ -215,7 +215,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 7b23db5c..6668c1c5 100644 --- a/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue +++ b/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue @@ -213,7 +213,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 75fd5524..c23744e6 100644 --- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue +++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue @@ -276,7 +276,7 @@ this.pageInfo.count=false; this.xmMenus = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -297,7 +297,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, //删除xmMenu @@ -311,7 +311,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false ); }, //批量删除xmMenu @@ -328,7 +328,7 @@ this.pageInfo.count=true; this.getXmMenus(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -407,7 +407,7 @@ }, showBatchEdit:function(){ if(this.xmMenus.length==0 ){ - this.$message({ message:"没有数据可以修改", type: 'error'}); + this.$message({showClose: true, message:"没有数据可以修改", type: 'error'}); return ; } @@ -415,7 +415,7 @@ }, saveBatchEdit:function(){ if(this.valueChangeRows.length==0){ - this.$message({ message:"没有改变任何数据，无需保存", type: 'success'}); + this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { @@ -427,7 +427,7 @@ this.valueChangeRows=[] this.getXmMenus() } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 d42f833e..a5ee6023 100644 --- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue +++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue @@ -79,7 +79,7 @@ //新增提交XmMenuTemplate 项目故事表 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.parentMenu==null && this.product ==null ){ - this.$message({ message: '请选择产品/或者上级故事进行新增', type:'error' }); + this.$message({showClose: true, message: '请选择产品/或者上级故事进行新增', type:'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -95,7 +95,7 @@ params.productId=this.product.id } if(params.productId==null|| params.productId==''){ - this.$message({ message: '产品编号不能为空', type:'error' }); + this.$message({showClose: true, message: '产品编号不能为空', type:'error' }); return; } addXmMenuTemplate(params).then((res) => { @@ -105,7 +105,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 56d04fbe..98a5050c 100644 --- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue +++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue @@ -93,7 +93,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 e9d9997c..c5319d58 100644 --- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue +++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue @@ -215,7 +215,7 @@ if( this.filters.product!==null && this.filters.product.id!=''){ params.productId=this.filters.product.id }else { - this.$message({ message: "请先选择产品", type: 'error' }); + this.$message({showClose: true, message: "请先选择产品", type: 'error' }); return; //params.xxx=xxxxx } @@ -229,7 +229,7 @@ this.pageInfo.count=false; this.xmMenuTemplates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -243,7 +243,7 @@ //显示新增界面 XmMenuTemplate xm_project_menu showAdd: function () { if(this.filters.product==null){ - this.$message({ message: "请先选择产品", type: 'error' }); + this.$message({showClose: true, message: "请先选择产品", type: 'error' }); return; } this.addFormVisible = true; @@ -288,7 +288,7 @@ this.pageInfo.count=true; this.getXmMenuTemplates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -306,7 +306,7 @@ this.pageInfo.count=true; this.getXmMenuTemplates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -387,7 +387,7 @@ this.valueChangeRows=[] this.getXmMenuTemplates() } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }); }, fieldChange:function(row,fieldName, nextReplace){ diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue index 1a87fb9a..c5ff475d 100644 --- a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue +++ b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue @@ -101,7 +101,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 0b64cb93..37a788ee 100644 --- a/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue +++ b/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue @@ -99,7 +99,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 87afc609..898801cb 100644 --- a/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue +++ b/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue @@ -145,7 +145,7 @@ this.pageInfo.count=false; this.xmMyFocuss = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -187,7 +187,7 @@ this.pageInfo.count=true; this.getXmMyFocuss(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -205,7 +205,7 @@ this.pageInfo.count=true; this.getXmMyFocuss(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProduct/XmProductAdd.vue b/src/views/xm/core/xmProduct/XmProductAdd.vue index 35b9256e..5898afdb 100644 --- a/src/views/xm/core/xmProduct/XmProductAdd.vue +++ b/src/views/xm/core/xmProduct/XmProductAdd.vue @@ -94,7 +94,7 @@ //新增提交XmProduct 产品表 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({ message: "只有产品经理能够创建产品", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理能够创建产品", type: 'error'}); return false; } @@ -112,7 +112,7 @@ //this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue index d5989da1..4d76a63b 100644 --- a/src/views/xm/core/xmProduct/XmProductEdit.vue +++ b/src/views/xm/core/xmProduct/XmProductEdit.vue @@ -94,7 +94,7 @@ //新增提交XmProduct 产品表 父组件监听@submit="afterAddSubmit" editSubmit: function () { if(this.userInfo.userid!=this.editForm.pmUserid){ - this.$message({ message: "你不是该产品负责人，不能修改产品信息", type: 'error' }); + this.$message({showClose: true, message: "你不是该产品负责人，不能修改产品信息", type: 'error' }); return; } this.$refs.editForm.validate((valid) => { @@ -111,7 +111,7 @@ //this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } @@ -119,7 +119,7 @@ }, selectUser(){ if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({ message: "你不是产品经理，不能修改产品负责人", type: 'error' }); + this.$message({showClose: true, message: "你不是产品经理，不能修改产品负责人", type: 'error' }); return; } this.userSelectVisible=true; @@ -133,7 +133,7 @@ }, clearPmUser:function(){ if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({ message: "你不是产品经理，不能修改产品负责人", type: 'error' }); + this.$message({showClose: true, message: "你不是产品经理，不能修改产品负责人", type: 'error' }); return; } this.editForm.pmUserid='' diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue index c5816cd3..f5744c43 100644 --- a/src/views/xm/core/xmProduct/XmProductMng.vue +++ b/src/views/xm/core/xmProduct/XmProductMng.vue @@ -279,7 +279,7 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, //获取列表 XmProduct 产品表 @@ -300,7 +300,7 @@ params.queryScope=this.filters.queryScope if(this.filters.queryScope=='productId'){ if(!this.filters.id){ - this.$message({ message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); + this.$message({showClose: true, message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); return; } params.id=this.filters.id @@ -312,7 +312,7 @@ } if(!this.selProject && this.filters.queryScope!='productId'){ if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' }); return; } params.ctimeStart=this.dateRanger[0]+" 00:00:00" @@ -336,7 +336,7 @@ this.pageInfo.count=false; this.xmProducts = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -350,7 +350,7 @@ //显示新增界面 XmProduct 产品表 showAdd: function () { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({ message: "只有产品经理能够创建产品", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理能够创建产品", type: 'error'}); return false; } this.addFormVisible = true; @@ -372,7 +372,7 @@ //删除xmProduct handleDel: function (row,index) { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({ message: "只有产品经理能够删除产品", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'}); return false; } this.$confirm('确认删除该记录吗?', '提示', { @@ -387,19 +387,19 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmProduct batchDel: function () { if(!this.roles.some(i=>i.roleid=='productAdmin')){ - this.$message({ message: "只有产品经理能够删除产品", type: 'error'}); + this.$message({showClose: true, message: "只有产品经理能够删除产品", type: 'error'}); return false; } var mmSels=this.sels.filter(i=>i.pmUserid!=this.userInfo.userid) if(mmSels.length>0){ - this.$message({ message: "只能删除你负责的产品", type: 'error'}); + this.$message({showClose: true, message: "只能删除你负责的产品", type: 'error'}); return false; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -413,7 +413,7 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue index b2fe7c33..13dd4dd4 100644 --- a/src/views/xm/core/xmProduct/XmProductSelect.vue +++ b/src/views/xm/core/xmProduct/XmProductSelect.vue @@ -211,7 +211,7 @@ params.queryScope=this.filters.queryScope if(this.filters.queryScope=='productId'){ if(!this.filters.id){ - this.$message({ message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); + this.$message({showClose: true, message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' }); return; } params.id=this.filters.id @@ -223,7 +223,7 @@ } if(!this.selProject && this.filters.queryScope!='productId'){ if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' }); return; } params.ctimeStart=this.dateRanger[0]+" 00:00:00" @@ -238,7 +238,7 @@ this.pageInfo.count=false; this.xmProducts = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -289,7 +289,7 @@ this.pageInfo.count=true; this.getXmProducts(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false ); }, },//end methods diff --git a/src/views/xm/core/xmProductState/XmProductStateAdd.vue b/src/views/xm/core/xmProductState/XmProductStateAdd.vue index cafb5282..a1b2507f 100644 --- a/src/views/xm/core/xmProductState/XmProductStateAdd.vue +++ b/src/views/xm/core/xmProductState/XmProductStateAdd.vue @@ -185,7 +185,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProductState/XmProductStateEdit.vue b/src/views/xm/core/xmProductState/XmProductStateEdit.vue index e23fcfc7..5ce2be11 100644 --- a/src/views/xm/core/xmProductState/XmProductStateEdit.vue +++ b/src/views/xm/core/xmProductState/XmProductStateEdit.vue @@ -183,7 +183,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProductState/XmProductStateMng.vue b/src/views/xm/core/xmProductState/XmProductStateMng.vue index 6f024b52..2d86830c 100644 --- a/src/views/xm/core/xmProductState/XmProductStateMng.vue +++ b/src/views/xm/core/xmProductState/XmProductStateMng.vue @@ -146,7 +146,7 @@ this.pageInfo.count=false; this.xmProductStates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -188,7 +188,7 @@ this.pageInfo.count=true; this.getXmProductStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -206,7 +206,7 @@ this.pageInfo.count=true; this.getXmProductStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue index 27ed0ed2..05f88ef1 100644 --- a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue +++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue @@ -92,7 +92,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 11d7ac59..190a3c86 100644 --- a/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue +++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue @@ -88,7 +88,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 12eb4601..badef357 100644 --- a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue +++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue @@ -160,7 +160,7 @@ this.pageInfo.count=false; this.xmProductTemplates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -202,7 +202,7 @@ this.pageInfo.count=true; this.getXmProductTemplates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -220,7 +220,7 @@ this.pageInfo.count=true; this.getXmProductTemplates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProject/XmProjectAdd.vue b/src/views/xm/core/xmProject/XmProjectAdd.vue index e2ba63cd..2640b057 100644 --- a/src/views/xm/core/xmProject/XmProjectAdd.vue +++ b/src/views/xm/core/xmProject/XmProjectAdd.vue @@ -345,7 +345,7 @@ //编辑提交XmProject xm_project父组件监听@submit="afterEditSubmit" addSubmit: function () { if(!this.roles.some(i=>i.roleid=='projectAdmin')){ - this.$message({ message: "只有项目经理可以建立项目", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理可以建立项目", type: 'error' }); return; } if ( @@ -355,7 +355,7 @@ this.addForm.startTime = this.dateRanger[0] + " 00:00:00"; this.addForm.endTime = this.dateRanger[1] + " 23:59:59"; }else{ - this.$message({ message: "请输入开始日期和结束日期", type: 'error' }); + this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -374,7 +374,7 @@ if(tips.isOk){ this.$emit('submit',params);// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.add=false); }); } diff --git a/src/views/xm/core/xmProject/XmProjectAssess.vue b/src/views/xm/core/xmProject/XmProjectAssess.vue index d5b70ce9..1c70556a 100644 --- a/src/views/xm/core/xmProject/XmProjectAssess.vue +++ b/src/views/xm/core/xmProject/XmProjectAssess.vue @@ -129,7 +129,7 @@ this.xmProjects = res.data.data; console.log(this.xmProjects); }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -143,7 +143,7 @@ var tips=res.data.tips; if(tips.isOk){ } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 69b27aca..e41b9fd0 100644 --- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue +++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue @@ -259,7 +259,7 @@ import { months } from 'moment'; // }, updateBudget() { if(this.selProject.planTotalCost==undefined){ - this.$message({ message:"不允许修改", type: 'success'}); + this.$message({showClose: true, message:"不允许修改", type: 'success'}); return; } var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost) @@ -282,7 +282,7 @@ import { months } from 'moment'; }else{ this.selProjectBudget=Object.assign({},this.selProject) } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 034b73df..6c787ce7 100644 --- a/src/views/xm/core/xmProject/XmProjectCost.vue +++ b/src/views/xm/core/xmProject/XmProjectCost.vue @@ -256,7 +256,7 @@ import { months } from 'moment'; // }, updateBudget() { if(this.selProject.planTotalCost==undefined){ - this.$message({ message:"不允许修改", type: 'success'}); + this.$message({showClose: true, message:"不允许修改", type: 'success'}); return; } var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost) @@ -279,7 +279,7 @@ import { months } from 'moment'; }else{ this.selProjectBudget=Object.assign({},this.selProject) } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 c16b1458..1fb76e5a 100644 --- a/src/views/xm/core/xmProject/XmProjectEdit.vue +++ b/src/views/xm/core/xmProject/XmProjectEdit.vue @@ -354,11 +354,11 @@ //编辑提交XmProject xm_project父组件监听@submit="afterEditSubmit" editSubmit: function () { if(!this.roles.some(i=>i.roleid=='projectAdmin')){ - this.$message({ message: "只有项目经理可以修改项目", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理可以修改项目", type: 'error' }); return; } if("0" != this.selProject.status){ - this.$message({ message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); + this.$message({showClose: true, message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); return; } if ( @@ -368,7 +368,7 @@ this.editForm.startTime = this.dateRanger[0] + " 00:00:00"; this.editForm.endTime = this.dateRanger[1] + " 23:59:59"; }else{ - this.$message({ message: "请输入开始日期和结束日期", type: 'error' }); + this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } this.$refs.editForm.validate((valid) => { @@ -386,7 +386,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit',params);// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } @@ -402,7 +402,7 @@ if(tips.isOk){ this.xmProjectGroups = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -484,7 +484,7 @@ }, sendToProcessApprova:function(row,bizKey){ if(!this.roles.some(i=>i.roleid=='projectAdmin')){ - this.$message({ message: "只有项目经理可以发起流程", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理可以发起流程", type: 'error' }); return; } // 传过来的参数格式 diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue index d537a849..0b3d06e5 100644 --- a/src/views/xm/core/xmProject/XmProjectList.vue +++ b/src/views/xm/core/xmProject/XmProjectList.vue @@ -137,7 +137,7 @@ this.pageInfo.count=false; this.xmProjects = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index 8534831d..183f2edb 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -341,7 +341,7 @@ } if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' }); return; } this.load.list = true; @@ -370,7 +370,7 @@ this.pageInfo.count=false; this.xmProjects = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -448,7 +448,7 @@ this.pageInfo.count=true; this.getXmProjects(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -465,7 +465,7 @@ this.pageInfo.count=true; this.getXmProjects(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -505,7 +505,7 @@ this.ScreenData[scope.$index].status = val; this.status = val; } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); this.load.edit = false; }).catch( err => this.load.edut = false ); }, @@ -631,12 +631,12 @@ if(tips.isOk){ this.getXmProjects(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }else{ addXmMyFocus({projectId:row.id,focusType:'project',projectName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{ var tips=res.data.tips; - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) } }, diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue index f9ad6ff8..512d9e1e 100644 --- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue +++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue @@ -197,7 +197,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue index 06532899..468307e1 100644 --- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue +++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue @@ -195,7 +195,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue index 7a6e2530..3a137acf 100644 --- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue +++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue @@ -177,7 +177,7 @@ this.pageInfo.count=false; this.xmProjectBaselines = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -219,7 +219,7 @@ this.pageInfo.count=true; this.getXmProjectBaselines(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -237,7 +237,7 @@ this.pageInfo.count=true; this.getXmProjectBaselines(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue b/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue index 956c90be..91d5a575 100644 --- a/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue +++ b/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue @@ -83,7 +83,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue b/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue index 7f5004b7..963a4542 100644 --- a/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue +++ b/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue @@ -81,7 +81,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue index fd2cf669..d124893b 100644 --- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue +++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue @@ -155,7 +155,7 @@ this.xmProjectContracts = res.data.data; console.log(res.data.data); }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -197,7 +197,7 @@ this.pageInfo.count=true; this.getXmProjectContracts(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -215,7 +215,7 @@ this.pageInfo.count=true; this.getXmProjectContracts(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue index fc5c305b..2ab267db 100644 --- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue +++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue @@ -116,7 +116,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 b9aed31a..c5649061 100644 --- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue +++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue @@ -114,7 +114,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 ccc2c566..e720710b 100644 --- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue +++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue @@ -196,7 +196,7 @@ this.pageInfo.count=false; this.xmProjectEnvLists = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -238,7 +238,7 @@ this.pageInfo.count=true; this.getXmProjectEnvLists(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -255,7 +255,7 @@ this.pageInfo.count=true; this.getXmProjectEnvLists(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -278,7 +278,7 @@ // console.log(this.envList); // this.getXmProjectEnvLists(); }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -302,7 +302,7 @@ this.importVisible = false; this.getXmProjectEnvLists(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue index a4dab8fb..a4193c8e 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue @@ -86,7 +86,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue index 4d03138a..de0c677e 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue @@ -84,7 +84,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue index 01959c71..eab078f6 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue @@ -53,7 +53,7 @@ groups.push(group); }); if(selGroups.length==0){ - this.$message({ message: "最少保留一个小组", type: 'error' }); + this.$message({showClose: true, message: "最少保留一个小组", type: 'error' }); this.load.edit=false return; } @@ -61,9 +61,9 @@ var tips=res.data.tips; if(tips.isOk){ //this.groups = res.data.data; - this.$message({ message: tips.msg, type: 'success' }); + this.$message({showClose: true, message: tips.msg, type: 'success' }); }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.getXmProjectGroup(); this.load.edit=false @@ -81,7 +81,7 @@ if(tips.isOk){ this.groups = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue index d5f72714..4679a6cd 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue @@ -122,7 +122,7 @@ if(this.isSelectSingleUser=='1'){ if(users.length>1){ - this.$message({ + this.$message({showClose: true, message: '只能选中一个用户', type: 'error' }); @@ -137,7 +137,7 @@ params.projectId=this.filters.selProject.id }else{ this.selectProjectVisible=true; - this.$message({ + this.$message({showClose: true, message: '请选中项目', type: 'success' }); @@ -148,7 +148,7 @@ if(tips.isOk){ this.selGroups=res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } }) }, diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue index 071a391b..755a7df7 100644 --- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue +++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue @@ -296,21 +296,21 @@ addGroupName() { let that = this; if(this.projectGroupType==null){ - this.$message({ + this.$message({showClose: true, message:"项目小组类型为空，请选择小组类型后操作", type: 'error' }); return false; } if(!this.needAddGroupNameValue) { - this.$message({ + this.$message({showClose: true, message:"小组名称不能为空", type: 'error' }); return; } if(this.convertXmProjectGroupFormworks.some(i=>i.groupName==this.needAddGroupNameValue.trim())){ - this.$message({ + this.$message({showClose: true, message:"团队名已经存在", type: 'error' }); @@ -335,7 +335,7 @@ that.needAddGroupNameValue = ''; this.getXmProjectGroupFormworks() } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -395,7 +395,7 @@ this.convertXmProjectGroupFormworks = convert; console.log("applyData"); } else { - this.$message({ + this.$message({showClose: true, message: tips.msg, type: 'error' }); @@ -427,7 +427,7 @@ if(this.isSelectSingleUser=='1'){ if(users.length>1){ - this.$message({ + this.$message({showClose: true, message: '只能选中一个用户', type: 'error' }); @@ -498,7 +498,7 @@ if(tips.isOk){ this.imGroups=res.data.data; } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); @@ -530,7 +530,7 @@ params.id=params.groupId this.imGroups.push(params); } - this.$message({ + this.$message({showClose: true, message: tips.msg, type: tips.isOk ? 'success' : 'error' }); diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue index 8d468241..4251cf8d 100644 --- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue +++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue @@ -89,7 +89,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue index f73d15a9..6cf2ce3f 100644 --- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue +++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue @@ -87,7 +87,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue index fdd4b39b..51eed2bc 100644 --- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue +++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue @@ -142,7 +142,7 @@ this.pageInfo.count=false; this.xmProjectGroupFormworks = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -184,7 +184,7 @@ this.pageInfo.count=true; this.getXmProjectGroupFormworks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -202,7 +202,7 @@ this.pageInfo.count=true; this.getXmProjectGroupFormworks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue index d021bff5..a0dbb944 100644 --- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue +++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue @@ -185,7 +185,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue index 1c0cc5ab..6184b4e1 100644 --- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue +++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue @@ -183,7 +183,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue index 213b5895..61cbb74d 100644 --- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue +++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue @@ -153,7 +153,7 @@ this.pageInfo.count=false; this.xmProjectGroupStates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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.getXmProjectGroupStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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.getXmProjectGroupStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -226,7 +226,7 @@ if(tips.isOk){ this.getXmProjectGroupStates(); }else{ - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); } }) diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue index 84019691..074bd945 100644 --- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue +++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue @@ -89,7 +89,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue index 0f17a4bb..af17312b 100644 --- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue +++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue @@ -87,7 +87,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue index 9b287c28..2c66058b 100644 --- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue +++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue @@ -142,7 +142,7 @@ this.pageInfo.count=false; this.xmProjectGroupUsers = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -184,7 +184,7 @@ this.pageInfo.count=true; this.getXmProjectGroupUsers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -202,7 +202,7 @@ this.pageInfo.count=true; this.getXmProjectGroupUsers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue index d9a2c36b..718914ae 100644 --- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue +++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue @@ -101,7 +101,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue index 7906e1c4..917bf292 100644 --- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue +++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue @@ -99,7 +99,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue index 84f5da62..fd4db9c6 100644 --- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue +++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue @@ -146,7 +146,7 @@ this.pageInfo.count=false; this.xmProjectGroupUserCandidates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -188,7 +188,7 @@ this.pageInfo.count=true; this.getXmProjectGroupUserCandidates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -206,7 +206,7 @@ this.pageInfo.count=true; this.getXmProjectGroupUserCandidates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue index 2843ece2..240c77d9 100644 --- a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue +++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue @@ -122,7 +122,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 9b4476f5..0b62ab73 100644 --- a/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue +++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue @@ -120,7 +120,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 83f4ac24..e3d07724 100644 --- a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue +++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue @@ -169,7 +169,7 @@ this.pageInfo.count=false; this.xmProjectKpis = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -211,7 +211,7 @@ this.pageInfo.count=true; this.getXmProjectKpis(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -229,7 +229,7 @@ this.pageInfo.count=true; this.getXmProjectKpis(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 2dd08789..ddce8337 100644 --- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue +++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue @@ -128,7 +128,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 4a4b00a4..82526871 100644 --- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue +++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue @@ -126,7 +126,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 c5f622ba..a3035663 100644 --- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue +++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue @@ -154,7 +154,7 @@ this.pageInfo.count=false; this.xmProjectKpiHiss = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -196,7 +196,7 @@ this.pageInfo.count=true; this.getXmProjectKpiHiss(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -214,7 +214,7 @@ this.pageInfo.count=true; this.getXmProjectKpiHiss(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 6f85881b..208a5147 100644 --- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue +++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue @@ -149,7 +149,7 @@ //新增提交XmProjectMBudgetCostNouser xm_project_m_budget_cost_user 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.bizzYear==null || this.bizzYear==''){ - this.$message({ message:"请选择需要分摊的年份", type: 'error' }); + this.$message({showClose: true, message:"请选择需要分摊的年份", type: 'error' }); return; } @@ -169,7 +169,7 @@ batchAddXmProjectMBudgetCostNouser(list).then((res) => { this.load.add=false var tips=res.data.tips; - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 286e937b..fb976793 100644 --- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue +++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue @@ -117,7 +117,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 79bc26c6..7179d1b3 100644 --- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue +++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue @@ -224,7 +224,7 @@ this.xmProjectMBudgetCostNousers = res.data.data; this.valueChangeRows=[]; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -266,7 +266,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostNousers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -284,7 +284,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostNousers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -296,7 +296,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$message({ message:"没有改变任何数据，无需保存", type: 'success'}); + this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -307,7 +307,7 @@ this.valueChangeRows=[] this.getXmProjectMBudgetCostNousers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 b6ff4a53..1a6d6f46 100644 --- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue +++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue @@ -151,7 +151,7 @@ //新增提交XmProjectMBudgetCostUser xm_project_m_budget_cost_user 父组件监听@submit="afterAddSubmit" addSubmit: function () { if(this.bizzYear==null || this.bizzYear==''){ - this.$message({ message:"请选择需要分摊的年份", type: 'error' }); + this.$message({showClose: true, message:"请选择需要分摊的年份", type: 'error' }); return; } @@ -170,7 +170,7 @@ batchAddXmProjectMBudgetCostUser(list).then((res) => { this.load.add=false var tips=res.data.tips; - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 4e718394..e399c557 100644 --- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue +++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue @@ -123,7 +123,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 8f5cbdb4..967b4351 100644 --- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue +++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue @@ -229,7 +229,7 @@ this.xmProjectMBudgetCostUsers = res.data.data; this.valueChangeRows=[]; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -271,7 +271,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostUsers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -289,7 +289,7 @@ this.pageInfo.count=true; this.getXmProjectMBudgetCostUsers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -301,7 +301,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$message({ message:"没有改变任何数据，无需保存", type: 'success'}); + this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -312,7 +312,7 @@ this.valueChangeRows=[] this.getXmProjectMBudgetCostUsers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 e47fae0a..ddc4e062 100644 --- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue +++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue @@ -117,7 +117,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 b2aa9148..1df1d167 100644 --- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue +++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue @@ -141,7 +141,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 b5b0b505..7735aec2 100644 --- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue +++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue @@ -225,7 +225,7 @@ this.xmProjectMCostNousers = res.data.data; this.valueChangeRows=[]; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -267,7 +267,7 @@ this.pageInfo.count=true; this.getXmProjectMCostNousers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -285,7 +285,7 @@ this.pageInfo.count=true; this.getXmProjectMCostNousers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -297,7 +297,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$message({ message:"没有改变任何数据，无需保存", type: 'success'}); + this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -308,7 +308,7 @@ this.valueChangeRows=[] this.getXmProjectMCostNousers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 bb2dfa8f..b7520645 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue @@ -139,7 +139,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 6cef9eb3..d0457d5f 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue @@ -144,7 +144,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 bbe5c974..903f00f9 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue @@ -197,7 +197,7 @@ this.pageInfo.count=false; this.xmProjectMCostUsers = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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 4141f769..6745900f 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue @@ -230,7 +230,7 @@ this.xmProjectMCostUsers = res.data.data; this.valueChangeRows=[]; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -272,7 +272,7 @@ this.pageInfo.count=true; this.getXmProjectMCostUsers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -290,7 +290,7 @@ this.pageInfo.count=true; this.getXmProjectMCostUsers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -302,7 +302,7 @@ batchSave:function(){ if(this.valueChangeRows.length==0){ - this.$message({ message:"没有改变任何数据，无需保存", type: 'success'}); + this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -313,7 +313,7 @@ this.valueChangeRows=[] this.getXmProjectMCostUsers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue index f4de8461..596655b2 100644 --- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue +++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue @@ -89,7 +89,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue index 8f144aca..3f759054 100644 --- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue +++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue @@ -87,7 +87,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue index 28863c38..6d9859f7 100644 --- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue +++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue @@ -141,7 +141,7 @@ this.pageInfo.count=false; this.xmProjectOptionss = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -183,7 +183,7 @@ this.pageInfo.count=true; this.getXmProjectOptionss(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -201,7 +201,7 @@ this.pageInfo.count=true; this.getXmProjectOptionss(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue index df468955..380180c7 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue @@ -267,20 +267,20 @@ } }else{ - this.$message({ message: "请输入开始日期和结束日期", type: 'error' }); + this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } if(!this.addForm.phaseBudgetInnerUserCnt){ - this.$message({ message: "内购人员数不能为空", type: 'error' }); + this.$message({showClose: true, message: "内购人员数不能为空", type: 'error' }); return; } if(!this.addForm.phaseBudgetHours){ - this.$message({ message: "工期不能为空", type: 'error' }); + this.$message({showClose: true, message: "工期不能为空", type: 'error' }); return; } if(!this.addForm.phaseBudgetInnerUserPrice){ - this.$message({ message: "内购单价不能为空", type: 'error' }); + this.$message({showClose: true, message: "内购单价不能为空", type: 'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -314,7 +314,7 @@ //this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue index 2e809bf9..542f360b 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue @@ -354,7 +354,7 @@ this.pageInfo.count=false; this.xmProjectPhases = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -364,7 +364,7 @@ showEdit: function ( row,index ) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } this.editForm = Object.assign({}, row); @@ -374,7 +374,7 @@ showAdd: function () { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } this.parentProjectPhase=null; @@ -386,7 +386,7 @@ showSubAdd: function (parentProjectPhase) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } var myrow=JSON.parse(JSON.stringify(parentProjectPhase)) @@ -486,7 +486,7 @@ if(tips.isOk){ this.getXmProjectPhases() }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } }).catch( err => this.load.add=false ); }, @@ -498,16 +498,16 @@ handleDel: function (row,index) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } if(!!row.bizFlowState ){ - this.$message({ message:"初始状态的计划可以直接删除，其它状态请发起审核流程进行删除", type: 'error' }); + this.$message({showClose: true, message:"初始状态的计划可以直接删除，其它状态请发起审核流程进行删除", type: 'error' }); return; } if(command.data.children && command.data.length>0){ - this.$message({ message: "该计划存在子计划，不允许删除", type: 'error'}); + this.$message({showClose: true, message: "该计划存在子计划，不允许删除", type: 'error'}); return; } this.$confirm('确认删除该记录吗?', '提示', { @@ -522,7 +522,7 @@ this.pageInfo.count=true; this.getXmProjectPhases(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -530,7 +530,7 @@ batchDel: function () { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } var phases=this.sels.filter(i=>{ @@ -555,14 +555,14 @@ this.pageInfo.count=true; this.getXmProjectPhases(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, showPhaseTemplate: function(parentPhase){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } this.parentProjectPhase=parentPhase @@ -640,7 +640,7 @@ if(tips.isOk){ this.getXmProjectPhases() } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }, getFloatValue(value,digit){ @@ -767,23 +767,23 @@ saveBatchEdit:function(){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } if(this.valueChangeRows.length==0){ - this.$message({ message:"没有改变任何数据，无需保存", type: 'success'}); + this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { if(this.phaseBudgetData.surplusPlanInnerUserAt<0){ - this.$message({ message:"内部人力预算不足，请调整", type: 'error'}); + this.$message({showClose: true, message:"内部人力预算不足，请调整", type: 'error'}); return; } if(this.phaseBudgetData.surplusPlanOutUserAt<0){ - this.$message({ message:"外购人力预算不足，请调整", type: 'error'}); + this.$message({showClose: true, message:"外购人力预算不足，请调整", type: 'error'}); return; } if(this.phaseBudgetData.surplusPlanNouserAt<0){ - this.$message({ message:"非人力预算不足请调整",type: 'error'}); + this.$message({showClose: true, message:"非人力预算不足请调整",type: 'error'}); return; } @@ -795,7 +795,7 @@ this.valueChangeRows=[] this.getXmProjectPhases(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } @@ -1104,7 +1104,7 @@ showMenu:function(parentPhase){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } this.parentProjectPhase=parentPhase @@ -1130,7 +1130,7 @@ handlePopover:function(row,opType){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } if('add'==opType){ diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue index 8cfa0c25..78f97399 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue @@ -1,108 +1,101 @@ @@ -152,10 +145,8 @@ } var weekday=1; if(this.dateRanger!=null && this.dateRanger.length>=2 ){ - weekday=this.getWeekday(new Date(this.dateRanger[0]),new Date(this.dateRanger[1])); - if(this.editForm.phaseBudgetHours==null || this.editForm.phaseBudgetHours=='' || this.editForm.phaseBudgetHours<=0){ - phaseBudgetHours=weekday * 8 - } + weekday=this.getWeekday(new Date(this.dateRanger[0]),new Date(this.dateRanger[1])); + phaseBudgetHours=weekday * 8 } autoParams.weekday=weekday @@ -185,6 +176,10 @@ //从新打开页面时某些数据需要重新加载，可以在这里添加 } }, + autoParams:function(autoParams){ + this.fillphaseBudgetHoursToField() + this.fillphaseBudgetCostAtToField() + } }, data() { const beginDate = new Date(); @@ -220,6 +215,7 @@ /**begin 在下面加自定义属性,记得补上面的一个逗号**/ pickerOptions: util.pickerOptions('datarange'), activeName:'', + costVisible:false, /**end 在上面加自定义属性**/ }//end return },//end data @@ -252,20 +248,20 @@ } }else{ - this.$message({ message: "请输入开始日期和结束日期", type: 'error' }); + this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } if(!this.editForm.phaseBudgetInnerUserCnt){ - this.$message({ message: "内购人员数不能为空", type: 'error' }); + this.$message({showClose: true, message: "内购人员数不能为空", type: 'error' }); return; } if(!this.editForm.phaseBudgetHours){ - this.$message({ message: "工期不能为空", type: 'error' }); + this.$message({showClose: true, message: "工期不能为空", type: 'error' }); return; } if(!this.editForm.phaseBudgetInnerUserPrice){ - this.$message({ message: "内购单价不能为空", type: 'error' }); + this.$message({showClose: true, message: "内购单价不能为空", type: 'error' }); return; } this.$refs.editForm.validate((valid) => { @@ -294,7 +290,7 @@ //this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="aftereditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } @@ -365,6 +361,11 @@ - \ No newline at end of file diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue index 324df2db..9ab90840 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue @@ -146,9 +146,9 @@ - + - + @@ -410,7 +410,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; this.pageInfo.count=false; this.xmProjectPhases = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -420,7 +420,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; showEdit: function ( row,index ) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } this.editForm = Object.assign({}, row); @@ -430,7 +430,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; showAdd: function () { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } this.parentProjectPhase=null; @@ -442,7 +442,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; showSubAdd: function (parentProjectPhase) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } var myrow=JSON.parse(JSON.stringify(parentProjectPhase)) @@ -542,7 +542,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; if(tips.isOk){ this.getXmProjectPhases() }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } }).catch( err => this.load.add=false ); }, @@ -554,16 +554,16 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; handleDel: function (row,index) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } if(!!row.bizFlowState ){ - this.$message({ message:"初始状态的计划可以直接删除，其它状态请发起审核流程进行删除", type: 'error' }); + this.$message({showClose: true, message:"初始状态的计划可以直接删除，其它状态请发起审核流程进行删除", type: 'error' }); return; } if(command.data.children && command.data.length>0){ - this.$message({ message: "该计划存在子计划，不允许删除", type: 'error'}); + this.$message({showClose: true, message: "该计划存在子计划，不允许删除", type: 'error'}); return; } this.$confirm('确认删除该记录吗?', '提示', { @@ -578,7 +578,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; this.pageInfo.count=true; this.getXmProjectPhases(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -586,7 +586,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; batchDel: function () { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } var phases=this.sels.filter(i=>{ @@ -611,14 +611,14 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; this.pageInfo.count=true; this.getXmProjectPhases(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, showPhaseTemplate: function(parentPhase){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } this.parentProjectPhase=parentPhase @@ -722,7 +722,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; sendToProcessApprova:function(row,bizKey){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } if(row.bizFlowState=='1'){ @@ -809,7 +809,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; handleCommand(command) { if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } if(command.type=='sendToProcessApprova'){ @@ -847,7 +847,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; if(tips.isOk){ this.getXmProjectPhases() } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }, getFloatValue(value,digit){ @@ -974,23 +974,23 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; saveBatchEdit:function(){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } if(this.valueChangeRows.length==0){ - this.$message({ message:"没有改变任何数据，无需保存", type: 'success'}); + this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { if(this.phaseBudgetData.surplusPlanInnerUserAt<0){ - this.$message({ message:"内部人力预算不足，请调整", type: 'error'}); + this.$message({showClose: true, message:"内部人力预算不足，请调整", type: 'error'}); return; } if(this.phaseBudgetData.surplusPlanOutUserAt<0){ - this.$message({ message:"外购人力预算不足，请调整", type: 'error'}); + this.$message({showClose: true, message:"外购人力预算不足，请调整", type: 'error'}); return; } if(this.phaseBudgetData.surplusPlanNouserAt<0){ - this.$message({ message:"非人力预算不足请调整",type: 'error'}); + this.$message({showClose: true, message:"非人力预算不足请调整",type: 'error'}); return; } @@ -1002,7 +1002,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; this.valueChangeRows=[] this.getXmProjectPhases(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } @@ -1170,7 +1170,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; showMenu:function(parentPhase){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } this.parentProjectPhase=parentPhase @@ -1196,7 +1196,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; handlePopover:function(row,opType){ if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){ - this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); + this.$message({showClose: true, message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' }); return; } if('add'==opType){ diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue index 0ad5266e..a305a106 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue @@ -181,7 +181,7 @@ this.pageInfo.count=false; this.xmProjectPhases = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue index 4ad5dc46..07f5a594 100644 --- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue +++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue @@ -143,7 +143,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue index 7a2c8966..b862506a 100644 --- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue +++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue @@ -141,7 +141,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue index 136577dd..58ba6e28 100644 --- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue +++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue @@ -159,7 +159,7 @@ this.pageInfo.count=false; this.xmProjectPhaseBaselines = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -201,7 +201,7 @@ this.pageInfo.count=true; this.getXmProjectPhaseBaselines(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -219,7 +219,7 @@ this.pageInfo.count=true; this.getXmProjectPhaseBaselines(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue index 671d8517..55495995 100644 --- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue +++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue @@ -164,7 +164,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue index ed5e5d7d..b80de8ed 100644 --- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue +++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue @@ -155,7 +155,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue index f5719087..03cc5acd 100644 --- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue +++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue @@ -178,7 +178,7 @@ if( this.filters.projectTemplate ){ params.projectId=this.filters.projectTemplate.id }else{ - this.$message({ message: "请选择项目模板", type: 'error' }); + this.$message({showClose: true, message: "请选择项目模板", type: 'error' }); return; } this.load.list = true; @@ -189,7 +189,7 @@ this.pageInfo.count=false; this.xmProjectPhaseTemplates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -239,7 +239,7 @@ this.pageInfo.count=true; this.getXmProjectPhaseTemplates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -257,7 +257,7 @@ this.pageInfo.count=true; this.getXmProjectPhaseTemplates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectState/XmCockpit.vue b/src/views/xm/core/xmProjectState/XmCockpit.vue index 3c80f6e0..f48385f7 100644 --- a/src/views/xm/core/xmProjectState/XmCockpit.vue +++ b/src/views/xm/core/xmProjectState/XmCockpit.vue @@ -210,7 +210,7 @@ this.pageInfo.count=false; this.xmProjectStates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -252,7 +252,7 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -270,7 +270,7 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 4f046a68..5bb45ab9 100644 --- a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue +++ b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue @@ -245,7 +245,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue index 9d808a58..381087ce 100644 --- a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue +++ b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue @@ -243,7 +243,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue index 3586cff9..bddd0c61 100644 --- a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue +++ b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue @@ -232,7 +232,7 @@ this.pageInfo.count=false; this.xmProjectStates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -274,7 +274,7 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -292,13 +292,13 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, loadProjectToXmProjectState: function () { if(!this.filters.selProject){ - this.$message({ message: '请选择一个项目', type: 'error'}); + this.$message({showClose: true, message: '请选择一个项目', type: 'error'}); return; } @@ -311,12 +311,12 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ); }, loadBugsToXmProjectState: function () { if(!this.filters.selProject){ - this.$message({ message: '请选择一个项目', type: 'error'}); + this.$message({showClose: true, message: '请选择一个项目', type: 'error'}); return; } @@ -329,12 +329,12 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ); }, loadTasksToXmProjectState: function () { if(!this.filters.selProject){ - this.$message({ message: '请选择一个项目', type: 'error'}); + this.$message({showClose: true, message: '请选择一个项目', type: 'error'}); return; } @@ -347,12 +347,12 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ); }, loadTasksSettleToXmProjectState: function () { if(!this.filters.selProject){ - this.$message({ message: '请选择一个项目', type: 'error'}); + this.$message({showClose: true, message: '请选择一个项目', type: 'error'}); return; } @@ -365,7 +365,7 @@ this.pageInfo.count=true; this.getXmProjectStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.edit=false ); }, rowClick: function(row, event, column){ diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue index 377c3868..aee6f3bf 100644 --- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue +++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue @@ -170,7 +170,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue index 5f82cd04..b2f5842a 100644 --- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue +++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue @@ -168,7 +168,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue index 4677fefd..5ffbe45b 100644 --- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue +++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue @@ -168,7 +168,7 @@ this.pageInfo.count=false; this.xmProjectStateHiss = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -210,7 +210,7 @@ this.pageInfo.count=true; this.getXmProjectStateHiss(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -228,7 +228,7 @@ this.pageInfo.count=true; this.getXmProjectStateHiss(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue index 21f3f3b0..4f1d447a 100644 --- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue +++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue @@ -140,7 +140,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 5f695b6b..9194a8dd 100644 --- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue +++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue @@ -138,7 +138,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 6eea039e..91bcff64 100644 --- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue +++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue @@ -160,7 +160,7 @@ this.pageInfo.count=false; this.xmProjectTaskTypeStates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -202,7 +202,7 @@ this.pageInfo.count=true; this.getXmProjectTaskTypeStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -220,7 +220,7 @@ this.pageInfo.count=true; this.getXmProjectTaskTypeStates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 8de382c8..4edefd5f 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue @@ -321,7 +321,7 @@ this.addForm.startTime = this.dateRanger[0] + " 00:00:00"; this.addForm.endTime = this.dateRanger[1] + " 23:59:59"; }else{ - this.$message({ message: "请输入开始日期和结束日期", type: 'error' }); + this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } this.$refs.addForm.validate((valid) => { @@ -340,7 +340,7 @@ if(tips.isOk){ this.$emit('submit',params);// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 d1165ba1..9de443e0 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue @@ -322,7 +322,7 @@ //编辑提交XmProjectTemplate xm_project父组件监听@submit="afterEditSubmit" editSubmit: function () { if("0" != this.selProjectTemplate.status){ - this.$message({ message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); + this.$message({showClose: true, message: "只有初始状态的项目可以修改，如确实需要修改，请进行项目变更审批", type: 'error' }); return; } if ( @@ -332,12 +332,12 @@ this.editForm.startTime = this.dateRanger[0] + " 00:00:00"; this.editForm.endTime = this.dateRanger[1] + " 23:59:59"; }else{ - this.$message({ message: "请输入开始日期和结束日期", type: 'error' }); + this.$message({showClose: true, message: "请输入开始日期和结束日期", type: 'error' }); return; } if(!this.editForm.productId){ - this.$message({ message: "请选择归属产品", type: 'error' }); + this.$message({showClose: true, message: "请选择归属产品", type: 'error' }); return; } this.$refs.editForm.validate((valid) => { @@ -355,7 +355,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit',params);// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 172e0edd..651b36ea 100644 --- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue +++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue @@ -143,7 +143,7 @@ this.pageInfo.count=false; this.xmProjectTemplates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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 424e73ea..3bc3f411 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.$message({ message: tips.msg, type: 'error' }); + this.$message({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.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 283274f3..dad7a0da 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue @@ -199,7 +199,7 @@ this.$emit('submit');// @submit="afterAddSubmit" this.handleCancel(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } @@ -275,7 +275,7 @@ }, showSelectTask:function(){ if(this.filters.selProject==null){ - this.$message({ message: "请先选项目", type: 'error' }); + this.$message({showClose: true, message: "请先选项目", type: 'error' }); return ; } this.selectTaskVisible=true; @@ -295,7 +295,7 @@ }, showSelectMenu:function(){ if(this.filters.selProject==null){ - this.$message({ message: "请先选项目", type: 'error' }); + this.$message({showClose: true, message: "请先选项目", type: 'error' }); return ; } this.selectMenuVisible=true; diff --git a/src/views/xm/core/xmQuestion/XmQuestionCenter.vue b/src/views/xm/core/xmQuestion/XmQuestionCenter.vue index 791f96b4..ee464bfa 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionCenter.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionCenter.vue @@ -162,7 +162,7 @@ this.pageInfo.count=false; this.xmQuestions = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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.getXmQuestions(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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.getXmQuestions(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index 3f0e6826..62abf080 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -237,7 +237,7 @@ this.$emit('submit');// @submit="afterAddSubmit" this.handleCancel(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } @@ -297,7 +297,7 @@ var oldBugStatus=this.editForm.bugStatus; if(tardgetBugStatus=="closed"){ if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({message:"只有测试经理、测试组长、测试员可以关闭bug",type:"error"}); + this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以关闭bug",type:"error"}); return ; } } @@ -346,12 +346,12 @@ if(tips.isOk){ this.xmQuestionHandles=res.data.data; } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.list=false); }, showSelectTask:function(){ if(this.selProject==null){ - this.$message({ message: "请先选项目", type: 'error' }); + this.$message({showClose: true, message: "请先选项目", type: 'error' }); return ; } this.selectTaskVisible=true; @@ -382,7 +382,7 @@ showSelectMenu:function(){ if(this.selProject==null){ - this.$message({ message: "请先选项目", type: 'error' }); + this.$message({showClose: true, message: "请先选项目", type: 'error' }); return ; } this.selectMenuVisible=true; diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index 2c05327f..3aaa56b6 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -386,7 +386,7 @@ if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' }); return; } if( this.filters.bugStatus!=null && this.filters.bugStatus!="" ){ @@ -420,7 +420,7 @@ if(this.filters.hisHandleStatus){ params.hisHandlerUserid=this.filters.hisHandler.userid; }else{ - this.$message({ message: "请选择曾经的缺陷状态", type: 'error' }); + this.$message({showClose: true, message: "请选择曾经的缺陷状态", type: 'error' }); return; } @@ -429,7 +429,7 @@ if(this.filters.hisHandler){ params.hisHandleStatus=this.filters.hisHandleStatus }else{ - this.$message({ message: "请选择曾经的执行人", type: 'error' }); + this.$message({showClose: true, message: "请选择曾经的执行人", type: 'error' }); return; } @@ -464,7 +464,7 @@ this.pageInfo.count=false; this.xmQuestions = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -510,7 +510,7 @@ showAdd: function () { if(this.filters.selProject==null){ - this.$message({ message: "请先选中项目", type: 'success' }); + this.$message({showClose: true, message: "请先选中项目", type: 'success' }); this.nextAction="showAdd" this.showProjectList(); return; @@ -544,7 +544,7 @@ this.pageInfo.count=true; this.getXmQuestions(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -561,7 +561,7 @@ this.pageInfo.count=true; this.getXmQuestions(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -652,7 +652,7 @@ showGroupUsers:function(userType){ this.userType=userType; if(this.filters.selProject==null || this.filters.selProject.id==''){ - this.$message({ message: "请先选中项目", type: 'success' }); + this.$message({showClose: true, message: "请先选中项目", type: 'success' }); this.nextAction="showGroupUsers" this.showProjectList(); return; diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue index b44b21a8..e163e820 100644 --- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue +++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue @@ -128,7 +128,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue index 959736ad..1c84b829 100644 --- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue +++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue @@ -126,7 +126,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue index 8c9bcc67..8a3dcf6a 100644 --- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue +++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue @@ -154,7 +154,7 @@ this.pageInfo.count=false; this.xmQuestionHandles = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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.getXmQuestionHandles(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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.getXmQuestionHandles(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue index aae5cc8a..b63b48f5 100644 --- a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue +++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue @@ -92,7 +92,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue index ee06033a..f4c19d25 100644 --- a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue +++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue @@ -90,7 +90,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue index e0914555..4450c100 100644 --- a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue +++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue @@ -142,7 +142,7 @@ this.pageInfo.count=false; this.xmQuestionTags = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -184,7 +184,7 @@ this.pageInfo.count=true; this.getXmQuestionTags(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -202,7 +202,7 @@ this.pageInfo.count=true; this.getXmQuestionTags(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 c2887158..91248b45 100644 --- a/src/views/xm/core/xmRecord/XmRecord.vue +++ b/src/views/xm/core/xmRecord/XmRecord.vue @@ -163,7 +163,7 @@ this.pageInfo.count=false; this.xmRecords = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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.getXmRecords(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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.getXmRecords(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 227d93ac..1b06b900 100644 --- a/src/views/xm/core/xmTask/XmTaskAdd.vue +++ b/src/views/xm/core/xmTask/XmTaskAdd.vue @@ -294,7 +294,7 @@ //this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } @@ -336,7 +336,7 @@ this.skillVisible = false; // this.getXmTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }, diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index cf742562..4a5deba5 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -324,7 +324,7 @@ //this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="aftereditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.edit=false); }); } @@ -366,7 +366,7 @@ this.skillVisible = false; // this.getXmTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 7c5c0846..834041d7 100644 --- a/src/views/xm/core/xmTask/XmTaskList.vue +++ b/src/views/xm/core/xmTask/XmTaskList.vue @@ -235,7 +235,7 @@ } if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' }); return; } if(this.filters.key){ @@ -252,7 +252,7 @@ if(this.filters.selProject){ params.projectId=this.filters.selProject.id }else{ - this.$message({ message: "请选择项目", type: 'error' }); + this.$message({showClose: true, message: "请选择项目", type: 'error' }); this.load.list=false; this.selectProjectVisible=true; return; @@ -276,7 +276,7 @@ var xmTasks=res.data.data; this.xmTasks=xmTasks; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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 ad8402a1..b49fb96e 100644 --- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue +++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue @@ -228,7 +228,7 @@ var xmTasks=res.data.data; this.xmTasks=xmTasks; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index fcba47b4..2f346612 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -709,7 +709,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; params.orderBy= orderBys.join(",") } if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' }); return; } if(this.filters.taskType!="all" && this.filters.taskType!="" && this.filters.taskType!=null){ @@ -786,7 +786,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; } }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -854,7 +854,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; var isCreate=this.userInfo.userid==this.editForm.createUserid var isExec=this.userInfo.userid==this.editForm.executorUserid if( !isCreate && !isExec ){ - this.$message({ message: "你不是该任务的执行人、主负责人，不能更新进度", type: 'error' }); + this.$message({showClose: true, message: "你不是该任务的执行人、主负责人，不能更新进度", type: 'error' }); return; } if(rate){ @@ -867,13 +867,13 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; parentTaskid: this.editForm.parentTaskid, } if(this.editForm.rate==0){ - this.$message({ message: "不允许更新为0", type: 'error' }); + this.$message({showClose: true, message: "不允许更新为0", type: 'error' }); return; } this.load.edit = true; editRate(params).then((res) => { var tips=res.data.tips; - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); this.getXmTasks(); this.load.edit = false; }).catch( err =>{ @@ -895,7 +895,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; return; } if(this.currentProjectPhase==null){ - this.$message({ message: "请先选择项目阶段计划", type: 'error' }); + this.$message({showClose: true, message: "请先选择项目阶段计划", type: 'error' }); return false; } this.taskTemplateVisible=true; @@ -918,7 +918,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; return; } if(!this.currentProjectPhase){ - this.$message({ message: "请先选择项目阶段计划", type: 'error' }); + this.$message({showClose: true, message: "请先选择项目阶段计划", type: 'error' }); return; } this.addFormVisible = true; @@ -955,7 +955,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; this.pageInfo.count=true; this.getXmTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -977,7 +977,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; this.pageInfo.count=true; this.getXmTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -1162,7 +1162,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; } this.taskTemplateVisible=false; - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>{this.taskTemplateVisible=false;}); }, onTaskSkillsSearchSelected(skills){ @@ -1185,7 +1185,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; this.skillVisible = false; this.getXmTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }, @@ -1322,12 +1322,12 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; if(tips.isOk){ this.getXmTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }else{ addXmMyFocus({projectId:row.projectId,projectName:row.projectName,focusType:'task',taskId:row.id,taskName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{ var tips=res.data.tips; - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) } }, @@ -1338,7 +1338,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; return; } if(this.projectPhase==null ){ - this.$message({ message:"请选择阶段计划再编辑", type: 'error'}); + this.$message({showClose: true, message:"请选择阶段计划再编辑", type: 'error'}); return ; } this.batchEditVisible=true diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue index 5849409c..e1a2cb22 100644 --- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue +++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue @@ -397,7 +397,7 @@ } }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -422,7 +422,7 @@ return; } if(this.currentProjectPhase==null){ - this.$message({ message: "请先选择项目阶段计划", type: 'error' }); + this.$message({showClose: true, message: "请先选择项目阶段计划", type: 'error' }); return false; } this.taskTemplateVisible=true; @@ -445,7 +445,7 @@ return; } if(!this.currentProjectPhase){ - this.$message({ message: "请先选择项目阶段计划", type: 'error' }); + this.$message({showClose: true, message: "请先选择项目阶段计划", type: 'error' }); return; } this.addFormVisible = true; @@ -482,7 +482,7 @@ this.pageInfo.count=true; this.getXmTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -504,7 +504,7 @@ this.pageInfo.count=true; this.getXmTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -635,7 +635,7 @@ } this.taskTemplateVisible=false; - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>{this.taskTemplateVisible=false;}); }, onTaskSkillsSelected(skills) { @@ -653,7 +653,7 @@ this.skillVisible = false; this.getXmTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }, @@ -789,12 +789,12 @@ if(tips.isOk){ this.getXmTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }else{ addXmMyFocus({projectId:row.projectId,projectName:row.projectName,focusType:'task',taskId:row.id,taskName:row.name,userid:this.userInfo.userid,username:this.userInfo.username}).then(res=>{ var tips=res.data.tips; - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) } }, @@ -805,19 +805,19 @@ } console.log(JSON.stringify(this.taskBudgetData)) if(this.valueChangeRows.length==0){ - this.$message({ message:"没有改变任何数据，无需保存", type: 'success'}); + this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { if(this.taskBudgetData.surplusPhaseBudgetInnerUserAt<0){ - this.$message({ message:"内部人力预算不足，请调整", type: 'error'}); + this.$message({showClose: true, message:"内部人力预算不足，请调整", type: 'error'}); return; } if(this.taskBudgetData.surplusPhaseBudgetOutUserAt<0){ - this.$message({ message:"外购人力预算不足，请调整", type: 'error'}); + this.$message({showClose: true, message:"外购人力预算不足，请调整", type: 'error'}); return; } if(this.taskBudgetData.surplusPhaseBudgetNouserAt<0){ - this.$message({ message:"非人力预算不足请调整",type: 'error'}); + this.$message({showClose: true, message:"非人力预算不足请调整",type: 'error'}); return; } @@ -829,7 +829,7 @@ this.valueChangeRows=[] this.getXmTasks(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue index a0da4d15..1ad159c3 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.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.add=false); }); } @@ -173,7 +173,7 @@ //选择接收人 onUserSelected: function(users) { if(users.length>1){ - this.$message({ message: "只能选择一个人", type:'error' }); + this.$message({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 ca15bba0..68197735 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue @@ -131,7 +131,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 fd933a9e..b1f5a6fb 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue @@ -339,7 +339,7 @@ this.xmTaskExecusers = res.data.data; this.$emit("loadExecUserList",this.xmTaskExecusers); }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -420,7 +420,7 @@ this.pageInfo.count=true; this.afterDeleteSubmit(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -437,7 +437,7 @@ this.pageInfo.count=true; this.afterDeleteSubmit(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -462,7 +462,7 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); } @@ -478,7 +478,7 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }else if(row.status=="1"){ @@ -511,7 +511,7 @@ this.$refs['settleForm'].resetFields(); this.afterEditSubmit(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }, @@ -530,7 +530,7 @@ this.quotePriceVisible = false; this.afterEditSubmit(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); }); }, @@ -586,7 +586,7 @@ if(tips.isOk){ this.getXmTaskExecusers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -598,7 +598,7 @@ if(tips.isOk){ this.getXmTaskExecusers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -610,7 +610,7 @@ if(tips.isOk){ this.getXmTaskExecusers(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -752,7 +752,7 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) }, @@ -766,7 +766,7 @@ if(tips.isOk){ this.afterEditSubmit(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 69c6a003..5fba0245 100644 --- a/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue +++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue @@ -92,7 +92,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 63bc81f1..aa9fd2e7 100644 --- a/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue +++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue @@ -90,7 +90,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 0dc3cbf6..654e70cd 100644 --- a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue +++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue @@ -164,7 +164,7 @@ this.skillIds = ids; this.$emit("getSkill",this.xmTaskSkills); }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -209,7 +209,7 @@ this.pageInfo.count=true; this.getXmTaskSkills(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, @@ -227,7 +227,7 @@ this.pageInfo.count=true; this.getXmTaskSkills(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -255,7 +255,7 @@ this.skillVisible = false; this.getXmTaskSkills(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 492089df..6a923eed 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.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 f26513d8..cb34da72 100644 --- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue +++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue @@ -218,7 +218,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 a0cf0106..4cd1332c 100644 --- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue +++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue @@ -195,7 +195,7 @@ this.pageInfo.count=false; this.xmTaskTemplates = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({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.getXmTaskTemplates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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.getXmTaskTemplates(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, diff --git a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue index 07ff6480..4ef2b533 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue @@ -114,7 +114,7 @@ if(tips.isOk && next!=true){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 92ae08e9..9f426745 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue @@ -99,7 +99,7 @@ editSubmit: function () { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } this.$refs.editForm.validate((valid) => { @@ -116,7 +116,7 @@ if(tips.isOk){ this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 bf97a550..ef59b88b 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue @@ -251,7 +251,7 @@ } if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' }); return; } if(this.filters.product){ @@ -277,7 +277,7 @@ this.pageInfo.count=false; this.xmTestCases = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -291,7 +291,7 @@ //显示新增界面 XmTestCase 测试用例 showAdd: function () { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } this.addFormVisible = true; @@ -312,11 +312,11 @@ //删除xmTestCase handleDel: function (row,index) { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } if(!this.roles.some(i=>i.roleid=='testAdmin')){ - this.$message({ message: "只有测试管理员才能删除测试用例", type: 'error' }); + this.$message({showClose: true, message: "只有测试管理员才能删除测试用例", type: 'error' }); return; } this.$confirm('确认删除该记录吗?', '提示', { @@ -331,18 +331,18 @@ this.pageInfo.count=true; this.getXmTestCases(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmTestCase batchDel: function () { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } if(!this.roles.some(i=>i.roleid=='testAdmin')){ - this.$message({ message: "只有测试管理员才能删除测试用例", type: 'error' }); + this.$message({showClose: true, message: "只有测试管理员才能删除测试用例", type: 'error' }); return; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -356,7 +356,7 @@ this.pageInfo.count=true; this.getXmTestCases(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({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 c43c04b3..58811912 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue @@ -134,7 +134,7 @@ this.$refs['addForm'].resetFields(); this.$emit('submit');// @submit="afterAddSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 9aee3ead..27796853 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue @@ -132,7 +132,7 @@ this.$refs['editForm'].resetFields(); this.$emit('submit');// @submit="afterEditSubmit" } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({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 a474f600..089d270e 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue @@ -366,7 +366,7 @@ //params.xxx=xxxxx } if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); + this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' }); return; } if(this.filters.product){ @@ -392,7 +392,7 @@ this.pageInfo.count=false; this.xmTestCaseExecs = res.data.data; }else{ - this.$message({ message: tips.msg, type: 'error' }); + this.$message({showClose: true, message: tips.msg, type: 'error' }); } this.load.list = false; }).catch( err => this.load.list = false ); @@ -423,7 +423,7 @@ //删除xmTestCaseExec handleDel: function (row,index) { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({message:"只有测试经理、测试组长可以操作",type:"error"}); + this.$message({showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); return ; } this.$confirm('确认删除该记录吗?', '提示', { @@ -438,14 +438,14 @@ this.pageInfo.count=true; this.getXmTestCaseExecs(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error' }); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.del=false ); }); }, //批量删除xmTestCaseExec batchDel: function () { if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({message:"只有测试经理、测试组长可以操作",type:"error"}); + this.$message({showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); return ; } this.$confirm('确认删除选中记录吗？', '提示', { @@ -459,7 +459,7 @@ this.pageInfo.count=true; this.getXmTestCaseExecs(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.del=false ); }); }, @@ -496,7 +496,7 @@ this.pageInfo.count=true; this.getXmTestCaseExecs(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }else{ this.xmTestCaseMngVisible=false; @@ -505,11 +505,11 @@ }, showCase(){ if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({message:"只有测试经理、测试组长可以操作",type:"error"}); + this.$message({showClose: true,message:"只有测试经理、测试组长可以操作",type:"error"}); return ; } if(!this.filters.selProject){ - this.$message({message:"请先选择项目",type:"success"}); + this.$message({showClose: true,message:"请先选择项目",type:"success"}); this.nextAction="showCase" this.showProjectList(); return; @@ -592,11 +592,11 @@ }, showBatchEdit:function(){ if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } if( !this.filters.selProject ){ - this.$message({ message:"请先选择项目", type: 'success'}); + this.$message({showClose: true, message:"请先选择项目", type: 'success'}); this.nextAction="showBatchEdit" this.showProjectList(); return ; @@ -606,11 +606,11 @@ batchEditXmTestCaseExec:function(){ if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){ - this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); + this.$message({showClose: true,message:"只有测试经理、测试组长、测试员可以操作",type:"error"}); return ; } if(this.valueChangeRows.length==0){ - this.$message({ message:"没有改变任何数据，无需保存", type: 'success'}); + this.$message({showClose: true, message:"没有改变任何数据，无需保存", type: 'success'}); return; }else { this.load.edit=true; @@ -621,7 +621,7 @@ this.valueChangeRows=[] this.getXmTestCaseExecs(); } - this.$message({ message: tips.msg, type: tips.isOk?'success':'error'}); + this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }).catch(e=>this.load.edit=false); } @@ -689,7 +689,7 @@ showSelectTask:function(row){ this.editForm=row if(this.filters.selProject==null){ - this.$message({ message: "请先选项目", type: 'success' }); + this.$message({showClose: true, message: "请先选项目", type: 'success' }); this.nextAction="showSelectTask" this.showProjectList(); @@ -718,7 +718,7 @@ showBugs(row){ this.editForm=row if(!this.filters.selProject){ - this.$message({ message: "请先选项目", type: 'success' }); + this.$message({showClose: true, message: "请先选项目", type: 'success' }); this.showProjectList(); this.nextAction="showBugs" return ; @@ -736,7 +736,7 @@ this.editForm=row if(!this.filters.selProject){ - this.$message({ message: "请先选项目", type: 'success' }); + this.$message({showClose: true, message: "请先选项目", type: 'success' }); this.nextAction="showAddBug" this.showProjectList(); return ;