Browse Source

优化消息提醒可关闭

master
陈裕财 5 years ago
parent
commit
5700f22204
  1. 2
      src/components/Image/ImageCategoryTree.vue
  2. 2
      src/components/Image/More/Index.vue
  3. 2
      src/components/Image/More/IndexOneUpdate.vue
  4. 2
      src/components/Image/More/sizeimg.vue
  5. 34
      src/components/Image/ShearSelectUpload.vue
  6. 34
      src/components/Image/UploadImage.vue
  7. 2
      src/components/LangSelect/index.vue
  8. 2
      src/components/Screenfull/index.vue
  9. 2
      src/components/ThemePicker/index.vue
  10. 4
      src/components/VueEditor/Index.vue
  11. 2
      src/components/excel/select-excel.vue
  12. 2
      src/components/excel/upload-excel.vue
  13. 4
      src/components/selectShopLocation/BranchSelect.vue
  14. 2
      src/components/selectShopLocation/DeptTree.vue
  15. 4
      src/components/selectShopLocation/selectManyShopLocationBySysDept.vue
  16. 6
      src/components/selectShopLocation/selectShopLocationBySysDept.vue
  17. 14
      src/styles/mdp.scss
  18. 2
      src/views/example/table/complexTable.vue
  19. 4
      src/views/example/table/inlineEditTable.vue
  20. 18
      src/views/login/BranchAdd.vue
  21. 4
      src/views/mdp/arc/archiveAttachment/AttachmentUpload.vue
  22. 2
      src/views/mdp/arc/category/CategoryTree.vue
  23. 28
      src/views/mdp/arc/tag/TagMng.vue
  24. 8
      src/views/mdp/form/formData/FormData.vue
  25. 2
      src/views/mdp/form/formData/FormDataAdd.vue
  26. 2
      src/views/mdp/form/formData/FormDataEdit.vue
  27. 20
      src/views/mdp/form/formData/FormDataMng.vue
  28. 36
      src/views/mdp/form/formData/FormDataMngForFlow.vue
  29. 4
      src/views/mdp/form/formData/FormDataMngForFlowForm.vue
  30. 36
      src/views/mdp/form/formData/FormDataMngForFlowTable.vue
  31. 4
      src/views/mdp/form/formData/FormDataSet.vue
  32. 6
      src/views/mdp/form/formDef/FormDefAdd.vue
  33. 20
      src/views/mdp/form/formDef/FormDefEdit.vue
  34. 2
      src/views/mdp/form/formDef/FormDefList.vue
  35. 6
      src/views/mdp/form/formDef/FormDefMng.vue
  36. 2
      src/views/mdp/form/formField/FormField.vue
  37. 6
      src/views/mdp/form/formQx/FormQxSet.vue
  38. 2
      src/views/mdp/form/formView/FormViewAdd.vue
  39. 2
      src/views/mdp/form/formView/FormViewEdit.vue
  40. 6
      src/views/mdp/form/formView/FormViewMng.vue
  41. 2
      src/views/mdp/meta/category/CategoryAdd.vue
  42. 2
      src/views/mdp/meta/category/CategoryEdit.vue
  43. 8
      src/views/mdp/meta/category/CategoryMng.vue
  44. 2
      src/views/mdp/meta/item/ItemAdd.vue
  45. 2
      src/views/mdp/meta/item/ItemEdit.vue
  46. 8
      src/views/mdp/meta/item/ItemMng.vue
  47. 2
      src/views/mdp/meta/itemOption/ItemOptionAdd.vue
  48. 2
      src/views/mdp/meta/itemOption/ItemOptionEdit.vue
  49. 10
      src/views/mdp/meta/itemOption/ItemOptionMng.vue
  50. 2
      src/views/mdp/meta/sysParam/ItemOptionAdd.vue
  51. 2
      src/views/mdp/meta/sysParam/ItemOptionEdit.vue
  52. 10
      src/views/mdp/meta/sysParam/SysParamMng.vue
  53. 24
      src/views/mdp/sms/SendSms.vue
  54. 4
      src/views/mdp/sys/branch/BranchSelect.vue
  55. 2
      src/views/mdp/sys/dept/DeptTree.vue
  56. 4
      src/views/mdp/sys/post/PostSelectCommon.vue
  57. 10
      src/views/mdp/sys/user/UsersSelect.vue
  58. 2
      src/views/mdp/sys/userDept/UserDeptEdit.vue
  59. 2
      src/views/mdp/workflow/biz/bizModel/BizModelAdd.vue
  60. 2
      src/views/mdp/workflow/biz/bizModel/BizModelEdit.vue
  61. 6
      src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
  62. 10
      src/views/mdp/workflow/de/model/ModelMng.vue
  63. 4
      src/views/mdp/workflow/hi/comment/commentStep.vue
  64. 6
      src/views/mdp/workflow/hi/procinst/ProcinstMng.vue
  65. 6
      src/views/mdp/workflow/re/deployment/DeploymentMng.vue
  66. 6
      src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
  67. 2
      src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
  68. 4
      src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue
  69. 6
      src/views/mdp/workflow/re/procdef/ProcdefMng.vue
  70. 6
      src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
  71. 14
      src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue
  72. 6
      src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue
  73. 26
      src/views/mdp/workflow/ru/execution/ExecutionMng.vue
  74. 26
      src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue
  75. 4
      src/views/mdp/workflow/ru/procinstParames/ProcinstNodeInfoSet.vue
  76. 16
      src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue
  77. 6
      src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue
  78. 34
      src/views/mdp/workflow/ru/task/TaskMng.vue
  79. 16
      src/views/xm/core/skill/skillMng.vue
  80. 2
      src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
  81. 2
      src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
  82. 6
      src/views/xm/core/xmAttachment/XmAttachmentMng.vue
  83. 2
      src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
  84. 2
      src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
  85. 8
      src/views/xm/core/xmBranchState/XmBranchStateMng.vue
  86. 2
      src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
  87. 2
      src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
  88. 6
      src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
  89. 2
      src/views/xm/core/xmEnvList/XmEnvListAdd.vue
  90. 2
      src/views/xm/core/xmEnvList/XmEnvListEdit.vue
  91. 6
      src/views/xm/core/xmEnvList/XmEnvListMng.vue
  92. 2
      src/views/xm/core/xmExchange/XmExchangeAdd.vue
  93. 2
      src/views/xm/core/xmExchange/XmExchangeEdit.vue
  94. 8
      src/views/xm/core/xmExchange/XmExchangeMng.vue
  95. 2
      src/views/xm/core/xmFile/XmFileAdd.vue
  96. 2
      src/views/xm/core/xmFile/XmFileEdit.vue
  97. 6
      src/views/xm/core/xmFile/XmFileMng.vue
  98. 4
      src/views/xm/core/xmIteration/XmIterationAdd.vue
  99. 4
      src/views/xm/core/xmIteration/XmIterationEdit.vue
  100. 18
      src/views/xm/core/xmIteration/XmIterationMng.vue

2
src/components/Image/ImageCategoryTree.vue

