From 2d95e1797d5d0a75a53adeac66cc3e4b3de3aa63 Mon Sep 17 00:00:00 2001
From: T-95707 <zhujt@neuray.cn>
Date: Mon, 7 Sep 2020 15:33:54 +0800
Subject: [PATCH] =?UTF-8?q?20200907=20zjt=20=E4=BF=AE=E6=94=B9=20=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=9C=BA=E6=9E=84=E5=B1=82=E7=BA=A7=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/basicData/ParBasicData.vue             |  2 +-
 src/views/par/personBasicData/ParPersonBasicData.vue | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/par/basicData/ParBasicData.vue b/src/views/par/basicData/ParBasicData.vue
index a495a7f..780ac89 100644
--- a/src/views/par/basicData/ParBasicData.vue
+++ b/src/views/par/basicData/ParBasicData.vue
@@ -134,7 +134,7 @@
                 <a-button type="primary" @click="saveBasicData" >
                   保存
                 </a-button>
-                <a-button type="danger" @click="delBasicData" style="margin-left: 8px" >
+                <a-button type="danger" @click="delBasicData" style="margin-left: 8px" v-if="type === '2'">
                   删除
                 </a-button>
               </a-col>
diff --git a/src/views/par/personBasicData/ParPersonBasicData.vue b/src/views/par/personBasicData/ParPersonBasicData.vue
index f684e35..e89b6b6 100644
--- a/src/views/par/personBasicData/ParPersonBasicData.vue
+++ b/src/views/par/personBasicData/ParPersonBasicData.vue
@@ -116,7 +116,7 @@
                 <a-button type="primary" @click="saveBasicData" >
                   保存
                 </a-button>
-                <a-button type="danger" @click="delBasicData" style="margin-left: 8px" v-if="!(currentitem.level === 2 && currentitem.deptCode === 'common')" >
+                <a-button type="danger" @click="delBasicData" style="margin-left: 8px" v-if="type === '2' && !(currentitem.level === 2 && currentitem.deptCode === 'common')" >
                   删除
                 </a-button>
               </a-col>
@@ -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
-- 
Gitee