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/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue b/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue
index 2941cbd..f128940 100644
--- a/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue
@@ -145,8 +145,13 @@
this.allTreeKeys = []
this.treeDataSource = res.result
this.generateList(res.result)
+ this.expandedKeys=this.allTreeKeys
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
this.loading = false
@@ -247,12 +252,20 @@
},
batchDel: function(entity) {
if (!this.url.deleteBatch) {
- this.$message.error('璇疯缃畊rl.deleteBatch灞炴��!')
+ // this.$message.error('璇疯缃畊rl.deleteBatch灞炴��!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇疯缃畊rl.deletBatch灞炴�э紒"
+ });
return
}
let ids = entity.id
if (!ids) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return
} else {
var that = this
@@ -263,10 +276,18 @@
that.loading = true
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.queryTreeData();
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false
@@ -337,10 +358,6 @@
.ant-modal-cust-warp .ant-modal-content {
height: 90% !important;
overflow-y: hidden;
- }
-
- #app .desktop {
- height: auto !important;
}
/** Button鎸夐挳闂磋窛 */
--
Gitblit v1.9.3