From a9f005e2af294c47d7cd1e4b6ed401bf65f5b080 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 04 三月 2025 16:44:09 +0800 Subject: [PATCH] art: 所有设备 台账 二保工单 根据设备id查询二保工单,并过滤掉已完成和已取消的二保工单 --- src/views/system/modules/ProductionManager/ProductionEquipment.vue | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/views/system/modules/ProductionManager/ProductionEquipment.vue b/src/views/system/modules/ProductionManager/ProductionEquipment.vue index d4b06a3..6227bb9 100644 --- a/src/views/system/modules/ProductionManager/ProductionEquipment.vue +++ b/src/views/system/modules/ProductionManager/ProductionEquipment.vue @@ -174,7 +174,11 @@ } //update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------ }else{ - this.$message.warning(res.message) + // this.$message.warning(res.message) + this.$notification.warning({ + message:'娑堟伅', + description:res.message + }); } }).finally(() => { this.loading = false @@ -214,7 +218,11 @@ } //update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------ }else{ - this.$message.warning(res.message) + // this.$message.warning(res.message) + this.$notification.warning({ + message:'娑堟伅', + description:res.message + }); } }).finally(() => { this.loading = false @@ -246,10 +254,16 @@ postAction(this.url.removeEquipmentForDepart,qs.stringify({productionId:this.productionId,equipmentId:equipmentId})).then((res)=>{ if (res.success) { - this.$message.warning(res.message) + this.$notification.success({ + message:'娑堟伅', + description:res.message + }); this.loadData(this.productionId); }else{ - this.$message.warning(res.message) + this.$notification.warning({ + message:'娑堟伅', + description:res.message + }); } }).finally(() => { @@ -266,7 +280,11 @@ return } if (this.selectedRowKeys.length <= 0) { - this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒'); + // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒'); + this.$notification.warning({ + message:'娑堟伅', + description:"璇烽�夋嫨涓�鏉¤褰�" + }); return; } else { var ids = ""; @@ -283,11 +301,19 @@ if (res.success) { //閲嶆柊璁$畻鍒嗛〉闂 that.reCalculatePage(that.selectedRowKeys.length) - that.$message.success(res.message); + // that.$message.success(res.message); + this.$notification.success({ + message:'娑堟伅', + description:res.message + }); that.loadData(that.productionId); that.onClearSelected(); } else { - that.$message.warning(res.message); + // that.$message.warning(res.message); + this.$notification.warning({ + message:'娑堟伅', + description:res.message + }); } }).finally(() => { that.loading = false; -- Gitblit v1.9.3