@ -168,7 +168,7 @@
this.categoryTreeData=[res.data.data]; this.categoryTreeData=[res.data.data];
this.$refs.categoryTree.setCurrentKey(this.currentKey); this.$refs.categoryTree.setCurrentKey(this.currentKey);
}else{ }else{
this.$message({ message: tips.msg, type: 'error'});
this.$message({showClose: true, message: tips.msg, type: 'error'});
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {

2
src/components/Image/More/Index.vue

@ -126,7 +126,7 @@
}, },
addImg(){ addImg(){
if(parseInt(this.limit)<=this.imageLists.length){ if(parseInt(this.limit)<=this.imageLists.length){
this.$message({ message: "图片数量已经超过", type: 'error' });
this.$message({showClose: true, message: "图片数量已经超过", type: 'error' });
return; return;
} }
this.addFormVisible = true; this.addFormVisible = true;

2
src/components/Image/More/IndexOneUpdate.vue

@ -127,7 +127,7 @@
}, },
addImg(){ addImg(){
if(parseInt(this.limit)<=this.imageLists.length){ if(parseInt(this.limit)<=this.imageLists.length){
this.$message({ message: "图片数量已经超过", type: 'error' });
this.$message({showClose: true, message: "图片数量已经超过", type: 'error' });
return; return;
} }
this.addFormVisible = true; this.addFormVisible = true;

2
src/components/Image/More/sizeimg.vue

@ -124,7 +124,7 @@
}, },
addImg(){ addImg(){
if(parseInt(this.limit)<=this.imageLists.length){ if(parseInt(this.limit)<=this.imageLists.length){
this.$message({ message: "图片数量已经超过", type: 'error' });
this.$message({showClose: true, message: "图片数量已经超过", type: 'error' });
return; return;
} }
this.addFormVisible = true; this.addFormVisible = true;

34
src/components/Image/ShearSelectUpload.vue

@ -205,15 +205,15 @@ export default {
}, },
plusCjbk(){ plusCjbk(){
if(this.crap==false){ if(this.crap==false){
this.$message({ message: "请先开始裁剪", type: "warning" });
this.$message({showClose: true, message: "请先开始裁剪", type: "warning" });
return; return;
} }
if(this.option.autoCropWidth+this.defaultImgHeight*0.1>800){ if(this.option.autoCropWidth+this.defaultImgHeight*0.1>800){
this.$message({ message: "不能再放大", type: "warning" });
this.$message({showClose: true, message: "不能再放大", type: "warning" });
return; return;
} }
if(this.option.autoCropHeight+this.defaultImgHeight*0.1>800){ if(this.option.autoCropHeight+this.defaultImgHeight*0.1>800){
this.$message({ message: "不能再放大", type: "warning" });
this.$message({showClose: true, message: "不能再放大", type: "warning" });
return; return;
} }
@ -223,16 +223,16 @@ export default {
}, },
reduceCjbk(){ reduceCjbk(){
if(this.crap==false){ if(this.crap==false){
this.$message({ message: "请先开始裁剪", type: "warning" });
this.$message({showClose: true, message: "请先开始裁剪", type: "warning" });
return; return;
} }
if(this.option.autoCropWidth-this.defaultImgWidth*0.1<=0){ if(this.option.autoCropWidth-this.defaultImgWidth*0.1<=0){
this.$message({ message: "不能再缩小", type: "warning" });
this.$message({showClose: true, message: "不能再缩小", type: "warning" });
return; return;
} }
if(this.option.autoCropHeight-this.defaultImgHeight*0.1<=0){ if(this.option.autoCropHeight-this.defaultImgHeight*0.1<=0){
this.$message({ message: "不能再缩小", type: "warning" });
this.$message({showClose: true, message: "不能再缩小", type: "warning" });
return; return;
} }
this.option.autoCropWidth=this.option.autoCropWidth-this.defaultImgWidth*0.1 this.option.autoCropWidth=this.option.autoCropWidth-this.defaultImgWidth*0.1
@ -241,7 +241,7 @@ export default {
}, },
recoveryCjbk(){ recoveryCjbk(){
if(this.crap==false){ if(this.crap==false){
this.$message({ message: "请先开始裁剪", type: "warning" });
this.$message({showClose: true, message: "请先开始裁剪", type: "warning" });
return; return;
} }
@ -277,7 +277,7 @@ export default {
} }
//var parm= this.$options.computed.uploadParams(); //var parm= this.$options.computed.uploadParams();
if(params.categoryId==''||params.categoryId==undefined){ if(params.categoryId==''||params.categoryId==undefined){
this.$message({ message: "分类不能为空", type: "warning" });
this.$message({showClose: true, message: "分类不能为空", type: "warning" });
return; return;
} }
if (type === 'blob') { if (type === 'blob') {
@ -310,13 +310,13 @@ export default {
//this.refreshCrop (); //this.refreshCrop ();
this.$emit('upload-success',image); this.$emit('upload-success',image);
}else{ }else{
this.$message({ message: "上传错误", type: "warning" });
this.$message({showClose: true, message: "上传错误", type: "warning" });
} }
}).catch(()=>{ }).catch(()=>{
this.$message.warning("上传失败"); this.$message.warning("上传失败");
}); });
}).catch(() => { }).catch(() => {
this.$message({
this.$message({showClose: true,
type: 'info', type: 'info',
message: '已取消' message: '已取消'
}); });
@ -332,13 +332,13 @@ export default {
//this.refreshCrop (); //this.refreshCrop ();
this.$emit('upload-success',image); this.$emit('upload-success',image);
}else{ }else{
this.$message({ message: "上传错误", type: "warning" });
this.$message({showClose: true, message: "上传错误", type: "warning" });
} }
}).catch(()=>{ }).catch(()=>{
this.$message.warning("上传失败"); this.$message.warning("上传失败");
}); });
}else{ }else{
this.$message({ message: "图片太大,不允许上传,请重新裁剪后上传", type: "warning" });
this.$message({showClose: true, message: "图片太大,不允许上传,请重新裁剪后上传", type: "warning" });
} }
} }
@ -353,9 +353,9 @@ export default {
imgLoad(info){ imgLoad(info){
this.imgLoading=false this.imgLoading=false
if(info=='success'){ if(info=='success'){
this.$message({ message: "加载图片成功", type: "success" });
this.$message({showClose: true, message: "加载图片成功", type: "success" });
}else{ }else{
this.$message({ message: "加载图片失败", type: "error" });
this.$message({showClose: true, message: "加载图片失败", type: "error" });
} }
}, },
@ -398,13 +398,13 @@ export default {
//alert(jsonData); //alert(jsonData);
/* var tips= res.tips; /* var tips= res.tips;
if(tips.isOk){ if(tips.isOk){
this.$message({ message: '上传成功', type: 'info' });
this.$message({showClose: true, message: '上传成功', type: 'info' });
}else{ }else{
if(tips.msg=='该图片不支持'){ if(tips.msg=='该图片不支持'){
this.$message({ message: '该图片不支持', type: 'info' });
this.$message({showClose: true, message: '该图片不支持', type: 'info' });
}else{ }else{
this.$message({ message: '未知异常', type: 'info' });
this.$message({showClose: true, message: '未知异常', type: 'info' });
} }
} */ } */

34
src/components/Image/UploadImage.vue

@ -173,7 +173,7 @@
if(this.branchId != undefined && this.branchId!= ''){ if(this.branchId != undefined && this.branchId!= ''){
params.branchId = this.branchId; params.branchId = this.branchId;
}else{ }else{
this.$message({ message: '请先选择分类,如果分类为空,请联系管理员添加分类', type: 'error' });
this.$message({showClose: true, message: '请先选择分类,如果分类为空,请联系管理员添加分类', type: 'error' });
return; return;
} }
this.listLoading = true; this.listLoading = true;
@ -183,12 +183,12 @@
this.categorys = [res.data.data]; this.categorys = [res.data.data];
gcategorys=Object.assign(this.categorys) gcategorys=Object.assign(this.categorys)
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
this.listLoading = false; this.listLoading = false;
this.$message({ message: '通讯异常', type: 'error' });
this.$message({showClose: true, message: '通讯异常', type: 'error' });
}); });
}, },
// obj.order=ascending/descending, asc/desc ; obj.prop=, // obj.order=ascending/descending, asc/desc ; obj.prop=,
@ -239,13 +239,13 @@
//var jsonData = JSON.stringify(res, null, 4); //var jsonData = JSON.stringify(res, null, 4);
var tips= res.tips; var tips= res.tips;
if(tips.isOk){ if(tips.isOk){
this.$message({ message: '上传成功', type: 'success' });
this.$message({showClose: true, message: '上传成功', type: 'success' });
this.getImages(); this.getImages();
}else{ }else{
if(tips.msg=='该图片不支持'){ if(tips.msg=='该图片不支持'){
this.$message({ message: '该图片不支持', type: 'info' });
this.$message({showClose: true, message: '该图片不支持', type: 'info' });
}else{ }else{
this.$message({ message: '未知异常', type: 'error' });
this.$message({showClose: true, message: '未知异常', type: 'error' });
} }
} }
@ -262,14 +262,14 @@
console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
console.log(file) console.log(file)
if(this.uploadOptions.categoryId=='' || this.uploadOptions.categoryId==null){ if(this.uploadOptions.categoryId=='' || this.uploadOptions.categoryId==null){
this.$message({ message: "请选择分类", type: "warning" });
this.$message({showClose: true, message: "请选择分类", type: "warning" });
return false; return false;
} }
if(file.size<=1024*2024){//1M if(file.size<=1024*2024){//1M
this.$message({ message: '小于2M的文件可直接上传图片库', type: 'success' });
this.$message({showClose: true, message: '小于2M的文件可直接上传图片库', type: 'success' });
return true; return true;
}else{ }else{
this.$message({ message: '为了良好的客户体验,大于2M的文件需经过裁剪压缩处理', type: 'warning' });
this.$message({showClose: true, message: '为了良好的客户体验,大于2M的文件需经过裁剪压缩处理', type: 'warning' });
return false; return false;
} }
@ -279,7 +279,7 @@
var that = this; var that = this;
//this.imageUrl = URL.createObjectURL(file.raw); //this.imageUrl = URL.createObjectURL(file.raw);
if(file.raw.size<=1024*1024){//1M 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;
} }
return true; return true;
@ -329,7 +329,7 @@
//params.jsessionid=this.jsessionid; //params.jsessionid=this.jsessionid;
this.listLoading = true; this.listLoading = true;
if(this.branchId == undefined || this.branchId== ''){ if(this.branchId == undefined || this.branchId== ''){
this.$message({ message: '机构不能为空', type: 'warning' });
this.$message({showClose: true, message: '机构不能为空', type: 'warning' });
return; return;
} }
params.branchId = this.branchId; params.branchId = this.branchId;
@ -346,12 +346,12 @@
//url //url
/* this.converUrl(this.images); */ /* this.converUrl(this.images); */
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
this.listLoading = false; this.listLoading = false;
this.$message({ message: '通讯异常', type: 'error' });
this.$message({showClose: true, message: '通讯异常', type: 'error' });
}); });
}, },
converUrl(url){ converUrl(url){
@ -381,11 +381,11 @@
}, },
handleConfirm(){ handleConfirm(){
if(this.images==null || this.images.length==0){ if(this.images==null || this.images.length==0){
this.$message({ message: '请选择图片', type: 'error' });
this.$message({showClose: true, message: '请选择图片', type: 'error' });
return return
} }
if(this.selectImages==null || this.selectImages.length==0){ if(this.selectImages==null || this.selectImages.length==0){
this.$message({ message: '请选择图片', type: 'error' });
this.$message({showClose: true, message: '请选择图片', type: 'error' });
return return
} }
if(this.multiple){ if(this.multiple){
@ -418,7 +418,7 @@
}; };
if(this.categoryName==''){ if(this.categoryName==''){
this.$message({ message: '请输入分类名字', type: 'error' });
this.$message({showClose: true, message: '请输入分类名字', type: 'error' });
return return
} }
addImageCategory(params).then(res=>{ addImageCategory(params).then(res=>{
@ -426,7 +426,7 @@
this.showAddCategoryForm=false this.showAddCategoryForm=false
this.getImageCategorys() this.getImageCategorys()
}else{ }else{
this.$message({ message: res.data.tips.msg, type: 'error' });
this.$message({showClose: true, message: res.data.tips.msg, type: 'error' });
} }
}) })
}, },

2
src/components/LangSelect/index.vue

@ -21,7 +21,7 @@ export default {
handleSetLanguage(lang) { handleSetLanguage(lang) {
this.$i18n.locale = lang this.$i18n.locale = lang
this.$store.dispatch('setLanguage', lang) this.$store.dispatch('setLanguage', lang)
this.$message({
this.$message({showClose: true,
message: 'switch language success', message: 'switch language success',
type: 'success' type: 'success'
}) })

2
src/components/Screenfull/index.vue

@ -41,7 +41,7 @@ export default {
methods: { methods: {
click() { click() {
if (!screenfull.enabled) { if (!screenfull.enabled) {
this.$message({
this.$message({showClose: true,
message: 'you browser can not work', message: 'you browser can not work',
type: 'warning' type: 'warning'
}) })

2
src/components/ThemePicker/index.vue

@ -57,7 +57,7 @@ export default {
if (typeof innerText !== 'string') return if (typeof innerText !== 'string') return
style.innerText = this.updateStyle(innerText, originalCluster, themeCluster) style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
}) })
this.$message({
this.$message({showClose: true,
message: '换肤成功', message: '换肤成功',
type: 'success' type: 'success'
}) })

4
src/components/VueEditor/Index.vue

@ -212,7 +212,7 @@
}, },
handleUploadError : function(err, file, fileList){ handleUploadError : function(err, file, fileList){
this.$message({ message: "文件上传失败,请检查文件是否过大,建议图片文件控制在500K内", type: "warning" });
this.$message({showClose: true, message: "文件上传失败,请检查文件是否过大,建议图片文件控制在500K内", type: "warning" });
}, },
/**begin 在下面加自定义方法,记得补上面的一个逗号**/ /**begin 在下面加自定义方法,记得补上面的一个逗号**/
converUrl(url){ converUrl(url){
@ -235,7 +235,7 @@
console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
console.log(file) console.log(file)
if(file.raw.type.indexOf('image')<0){ if(file.raw.type.indexOf('image')<0){
this.$message({ message: "请选择图片文件", type: "warning" });
this.$message({showClose: true, message: "请选择图片文件", type: "warning" });
return false; return false;
} }
return true; return true;

2
src/components/excel/select-excel.vue

@ -93,7 +93,7 @@ export default {
this.downloadLoading = false this.downloadLoading = false
}) })
} else { } else {
this.$message({
this.$message({showClose: true,
message: 'Please select at least one item', message: 'Please select at least one item',
type: 'warning' type: 'warning'
}) })

2
src/components/excel/upload-excel.vue

@ -27,7 +27,7 @@ export default {
return true return true
} }
this.$message({
this.$message({showClose: true,
message: 'Please do not upload files larger than 1m in size.', message: 'Please do not upload files larger than 1m in size.',
type: 'warning' type: 'warning'
}) })

4
src/components/selectShopLocation/BranchSelect.vue

@ -133,12 +133,12 @@
this.pageInfo.total = res.data.total;this.pageInfo.count=false; this.pageInfo.total = res.data.total;this.pageInfo.count=false;
this.branchs = res.data.data; this.branchs = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch(() => { }).catch(() => {
this.load.list = false; this.load.list = false;
//this.$message({ message: '', type: 'error' });
//this.$message({showClose: true, message: '', type: 'error' });
}); });
}, },
//branch //branch

2
src/components/selectShopLocation/DeptTree.vue

@ -196,7 +196,7 @@
} }
}else{ }else{
this.$message({ message: tips.msg, type: 'error'});
this.$message({showClose: true, message: tips.msg, type: 'error'});
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {

4
src/components/selectShopLocation/selectManyShopLocationBySysDept.vue

@ -85,7 +85,7 @@
this.currentSelectDeptObject.branchId == null || this.currentSelectDeptObject.branchId == null ||
this.currentSelectDeptObject.branchId == "" this.currentSelectDeptObject.branchId == ""
) { ) {
this.$message({
this.$message({showClose: true,
message: "请选择机构和部门", message: "请选择机构和部门",
type: "error" type: "error"
}); });
@ -154,7 +154,7 @@
this.pageInfo.count = false; this.pageInfo.count = false;
that.shopLocationTable = res.data.data; that.shopLocationTable = res.data.data;
} }
// this.$message({
// this.$message({showClose: true,
// message: tips.msg, // message: tips.msg,
// type: tips.isOk ? "success" : "error" // type: tips.isOk ? "success" : "error"
// }); // });

6
src/components/selectShopLocation/selectShopLocationBySysDept.vue

