Browse Source

优化消息提示位置

master
陈裕财 4 years ago
parent
commit
a6cfae3ec3
  1. 2
      src/views/xm/core/xmContract/XmContractMng.vue
  2. 4
      src/views/xm/core/xmGroup/XmGroupSelect.vue
  3. 4
      src/views/xm/core/xmMenu/XmMenuEdit.vue
  4. 24
      src/views/xm/core/xmMenu/XmMenuMng.vue
  5. 2
      src/views/xm/core/xmMenu/XmMenuMngBatch.vue
  6. 4
      src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
  7. 4
      src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
  8. 4
      src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
  9. 6
      src/views/xm/core/xmMenuWorkItem/XmSubWorkItem.vue
  10. 2
      src/views/xm/core/xmPhase/XmPhaseForProduct.vue
  11. 2
      src/views/xm/core/xmPhase/XmPhaseMng.vue
  12. 4
      src/views/xm/core/xmQuestion/XmQuestionMng.vue
  13. 2
      src/views/xm/core/xmTask/XmTaskAgileKanban.vue
  14. 2
      src/views/xm/core/xmTask/XmTaskEdit.vue
  15. 4
      src/views/xm/core/xmTask/XmTaskList.vue
  16. 14
      src/views/xm/core/xmTask/XmTaskMng.vue
  17. 4
      src/views/xm/core/xmTask/XmTaskMngBatch.vue
  18. 4
      src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue
  19. 4
      src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
  20. 10
      src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue
  21. 2
      src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue
  22. 2
      src/views/xm/rpt/product/menuAttDist.vue
  23. 2
      src/views/xm/rpt/product/menuDayAccumulate.vue
  24. 2
      src/views/xm/rpt/product/menuDayTrend.vue
  25. 2
      src/views/xm/rpt/product/productWorkItemDayList.vue

2
src/views/xm/core/xmContract/XmContractMng.vue

@ -184,7 +184,7 @@
} }
if(!params.projectId && !params.productId && params.htSn){ if(!params.projectId && !params.productId && params.htSn){
this.$notify({showClose:true,message:'项目编号、产品编号、合同编号必须输入一个',type:'error'})
this.$notify({position:'bottom-left',showClose:true,message:'项目编号、产品编号、合同编号必须输入一个',type:'error'})
return; return;
} }
this.load.list = true; this.load.list = true;

4
src/views/xm/core/xmGroup/XmGroupSelect.vue

