diff --git a/src/views/par/basicData/ParBasicData.vue b/src/views/par/basicData/ParBasicData.vue
index 25d337ab35c4573ef325de959e12ece6c0b4077f..a495a7f30c96b7d134e913e4121bf0ffe479e847 100644
--- a/src/views/par/basicData/ParBasicData.vue
+++ b/src/views/par/basicData/ParBasicData.vue
@@ -3,7 +3,7 @@
     <a-row :gutter="24" >
       <a-spin :spinning="spinning">
         <a-col :span="8">
-          <a-card :bordered="true" title="绩效基础数据" :bodyStyle="bodyStyle" :headStyle="headStyle">
+          <a-card :bordered="true" :bodyStyle="bodyStyle" :headStyle="headStyle">
             <!-- extra -->
             <template v-slot:extra>
               <!-- 手动创建 -->
@@ -232,7 +232,7 @@ export default {
     onExpand  (expandedKeys) {
       // 展开指定树节点
       this.expandedKeys = expandedKeys
-      // this.autoExpandParent = false
+      this.autoExpandParent = false
     },
     /**
      * 搜索基础数据
@@ -457,7 +457,7 @@ export default {
           if (this.type === '1') {
             values.parentId = this.currentitem.key
             values.parLevel = this.currentitem.level
-            values.dwlx = this.currentitem.dwlx
+            values.dwlx = this.currentitem.dwlx === undefined ? values.dwlx : this.currentitem.dwlx
             // 在这里调用新增接口
             return addBasicData(
               values
@@ -489,7 +489,7 @@ export default {
             values.parentId = this.parentId
             values.id = this.currentitem.key
             const parentNodeTree = this.getParentNode(this.currentitem.key, this.basicDataTree)
-            values.dwlx = parentNodeTree.dwlx
+            values.dwlx = parentNodeTree.dwlx === undefined ? values.dwlx : parentNodeTree.dwlx
             // 在这里调用修改接口
             return updateBasicData(
               values
diff --git a/src/views/par/personBasicData/ParPersonBasicData.vue b/src/views/par/personBasicData/ParPersonBasicData.vue
index 4d8c1201ef344ebdf7b26194950d1d8621214877..f684e359429963c0bfd139e6e2569ec370746e01 100644
--- a/src/views/par/personBasicData/ParPersonBasicData.vue
+++ b/src/views/par/personBasicData/ParPersonBasicData.vue
@@ -3,7 +3,7 @@
     <a-row :gutter="24" >
       <a-spin :spinning="spinning">
         <a-col :span="8">
-          <a-card :bordered="true" title="绩效基础数据" :bodyStyle="bodyStyle" :headStyle="headStyle">
+          <a-card :bordered="true" :bodyStyle="bodyStyle" :headStyle="headStyle">
             <!-- extra -->
             <template v-slot:extra>
               <!-- 手动创建 -->
@@ -116,7 +116,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="!(currentitem.level === 2 && currentitem.deptCode === 'common')" >
                   删除
                 </a-button>
               </a-col>
@@ -130,6 +130,7 @@
 <script>
 
 import { getBasicDataTree, addBasicData, updateBasicData, delBasicData } from '@/api/parBasicData'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'ParBasicData',
@@ -182,7 +183,7 @@ export default {
   },
   created () {
     // 获取树形基础数据
-    getBasicDataTree({ 'parentTreeId': 'root', 'queryType': '2' }).then(res => {
+    getBasicDataTree({ 'parentTreeId': 'root', 'queryType': '2', 'deptCode': this.userInfo.orgCode }).then(res => {
       this.basicDataTree = this.handleVal(res.result.data)
       generateList(this.basicDataTree)
     })
@@ -200,6 +201,11 @@ export default {
       }
     }
   },
+  computed: {
+    userInfo () {
+      return this.$store.getters.userInfo
+    }
+  },
   methods: {
     /**
      * 展开/收起节点时触发
@@ -207,7 +213,7 @@ export default {
     onExpand  (expandedKeys) {
       // 展开指定树节点
       this.expandedKeys = expandedKeys
-      // this.autoExpandParent = false
+      this.autoExpandParent = false
     },
     /**
      * 搜索基础数据
@@ -383,7 +389,7 @@ export default {
      * 基础数据增删改后强制刷新树
      */
     refreshTree () {
-      getBasicDataTree({ 'parentTreeId': 'root', 'queryType': '2' }).then(res => {
+      getBasicDataTree({ 'parentTreeId': 'root', 'queryType': '2', 'deptCode': this.userInfo.orgCode }).then(res => {
         this.basicDataTree = this.handleVal(res.result.data)
       })
     },
@@ -396,38 +402,47 @@ export default {
         if (!err) {
           this.spinning = true
           if (this.type === '1') {
-            values.parentId = this.currentitem.key
-            values.parLevel = this.currentitem.level
-            // 在这里调用新增接口
-            return addBasicData(
-              values
-            ).then(
-              res => {
-                if (res.status === 200) {
-                  _this.$notification['success']({
-                    message: '保存成功',
-                    duration: 2
-                  })
-                  _this.formvisable = false
-                  _this.refreshTree()
-                } else {
-                  _this.$notification['error']({
-                    message: res.message,
-                    duration: 4
-                  })
-                }
-              }
-            ).catch(() =>
-              _this.$notification['error']({
-                message: '出现异常，请联系系统管理员',
+            if (this.currentitem.level === 1 && this.basicDataTree.some(item => item.deptCode === this.userInfo.orgCode)) {
+              this.$notification['error']({
+                message: '该部门已有基础数据，请勿重复添加',
                 duration: 4
               })
-            ).finally(() => {
-              _this.spinning = false
-            })
+            } else {
+              values.parentId = this.currentitem.key
+              values.parLevel = this.currentitem.level
+              values.deptCode = this.currentitem.level === 1 ? this.userInfo.orgCode : this.currentitem.deptCode
+              // 在这里调用新增接口
+              return addBasicData(
+                values
+              ).then(
+                res => {
+                  if (res.status === 200) {
+                    _this.$notification['success']({
+                      message: '保存成功',
+                      duration: 2
+                    })
+                    _this.formvisable = false
+                    _this.refreshTree()
+                  } else {
+                    _this.$notification['error']({
+                      message: res.message,
+                      duration: 4
+                    })
+                  }
+                }
+              ).catch(() =>
+                _this.$notification['error']({
+                  message: '出现异常，请联系系统管理员',
+                  duration: 4
+                })
+              ).finally(() => {
+                _this.spinning = false
+              })
+            }
           } else {
             values.parentId = this.parentId
             values.id = this.currentitem.key
+            values.deptCode = this.currentitem.deptCode
             // 在这里调用修改接口
             return updateBasicData(
               values
diff --git a/src/views/par/personScoreManage/ParPersonScoreManage.vue b/src/views/par/personScoreManage/ParPersonScoreManage.vue
index c40d869ed9a64436c58d9177d0b83985907a9bb2..312131ee7344550e8e26be77a692952715bf66ed 100644
--- a/src/views/par/personScoreManage/ParPersonScoreManage.vue
+++ b/src/views/par/personScoreManage/ParPersonScoreManage.vue
@@ -229,9 +229,6 @@ export default {
       })
       const param = {}
       param.scbj = '0'
-      getPlan(param).then(res => {
-        this.planList = res
-      })
       getAllOrg().then(res => {
         this.orgList = res
       })
diff --git a/src/views/par/personScoreManage/PersonScoreManageAdd.vue b/src/views/par/personScoreManage/PersonScoreManageAdd.vue
index afb69b3e89930e00decb03394ca3b24b3f9e5c80..ce5095ba6fc6ac6bc90982f111823084ca0227b1 100644
--- a/src/views/par/personScoreManage/PersonScoreManageAdd.vue
+++ b/src/views/par/personScoreManage/PersonScoreManageAdd.vue
@@ -7,6 +7,7 @@
     :confirmLoading="confirmLoading"
     @ok="handleOk"
     @cancel="handleCancel"
+    :maskClosable="false"
   >
     <a-form :form="form" >
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评名称" >
@@ -77,6 +78,11 @@ export default {
   },
   created () {
 
+  },
+  computed: {
+    userInfo () {
+      return this.$store.getters.userInfo
+    }
   },
   methods: {
     add (orgTree) {
@@ -140,9 +146,14 @@ export default {
       const param = {}
       param.scbj = '0'
       param.type = '2'
+      param.deptCode = this.userInfo.orgCode
       getPlan(param).then(res => {
         this.planList = res
       })
+      this.userList = []
+      getUserByOrgCode({ orgCode: this.userInfo.orgCode }).then(res => {
+        this.userList = res
+      })
     },
     changePlan (val) {
       const plan = this.planList.filter(item => item.id === val)[0]
@@ -152,10 +163,6 @@ export default {
         jssj: plan.jssj,
         bz: plan.bz
       })
-      this.userList = []
-      getUserByOrgCode({ orgCode: plan.kpr }).then(res => {
-        this.userList = res
-      })
     }
   }
 }
diff --git a/src/views/par/scoreManage/ScoreManageAdd.vue b/src/views/par/scoreManage/ScoreManageAdd.vue
index 2c7fb0962690a86af4f2eaa39e9bf254f0e682e5..ff6bb56594cc7d6aad05ea82de86f275d90d173e 100644
--- a/src/views/par/scoreManage/ScoreManageAdd.vue
+++ b/src/views/par/scoreManage/ScoreManageAdd.vue
@@ -7,6 +7,7 @@
     :confirmLoading="confirmLoading"
     @ok="handleOk"
     @cancel="handleCancel"
+    :maskClosable="false"
   >
     <a-form :form="form" >
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评名称" >
diff --git a/src/views/par/scoreManage/ScoreManageRecord.vue b/src/views/par/scoreManage/ScoreManageRecord.vue
index 59782f4ce1051579c32908bb0175f6c395aa0a8e..50c5bd4e887c2f0f1b0cc1788edf5395a7c216dc 100644
--- a/src/views/par/scoreManage/ScoreManageRecord.vue
+++ b/src/views/par/scoreManage/ScoreManageRecord.vue
@@ -103,7 +103,7 @@ export default {
       // 表头
       bonusColumns: [
         { title: '工作分类', dataIndex: 'kpdlName' },
-        { title: '当前得分',
+        { title: '当前加分',
           customRender: function (attr1, record) {
             if (record.itemList[0].dqdf === null || record.itemList[0].dqdf === undefined) {
               return 0