@ -72,7 +72,7 @@
methods: { methods: {
selectshopLocationBySysDeptIdMethodLike(){ selectshopLocationBySysDeptIdMethodLike(){
if(this.currentSelectDeptObject.branchId==null||this.currentSelectDeptObject.branchId==''){ if(this.currentSelectDeptObject.branchId==null||this.currentSelectDeptObject.branchId==''){
this.$message({
this.$message({showClose: true,
message: "请选择机构和部门", message: "请选择机构和部门",
type: "error" type: "error"
}); });
@ -131,7 +131,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
that.shopLocationTable = res.data.data; that.shopLocationTable = res.data.data;
} }
// this.$message({
// this.$message({showClose: true,
// message: tips.msg, // message: tips.msg,
// type: tips.isOk ? 'success' : 'error' // type: tips.isOk ? 'success' : 'error'
// }); // });
@ -148,7 +148,7 @@
}, },
checkSureMethod(){ checkSureMethod(){
if(this.multipleSelection.length<1){ if(this.multipleSelection.length<1){
this.$message({
this.$message({showClose: true,
message: "必须选择某个门店", message: "必须选择某个门店",
type: "error" type: "error"
}); });

14
src/styles/mdp.scss

@ -121,3 +121,17 @@
margin-right: 10px; margin-right: 10px;
margin-top: 2px; margin-top: 2px;
} }
.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;
}

2
src/views/example/table/complexTable.vue

@ -237,7 +237,7 @@ export default {
this.getList() this.getList()
}, },
handleModifyStatus(row, status) { handleModifyStatus(row, status) {
this.$message({
this.$message({showClose: true,
message: '操作成功', message: '操作成功',
type: 'success' type: 'success'
}) })

4
src/views/example/table/inlineEditTable.vue

@ -100,7 +100,7 @@ export default {
cancelEdit(row) { cancelEdit(row) {
row.title = row.originalTitle row.title = row.originalTitle
row.edit = false row.edit = false
this.$message({
this.$message({showClose: true,
message: 'The title has been restored to the original value', message: 'The title has been restored to the original value',
type: 'warning' type: 'warning'
}) })
@ -108,7 +108,7 @@ export default {
confirmEdit(row) { confirmEdit(row) {
row.edit = false row.edit = false
row.originalTitle = row.title row.originalTitle = row.title
this.$message({
this.$message({showClose: true,
message: 'The title has been edited', message: 'The title has been edited',
type: 'success' type: 'success'
}) })

18
src/views/login/BranchAdd.vue

@ -181,16 +181,16 @@
if(tips.isOk){ if(tips.isOk){
this.$emit('submit',res.data.data );// @submit="afterAddSubmit" 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); }).catch(() => this.load.add=false);
}else{ }else{
this.$message({ message: "该公司名已注册,不可以使用", type: 'error' });
this.$message({showClose: true, message: "该公司名已注册,不可以使用", type: 'error' });
return; return;
} }
} }
}) })
}else{ }else{
this.$message({ message: "公司名必须6个字以上", type: 'error' });
this.$message({showClose: true, message: "公司名必须6个字以上", type: 'error' });
return; return;
} }
@ -219,7 +219,7 @@
}) })
}else{ }else{
this.load.list=false; this.load.list=false;
this.$message({ message: "最少输入两个字", type: 'info' });
this.$message({showClose: true, message: "最少输入两个字", type: 'info' });
return; return;
} }
}, },
@ -231,11 +231,11 @@
addUserJoinBranchRequire(params).then(res=>{ addUserJoinBranchRequire(params).then(res=>{
var tips = res.data.tips; var tips = res.data.tips;
if(tips.isOk){ 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" //this.$emit('submit',res.data.data );// @submit="afterAddSubmit"
return; return;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
}) })
@ -251,16 +251,16 @@
listBranchNoAuth(params).then(res=>{ listBranchNoAuth(params).then(res=>{
if(res.data.tips.isOk){ if(res.data.tips.isOk){
if(res.data.data.length<=0){ if(res.data.data.length<=0){
this.$message({ message: "该公司名未注册,可以使用", type: 'success' });
this.$message({showClose: true, message: "该公司名未注册,可以使用", type: 'success' });
return; return;
}else{ }else{
this.$message({ message: "该公司名已注册,不可以使用", type: 'error' });
this.$message({showClose: true, message: "该公司名已注册,不可以使用", type: 'error' });
return; return;
} }
} }
}) })
}else{ }else{
this.$message({ message: "最少输入两个字", type: 'error' });
this.$message({showClose: true, message: "最少输入两个字", type: 'error' });
return; return;
} }
} }

4
src/views/mdp/arc/archiveAttachment/AttachmentUpload.vue