@ -140,13 +140,13 @@ import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'
params.productId=this.filters.xmProduct.id params.productId=this.filters.xmProduct.id
} }
if(this.pgClass==='1' && !params.productId){ if(this.pgClass==='1' && !params.productId){
this.$notify({showClose:true,message:'请选择产品',type:'error'})
this.$notify({position:'bottom-left',showClose:true,message:'请选择产品',type:'error'})
return; return;
} }
if((this.pgClass==='0' || !this.pgClass )&& !params.projectId){ if((this.pgClass==='0' || !this.pgClass )&& !params.projectId){
params.productId=null params.productId=null
this.$notify({showClose:true,message:'请选择项目',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请选择项目',type:'warning'})
} }
getGroups(params).then(res=>{ getGroups(params).then(res=>{
var tips = res.data.tips; var tips = res.data.tips;

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

@ -451,10 +451,10 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
Object.assign(row,params) Object.assign(row,params)
this.$emit("edit-fields",params); this.$emit("edit-fields",params);
if(fieldName==='remark'||fieldName==='link'){ if(fieldName==='remark'||fieldName==='link'){
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },

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

@ -1069,12 +1069,12 @@
showParentMenu(){ showParentMenu(){
if(this.filters.product && this.filters.product.id){ if(this.filters.product && this.filters.product.id){
if(this.sels.length==0){ if(this.sels.length==0){
this.$notify({showClose:true,message:'请先选择一个或者多个需求',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选择一个或者多个需求',type:'warning'})
return; return;
} }
this.parentMenuVisible=true; this.parentMenuVisible=true;
}else{ }else{
this.$notify({showClose:true,message:'请先选择产品',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选择产品',type:'warning'})
return; return;
} }
@ -1082,7 +1082,7 @@
onParentMenuSelected(menu){ onParentMenuSelected(menu){
if(!menu||!menu.menuId){ if(!menu||!menu.menuId){
this.$notify({showClose:true,message:'请先选择一个上级需求',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选择一个上级需求',type:'warning'})
return; return;
} }
this.parentMenuVisible=false; this.parentMenuVisible=false;
@ -1097,7 +1097,7 @@
var rows=[...this.sels,{menuId:'',pmenuId:menu.menuId}] var rows=[...this.sels,{menuId:'',pmenuId:menu.menuId}]
treeTool.reloadAllChildren(this.$refs.table,this.maps,rows,'pmenuId',this.loadXmMenusLazy) treeTool.reloadAllChildren(this.$refs.table,this.maps,rows,'pmenuId',this.loadXmMenusLazy)
} }
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
}) })
}, },
formaterByDicts(row,property,cellValue){ formaterByDicts(row,property,cellValue){
@ -1122,11 +1122,11 @@
doBatchDelXmIterationMenu(){ doBatchDelXmIterationMenu(){
if(!this.filters.iteration||!this.filters.iteration.id){ if(!this.filters.iteration||!this.filters.iteration.id){
this.$notify({showClose:true,message:"请选择一个迭代进行操作",type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:"请选择一个迭代进行操作",type:'warning'})
return; return;
} }
if(this.sels.length==0){ if(this.sels.length==0){
this.$notify({showClose:true,message:"请选择一个或者多个需求进行操作",type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:"请选择一个或者多个需求进行操作",type:'warning'})
return; return;
} }
var params={ var params={
@ -1138,16 +1138,16 @@
if(tips.isOk){ if(tips.isOk){
this.searchXmMenus(); this.searchXmMenus();
} }
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
}) })
}, },
doBatchAddXmIterationMenu(){ doBatchAddXmIterationMenu(){
if(!this.filters.iteration||!this.filters.iteration.id){ if(!this.filters.iteration||!this.filters.iteration.id){
this.$notify({showClose:true,message:"请选择一个迭代进行操作",type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:"请选择一个迭代进行操作",type:'warning'})
return; return;
} }
if(this.sels.length==0){ if(this.sels.length==0){
this.$notify({showClose:true,message:"请选择一个或者多个需求进行操作",type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:"请选择一个或者多个需求进行操作",type:'warning'})
return; return;
} }
var params={ var params={
@ -1159,7 +1159,7 @@
if(tips.isOk){ if(tips.isOk){
this.searchXmMenus(); this.searchXmMenus();
} }
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
}) })
}, },
@ -1182,7 +1182,7 @@
var params={menuIds:[row.menuId]}; var params={menuIds:[row.menuId]};
if(this.sels.length>0){ if(this.sels.length>0){
if(!this.sels.some(k=>k.menuId==row.menuId)){ if(!this.sels.some(k=>k.menuId==row.menuId)){
this.$notify({showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
return; return;
} }
params.menuIds=this.sels.map(i=>i.menuId) params.menuIds=this.sels.map(i=>i.menuId)
@ -1222,7 +1222,7 @@
Object.assign(row,params) Object.assign(row,params)
} }
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },

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

@ -241,7 +241,7 @@
// //
showBatchMmUserSelectVisible() { showBatchMmUserSelectVisible() {
if(!this.sels||this.sels.length==0){ if(!this.sels||this.sels.length==0){
this.$notify({showClose:true,message:'请先选中一条或多条数据',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选中一条或多条数据',type:'warning'})
return; return;
}else{ }else{
this.batchMmUserSelectVisible=true; this.batchMmUserSelectVisible=true;

4
src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue

@ -244,7 +244,7 @@ export default {
var params={ids:[row.id]}; var params={ids:[row.id]};
if(this.sels.length>0){ if(this.sels.length>0){
if(!this.sels.some(k=>k.id==row.id)){ if(!this.sels.some(k=>k.id==row.id)){
this.$notify({showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
return; return;
} }
params.ids=this.sels.map(i=>i.id) params.ids=this.sels.map(i=>i.id)
@ -284,7 +284,7 @@ export default {
Object.assign(row,params) Object.assign(row,params)
} }
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },

4
src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue

@ -306,7 +306,7 @@ export default {
var params={menuIds:[row.menuId]}; var params={menuIds:[row.menuId]};
if(this.sels.length>0){ if(this.sels.length>0){
if(!this.sels.some(k=>k.menuId==row.menuId)){ if(!this.sels.some(k=>k.menuId==row.menuId)){
this.$notify({showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
return; return;
} }
params.menuIds=this.sels.map(i=>i.menuId) params.menuIds=this.sels.map(i=>i.menuId)
@ -346,7 +346,7 @@ export default {
Object.assign(row,params) Object.assign(row,params)
} }
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },

4
src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue

@ -242,7 +242,7 @@ export default {
var params={ids:[row.id]}; var params={ids:[row.id]};
if(this.sels.length>0){ if(this.sels.length>0){
if(!this.sels.some(k=>k.id==row.id)){ if(!this.sels.some(k=>k.id==row.id)){
this.$notify({showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
return; return;
} }
params.ids=this.sels.map(i=>i.id) params.ids=this.sels.map(i=>i.id)
@ -286,7 +286,7 @@ export default {
Object.assign(row,params) Object.assign(row,params)
} }
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },

6
src/views/xm/core/xmMenuWorkItem/XmSubWorkItem.vue

@ -102,13 +102,13 @@ export default {
this.$refs.menuList.showAdd(); this.$refs.menuList.showAdd();
}else if(dclass==='4'){ }else if(dclass==='4'){
if(!this.linkProjectId && !this.xmProject){ if(!this.linkProjectId && !this.xmProject){
this.$notify({showClose:true,message:'请先选择一个项目',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选择一个项目',type:'warning'})
return; return;
} }
this.$refs.taskList.showAdd(); this.$refs.taskList.showAdd();
}else if(dclass==='5'){ }else if(dclass==='5'){
if(!this.linkProjectId && !this.xmProject){ if(!this.linkProjectId && !this.xmProject){
this.$notify({showClose:true,message:'请先选择一个项目',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选择一个项目',type:'warning'})
return; return;
} }
this.$refs.bugList.showAdd(); this.$refs.bugList.showAdd();
@ -116,7 +116,7 @@ export default {
}, },
doDelete(){ doDelete(){
if((this.$refs.menuList.sels.length+ this.$refs.taskList.sels.length+this.$refs.bugList.sels.length)==0){ if((this.$refs.menuList.sels.length+ this.$refs.taskList.sels.length+this.$refs.bugList.sels.length)==0){
this.$notify({showClose:true,message:'请先选择要删除的数据',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选择要删除的数据',type:'warning'})
return; return;
} }
if(this.$refs.menuList.sels.length>0){ if(this.$refs.menuList.sels.length>0){

2
src/views/xm/core/xmPhase/XmPhaseForProduct.vue

@ -1151,7 +1151,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
if(tips.isOk){ if(tips.isOk){
this.taskVisible=false; this.taskVisible=false;
} }
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
}) })
}, },
handlePopover:function(row,opType){ handlePopover:function(row,opType){

2
src/views/xm/core/xmPhase/XmPhaseMng.vue

@ -1186,7 +1186,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
if(tips.isOk){ if(tips.isOk){
this.taskVisible=false; this.taskVisible=false;
} }
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
}) })
}, },
handlePopover:function(row,opType){ handlePopover:function(row,opType){

4
src/views/xm/core/xmQuestion/XmQuestionMng.vue

@ -1030,7 +1030,7 @@
var params={ids:[row.id]}; var params={ids:[row.id]};
if(this.sels.length>0){ if(this.sels.length>0){
if(!this.sels.some(k=>k.id==row.id)){ if(!this.sels.some(k=>k.id==row.id)){
this.$notify({showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
return; return;
} }
params.ids=this.sels.map(i=>i.id) params.ids=this.sels.map(i=>i.id)
@ -1070,7 +1070,7 @@
Object.assign(row,params) Object.assign(row,params)
} }
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },

2
src/views/xm/core/xmTask/XmTaskAgileKanban.vue

@ -169,7 +169,7 @@ export default {
task.taskState=params.taskState task.taskState=params.taskState
this.$set(this.xmTasks,taskIndex,task) this.$set(this.xmTasks,taskIndex,task)
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:'error'})
} }
return res.data.tips.isOk return res.data.tips.isOk
}) })

2
src/views/xm/core/xmTask/XmTaskEdit.vue

@ -616,7 +616,7 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
this.$emit('edit-fields',params) this.$emit('edit-fields',params)
Object.assign(row,params) Object.assign(row,params)
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },

4
src/views/xm/core/xmTask/XmTaskList.vue

@ -254,12 +254,12 @@
} }
if(params.ptype!=='1'){ if(params.ptype!=='1'){
if(!params.projectId){ if(!params.projectId){
this.$notify({showClose:true,message:'请选择一个项目',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请选择一个项目',type:'warning'})
return; return;
} }
}else{ }else{
if(!params.productId){ if(!params.productId){
this.$notify({showClose:true,message:'请选择一个产品',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请选择一个产品',type:'warning'})
return; return;
} }
} }

14
src/views/xm/core/xmTask/XmTaskMng.vue

@ -2318,17 +2318,17 @@ export default {
}, },
showParentTaskList(){ showParentTaskList(){
if(this.sels.length==0){ if(this.sels.length==0){
this.$notify({showClose:true,message:"请先选择一个或者多个需要更换上级的计划/任务",type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:"请先选择一个或者多个需要更换上级的计划/任务",type:'warning'})
return; return;
} }
if(this.ptype==='0'){ if(this.ptype==='0'){
if( !this.filters.selProject|| !this.filters.selProject.id){ if( !this.filters.selProject|| !this.filters.selProject.id){
this.$notify({showClose:true,message:"请先选择项目",type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:"请先选择项目",type:'warning'})
return; return;
} }
}else if(this.ptype==='1'){ }else if(this.ptype==='1'){
if( !this.filters.product|| !this.filters.product.id){ if( !this.filters.product|| !this.filters.product.id){
this.$notify({showClose:true,message:"请先选择产品",type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:"请先选择产品",type:'warning'})
return; return;
} }
} }
@ -2340,7 +2340,7 @@ export default {
var params={ids:[row.id]}; var params={ids:[row.id]};
if(this.sels.length>0){ if(this.sels.length>0){
if(!this.sels.some(k=>k.id==row.id)){ if(!this.sels.some(k=>k.id==row.id)){
this.$notify({showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
return; return;
} }
params.ids=this.sels.map(i=>i.id) params.ids=this.sels.map(i=>i.id)
@ -2384,17 +2384,17 @@ export default {
Object.assign(row,params) Object.assign(row,params)
} }
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },
onSelectedParentTask(task){ onSelectedParentTask(task){
if(this.sels.length==0){ if(this.sels.length==0){
this.$notify({showClose:true,message:"请先选择一个或者多个需要更换上级的计划/任务",type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:"请先选择一个或者多个需要更换上级的计划/任务",type:'warning'})
this.selectParentTaskVisible=true this.selectParentTaskVisible=true
return; return;
}else if(task==null || !task.id){ }else if(task==null || !task.id){
this.$notify({showClose:true,message:"请选择上级计划/任务",type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:"请选择上级计划/任务",type:'warning'})
return; return;
} }

4
src/views/xm/core/xmTask/XmTaskMngBatch.vue

@ -1145,7 +1145,7 @@ export default {
// //
showBatchCreateUserSelectVisible() { showBatchCreateUserSelectVisible() {
if(!this.sels||this.sels.length==0){ if(!this.sels||this.sels.length==0){
this.$notify({showClose:true,message:'请先选中一条或多条数据',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选中一条或多条数据',type:'warning'})
return; return;
}else{ }else{
this.batchGroupUserSelectVisible=true; this.batchGroupUserSelectVisible=true;
@ -1154,7 +1154,7 @@ export default {
// //
showBatchExecUserSelectVisible() { showBatchExecUserSelectVisible() {
if(!this.sels||this.sels.length==0){ if(!this.sels||this.sels.length==0){
this.$notify({showClose:true,message:'请先选中一条或多条数据',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选中一条或多条数据',type:'warning'})
return; return;
}else{ }else{
this.batchExecUserSelectVisible=true; this.batchExecUserSelectVisible=true;

4
src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue

@ -151,13 +151,13 @@
saveSubmit: function () { saveSubmit: function () {
if(this.currOpType=='add'){ if(this.currOpType=='add'){
if(this.editForm.projectId==null || this.editForm.projectId=='' || this.editForm.projectId==undefined){ if(this.editForm.projectId==null || this.editForm.projectId=='' || this.editForm.projectId==undefined){
this.$notify({showClose:true,message:'请选择项目',type:'error'});
this.$notify({position:'bottom-left',showClose:true,message:'请选择项目',type:'error'});
return; return;
} }
} }
if(this.currOpType=='edit'){ if(this.currOpType=='edit'){
if(this.editForm.status!='0'){ if(this.editForm.status!='0'){
this.$notify({showClose:true,message:'当前状态不能修改',type:'error'});
this.$notify({position:'bottom-left',showClose:true,message:'当前状态不能修改',type:'error'});
return; return;
} }
} }

4
src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue

@ -229,7 +229,7 @@ export default {
var params={ids:[row.id]}; var params={ids:[row.id]};
if(this.sels.length>0){ if(this.sels.length>0){
if(!this.sels.some(k=>k.id==row.id)){ if(!this.sels.some(k=>k.id==row.id)){
this.$notify({showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
return; return;
} }
params.ids=this.sels.map(i=>i.id) params.ids=this.sels.map(i=>i.id)
@ -273,7 +273,7 @@ export default {
Object.assign(row,params) Object.assign(row,params)
} }
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },

10
src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue

@ -396,7 +396,7 @@
}, },
editXmWorkloadSomeFields(workload,row,fieldName,$event){ editXmWorkloadSomeFields(workload,row,fieldName,$event){
if(row.status!='0'){ if(row.status!='0'){
this.$notify.error({showClose:true,message:'该结算单已提交,请重新选择',type:'warning'})
this.$notify.error({position:'bottom-left',showClose:true,message:'该结算单已提交,请重新选择',type:'warning'})
return; return;
} }
let params={ let params={
@ -404,7 +404,7 @@
}; };
if(this.sels.length>0){ if(this.sels.length>0){
if(!this.sels.some(k=>k.projectId==row.projectId)){ if(!this.sels.some(k=>k.projectId==row.projectId)){
this.$notify({showClose:true,message:'存在不同项目的工时单,请重新选择',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'存在不同项目的工时单,请重新选择',type:'warning'})
return; return;
} }
params.ids=this.sels.map(i=>i.id); params.ids=this.sels.map(i=>i.id);
@ -418,7 +418,7 @@
if(tips.isOk){ if(tips.isOk){
this.getXmTaskWorkloads(); this.getXmTaskWorkloads();
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },
@ -447,7 +447,7 @@
let params={ids:[row.id]}; let params={ids:[row.id]};
if(this.sels.length>0){ if(this.sels.length>0){
if(!this.sels.some(k=>k.id==row.id)){ if(!this.sels.some(k=>k.id==row.id)){
this.$notify({showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请操作选中的行或者取消选中的行再操作其它行',type:'warning'})
return; return;
} }
params.ids=this.sels.map(i=>i.id) params.ids=this.sels.map(i=>i.id)
@ -466,7 +466,7 @@
if(tips.isOk){ if(tips.isOk){
this.getXmTaskWorkloads(); this.getXmTaskWorkloads();
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },

2
src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue

@ -130,7 +130,7 @@
//Object.assign(row,params) //Object.assign(row,params)
this.$emit("edit-xm-task-some-fields",params); this.$emit("edit-xm-task-some-fields",params);
}else{ }else{
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
} }
}) })
}, },

2
src/views/xm/rpt/product/menuAttDist.vue

@ -219,7 +219,7 @@
}, },
searchXmMenuAttDist(){ searchXmMenuAttDist(){
if(!this.groupBy){ if(!this.groupBy){
this.$notify({showClose:true,message:'请选中分组属性',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'})
return return
} }
var params={} var params={}

2
src/views/xm/rpt/product/menuDayAccumulate.vue

@ -114,7 +114,7 @@
}, },
listXmProductStateHis(){ listXmProductStateHis(){
if(!this.filters.product){ if(!this.filters.product){
this.$notify({showClose:true,message:'请先选中产品',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选中产品',type:'warning'})
return; return;
} }
var params={productId:this.filters.product.id,orderBy:'biz_date asc'} var params={productId:this.filters.product.id,orderBy:'biz_date asc'}

2
src/views/xm/rpt/product/menuDayTrend.vue

@ -116,7 +116,7 @@
}, },
listXmProductStateHis(){ listXmProductStateHis(){
if(!this.filters.product){ if(!this.filters.product){
this.$notify({showClose:true,message:'请先选中产品',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选中产品',type:'warning'})
return; return;
} }
var params={productId:this.filters.product.id,orderBy:'biz_date asc'} var params={productId:this.filters.product.id,orderBy:'biz_date asc'}

2
src/views/xm/rpt/product/productWorkItemDayList.vue

@ -78,7 +78,7 @@
methods: { methods: {
listXmProductStateHis(){ listXmProductStateHis(){
if(!this.filters.product){ if(!this.filters.product){
this.$notify({showClose:true,message:'请先选中产品',type:'warning'})
this.$notify({position:'bottom-left',showClose:true,message:'请先选中产品',type:'warning'})
return; return;
} }
var params={productId:this.filters.product.id,orderBy:'biz_date asc'} var params={productId:this.filters.product.id,orderBy:'biz_date asc'}

Loading…
Cancel
Save