diff --git a/src/views/par/basicData/ParBasicData.vue b/src/views/par/basicData/ParBasicData.vue
index a495a7f30c96b7d134e913e4121bf0ffe479e847..780ac89b0f79fe278305b8b9b5be24bbbbb19683 100644
--- a/src/views/par/basicData/ParBasicData.vue
+++ b/src/views/par/basicData/ParBasicData.vue
@@ -134,7 +134,7 @@
保存
-
+
删除
diff --git a/src/views/par/personBasicData/ParPersonBasicData.vue b/src/views/par/personBasicData/ParPersonBasicData.vue
index f684e359429963c0bfd139e6e2569ec370746e01..e89b6b613a37aa8976f7ae0b0d14c6e73197e594 100644
--- a/src/views/par/personBasicData/ParPersonBasicData.vue
+++ b/src/views/par/personBasicData/ParPersonBasicData.vue
@@ -116,7 +116,7 @@
保存
-
+
删除
@@ -400,13 +400,14 @@ export default {
const _this = this
this.editForm.validateFields((err, values) => {
if (!err) {
- this.spinning = true
if (this.type === '1') {
- if (this.currentitem.level === 1 && this.basicDataTree.some(item => item.deptCode === this.userInfo.orgCode)) {
- this.$notification['error']({
+ this.spinning = true
+ if (this.currentitem.level === 1 && this.basicDataTree[0].children.some(item => item.deptCode === this.userInfo.orgCode)) {
+ this.$notification['warning']({
message: '该部门已有基础数据,请勿重复添加',
- duration: 4
+ duration: 2
})
+ this.spinning = false
} else {
values.parentId = this.currentitem.key
values.parLevel = this.currentitem.level