@ -249,12 +249,12 @@ export default {
handleBeforeUpload(file) { handleBeforeUpload(file) {
let files = this.fileList.filter(i => i.name == file.name); let files = this.fileList.filter(i => i.name == file.name);
if (files.length > 0) { if (files.length > 0) {
this.$message({ message: "文件已经存在", type: "warning" });
this.$message({showClose: true, message: "文件已经存在", type: "warning" });
return false; return false;
} else { } else {
if (file.size > 1024 * 1024 * 4) { if (file.size > 1024 * 1024 * 4) {
//4M //4M
this.$message({
this.$message({showClose: true,
message: message:
"文件大小为" + "文件大小为" +
file.size / (1024 * 1024) + file.size / (1024 * 1024) +

2
src/views/mdp/arc/category/CategoryTree.vue

@ -288,7 +288,7 @@
this.treeData=res.data.data; this.treeData=res.data.data;
console.log("this.treeData----"+JSON.stringify(this.treeData)); console.log("this.treeData----"+JSON.stringify(this.treeData));
}else{ }else{
this.$message({ message: tips.msg, type: 'error'});
this.$message({showClose: true, message: tips.msg, type: 'error'});
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {

28
src/views/mdp/arc/tag/TagMng.vue

@ -283,7 +283,7 @@
} }
this.convertTags = convert; this.convertTags = convert;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: 'error' type: 'error'
}); });
@ -336,7 +336,7 @@
this.pageInfo.count = true; this.pageInfo.count = true;
this.getTags(); this.getTags();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });
@ -357,7 +357,7 @@
this.pageInfo.count = true; this.pageInfo.count = true;
this.getTags(); this.getTags();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });
@ -379,7 +379,7 @@
addTagMethod(index) { addTagMethod(index) {
if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) { if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) {
if (this.isPub == '1') { if (this.isPub == '1') {
this.$message({
this.$message({showClose: true,
message: "不是平台管理员,不允许增加公共标签", message: "不是平台管理员,不允许增加公共标签",
type: 'error' type: 'error'
}); });
@ -389,7 +389,7 @@
if (this.convertTags.some(i => { if (this.convertTags.some(i => {
return i.values.some(tag => tag.tagName == this.convertTags[index].showAddButtonInputValue) return i.values.some(tag => tag.tagName == this.convertTags[index].showAddButtonInputValue)
})) { })) {
this.$message({
this.$message({showClose: true,
message: "标签已经存在", message: "标签已经存在",
type: 'error' type: 'error'
}); });
@ -397,7 +397,7 @@
} }
if (!this.convertTags[index].pubc) { if (!this.convertTags[index].pubc) {
if (this.isPub == '1') { if (this.isPub == '1') {
this.$message({
this.$message({showClose: true,
message: "该分类不是公共分类,不能添加公共标签", message: "该分类不是公共分类,不能添加公共标签",
type: 'error' type: 'error'
}); });
@ -435,7 +435,7 @@
this.convertTags[index].showAddButtonInputValue = ''; this.convertTags[index].showAddButtonInputValue = '';
this.convertTags[index].values.push(json); this.convertTags[index].values.push(json);
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });
@ -445,7 +445,7 @@
delTagMethod(tagId, index, valueIndex) { delTagMethod(tagId, index, valueIndex) {
if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) { if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) {
if (this.convertTags[index].values.some(i => i.pubTag == '1' && i.tagId == tagId)) { if (this.convertTags[index].values.some(i => i.pubTag == '1' && i.tagId == tagId)) {
this.$message({
this.$message({showClose: true,
message: "公共标签不允许删除", message: "公共标签不允许删除",
type: 'error' type: 'error'
}); });
@ -475,7 +475,7 @@
this.convertTags[index].values.splice(valueIndex, 1); this.convertTags[index].values.splice(valueIndex, 1);
/*this.getTags();*/ /*this.getTags();*/
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });
@ -493,7 +493,7 @@
let that = this; let that = this;
if (!(this.userInfo.isPlatformAdmin || this.userInfo.isSuperAdmin)) { if (!(this.userInfo.isPlatformAdmin || this.userInfo.isSuperAdmin)) {
if (this.isPub == '1') { if (this.isPub == '1') {
this.$message({
this.$message({showClose: true,
message: "你不是平台管理员不能添加公共标签分类", message: "你不是平台管理员不能添加公共标签分类",
type: 'error' type: 'error'
}); });
@ -502,7 +502,7 @@
} }
if (this.convertTags.some(i => i.categoryName == this.needAddTagCategoryNameInputValue)) { if (this.convertTags.some(i => i.categoryName == this.needAddTagCategoryNameInputValue)) {
this.$message({
this.$message({showClose: true,
message: "标签分类已经存在", message: "标签分类已经存在",
type: 'error' type: 'error'
}); });
@ -533,7 +533,7 @@
} }
this.convertTags.push(json); this.convertTags.push(json);
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });
@ -568,7 +568,7 @@
} }
if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) { if (!this.userInfo.isPlatformAdmin && !this.userInfo.isSuperAdmin) {
if (this.convertTags.some(i => i.pubc == '1' && i.categoryId == categoryId)) { if (this.convertTags.some(i => i.pubc == '1' && i.categoryId == categoryId)) {
this.$message({
this.$message({showClose: true,
message: "公共分类不允许删除", message: "公共分类不允许删除",
type: 'error' type: 'error'
}); });
@ -588,7 +588,7 @@
this.convertTags.splice(index, 1); this.convertTags.splice(index, 1);
/*this.getTags();*/ /*this.getTags();*/
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });

8
src/views/mdp/form/formData/FormData.vue

@ -307,7 +307,7 @@
let deptids=this.$refs['dept_'+item.fieldIdCamel][0].$refs.deptTree.getCheckedKeys(); let deptids=this.$refs['dept_'+item.fieldIdCamel][0].$refs.deptTree.getCheckedKeys();
if(item.isRequired=='1'){ if(item.isRequired=='1'){
if(!deptids||deptids.length<=0){ if(!deptids||deptids.length<=0){
this.$message({ message: item.fieldTitle+'不能为空', type: 'error' });
this.$message({showClose: true, message: item.fieldTitle+'不能为空', type: 'error' });
checkOk=false; checkOk=false;
return; return;
} }
@ -316,7 +316,7 @@
if(item.isMultiple=='1' && item.extFieldType!='dept'){ if(item.isMultiple=='1' && item.extFieldType!='dept'){
if(item.isRequired=='1'){ if(item.isRequired=='1'){
if(!this.multipleFieldsData[item.fieldIdCamel]||this.multipleFieldsData[item.fieldIdCamel].length<=0){ 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; checkOk=false;
return; return;
} }
@ -422,7 +422,7 @@
} }
this.$emit('submit',params);// @submit="afterAddSubmit" 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)); //console.log("params----------"+JSON.stringify(params));
//return params; //return params;
@ -434,7 +434,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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(() => { }).catch(() => {
this.editLoading = false; this.editLoading = false;
}); });

2
src/views/mdp/form/formData/FormDataAdd.vue

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

2
src/views/mdp/form/formData/FormDataEdit.vue

@ -78,7 +78,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit',formData);// @submit="afterAddSubmit" 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(() => { }).catch(() => {
this.editLoading = false; this.editLoading = false;
}); });

20
src/views/mdp/form/formData/FormDataMng.vue

@ -430,7 +430,7 @@
} else{ } else{
if(this.formDefSelected==null){ if(this.formDefSelected==null){
this.$message({ message: '请先选择表单', type: 'info' });
this.$message({showClose: true, message: '请先选择表单', type: 'info' });
return; return;
} }
@ -460,7 +460,7 @@
let tips=this.checkFormQueryQx(this.formQx,params.userid,params.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) let tips=this.checkFormQueryQx(this.formQx,params.userid,params.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
@ -484,7 +484,7 @@
this.pageInfo.count = false; this.pageInfo.count = false;
this.formDatas = res.data.data this.formDatas = res.data.data
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -497,7 +497,7 @@
showEdit: function ( row,index ) { showEdit: function ( row,index ) {
let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
this.editFormVisible = true; this.editFormVisible = true;
@ -523,16 +523,16 @@
//formData //formData
handleDel: function (row,index) { handleDel: function (row,index) {
if(row.flowState=='1'){ if(row.flowState=='1'){
this.$message({ message: '数据审核中,不允许删除', type: 'error' });
this.$message({showClose: true, message: '数据审核中,不允许删除', type: 'error' });
return; return;
} }
if(row.flowState=='2'){ if(row.flowState=='2'){
this.$message({ message: '数据已审核通过,不允许删除', type: 'error' });
this.$message({showClose: true, message: '数据已审核通过,不允许删除', type: 'error' });
return; return;
} }
let tips=this.checkFormDelQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) let tips=this.checkFormDelQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
this.$confirm('确认删除该记录吗?', '提示', { this.$confirm('确认删除该记录吗?', '提示', {
@ -547,7 +547,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getFormDatas(); 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(() => { }).catch(() => {
@ -569,7 +569,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getFormDatas(); 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(() => { }).catch(() => {
this.listLoading = false; this.listLoading = false;
@ -612,7 +612,7 @@
this.formFields = res.data.data; this.formFields = res.data.data;
this.getOptions2(); this.getOptions2();
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}).catch(() => { }).catch(() => {

36
src/views/mdp/form/formData/FormDataMngForFlow.vue

@ -189,14 +189,14 @@
that.$emit("submit",formDatas) that.$emit("submit",formDatas)
return; return;
}else{ }else{
this.$message({ message: '请补充智能表单数据', type: 'info' });
this.$message({showClose: true, message: '请补充智能表单数据', type: 'info' });
return; return;
} }
}); });
return; return;
}else{ }else{
if(formDatas.length<=0){ if(formDatas.length<=0){
this.$message({ message: '请先选择要加入审批流的智能表单数据', type: 'info' });
this.$message({showClose: true, message: '请先选择要加入审批流的智能表单数据', type: 'info' });
}else{ }else{
formDatas.forEach(i=>{ formDatas.forEach(i=>{
i.flowAction="join" i.flowAction="join"
@ -358,7 +358,7 @@
this.editForm=this.procFormDatas[0]; this.editForm=this.procFormDatas[0];
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -496,7 +496,7 @@
if(this.formDefSelected!=null){ if(this.formDefSelected!=null){
params.formId=this.formDefSelected.id; params.formId=this.formDefSelected.id;
}else{ }else{
this.$message({ message: '没有关联智能表单,无法查询表单数据', type: 'info' });
this.$message({showClose: true, message: '没有关联智能表单,无法查询表单数据', type: 'info' });
return; return;
} }
if(this.formDataIds){ 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) let tips=this.checkFormQueryQx(this.formQx,params.userid,params.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
//params.flowState="0" //params.flowState="0"
@ -534,7 +534,7 @@
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -547,7 +547,7 @@
showEdit: function ( row,index ) { showEdit: function ( row,index ) {
let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
this.editFormVisible = true; this.editFormVisible = true;
@ -560,7 +560,7 @@
}, },
startProc: function() { startProc: function() {
if(this.sels.length<1){ if(this.sels.length<1){
this.$message({ message: "请至少选择一条数据发审", type: 'error' });
this.$message({showClose: true, message: "请至少选择一条数据发审", type: 'error' });
return; return;
} }
let extVars={ids:this.sels.map(i=>i.id),formId:this.formDefSelected.id} let extVars={ids:this.sels.map(i=>i.id),formId:this.formDefSelected.id}
@ -578,17 +578,17 @@
joinToProc: function(row,index){ joinToProc: function(row,index){
let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
if(this.procFormDatas.some(i=>i.id==row.id)){ if(this.procFormDatas.some(i=>i.id==row.id)){
this.$message({ message: '该数据已在审核单中', type: 'info'});
this.$message({showClose: true, message: '该数据已在审核单中', type: 'info'});
}else{ }else{
this.$nextTick(() => { this.$nextTick(() => {
this.formDatas.splice(index, 1); this.formDatas.splice(index, 1);
this.delProcFormDatas=this.delProcFormDatas.filter(i=>i.id!=row.id) this.delProcFormDatas=this.delProcFormDatas.filter(i=>i.id!=row.id)
this.procFormDatas.push(row) this.procFormDatas.push(row)
this.$message({ message: '添加成功', type: 'info'});
this.$message({showClose: true, message: '添加成功', type: 'info'});
}); });
} }
@ -596,7 +596,7 @@
removeFromProc: function(row,index){ removeFromProc: function(row,index){
let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
if(this.procFormDatas.some(i=>i.id==row.id)){ if(this.procFormDatas.some(i=>i.id==row.id)){
@ -606,11 +606,11 @@
this.delProcFormDatas.push(row) this.delProcFormDatas.push(row)
} }
this.formDatas.push(row); this.formDatas.push(row);
this.$message({ message: '移除成功', type: 'info'});
this.$message({showClose: true, message: '移除成功', type: 'info'});
}); });
}else{ }else{
this.$message({ message: '没有该条数据', type: 'error'});
this.$message({showClose: true, message: '没有该条数据', type: 'error'});
} }
}, },
afterAddSubmit(){ afterAddSubmit(){
@ -633,7 +633,7 @@
handleDel: function (row,index) { handleDel: function (row,index) {
let tips=this.checkFormDelQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) let tips=this.checkFormDelQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
this.$confirm('确认删除该记录吗?', '提示', { this.$confirm('确认删除该记录吗?', '提示', {
@ -648,7 +648,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getFormDatas(); 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(() => { }).catch(() => {
@ -670,7 +670,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getFormDatas(); 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(() => { }).catch(() => {
this.listLoading = false; this.listLoading = false;
@ -726,7 +726,7 @@
this.getOptions2(); this.getOptions2();
this.$emit('formFieldsLoad',this.formFields); this.$emit('formFieldsLoad',this.formFields);
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}).catch(() => { }).catch(() => {
this.listLoading=false; this.listLoading=false;

4
src/views/mdp/form/formData/FormDataMngForFlowForm.vue

@ -141,7 +141,7 @@
this.editForm=res.data.data[0] this.editForm=res.data.data[0]
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -169,7 +169,7 @@
this.getOptions2(); this.getOptions2();
this.$emit('formFieldsLoad',this.formFields); this.$emit('formFieldsLoad',this.formFields);
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}).catch(() => { }).catch(() => {
this.listLoading=false; this.listLoading=false;

36
src/views/mdp/form/formData/FormDataMngForFlowTable.vue

@ -189,14 +189,14 @@
that.$emit("submit",formDatas) that.$emit("submit",formDatas)
return; return;
}else{ }else{
this.$message({ message: '请补充智能表单数据', type: 'info' });
this.$message({showClose: true, message: '请补充智能表单数据', type: 'info' });
return; return;
} }
}); });
return; return;
}else{ }else{
if(formDatas.length<=0){ if(formDatas.length<=0){
this.$message({ message: '请先选择要加入审批流的智能表单数据', type: 'info' });
this.$message({showClose: true, message: '请先选择要加入审批流的智能表单数据', type: 'info' });
}else{ }else{
formDatas.forEach(i=>{ formDatas.forEach(i=>{
i.flowAction="join" i.flowAction="join"
@ -358,7 +358,7 @@
this.editForm=this.procFormDatas[0]; this.editForm=this.procFormDatas[0];
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -496,7 +496,7 @@
if(this.formDefSelected!=null){ if(this.formDefSelected!=null){
params.formId=this.formDefSelected.id; params.formId=this.formDefSelected.id;
}else{ }else{
this.$message({ message: '没有关联智能表单,无法查询表单数据', type: 'info' });
this.$message({showClose: true, message: '没有关联智能表单,无法查询表单数据', type: 'info' });
return; return;
} }
if(this.formDataIds){ 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) let tips=this.checkFormQueryQx(this.formQx,params.userid,params.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
//params.flowState="0" //params.flowState="0"
@ -534,7 +534,7 @@
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -547,7 +547,7 @@
showEdit: function ( row,index ) { showEdit: function ( row,index ) {
let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
this.editFormVisible = true; this.editFormVisible = true;
@ -560,7 +560,7 @@
}, },
startProc: function() { startProc: function() {
if(this.sels.length<1){ if(this.sels.length<1){
this.$message({ message: "请至少选择一条数据发审", type: 'error' });
this.$message({showClose: true, message: "请至少选择一条数据发审", type: 'error' });
return; return;
} }
let extVars={ids:this.sels.map(i=>i.id),formId:this.formDefSelected.id} let extVars={ids:this.sels.map(i=>i.id),formId:this.formDefSelected.id}
@ -578,17 +578,17 @@
joinToProc: function(row,index){ joinToProc: function(row,index){
let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
if(this.procFormDatas.some(i=>i.id==row.id)){ if(this.procFormDatas.some(i=>i.id==row.id)){
this.$message({ message: '该数据已在审核单中', type: 'info'});
this.$message({showClose: true, message: '该数据已在审核单中', type: 'info'});
}else{ }else{
this.$nextTick(() => { this.$nextTick(() => {
this.formDatas.splice(index, 1); this.formDatas.splice(index, 1);
this.delProcFormDatas=this.delProcFormDatas.filter(i=>i.id!=row.id) this.delProcFormDatas=this.delProcFormDatas.filter(i=>i.id!=row.id)
this.procFormDatas.push(row) this.procFormDatas.push(row)
this.$message({ message: '添加成功', type: 'info'});
this.$message({showClose: true, message: '添加成功', type: 'info'});
}); });
} }
@ -596,7 +596,7 @@
removeFromProc: function(row,index){ removeFromProc: function(row,index){
let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) let tips=this.checkFormEditQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
if(this.procFormDatas.some(i=>i.id==row.id)){ if(this.procFormDatas.some(i=>i.id==row.id)){
@ -606,11 +606,11 @@
this.delProcFormDatas.push(row) this.delProcFormDatas.push(row)
} }
this.formDatas.push(row); this.formDatas.push(row);
this.$message({ message: '移除成功', type: 'info'});
this.$message({showClose: true, message: '移除成功', type: 'info'});
}); });
}else{ }else{
this.$message({ message: '没有该条数据', type: 'error'});
this.$message({showClose: true, message: '没有该条数据', type: 'error'});
} }
}, },
afterAddSubmit(){ afterAddSubmit(){
@ -633,7 +633,7 @@
handleDel: function (row,index) { handleDel: function (row,index) {
let tips=this.checkFormDelQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid) let tips=this.checkFormDelQx(this.formQx,row.userid,row.deptid,this.userInfo.userid,this.userInfo.deptid,this.userInfo.roleid)
if(tips.isOk==false){ if(tips.isOk==false){
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
return; return;
} }
this.$confirm('确认删除该记录吗?', '提示', { this.$confirm('确认删除该记录吗?', '提示', {
@ -648,7 +648,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getFormDatas(); 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(() => { }).catch(() => {
@ -670,7 +670,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getFormDatas(); 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(() => { }).catch(() => {
this.listLoading = false; this.listLoading = false;
@ -726,7 +726,7 @@
this.getOptions2(); this.getOptions2();
this.$emit('formFieldsLoad',this.formFields); this.$emit('formFieldsLoad',this.formFields);
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}).catch(() => { }).catch(() => {
this.listLoading=false; this.listLoading=false;

4
src/views/mdp/form/formData/FormDataSet.vue

@ -106,7 +106,7 @@
if(tips.isOk){ if(tips.isOk){
this.formFields = res.data.data; this.formFields = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.addLoading=false; this.addLoading=false;
}).catch(() => { }).catch(() => {
@ -127,7 +127,7 @@
if(tips.isOk){ if(tips.isOk){
this.addForm = res.data.data[0]; this.addForm = res.data.data[0];
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}).catch(() => { }).catch(() => {

6
src/views/mdp/form/formDef/FormDefAdd.vue

@ -74,11 +74,11 @@
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
if (valid) { if (valid) {
if(this.addForm.formName==''){ if(this.addForm.formName==''){
this.$message({ message: '表单名称不能为空', type: 'error' });
this.$message({showClose: true, message: '表单名称不能为空', type: 'error' });
return; return;
} }
if(this.addForm.categoryId==null || this.addForm.categoryId=='' ){ if(this.addForm.categoryId==null || this.addForm.categoryId=='' ){
this.$message({ message: '归属分类不能为空', type: 'error' });
this.$message({showClose: true, message: '归属分类不能为空', type: 'error' });
return; return;
} }
this.$confirm('确认提交吗?', '提示', {}).then(() => { this.$confirm('确认提交吗?', '提示', {}).then(() => {
@ -97,7 +97,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" this.$emit('submit');// @submit="afterAddSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.addLoading = false; this.addLoading = false;
}); });

20
src/views/mdp/form/formDef/FormDefEdit.vue

@ -78,16 +78,16 @@
this.$refs.editForm.validate((valid) => { this.$refs.editForm.validate((valid) => {
if (valid) { if (valid) {
if(this.editForm.formName==''){ if(this.editForm.formName==''){
this.$message({ message: '表单名称不能为空', type: 'error' });
this.$message({showClose: true, message: '表单名称不能为空', type: 'error' });
return; return;
} }
if(this.editForm.formName==''){ if(this.editForm.formName==''){
this.$message({ message: '表单名称不能为空', type: 'error' });
this.$message({showClose: true, message: '表单名称不能为空', type: 'error' });
return; return;
} }
if(this.editForm.categoryId==null || this.editForm.categoryId=='' ){ if(this.editForm.categoryId==null || this.editForm.categoryId=='' ){
this.$message({ message: '归属分类不能为空', type: 'error' });
this.$message({showClose: true, message: '归属分类不能为空', type: 'error' });
return; return;
} }
this.$confirm('确认提交吗?', '提示', {}).then(() => { this.$confirm('确认提交吗?', '提示', {}).then(() => {
@ -100,7 +100,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" this.$emit('submit');// @submit="afterEditSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.addLoading = false; this.addLoading = false;
}); });
@ -113,26 +113,26 @@
this.$refs.editForm.validate((valid) => { this.$refs.editForm.validate((valid) => {
if (valid) { if (valid) {
if(this.editForm.formName==''){ if(this.editForm.formName==''){
this.$message({ message: '表单名称不能为空', type: 'error' });
this.$message({showClose: true, message: '表单名称不能为空', type: 'error' });
return; return;
} }
if(this.editForm.formName==''){ if(this.editForm.formName==''){
this.$message({ message: '表单名称不能为空', type: 'error' });
this.$message({showClose: true, message: '表单名称不能为空', type: 'error' });
return; return;
} }
if(this.editForm.categoryId==null || this.editForm.categoryId=='' ){ if(this.editForm.categoryId==null || this.editForm.categoryId=='' ){
this.$message({ message: '归属分类不能为空', type: 'error' });
this.$message({showClose: true, message: '归属分类不能为空', type: 'error' });
return; return;
} }
if(this.fields.length==0 ){ if(this.fields.length==0 ){
this.$message({ message: '最少需要定义一个字段', type: 'error' });
this.$message({showClose: true, message: '最少需要定义一个字段', type: 'error' });
return; return;
} }
if(this.fields.length>15){ if(this.fields.length>15){
this.$message({ message: '最多支持15个字段', type: 'error' });
this.$message({showClose: true, message: '最多支持15个字段', type: 'error' });
return; return;
} }
this.$confirm('确认提交吗?', '提示', {}).then(() => { this.$confirm('确认提交吗?', '提示', {}).then(() => {
@ -151,7 +151,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" this.$emit('submit');// @submit="afterEditSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.addLoading = false; this.addLoading = false;
}); });

2
src/views/mdp/form/formDef/FormDefList.vue

@ -177,7 +177,7 @@
this.rowClick(this.formDefs[0], null, null); this.rowClick(this.formDefs[0], null, null);
} }
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {

6
src/views/mdp/form/formDef/FormDefMng.vue

@ -257,7 +257,7 @@
this.pageInfo.total = res.data.total; this.pageInfo.total = res.data.total;
this.formDefs = res.data.data; this.formDefs = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -302,7 +302,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getFormDefs(); 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(() => { }).catch(() => {
@ -323,7 +323,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getFormDefs(); 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(() => { }).catch(() => {
this.listLoading = false; this.listLoading = false;

2
src/views/mdp/form/formField/FormField.vue

@ -612,7 +612,7 @@
this.selectedFields = res.data.data; this.selectedFields = res.data.data;
} }
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.addLoading=false; this.addLoading=false;
}).catch(() => { }).catch(() => {

6
src/views/mdp/form/formQx/FormQxSet.vue

@ -167,7 +167,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" 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); }).catch( err => this.load.add=false);
}else{ }else{
editFormQx(params).then((res) => { editFormQx(params).then((res) => {
@ -177,7 +177,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" this.$emit('submit');// @submit="afterEditSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch( err =>this.load.edit=false); }).catch( err =>this.load.edit=false);
} }
@ -236,7 +236,7 @@
} }
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );

2
src/views/mdp/form/formView/FormViewAdd.vue

@ -92,7 +92,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" this.$emit('submit');// @submit="afterAddSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.addLoading = false; this.addLoading = false;
}); });

2
src/views/mdp/form/formView/FormViewEdit.vue

@ -92,7 +92,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" this.$emit('submit');// @submit="afterEditSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.editLoading = false; this.editLoading = false;
}); });

6
src/views/mdp/form/formView/FormViewMng.vue

@ -158,7 +158,7 @@
this.pageInfo.total = res.data.total; this.pageInfo.total = res.data.total;
this.formViews = res.data.data; this.formViews = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -203,7 +203,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getFormViews(); 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(() => { }).catch(() => {
@ -225,7 +225,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getFormViews(); 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(() => { }).catch(() => {
this.listLoading = false; this.listLoading = false;

2
src/views/mdp/meta/category/CategoryAdd.vue

@ -93,7 +93,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" this.$emit('submit');// @submit="afterAddSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.load.add=false this.load.add=false
}); });

2
src/views/mdp/meta/category/CategoryEdit.vue

@ -93,7 +93,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" this.$emit('submit');// @submit="afterEditSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.load.edit=false this.load.edit=false
}); });

8
src/views/mdp/meta/category/CategoryMng.vue

@ -146,12 +146,12 @@
this.pageInfo.total = res.data.data.total;this.pageInfo.count=false; this.pageInfo.total = res.data.data.total;this.pageInfo.count=false;
this.categorys = res.data.data; this.categorys = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch(() => { }).catch(() => {
this.load.list = false; 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.pageInfo.count=true;
this.getCategorys(); 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(() => { }).catch(() => {
this.load.del=false; this.load.del=false;
@ -212,7 +212,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getCategorys(); 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(() => { }).catch(() => {
this.load.del=false; this.load.del=false;

2
src/views/mdp/meta/item/ItemAdd.vue

@ -104,7 +104,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" this.$emit('submit');// @submit="afterAddSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.load.add=false this.load.add=false
}); });

2
src/views/mdp/meta/item/ItemEdit.vue

@ -104,7 +104,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" this.$emit('submit');// @submit="afterEditSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.load.edit=false this.load.edit=false
}); });

8
src/views/mdp/meta/item/ItemMng.vue

@ -152,12 +152,12 @@
this.pageInfo.total = res.data.data.total;this.pageInfo.count=false; this.pageInfo.total = res.data.data.total;this.pageInfo.count=false;
this.items = res.data.data; this.items = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch(() => { }).catch(() => {
this.load.list = false; 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.pageInfo.count=true;
this.getItems(); 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(() => { }).catch(() => {
this.load.del=false; this.load.del=false;
@ -223,7 +223,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getItems(); 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(() => { }).catch(() => {
this.load.del=false; this.load.del=false;

2
src/views/mdp/meta/itemOption/ItemOptionAdd.vue

@ -117,7 +117,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" this.$emit('submit');// @submit="afterAddSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.load.add=false this.load.add=false
}); });

2
src/views/mdp/meta/itemOption/ItemOptionEdit.vue

@ -121,7 +121,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" this.$emit('submit');// @submit="afterEditSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.load.edit=false this.load.edit=false
}); });

10
src/views/mdp/meta/itemOption/ItemOptionMng.vue

@ -157,12 +157,12 @@
this.pageInfo.total = res.data.data.total;this.pageInfo.count=false; this.pageInfo.total = res.data.data.total;this.pageInfo.count=false;
this.itemOptions = res.data.data; this.itemOptions = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch(() => { }).catch(() => {
this.load.list = false; 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.pageInfo.count=true;
this.getItemOptions(); 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(() => { }).catch(() => {
this.load.del=false; this.load.del=false;
@ -224,7 +224,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getItemOptions(); 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(() => { }).catch(() => {
this.load.del=false; this.load.del=false;
@ -259,7 +259,7 @@
if(tips.isOk){ if(tips.isOk){
this.itemOptions.push(res.data.data); 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(() => { }).catch(() => {
this.load.add=false this.load.add=false
}); });

2
src/views/mdp/meta/sysParam/ItemOptionAdd.vue

@ -109,7 +109,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" this.$emit('submit');// @submit="afterAddSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.load.add=false this.load.add=false
}); });

2
src/views/mdp/meta/sysParam/ItemOptionEdit.vue

@ -109,7 +109,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" this.$emit('submit');// @submit="afterEditSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.load.edit=false this.load.edit=false
}); });

10
src/views/mdp/meta/sysParam/SysParamMng.vue

@ -152,12 +152,12 @@
this.pageInfo.total = res.data.data.total;this.pageInfo.count=false; this.pageInfo.total = res.data.data.total;this.pageInfo.count=false;
this.itemOptions = res.data.data; this.itemOptions = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch(() => { }).catch(() => {
this.load.list = false; 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.pageInfo.count=true;
this.getItemOptions(); 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(() => { }).catch(() => {
this.load.del=false; this.load.del=false;
@ -219,7 +219,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getItemOptions(); 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(() => { }).catch(() => {
this.load.del=false; this.load.del=false;
@ -248,7 +248,7 @@
if(tips.isOk){ if(tips.isOk){
this.itemOptions.push(res.data.data); 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(() => { }).catch(() => {
this.load.add=false this.load.add=false
}); });

24
src/views/mdp/sms/SendSms.vue

@ -192,21 +192,21 @@
sendSmsMethod() { sendSmsMethod() {
let that = this; let that = this;
if (!this.smsTemplatesSelectValue) { if (!this.smsTemplatesSelectValue) {
this.$message({
this.$message({showClose: true,
message: "请选择某个模板", message: "请选择某个模板",
type: 'error' type: 'error'
}); });
return; return;
} }
if (!this.smsSignsSelectValue) { if (!this.smsSignsSelectValue) {
this.$message({
this.$message({showClose: true,
message: "请选择某个签名", message: "请选择某个签名",
type: 'error' type: 'error'
}); });
return; return;
} }
if (!this.mobilesStr) { if (!this.mobilesStr) {
this.$message({
this.$message({showClose: true,
message: "发送对象不能为空", message: "发送对象不能为空",
type: 'error' type: 'error'
}); });
@ -223,7 +223,7 @@
var mobileArr = this.mobilesStr.split(","); var mobileArr = this.mobilesStr.split(",");
if (mobileArr.length > 10) { if (mobileArr.length > 10) {
this.$message({
this.$message({showClose: true,
message: "发送的对象不能超过10个", message: "发送的对象不能超过10个",
type: 'error' type: 'error'
}); });
@ -232,14 +232,14 @@
for (let i = 0; i < mobileArr.length; i++) { 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( 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])) { mobileArr[i])) {
this.$message({
this.$message({showClose: true,
message: mobileArr[i] + "手机号码不对", message: mobileArr[i] + "手机号码不对",
type: 'error' type: 'error'
}); });
return; return;
} }
if (this.mobilesStr.lastIndexOf(mobileArr[i]) != this.mobilesStr.indexOf(mobileArr[i])) { if (this.mobilesStr.lastIndexOf(mobileArr[i]) != this.mobilesStr.indexOf(mobileArr[i])) {
this.$message({
this.$message({showClose: true,
message: "请填写不同的手机号码进行发送", message: "请填写不同的手机号码进行发送",
type: 'error' type: 'error'
}); });
@ -251,21 +251,21 @@
var reg = /\{\d\}/; var reg = /\{\d\}/;
let smsTemplateVariableCount = this.smsTemplatesSelectValue.text.split(reg).length - 1; let smsTemplateVariableCount = this.smsTemplatesSelectValue.text.split(reg).length - 1;
if (templateParamsArr.length != smsTemplateVariableCount) { if (templateParamsArr.length != smsTemplateVariableCount) {
this.$message({
this.$message({showClose: true,
message: "输入的短信模板参数与短信模板的变量的数目不一致", message: "输入的短信模板参数与短信模板的变量的数目不一致",
type: 'error' type: 'error'
}); });
return; return;
} }
if (this.userNeedReplySmsRadio === '1' && !this.replyEndDay) { if (this.userNeedReplySmsRadio === '1' && !this.replyEndDay) {
this.$message({
this.$message({showClose: true,
message: "如果勾选需要用户回复,必须填写天数", message: "如果勾选需要用户回复,必须填写天数",
type: 'error' type: 'error'
}); });
return; return;
} }
if (this.userNeedReplySmsRadio === '1' && !/^\d+$/.test(this.replyEndDay)) { if (this.userNeedReplySmsRadio === '1' && !/^\d+$/.test(this.replyEndDay)) {
this.$message({
this.$message({showClose: true,
message: "天数必须是正整数", message: "天数必须是正整数",
type: 'error' type: 'error'
}); });
@ -301,7 +301,7 @@
this.sendResultVisible = true; this.sendResultVisible = true;
that.sendResult = res.data.data; that.sendResult = res.data.data;
}; };
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });
@ -326,7 +326,7 @@
if (tips.isOk) { if (tips.isOk) {
this.smsTemplatesOptions = res.data.data; this.smsTemplatesOptions = res.data.data;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: 'error' type: 'error'
}); });
@ -346,7 +346,7 @@
if (tips.isOk) { if (tips.isOk) {
this.smsSignsOptions = res.data.data; this.smsSignsOptions = res.data.data;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: 'error' type: 'error'
}); });

4
src/views/mdp/sys/branch/BranchSelect.vue

@ -133,12 +133,12 @@
this.pageInfo.total = res.data.data.total;this.pageInfo.countSql=false; this.pageInfo.total = res.data.data.total;this.pageInfo.countSql=false;
this.branchs = res.data.data; this.branchs = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch(() => { }).catch(() => {
this.load.list = false; this.load.list = false;
//this.$message({ message: '', type: 'error' });
//this.$message({showClose: true, message: '', type: 'error' });
}); });
}, },
//branch //branch

2
src/views/mdp/sys/dept/DeptTree.vue

@ -239,7 +239,7 @@
} }
}else{ }else{
this.$message({ message: tips.msg, type: 'error'});
this.$message({showClose: true, message: tips.msg, type: 'error'});
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {

4
src/views/mdp/sys/post/PostSelectCommon.vue

@ -138,7 +138,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.posts = res.data.data; this.posts = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -179,7 +179,7 @@
confirmPostSelect(){ confirmPostSelect(){
if(this.sels.length<=0){ if(this.sels.length<=0){
this.$message({ message:'请选择角色', type: 'error'});
this.$message({showClose: true, message:'请选择角色', type: 'error'});
return; return;
} }
this.load.add=true; this.load.add=true;

10
src/views/mdp/sys/user/UsersSelect.vue

@ -169,7 +169,7 @@
searchUsers(){ searchUsers(){
// //
if(this.isSelectByDept && Object.keys(this.deptTree.deptNodeSelected).length === 0) { if(this.isSelectByDept && Object.keys(this.deptTree.deptNodeSelected).length === 0) {
this.$message({ message: "必须先选择一个部门", type: 'error' });
this.$message({showClose: true, message: "必须先选择一个部门", type: 'error' });
return; return;
} }
@ -218,7 +218,7 @@
this.pageInfo.total = res.data.total;this.pageInfo.count=false; this.pageInfo.total = res.data.total;this.pageInfo.count=false;
this.users = res.data.data; this.users = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
if(this.needSetTableUserChecked==true){ if(this.needSetTableUserChecked==true){
this.setTableUserChecked(); this.setTableUserChecked();
@ -228,7 +228,7 @@
this.load.list = false; this.load.list = false;
}).catch(() => { }).catch(() => {
this.load.list = false; this.load.list = false;
//this.$message({ message: '', type: 'error' });
//this.$message({showClose: true, message: '', type: 'error' });
}); });
}, },
@ -270,12 +270,12 @@
}, },
confirmUsers: function(){ confirmUsers: function(){
if(this.sels.length<1){ if(this.sels.length<1){
this.$message({ message: "请选择一个用户", type: 'error' });
this.$message({showClose: true, message: "请选择一个用户", type: 'error' });
return; return;
} }
if(this.isSingleUser==true){ if(this.isSingleUser==true){
if(this.sels.length!=1){ if(this.sels.length!=1){
this.$message({ message: "最多只能选择一个用户", type: 'error' });
this.$message({showClose: true, message: "最多只能选择一个用户", type: 'error' });
return; return;
} }
} }

2
src/views/mdp/sys/userDept/UserDeptEdit.vue

@ -147,7 +147,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" this.$emit('submit');// @submit="afterEditSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch((e) => { }).catch((e) => {
console.log(e) console.log(e)
this.load.edit=false this.load.edit=false

2
src/views/mdp/workflow/biz/bizModel/BizModelAdd.vue

@ -114,7 +114,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" this.$emit('submit');// @submit="afterAddSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch( err => this.load.add=false); }).catch( err => this.load.add=false);
}); });
} }

2
src/views/mdp/workflow/biz/bizModel/BizModelEdit.vue

@ -109,7 +109,7 @@
this.$refs['editForm'].resetFields(); this.$refs['editForm'].resetFields();
this.$emit('submit');// @submit="afterEditSubmit" this.$emit('submit');// @submit="afterEditSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch( err =>this.load.edit=false); }).catch( err =>this.load.edit=false);
}); });
} }

6
src/views/mdp/workflow/biz/bizModel/BizModelMng.vue

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

10
src/views/mdp/workflow/de/model/ModelMng.vue

@ -177,7 +177,7 @@
this.pageInfo.count=false this.pageInfo.count=false
this.models = res.data.data; this.models = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -223,7 +223,7 @@
this.pageInfo.count=true this.pageInfo.count=true
this.getModels(); 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(() => { }).catch(() => {
@ -246,7 +246,7 @@
this.pageInfo.count=true this.pageInfo.count=true
this.getModels(); 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(() => { }).catch(() => {
this.listLoading = false; this.listLoading = false;
@ -266,7 +266,7 @@
if(tips.isOk){ if(tips.isOk){
this.getModels(); this.getModels();
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}); });
@ -284,7 +284,7 @@
if(tips.isOk){ if(tips.isOk){
this.getModels(); this.getModels();
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}); });

4
src/views/mdp/workflow/hi/comment/commentStep.vue

@ -101,7 +101,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" this.$emit('submit');// @submit="afterAddSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.addLoading = false; this.addLoading = false;
}); });
@ -130,7 +130,7 @@
this.$emit('get-comments',this.comments) this.$emit('get-comments',this.comments)
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}).catch(() => { }).catch(() => {

6
src/views/mdp/workflow/hi/procinst/ProcinstMng.vue

@ -487,7 +487,7 @@
this.pageInfo.count = false; this.pageInfo.count = false;
this.procinsts = res.data.data; this.procinsts = res.data.data;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: "error" type: "error"
}); });
@ -541,7 +541,7 @@
this.pageInfo.count = true; this.pageInfo.count = true;
this.getProcinsts(); this.getProcinsts();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error" type: tips.isOk ? "success" : "error"
}); });
@ -566,7 +566,7 @@
this.pageInfo.total = 0; this.pageInfo.total = 0;
this.getProcinsts(); this.getProcinsts();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error" type: tips.isOk ? "success" : "error"
}); });

6
src/views/mdp/workflow/re/deployment/DeploymentMng.vue

@ -222,7 +222,7 @@ export default {
this.pageInfo.total = res.data.total; this.pageInfo.total = res.data.total;
this.deployments = res.data.data; this.deployments = res.data.data;
} else { } else {
this.$message({ message: tips.msg, type: "error" });
this.$message({showClose: true, message: tips.msg, type: "error" });
} }
this.listLoading = false; this.listLoading = false;
}) })
@ -272,7 +272,7 @@ export default {
this.pageInfo.total = 0; this.pageInfo.total = 0;
this.getDeployments(); this.getDeployments();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error" type: tips.isOk ? "success" : "error"
}); });
@ -297,7 +297,7 @@ export default {
this.pageInfo.total = 0; this.pageInfo.total = 0;
this.getDeployments(); this.getDeployments();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error" type: tips.isOk ? "success" : "error"
}); });

