From 8e75a78f55d60565eb48b25eafd4eb07939ce2cc Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:05 +0800
Subject: [PATCH] Merge branch 'master' into develop
---
src/views/mdc/base/ProductionManager.vue | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/ProductionManager.vue b/src/views/mdc/base/ProductionManager.vue
index df6690b..c1ea8b7 100644
--- a/src/views/mdc/base/ProductionManager.vue
+++ b/src/views/mdc/base/ProductionManager.vue
@@ -293,7 +293,11 @@
batchDel: function () {
console.log(this.checkedKeys)
if (this.checkedKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
} else {
var ids = ''
for (var a = 0; a < this.checkedKeys.length; a++) {
@@ -306,11 +310,19 @@
onOk: function () {
deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadTree()
that.onClearSelected()
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
@@ -328,7 +340,11 @@
that.departTree.push(temp)
}
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
} else {
@@ -400,16 +416,28 @@
this.$refs.form.validate(valid => {
if (valid) {
if (!this.currSelected.id) {
- this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂�!')
+ // this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂�!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂�!'
+ });
return
}
httpAction(this.url.edit, this.currSelected, 'put').then((res) => {
if (res.success) {
- this.$message.success('淇濆瓨鎴愬姛!')
+ // this.$message.success('淇濆瓨鎴愬姛!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"淇濆瓨鎴愬姛"
+ });
this.loadTree()
} else {
- this.$message.error(res.message)
+ // this.$message.error(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
--
Gitblit v1.9.3