From 412ace8e5e491acbd58f5d678ae624737720f5e2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 14 九月 2023 10:52:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/technology.vue | 13 ++++++++++---
src/components/view/laboratoryManagement.vue | 4 +++-
src/components/view/Technicalindex.vue | 9 ++++++---
src/view/index.vue | 1 +
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/components/view/Technicalindex.vue b/src/components/view/Technicalindex.vue
index 96f7f9f..a5016bb 100644
--- a/src/components/view/Technicalindex.vue
+++ b/src/components/view/Technicalindex.vue
@@ -413,7 +413,8 @@
"Content-Type": "application/json"
}
}).then(res => {
- this.selectAllright()
+ /* this.selectAllright() */
+ this.$parent.removeAllTab()
})
},
submitUpData() { //纭畾
@@ -426,8 +427,9 @@
this.$axios.post(this.$api.url.delTechBy, {
id: this.upData.id
}).then(res => {
- this.selectAllright()
+ /* this.selectAllright() */
this.$message.success('鍒犻櫎瀹屾垚')
+ this.$parent.removeAllTab()
})
},
deleteRow(index, rows) {
@@ -441,7 +443,8 @@
this.$axios.post(this.$api.url.delAllTechskill, {
ids: this.delete
}).then(res => {
- this.selectAllright()
+ /* this.selectAllright() */
+ this.$parent.removeAllTab()
})
},
dels() {
diff --git a/src/components/view/laboratoryManagement.vue b/src/components/view/laboratoryManagement.vue
index 38548d3..f00b04d 100644
--- a/src/components/view/laboratoryManagement.vue
+++ b/src/components/view/laboratoryManagement.vue
@@ -696,7 +696,9 @@
delDeviceById() {
this.$axios.post(this.$api.url.delDeviceById,{
id:this.delete.id
- })
+ }).then(res=>{
+ this.$parent.removeAllTab()
+ });
},
handleClick(row) {
console.log(row);
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 09c9d13..51225fc 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -624,8 +624,9 @@
)
.then((res) => {
console.log(res);
- this.selectAllTechNam();
+ /* this.selectAllTechNam(); */
this.form = {};
+ this.$parent.removeAllTab()
});
},
@@ -664,6 +665,8 @@
console.log(this.delete);
this.$axios.post(this.$api.url.delAllTech, {
ids: this.delete,
+ }).then(res=>{
+ this.$parent.removeAllTab()
});
},
//鍒犻櫎
@@ -671,6 +674,8 @@
console.log(this.$api.url.delTechById, this.upData.id);
this.$axios.post(this.$api.url.delTechById, {
id: this.upData.id,
+ }).then(res=>{
+ this.$parent.removeAllTab()
});
},
//缂栬緫
@@ -699,7 +704,8 @@
}
)
.then((res) => {
- this.selectAllTechNam()
+ /* this.selectAllTechNam(), */
+ this.$parent.removeAllTab()
});
},
@@ -720,7 +726,8 @@
let one=this.towTree.filter(item=>{
return item.children.length>0
})[0]
- let name=one.children[0].name
+ let name=one.children[0].name
+ this.checkTreeNode.name=name
this.selectAllTechNamStart(name)
this.selectDataList();
});
diff --git a/src/view/index.vue b/src/view/index.vue
index 27712b5..dd9f1d7 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -579,6 +579,7 @@
},
removeAllTab(){
this.upIndex++
+ this.$message.warning('鏁版嵁鍙樺姩杈冨ぇ,椤甸潰鑷姩鏇存柊!')
}
}
};
--
Gitblit v1.9.3