6
src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue

@ -390,7 +390,7 @@ export default {
this.pageInfo.total = res.data.total; this.pageInfo.total = res.data.total;
this.procdefs = res.data.data; this.procdefs = res.data.data;
} else { } else {
this.$message({ message: tips.msg, type: "error" });
this.$message({showClose: true, message: tips.msg, type: "error" });
} }
this.listLoading = false; this.listLoading = false;
}) })
@ -419,7 +419,7 @@ export default {
this.pageInfo.total = 0; this.pageInfo.total = 0;
this.getProcdefs(); this.getProcdefs();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error" type: tips.isOk ? "success" : "error"
}); });
@ -444,7 +444,7 @@ export default {
this.pageInfo.total = 0; this.pageInfo.total = 0;
this.getProcdefs(); this.getProcdefs();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error" type: tips.isOk ? "success" : "error"
}); });

2
src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue

@ -271,7 +271,7 @@
} }
this.procdefs = res.data.data; this.procdefs = res.data.data;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: 'error' type: 'error'
}); });

4
src/views/mdp/workflow/re/procdef/ProcdefListForStart.vue

@ -401,7 +401,7 @@
this.pageInfo.count = false; this.pageInfo.count = false;
this.procdefs = res.data.data; this.procdefs = res.data.data;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: "error" type: "error"
}); });
@ -436,7 +436,7 @@
this.pageInfo.count = true; this.pageInfo.count = true;
this.getProcdefs(); this.getProcdefs();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error" type: tips.isOk ? "success" : "error"
}); });

6
src/views/mdp/workflow/re/procdef/ProcdefMng.vue

@ -285,7 +285,7 @@
this.pageInfo.count=false this.pageInfo.count=false
this.procdefs = res.data.data; this.procdefs = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -314,7 +314,7 @@
this.pageInfo.count=true this.pageInfo.count=true
this.getProcdefs(); 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(() => { }).catch(() => {
@ -337,7 +337,7 @@
this.pageInfo.count=true this.pageInfo.count=true
this.getProcdefs(); 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(() => { }).catch(() => {

6
src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue

@ -375,7 +375,7 @@ export default {
this.pageInfo.count = false; this.pageInfo.count = false;
this.procdefs = res.data.data; this.procdefs = res.data.data;
} else { } else {
this.$message({ message: tips.msg, type: "error" });
this.$message({showClose: true, message: tips.msg, type: "error" });
} }
this.listLoading = false; this.listLoading = false;
}) })
@ -405,7 +405,7 @@ export default {
this.pageInfo.count = true; this.pageInfo.count = true;
this.getProcdefs(); this.getProcdefs();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error" type: tips.isOk ? "success" : "error"
}); });
@ -431,7 +431,7 @@ export default {
this.pageInfo.count = true; this.pageInfo.count = true;
this.getProcdefs(); this.getProcdefs();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error" type: tips.isOk ? "success" : "error"
}); });

14
src/views/mdp/workflow/re/procdefParames/ProcdefParamesSet.vue

@ -389,7 +389,7 @@
addOrUpdateTemplate(params).then(res=>{ addOrUpdateTemplate(params).then(res=>{
var tips=res.data.tips; var tips=res.data.tips;
this.addLoading = false; 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); }).catch(e=>this.addLoading=false);
return; return;
} }
@ -401,7 +401,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" this.$emit('submit');// @submit="afterAddSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.addLoading = false; this.addLoading = false;
}); });
@ -421,7 +421,7 @@
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.$emit('submit');// @submit="afterAddSubmit" this.$emit('submit');// @submit="afterAddSubmit"
} }
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch(() => { }).catch(() => {
this.addLoading = false; this.addLoading = false;
}); });
@ -452,7 +452,7 @@
console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxx"); console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxx");
console.log(this.nodeInfosSelectOptions); console.log(this.nodeInfosSelectOptions);
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -568,12 +568,12 @@
if(tips.isOk){ if(tips.isOk){
this.formDefs = res.data.data; this.formDefs = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
this.listLoading = false; this.listLoading = false;
this.$message({ message: '访问错误', type: 'error' });
this.$message({showClose: true, message: '访问错误', type: 'error' });
}); });
}, },
handleCategoryCheckChange(data, checked, indeterminate){ handleCategoryCheckChange(data, checked, indeterminate){
@ -596,7 +596,7 @@
this.nodeInfos=res.data.data; this.nodeInfos=res.data.data;
this.nodeInfosSelectOptions=this.nodeInfos; this.nodeInfosSelectOptions=this.nodeInfos;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}); });
}, },

6
src/views/mdp/workflow/re/procdefParamesTemplate/ProcdefParamesTemplateMng.vue

@ -148,7 +148,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.procdefParamesTemplates = res.data.data; this.procdefParamesTemplates = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -190,7 +190,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getProcdefParamesTemplates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -208,7 +208,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getProcdefParamesTemplates(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },

26
src/views/mdp/workflow/ru/execution/ExecutionMng.vue

@ -604,7 +604,7 @@
this.pageInfo.count = false; this.pageInfo.count = false;
this.executions = res.data.data; this.executions = res.data.data;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: 'error' type: 'error'
}); });
@ -664,7 +664,7 @@
this.pageInfo.total = 0; this.pageInfo.total = 0;
this.getExecutions(); this.getExecutions();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });
@ -703,7 +703,7 @@
this.pageInfo.total = 0; this.pageInfo.total = 0;
this.getExecutions(); this.getExecutions();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });
@ -730,7 +730,7 @@
this.pageInfo.total = 0; this.pageInfo.total = 0;
this.getExecutions(); this.getExecutions();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? 'success' : 'error' type: tips.isOk ? 'success' : 'error'
}); });
@ -847,12 +847,12 @@
showSendSms: function() { showSendSms: function() {
if (this.sels.length > 1) { if (this.sels.length > 1) {
this.$message({
this.$message({showClose: true,
message: '一次只能给一个人发短信', message: '一次只能给一个人发短信',
type: 'error' type: 'error'
}); });
} else if (this.sels.length < 1) { } else if (this.sels.length < 1) {
this.$message({
this.$message({showClose: true,
message: '请选择一条任务', message: '请选择一条任务',
type: 'error' type: 'error'
}); });
@ -868,14 +868,14 @@
}, },
showWeixinTask: function() { showWeixinTask: function() {
if (this.sels.length > 1) { if (this.sels.length > 1) {
this.$message({
this.$message({showClose: true,
message: '一次只能给一个人发信', message: '一次只能给一个人发信',
type: 'error' type: 'error'
}); });
this.weixinContentVisible = false; this.weixinContentVisible = false;
return false; return false;
} else if (this.sels.length < 1) { } else if (this.sels.length < 1) {
this.$message({
this.$message({showClose: true,
message: '请选择一条任务', message: '请选择一条任务',
type: 'error' type: 'error'
}); });
@ -896,7 +896,7 @@
this.weixinContent = task.assigneeName + "您好,您有任务【" + task.mainTitle + "-" + task.taskName + this.weixinContent = task.assigneeName + "您好,您有任务【" + task.mainTitle + "-" + task.taskName +
"】待处理,请登陆OA系统或者点击以下链接处理。" + url + "?userToken=" + userToken; "】待处理,请登陆OA系统或者点击以下链接处理。" + url + "?userToken=" + userToken;
this.$copyText(this.weixinContent).then(e => { this.$copyText(this.weixinContent).then(e => {
this.$message({
this.$message({showClose: true,
message: '已拷贝内容,您可黏贴到微信中', message: '已拷贝内容,您可黏贴到微信中',
type: 'success' type: 'success'
}); });
@ -908,14 +908,14 @@
}, },
showWeixin: function() { showWeixin: function() {
if (this.sels.length > 1) { if (this.sels.length > 1) {
this.$message({
this.$message({showClose: true,
message: '一次只能给一个人发信', message: '一次只能给一个人发信',
type: 'error' type: 'error'
}); });
this.weixinContentVisible = false; this.weixinContentVisible = false;
return false; return false;
} else if (this.sels.length < 1) { } else if (this.sels.length < 1) {
this.$message({
this.$message({showClose: true,
message: '请选择一条任务', message: '请选择一条任务',
type: 'error' type: 'error'
}); });
@ -945,13 +945,13 @@
}, },
showOaMsg: function() { showOaMsg: function() {
if (this.sels.length > 1) { if (this.sels.length > 1) {
this.$message({
this.$message({showClose: true,
message: '一次只能给一个人发信', message: '一次只能给一个人发信',
type: 'error' type: 'error'
}); });
return false; return false;
} else if (this.sels.length < 1) { } else if (this.sels.length < 1) {
this.$message({
this.$message({showClose: true,
message: '请选择一条任务', message: '请选择一条任务',
type: 'error' type: 'error'
}); });

26
src/views/mdp/workflow/ru/execution/ExecutionMngForFormData.vue

@ -274,7 +274,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.executions = res.data.data; this.executions = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -318,7 +318,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getTasks(); 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(() => { }).catch(() => {
@ -352,7 +352,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getExecutions(); 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(() => { }).catch(() => {
@ -374,7 +374,7 @@
this.pageInfo.total=0; this.pageInfo.total=0;
this.getExecutions(); 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(() => { }).catch(() => {
@ -454,9 +454,9 @@
showSendSms:function(){ showSendSms:function(){
if(this.sels.length>1){ if(this.sels.length>1){
this.$message({ message: '一次只能给一个人发短信', type: 'error' });
this.$message({showClose: true, message: '一次只能给一个人发短信', type: 'error' });
}else if(this.sels.length<1){ }else if(this.sels.length<1){
this.$message({ message: '请选择一条任务', type: 'error' });
this.$message({showClose: true, message: '请选择一条任务', type: 'error' });
}else{ }else{
let task=this.sels[0]; let task=this.sels[0];
this.smsBodyParams=[task.assigneeName,task.mainTitle+"-"+task.taskName,task.createTime,task.userid] this.smsBodyParams=[task.assigneeName,task.mainTitle+"-"+task.taskName,task.createTime,task.userid]
@ -467,11 +467,11 @@
}, },
showWeixinTask:function(){ showWeixinTask:function(){
if(this.sels.length>1){ if(this.sels.length>1){
this.$message({ message: '一次只能给一个人发信', type: 'error' });
this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' });
this.weixinContentVisible=false; this.weixinContentVisible=false;
return false; return false;
}else if(this.sels.length<1){ }else if(this.sels.length<1){
this.$message({ message: '请选择一条任务', type: 'error' });
this.$message({showClose: true, message: '请选择一条任务', type: 'error' });
this.weixinContentVisible=false; this.weixinContentVisible=false;
return false; return false;
}else{ }else{
@ -484,7 +484,7 @@
var userToken=res.data.userToken; var userToken=res.data.userToken;
this.weixinContent=task.assigneeName+"您好,您有任务【"+task.mainTitle+"-"+task.taskName +"】待处理,请登陆OA系统或者点击以下链接处理。"+url+"?userToken="+userToken; this.weixinContent=task.assigneeName+"您好,您有任务【"+task.mainTitle+"-"+task.taskName +"】待处理,请登陆OA系统或者点击以下链接处理。"+url+"?userToken="+userToken;
this.$copyText(this.weixinContent).then(e=>{ this.$copyText(this.weixinContent).then(e=>{
this.$message({ message: '已拷贝内容,您可黏贴到微信中', type: 'success' });
this.$message({showClose: true, message: '已拷贝内容,您可黏贴到微信中', type: 'success' });
}); });
} }
}); });
@ -493,11 +493,11 @@
}, },
showWeixin:function(){ showWeixin:function(){
if(this.sels.length>1){ if(this.sels.length>1){
this.$message({ message: '一次只能给一个人发信', type: 'error' });
this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' });
this.weixinContentVisible=false; this.weixinContentVisible=false;
return false; return false;
}else if(this.sels.length<1){ }else if(this.sels.length<1){
this.$message({ message: '请选择一条任务', type: 'error' });
this.$message({showClose: true, message: '请选择一条任务', type: 'error' });
this.weixinContentVisible=false; this.weixinContentVisible=false;
return false; return false;
}else{ }else{
@ -519,10 +519,10 @@
}, },
showOaMsg:function(){ showOaMsg:function(){
if(this.sels.length>1){ if(this.sels.length>1){
this.$message({ message: '一次只能给一个人发信', type: 'error' });
this.$message({showClose: true, message: '一次只能给一个人发信', type: 'error' });
return false; return false;
}else if(this.sels.length<1){ }else if(this.sels.length<1){
this.$message({ message: '请选择一条任务', type: 'error' });
this.$message({showClose: true, message: '请选择一条任务', type: 'error' });
return false; return false;
}else{ }else{
let task=this.sels[0]; let task=this.sels[0];

4
src/views/mdp/workflow/ru/procinstParames/ProcinstNodeInfoSet.vue

@ -203,7 +203,7 @@
this.nodeInfoList=res.data.data; this.nodeInfoList=res.data.data;
this.nodeInfoListOld=JSON.parse(JSON.stringify(this.nodeInfoList)); this.nodeInfoListOld=JSON.parse(JSON.stringify(this.nodeInfoList));
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}); });
}else{ }else{
@ -216,7 +216,7 @@
this.nodeInfoList=res.data.data; this.nodeInfoList=res.data.data;
this.nodeInfoListOld=JSON.parse(JSON.stringify(this.nodeInfoList)); this.nodeInfoListOld=JSON.parse(JSON.stringify(this.nodeInfoList));
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}); });
} }

16
src/views/mdp/workflow/ru/procinstParames/ProcinstParamesExecutionSet.vue

@ -677,7 +677,7 @@
addComment:function(){ addComment:function(){
if(this.task.commentMsg==''){ if(this.task.commentMsg==''){
this.$message({ message: "办理意见不能为空", type:'error' });
this.$message({showClose: true, message: "办理意见不能为空", type:'error' });
return; return;
} }
this.addLoading = true; this.addLoading = true;
@ -688,11 +688,11 @@
this.refreshCommentList=true this.refreshCommentList=true
this.addLoading=false; this.addLoading=false;
this.addForm.commentMsg="" this.addForm.commentMsg=""
this.$message({ message:'保存办理意见成功', type:'success' });
this.$message({showClose: true, message:'保存办理意见成功', type:'success' });
}else{ }else{
this.refreshCommentList=false this.refreshCommentList=false
this.addLoading=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=>{ }).catch(e=>{
this.addLoading = false; this.addLoading = false;
@ -746,7 +746,7 @@
this.needAssignee='' this.needAssignee=''
this.needAssigneeMsg='' this.needAssigneeMsg=''
this.needAssigneeNum=-1 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(); this.handleCancel();
}else if(tips.tipscode=='need-mulit-assignee'){//need-mulit-assignee need-single-assignee }else if(tips.tipscode=='need-mulit-assignee'){//need-mulit-assignee need-single-assignee
this.needAssignee=tips.tipscode this.needAssignee=tips.tipscode
@ -759,7 +759,7 @@
this.needAssigneeNum=1; this.needAssigneeNum=1;
this.$refs.addForm.validateField('needAssignee'); this.$refs.addForm.validateField('needAssignee');
}else{ }else{
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
} }
}).catch(() => { }).catch(() => {
@ -816,7 +816,7 @@
this.addForm=Object.assign(this.addForm,this.defaultAddForm); this.addForm=Object.assign(this.addForm,this.defaultAddForm);
} }
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.listLoading = false; this.listLoading = false;
}).catch(() => { }).catch(() => {
@ -883,7 +883,7 @@
newImg.src = dataUrl; newImg.src = dataUrl;
var printWindow=window.open(newImg.src,"_blank"); var printWindow=window.open(newImg.src,"_blank");
if(printWindow==null){ if(printWindow==null){
this.$message({ message: '无法打开打印窗口,请检查是否浏览器阻止弹出框', type: 'error' });
this.$message({showClose: true, message: '无法打开打印窗口,请检查是否浏览器阻止弹出框', type: 'error' });
}else{ }else{
this.$nextTick(() => { this.$nextTick(() => {
@ -1057,7 +1057,7 @@
this.nodeInfos=res.data.data; this.nodeInfos=res.data.data;
this.nodeInfoVisible=false; 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' });
}) })
}, },

6
src/views/mdp/workflow/ru/procinstParames/ProcinstParamesStartSet.vue

@ -402,7 +402,7 @@
this.needAssignee=''; this.needAssignee='';
this.needAssigneeMsg=''; this.needAssigneeMsg='';
this.$emit('submit');// @submit="afterAddSubmit" 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(); this.handleCancel();
}else if(tips.tipscode=='need-mulit-assignee'){//need-mulit-assignee need-single-assignee }else if(tips.tipscode=='need-mulit-assignee'){//need-mulit-assignee need-single-assignee
this.needAssignee=tips.tipscode this.needAssignee=tips.tipscode
@ -415,7 +415,7 @@
this.needAssigneeNum=1; this.needAssigneeNum=1;
this.$refs.addForm.validateField('needAssignee'); this.$refs.addForm.validateField('needAssignee');
}else{ }else{
this.$message({ message: tips.msg, type: tips.isOk?'success':'error' });
this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
} }
}).catch(() => { }).catch(() => {
@ -640,7 +640,7 @@
this.nodeInfoVisible=true this.nodeInfoVisible=true
} }
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
}); });
}, },

34
src/views/mdp/workflow/ru/task/TaskMng.vue

@ -522,7 +522,7 @@
this.pageInfo.count = true; this.pageInfo.count = true;
this.filters.taskType = "1"; this.filters.taskType = "1";
if (this.filters.candidateUser == "") { if (this.filters.candidateUser == "") {
this.$message({
this.$message({showClose: true,
message: "请先选择用户", message: "请先选择用户",
type: "error" type: "error"
}); });
@ -536,7 +536,7 @@
this.pageInfo.count = true; this.pageInfo.count = true;
this.filters.taskType = "2"; this.filters.taskType = "2";
if (this.filters.candidateGroups.length <= 0) { if (this.filters.candidateGroups.length <= 0) {
this.$message({
this.$message({showClose: true,
message: "请先选择部门", message: "请先选择部门",
type: "error" type: "error"
}); });
@ -550,7 +550,7 @@
this.pageInfo.count = true; this.pageInfo.count = true;
this.filters.taskType = "2"; this.filters.taskType = "2";
if (this.filters.candidateGroups.length <= 0) { if (this.filters.candidateGroups.length <= 0) {
this.$message({
this.$message({showClose: true,
message: "请先选择部门", message: "请先选择部门",
type: "error" type: "error"
}); });
@ -650,12 +650,12 @@
}, },
showSendSms: function() { showSendSms: function() {
if (this.sels.length > 1) { if (this.sels.length > 1) {
this.$message({
this.$message({showClose: true,
message: "一次只能给一个人发短信", message: "一次只能给一个人发短信",
type: "error" type: "error"
}); });
} else if (this.sels.length < 1) { } else if (this.sels.length < 1) {
this.$message({
this.$message({showClose: true,
message: "请选择一条任务", message: "请选择一条任务",
type: "error" type: "error"
}); });
@ -675,14 +675,14 @@
}, },
showWeixin: function() { showWeixin: function() {
if (this.sels.length > 1) { if (this.sels.length > 1) {
this.$message({
this.$message({showClose: true,
message: "一次只能给一个人发信", message: "一次只能给一个人发信",
type: "error" type: "error"
}); });
this.weixinContentVisible = false; this.weixinContentVisible = false;
return false; return false;
} else if (this.sels.length < 1) { } else if (this.sels.length < 1) {
this.$message({
this.$message({showClose: true,
message: "请选择一条任务", message: "请选择一条任务",
type: "error" type: "error"
}); });
@ -722,13 +722,13 @@
}, },
showOaMsg: function() { showOaMsg: function() {
if (this.sels.length > 1) { if (this.sels.length > 1) {
this.$message({
this.$message({showClose: true,
message: "一次只能给一个人发信", message: "一次只能给一个人发信",
type: "error" type: "error"
}); });
return false; return false;
} else if (this.sels.length < 1) { } else if (this.sels.length < 1) {
this.$message({
this.$message({showClose: true,
message: "请选择一条任务", message: "请选择一条任务",
type: "error" type: "error"
}); });
@ -849,7 +849,7 @@
}); });
this.tasks = taskList; this.tasks = taskList;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: "error" type: "error"
}); });
@ -877,7 +877,7 @@
}); });
this.tasks = taskList; this.tasks = taskList;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: "error" type: "error"
}); });
@ -904,7 +904,7 @@
}); });
this.tasks = taskList; this.tasks = taskList;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: "error" type: "error"
}); });
@ -932,7 +932,7 @@
}); });
this.tasks = taskList; this.tasks = taskList;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: "error" type: "error"
}); });
@ -959,7 +959,7 @@
}); });
this.tasks = taskList; this.tasks = taskList;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: "error" type: "error"
}); });
@ -986,7 +986,7 @@
}); });
this.tasks = taskList; this.tasks = taskList;
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: "error" type: "error"
}); });
@ -1049,7 +1049,7 @@
this.pageInfo.total = 0; this.pageInfo.total = 0;
this.getTasks(); this.getTasks();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error" type: tips.isOk ? "success" : "error"
}); });
@ -1074,7 +1074,7 @@
this.pageInfo.total = 0; this.pageInfo.total = 0;
this.getTasks(); this.getTasks();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error" type: tips.isOk ? "success" : "error"
}); });

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

@ -196,7 +196,7 @@ export default {
this.convertSkills = convert; this.convertSkills = convert;
this.setSkillsToLocal(); this.setSkillsToLocal();
} else { } else {
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: "error", type: "error",
}); });
@ -214,7 +214,7 @@ export default {
(i) => i.categoryName == this.needAddTagCategoryNameInputValue (i) => i.categoryName == this.needAddTagCategoryNameInputValue
) )
) { ) {
this.$message({
this.$message({showClose: true,
message: "技能分类已经存在", message: "技能分类已经存在",
type: "error", type: "error",
}); });
@ -247,7 +247,7 @@ export default {
this.convertSkills.push(json); this.convertSkills.push(json);
this.setSkillsToLocal(); this.setSkillsToLocal();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error", type: tips.isOk ? "success" : "error",
}); });
@ -285,7 +285,7 @@ export default {
this.setSkillsToLocal(); this.setSkillsToLocal();
/*this.getTags();*/ /*this.getTags();*/
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error", type: tips.isOk ? "success" : "error",
}); });
@ -310,7 +310,7 @@ export default {
); );
}) })
) { ) {
this.$message({
this.$message({showClose: true,
message: "技能已经存在", message: "技能已经存在",
type: "error", type: "error",
}); });
@ -318,7 +318,7 @@ export default {
} }
if (!this.convertSkills[index].pubc) { if (!this.convertSkills[index].pubc) {
if (this.isPub == "1") { if (this.isPub == "1") {
this.$message({
this.$message({showClose: true,
message: "该分类不是公共分类,不能添加公共技能", message: "该分类不是公共分类,不能添加公共技能",
type: "error", type: "error",
}); });
@ -358,7 +358,7 @@ export default {
this.convertSkills[index].values.push(json); this.convertSkills[index].values.push(json);
this.setSkillsToLocal(); this.setSkillsToLocal();
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error", type: tips.isOk ? "success" : "error",
}); });
@ -393,7 +393,7 @@ export default {
this.setSkillsToLocal(); this.setSkillsToLocal();
/*this.getTags();*/ /*this.getTags();*/
} }
this.$message({
this.$message({showClose: true,
message: tips.msg, message: tips.msg,
type: tips.isOk ? "success" : "error", type: tips.isOk ? "success" : "error",
}); });

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -257,7 +257,7 @@
count:this.pageInfo.count count:this.pageInfo.count
}; };
if(!this.dateRangerOnline || this.dateRangerOnline.length==0){ if(!this.dateRangerOnline || this.dateRangerOnline.length==0){
this.$message({ message: "上线日期范围不能为空", type: 'error' });
this.$message({showClose: true, message: "上线日期范围不能为空", type: 'error' });
return; return;
} }
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){ if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
@ -280,7 +280,7 @@
params.queryScope=this.filters.queryScope params.queryScope=this.filters.queryScope
if(this.filters.queryScope=='iterationId'){ if(this.filters.queryScope=='iterationId'){
if(!this.filters.id){ if(!this.filters.id){
this.$message({ message:"您选择了按迭代编号精确查找模式,请输入迭代编号", type: 'error' });
this.$message({showClose: true, message:"您选择了按迭代编号精确查找模式,请输入迭代编号", type: 'error' });
return; return;
} }
params.id=this.filters.id params.id=this.filters.id
@ -303,7 +303,7 @@
this.pageInfo.count=false; this.pageInfo.count=false;
this.xmIterations = res.data.data; this.xmIterations = res.data.data;
}else{ }else{
this.$message({ message: tips.msg, type: 'error' });
this.$message({showClose: true, message: tips.msg, type: 'error' });
} }
this.load.list = false; this.load.list = false;
}).catch( err => this.load.list = false ); }).catch( err => this.load.list = false );
@ -317,7 +317,7 @@
// XmIteration // XmIteration
showAdd: function () { showAdd: function () {
if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
this.$message({ message: "只有迭代管理员可以新增迭代", type: 'error' });
this.$message({showClose: true, message: "只有迭代管理员可以新增迭代", type: 'error' });
return ; return ;
} }
this.parentIteration=null this.parentIteration=null
@ -344,7 +344,7 @@
//xmIteration //xmIteration
handleDel: function (row,index) { handleDel: function (row,index) {
if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
this.$message({ message: "只有迭代管理员可以删除迭代", type: 'error' });
this.$message({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' });
return ; return ;
} }
this.$confirm('确认删除该记录吗?', '提示', { this.$confirm('确认删除该记录吗?', '提示', {
@ -359,14 +359,14 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterations(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
//xmIteration //xmIteration
batchDel: function () { batchDel: function () {
if(!this.roles.some(i=>i.roleid=='iterationAdmin')){ if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
this.$message({ message: "只有迭代管理员可以删除迭代", type: 'error' });
this.$message({showClose: true, message: "只有迭代管理员可以删除迭代", type: 'error' });
return ; return ;
} }
this.$confirm('确认删除选中记录吗?', '提示', { this.$confirm('确认删除选中记录吗?', '提示', {
@ -380,7 +380,7 @@
this.pageInfo.count=true; this.pageInfo.count=true;
this.getXmIterations(); 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 ); }).catch( err => this.load.del=false );
}); });
}, },
@ -453,7 +453,7 @@
if(tips.isOk){ if(tips.isOk){
this.getXmIterations(); 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){ showIterationState(row){

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

Loading…
Cancel
Save