diff --git a/src/api/access.js b/src/api/access.js
index aea0671..0e14a79 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -57,7 +57,7 @@
 }
 
 // 取消授权
-export function delAllPermission(doorCode,personType) {
+export function delAllPermission(doorCode, personType) {
   return request({
     url: 'acsPermission/deleteAll',
     method: 'post',

diff --git a/src/api/access.js b/src/api/access.js
index aea0671..0e14a79 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -57,7 +57,7 @@
 }
 
 // 取消授权
-export function delAllPermission(doorCode,personType) {
+export function delAllPermission(doorCode, personType) {
   return request({
     url: 'acsPermission/deleteAll',
     method: 'post',
diff --git a/src/api/attendance.js b/src/api/attendance.js
index e45ec35..853adc5 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -162,3 +162,12 @@
   })
 }
 
+//设置是否限制考勤备注功能
+export function updateUserAttr1(params) {
+  return request({
+    url: 'AtdRules/updateUserAttr1',
+    method: 'post',
+    params
+  })
+}
+

diff --git a/src/api/access.js b/src/api/access.js
index aea0671..0e14a79 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -57,7 +57,7 @@
 }
 
 // 取消授权
-export function delAllPermission(doorCode,personType) {
+export function delAllPermission(doorCode, personType) {
   return request({
     url: 'acsPermission/deleteAll',
     method: 'post',
diff --git a/src/api/attendance.js b/src/api/attendance.js
index e45ec35..853adc5 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -162,3 +162,12 @@
   })
 }
 
+//设置是否限制考勤备注功能
+export function updateUserAttr1(params) {
+  return request({
+    url: 'AtdRules/updateUserAttr1',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index b444af2..0f2a0b0 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -49,6 +49,12 @@
         name: 'SpecialDay',
         component: () => import('@/views/attendance/specialDay'),
         meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      },
+      {
+        path: '/remarksLimit',
+        name: 'RemarksLimit',
+        component: () => import('@/views/attendance/remarksLimit'),
+        meta: { title: '备注功能管理', icon: 'function', permission: ['/remarksLimit'] }
       }
     ]
   }

diff --git a/src/api/access.js b/src/api/access.js
index aea0671..0e14a79 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -57,7 +57,7 @@
 }
 
 // 取消授权
-export function delAllPermission(doorCode,personType) {
+export function delAllPermission(doorCode, personType) {
   return request({
     url: 'acsPermission/deleteAll',
     method: 'post',
diff --git a/src/api/attendance.js b/src/api/attendance.js
index e45ec35..853adc5 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -162,3 +162,12 @@
   })
 }
 
+//设置是否限制考勤备注功能
+export function updateUserAttr1(params) {
+  return request({
+    url: 'AtdRules/updateUserAttr1',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index b444af2..0f2a0b0 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -49,6 +49,12 @@
         name: 'SpecialDay',
         component: () => import('@/views/attendance/specialDay'),
         meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      },
+      {
+        path: '/remarksLimit',
+        name: 'RemarksLimit',
+        component: () => import('@/views/attendance/remarksLimit'),
+        meta: { title: '备注功能管理', icon: 'function', permission: ['/remarksLimit'] }
       }
     ]
   }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index a63d488..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -37,9 +37,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->

diff --git a/src/api/access.js b/src/api/access.js
index aea0671..0e14a79 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -57,7 +57,7 @@
 }
 
 // 取消授权
-export function delAllPermission(doorCode,personType) {
+export function delAllPermission(doorCode, personType) {
   return request({
     url: 'acsPermission/deleteAll',
     method: 'post',
diff --git a/src/api/attendance.js b/src/api/attendance.js
index e45ec35..853adc5 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -162,3 +162,12 @@
   })
 }
 
+//设置是否限制考勤备注功能
+export function updateUserAttr1(params) {
+  return request({
+    url: 'AtdRules/updateUserAttr1',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index b444af2..0f2a0b0 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -49,6 +49,12 @@
         name: 'SpecialDay',
         component: () => import('@/views/attendance/specialDay'),
         meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      },
+      {
+        path: '/remarksLimit',
+        name: 'RemarksLimit',
+        component: () => import('@/views/attendance/remarksLimit'),
+        meta: { title: '备注功能管理', icon: 'function', permission: ['/remarksLimit'] }
       }
     ]
   }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index a63d488..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -37,9 +37,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 665c880..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -34,9 +34,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->

diff --git a/src/api/access.js b/src/api/access.js
index aea0671..0e14a79 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -57,7 +57,7 @@
 }
 
 // 取消授权
-export function delAllPermission(doorCode,personType) {
+export function delAllPermission(doorCode, personType) {
   return request({
     url: 'acsPermission/deleteAll',
     method: 'post',
diff --git a/src/api/attendance.js b/src/api/attendance.js
index e45ec35..853adc5 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -162,3 +162,12 @@
   })
 }
 
+//设置是否限制考勤备注功能
+export function updateUserAttr1(params) {
+  return request({
+    url: 'AtdRules/updateUserAttr1',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index b444af2..0f2a0b0 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -49,6 +49,12 @@
         name: 'SpecialDay',
         component: () => import('@/views/attendance/specialDay'),
         meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      },
+      {
+        path: '/remarksLimit',
+        name: 'RemarksLimit',
+        component: () => import('@/views/attendance/remarksLimit'),
+        meta: { title: '备注功能管理', icon: 'function', permission: ['/remarksLimit'] }
       }
     ]
   }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index a63d488..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -37,9 +37,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 665c880..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -34,9 +34,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->
diff --git a/src/views/attendance/remarksLimit.vue b/src/views/attendance/remarksLimit.vue
new file mode 100644
index 0000000..ab210ff
--- /dev/null
+++ b/src/views/attendance/remarksLimit.vue
@@ -0,0 +1,200 @@
+<!--特殊考勤日列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" />
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>用户列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border >
+        <!--批量选择勾选框列-->
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <!--序号列-->
+        <el-table-column :index="indexMethod" label="#" align="center" type="index"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <!--<span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>-->
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="是否限制备注功能" align="center" width="180">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.attr1"
+              active-text="是"
+              inactive-text="否"
+              active-value="1"
+              inactive-value="0"
+              @change="changeSwitch(scope.row)"/>
+             </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+<script>
+
+import { updateUserAttr1 } from '@/api/attendance'
+import { getUserList } from '@/api/user'
+
+export default {
+  name: 'RemarksLimit',
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 姓名
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 20,
+        page: 1,
+        sort: 'id'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '所在部门',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '账户',
+          value: 'account',
+          align: 'center'
+        },
+        {
+          text: '角色',
+          value: 'roleName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true // 列表加载动画
+    }
+  },
+  watch: {},
+  created() {
+    this.fetchData()// 获取数据
+  },
+  activated() { // 页面激活刷新数据
+    this.fetchData()
+  },
+  methods: {
+    // 获取用户数据
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        debugger
+        var data= []
+        for (var i = 0; i < response.data.rows.length; i++) {
+          if(response.data.rows[i].roleName.indexOf('部门领导') > -1){
+            data.push(response.data.rows[i])
+          }
+        }
+        this.list = data
+        this.total = data.length
+        this.listLoading = false
+      })
+    },
+    search() {
+      this.fetchData()
+    },
+    changeSwitch (row) {
+      debugger
+      const data = {
+        id: row.id,
+        attr1: row.attr1
+      }
+      updateUserAttr1(data).then(res => {
+        if (res.code === '200' || res.code === 200) {
+        } else {
+          this.$message.error(res.msg)
+        }
+        // 调用表格数据
+        this.fetchData()
+        this.loading = false;
+      }).catch({
+      })
+    },
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>

diff --git a/src/api/access.js b/src/api/access.js
index aea0671..0e14a79 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -57,7 +57,7 @@
 }
 
 // 取消授权
-export function delAllPermission(doorCode,personType) {
+export function delAllPermission(doorCode, personType) {
   return request({
     url: 'acsPermission/deleteAll',
     method: 'post',
diff --git a/src/api/attendance.js b/src/api/attendance.js
index e45ec35..853adc5 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -162,3 +162,12 @@
   })
 }
 
+//设置是否限制考勤备注功能
+export function updateUserAttr1(params) {
+  return request({
+    url: 'AtdRules/updateUserAttr1',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index b444af2..0f2a0b0 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -49,6 +49,12 @@
         name: 'SpecialDay',
         component: () => import('@/views/attendance/specialDay'),
         meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      },
+      {
+        path: '/remarksLimit',
+        name: 'RemarksLimit',
+        component: () => import('@/views/attendance/remarksLimit'),
+        meta: { title: '备注功能管理', icon: 'function', permission: ['/remarksLimit'] }
       }
     ]
   }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index a63d488..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -37,9 +37,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 665c880..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -34,9 +34,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->
diff --git a/src/views/attendance/remarksLimit.vue b/src/views/attendance/remarksLimit.vue
new file mode 100644
index 0000000..ab210ff
--- /dev/null
+++ b/src/views/attendance/remarksLimit.vue
@@ -0,0 +1,200 @@
+<!--特殊考勤日列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" />
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>用户列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border >
+        <!--批量选择勾选框列-->
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <!--序号列-->
+        <el-table-column :index="indexMethod" label="#" align="center" type="index"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <!--<span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>-->
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="是否限制备注功能" align="center" width="180">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.attr1"
+              active-text="是"
+              inactive-text="否"
+              active-value="1"
+              inactive-value="0"
+              @change="changeSwitch(scope.row)"/>
+             </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+<script>
+
+import { updateUserAttr1 } from '@/api/attendance'
+import { getUserList } from '@/api/user'
+
+export default {
+  name: 'RemarksLimit',
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 姓名
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 20,
+        page: 1,
+        sort: 'id'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '所在部门',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '账户',
+          value: 'account',
+          align: 'center'
+        },
+        {
+          text: '角色',
+          value: 'roleName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true // 列表加载动画
+    }
+  },
+  watch: {},
+  created() {
+    this.fetchData()// 获取数据
+  },
+  activated() { // 页面激活刷新数据
+    this.fetchData()
+  },
+  methods: {
+    // 获取用户数据
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        debugger
+        var data= []
+        for (var i = 0; i < response.data.rows.length; i++) {
+          if(response.data.rows[i].roleName.indexOf('部门领导') > -1){
+            data.push(response.data.rows[i])
+          }
+        }
+        this.list = data
+        this.total = data.length
+        this.listLoading = false
+      })
+    },
+    search() {
+      this.fetchData()
+    },
+    changeSwitch (row) {
+      debugger
+      const data = {
+        id: row.id,
+        attr1: row.attr1
+      }
+      updateUserAttr1(data).then(res => {
+        if (res.code === '200' || res.code === 200) {
+        } else {
+          this.$message.error(res.msg)
+        }
+        // 调用表格数据
+        this.fetchData()
+        this.loading = false;
+      }).catch({
+      })
+    },
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 41f5ad4..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -194,17 +194,17 @@
   name: 'AddPerson',
   components: { DeptSelect },
   data() {
-    const validateIDCard = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
-          callback(new Error('请输入合法的身份证号'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('身份证号不能为空'))
-      }
-    }
+    // const validateIDCard = (rule, value, callback) => {
+    //   if (value !== '') {
+    //     if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+    //       callback(new Error('请输入合法的身份证号'))
+    //     } else {
+    //       callback()
+    //     }
+    //   } else {
+    //     callback(new Error('身份证号不能为空'))
+    //   }
+    // }
     // 校验年假
     const validateInitAnnualLeave = (rule, value, callback) => {
       if (value !== '') {

diff --git a/src/api/access.js b/src/api/access.js
index aea0671..0e14a79 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -57,7 +57,7 @@
 }
 
 // 取消授权
-export function delAllPermission(doorCode,personType) {
+export function delAllPermission(doorCode, personType) {
   return request({
     url: 'acsPermission/deleteAll',
     method: 'post',
diff --git a/src/api/attendance.js b/src/api/attendance.js
index e45ec35..853adc5 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -162,3 +162,12 @@
   })
 }
 
+//设置是否限制考勤备注功能
+export function updateUserAttr1(params) {
+  return request({
+    url: 'AtdRules/updateUserAttr1',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index b444af2..0f2a0b0 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -49,6 +49,12 @@
         name: 'SpecialDay',
         component: () => import('@/views/attendance/specialDay'),
         meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      },
+      {
+        path: '/remarksLimit',
+        name: 'RemarksLimit',
+        component: () => import('@/views/attendance/remarksLimit'),
+        meta: { title: '备注功能管理', icon: 'function', permission: ['/remarksLimit'] }
       }
     ]
   }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index a63d488..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -37,9 +37,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 665c880..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -34,9 +34,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->
diff --git a/src/views/attendance/remarksLimit.vue b/src/views/attendance/remarksLimit.vue
new file mode 100644
index 0000000..ab210ff
--- /dev/null
+++ b/src/views/attendance/remarksLimit.vue
@@ -0,0 +1,200 @@
+<!--特殊考勤日列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" />
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>用户列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border >
+        <!--批量选择勾选框列-->
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <!--序号列-->
+        <el-table-column :index="indexMethod" label="#" align="center" type="index"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <!--<span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>-->
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="是否限制备注功能" align="center" width="180">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.attr1"
+              active-text="是"
+              inactive-text="否"
+              active-value="1"
+              inactive-value="0"
+              @change="changeSwitch(scope.row)"/>
+             </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+<script>
+
+import { updateUserAttr1 } from '@/api/attendance'
+import { getUserList } from '@/api/user'
+
+export default {
+  name: 'RemarksLimit',
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 姓名
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 20,
+        page: 1,
+        sort: 'id'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '所在部门',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '账户',
+          value: 'account',
+          align: 'center'
+        },
+        {
+          text: '角色',
+          value: 'roleName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true // 列表加载动画
+    }
+  },
+  watch: {},
+  created() {
+    this.fetchData()// 获取数据
+  },
+  activated() { // 页面激活刷新数据
+    this.fetchData()
+  },
+  methods: {
+    // 获取用户数据
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        debugger
+        var data= []
+        for (var i = 0; i < response.data.rows.length; i++) {
+          if(response.data.rows[i].roleName.indexOf('部门领导') > -1){
+            data.push(response.data.rows[i])
+          }
+        }
+        this.list = data
+        this.total = data.length
+        this.listLoading = false
+      })
+    },
+    search() {
+      this.fetchData()
+    },
+    changeSwitch (row) {
+      debugger
+      const data = {
+        id: row.id,
+        attr1: row.attr1
+      }
+      updateUserAttr1(data).then(res => {
+        if (res.code === '200' || res.code === 200) {
+        } else {
+          this.$message.error(res.msg)
+        }
+        // 调用表格数据
+        this.fetchData()
+        this.loading = false;
+      }).catch({
+      })
+    },
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 41f5ad4..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -194,17 +194,17 @@
   name: 'AddPerson',
   components: { DeptSelect },
   data() {
-    const validateIDCard = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
-          callback(new Error('请输入合法的身份证号'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('身份证号不能为空'))
-      }
-    }
+    // const validateIDCard = (rule, value, callback) => {
+    //   if (value !== '') {
+    //     if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+    //       callback(new Error('请输入合法的身份证号'))
+    //     } else {
+    //       callback()
+    //     }
+    //   } else {
+    //     callback(new Error('身份证号不能为空'))
+    //   }
+    // }
     // 校验年假
     const validateInitAnnualLeave = (rule, value, callback) => {
       if (value !== '') {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 1b2bdb1..824a451 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -442,7 +442,7 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {

diff --git a/src/api/access.js b/src/api/access.js
index aea0671..0e14a79 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -57,7 +57,7 @@
 }
 
 // 取消授权
-export function delAllPermission(doorCode,personType) {
+export function delAllPermission(doorCode, personType) {
   return request({
     url: 'acsPermission/deleteAll',
     method: 'post',
diff --git a/src/api/attendance.js b/src/api/attendance.js
index e45ec35..853adc5 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -162,3 +162,12 @@
   })
 }
 
+//设置是否限制考勤备注功能
+export function updateUserAttr1(params) {
+  return request({
+    url: 'AtdRules/updateUserAttr1',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index b444af2..0f2a0b0 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -49,6 +49,12 @@
         name: 'SpecialDay',
         component: () => import('@/views/attendance/specialDay'),
         meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      },
+      {
+        path: '/remarksLimit',
+        name: 'RemarksLimit',
+        component: () => import('@/views/attendance/remarksLimit'),
+        meta: { title: '备注功能管理', icon: 'function', permission: ['/remarksLimit'] }
       }
     ]
   }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index a63d488..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -37,9 +37,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 665c880..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -34,9 +34,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->
diff --git a/src/views/attendance/remarksLimit.vue b/src/views/attendance/remarksLimit.vue
new file mode 100644
index 0000000..ab210ff
--- /dev/null
+++ b/src/views/attendance/remarksLimit.vue
@@ -0,0 +1,200 @@
+<!--特殊考勤日列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" />
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>用户列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border >
+        <!--批量选择勾选框列-->
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <!--序号列-->
+        <el-table-column :index="indexMethod" label="#" align="center" type="index"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <!--<span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>-->
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="是否限制备注功能" align="center" width="180">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.attr1"
+              active-text="是"
+              inactive-text="否"
+              active-value="1"
+              inactive-value="0"
+              @change="changeSwitch(scope.row)"/>
+             </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+<script>
+
+import { updateUserAttr1 } from '@/api/attendance'
+import { getUserList } from '@/api/user'
+
+export default {
+  name: 'RemarksLimit',
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 姓名
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 20,
+        page: 1,
+        sort: 'id'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '所在部门',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '账户',
+          value: 'account',
+          align: 'center'
+        },
+        {
+          text: '角色',
+          value: 'roleName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true // 列表加载动画
+    }
+  },
+  watch: {},
+  created() {
+    this.fetchData()// 获取数据
+  },
+  activated() { // 页面激活刷新数据
+    this.fetchData()
+  },
+  methods: {
+    // 获取用户数据
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        debugger
+        var data= []
+        for (var i = 0; i < response.data.rows.length; i++) {
+          if(response.data.rows[i].roleName.indexOf('部门领导') > -1){
+            data.push(response.data.rows[i])
+          }
+        }
+        this.list = data
+        this.total = data.length
+        this.listLoading = false
+      })
+    },
+    search() {
+      this.fetchData()
+    },
+    changeSwitch (row) {
+      debugger
+      const data = {
+        id: row.id,
+        attr1: row.attr1
+      }
+      updateUserAttr1(data).then(res => {
+        if (res.code === '200' || res.code === 200) {
+        } else {
+          this.$message.error(res.msg)
+        }
+        // 调用表格数据
+        this.fetchData()
+        this.loading = false;
+      }).catch({
+      })
+    },
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 41f5ad4..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -194,17 +194,17 @@
   name: 'AddPerson',
   components: { DeptSelect },
   data() {
-    const validateIDCard = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
-          callback(new Error('请输入合法的身份证号'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('身份证号不能为空'))
-      }
-    }
+    // const validateIDCard = (rule, value, callback) => {
+    //   if (value !== '') {
+    //     if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+    //       callback(new Error('请输入合法的身份证号'))
+    //     } else {
+    //       callback()
+    //     }
+    //   } else {
+    //     callback(new Error('身份证号不能为空'))
+    //   }
+    // }
     // 校验年假
     const validateInitAnnualLeave = (rule, value, callback) => {
       if (value !== '') {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 1b2bdb1..824a451 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -442,7 +442,7 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 70c5076..4273cde 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -12,14 +12,14 @@
             <dept-select v-model="listQuery.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
-            <!--<el-select v-model="listQuery.sex" placeholder="性别" clearable>-->
-              <!--<el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>-->
-            <!--</el-select>-->
+          <!--<el-select v-model="listQuery.sex" placeholder="性别" clearable>-->
+          <!--<el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
           <!--<el-form-item class="selectForm-container-item">-->
-            <!--<el-select v-model="listQuery.duty" placeholder="职务" clearable>-->
-              <!--<el-option v-for="item in dutyList" :key="item.value" :label="item.name" :value="item.value"/>-->
-            <!--</el-select>-->
+          <!--<el-select v-model="listQuery.duty" placeholder="职务" clearable>-->
+          <!--<el-option v-for="item in dutyList" :key="item.value" :label="item.name" :value="item.value"/>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item" />
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>

diff --git a/src/api/access.js b/src/api/access.js
index aea0671..0e14a79 100644
--- a/src/api/access.js
+++ b/src/api/access.js
@@ -57,7 +57,7 @@
 }
 
 // 取消授权
-export function delAllPermission(doorCode,personType) {
+export function delAllPermission(doorCode, personType) {
   return request({
     url: 'acsPermission/deleteAll',
     method: 'post',
diff --git a/src/api/attendance.js b/src/api/attendance.js
index e45ec35..853adc5 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -162,3 +162,12 @@
   })
 }
 
+//设置是否限制考勤备注功能
+export function updateUserAttr1(params) {
+  return request({
+    url: 'AtdRules/updateUserAttr1',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/router/modules/attendance.js b/src/router/modules/attendance.js
index b444af2..0f2a0b0 100644
--- a/src/router/modules/attendance.js
+++ b/src/router/modules/attendance.js
@@ -49,6 +49,12 @@
         name: 'SpecialDay',
         component: () => import('@/views/attendance/specialDay'),
         meta: { title: '特殊考勤日管理', icon: 'function', permission: ['/specialDay'] }
+      },
+      {
+        path: '/remarksLimit',
+        name: 'RemarksLimit',
+        component: () => import('@/views/attendance/remarksLimit'),
+        meta: { title: '备注功能管理', icon: 'function', permission: ['/remarksLimit'] }
       }
     ]
   }
diff --git a/src/views/accessPermission/listStaffPermission.vue b/src/views/accessPermission/listStaffPermission.vue
index a63d488..61737eb 100644
--- a/src/views/accessPermission/listStaffPermission.vue
+++ b/src/views/accessPermission/listStaffPermission.vue
@@ -37,9 +37,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->
diff --git a/src/views/accessPermission/listVisitorPermission.vue b/src/views/accessPermission/listVisitorPermission.vue
index 665c880..e9c9a22 100644
--- a/src/views/accessPermission/listVisitorPermission.vue
+++ b/src/views/accessPermission/listVisitorPermission.vue
@@ -34,9 +34,9 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="操作" align="center" width="120">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button v-if="hasPerm('/acsPermission/delete')" type="text" @click="cancelPermission(scope.row)">取消授权</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
       <!--分页-->
diff --git a/src/views/attendance/remarksLimit.vue b/src/views/attendance/remarksLimit.vue
new file mode 100644
index 0000000..ab210ff
--- /dev/null
+++ b/src/views/attendance/remarksLimit.vue
@@ -0,0 +1,200 @@
+<!--特殊考勤日列表-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" />
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>用户列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" size="small" border >
+        <!--批量选择勾选框列-->
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <!--序号列-->
+        <el-table-column :index="indexMethod" label="#" align="center" type="index"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+            <!--<span v-if="column.ext">{{ scope.row.ext[column.value] }}</span>-->
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="是否限制备注功能" align="center" width="180">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.attr1"
+              active-text="是"
+              inactive-text="否"
+              active-value="1"
+              inactive-value="0"
+              @change="changeSwitch(scope.row)"/>
+             </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+<script>
+
+import { updateUserAttr1 } from '@/api/attendance'
+import { getUserList } from '@/api/user'
+
+export default {
+  name: 'RemarksLimit',
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 姓名
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 20,
+        page: 1,
+        sort: 'id'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '所在部门',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '账户',
+          value: 'account',
+          align: 'center'
+        },
+        {
+          text: '角色',
+          value: 'roleName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true // 列表加载动画
+    }
+  },
+  watch: {},
+  created() {
+    this.fetchData()// 获取数据
+  },
+  activated() { // 页面激活刷新数据
+    this.fetchData()
+  },
+  methods: {
+    // 获取用户数据
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        debugger
+        var data= []
+        for (var i = 0; i < response.data.rows.length; i++) {
+          if(response.data.rows[i].roleName.indexOf('部门领导') > -1){
+            data.push(response.data.rows[i])
+          }
+        }
+        this.list = data
+        this.total = data.length
+        this.listLoading = false
+      })
+    },
+    search() {
+      this.fetchData()
+    },
+    changeSwitch (row) {
+      debugger
+      const data = {
+        id: row.id,
+        attr1: row.attr1
+      }
+      updateUserAttr1(data).then(res => {
+        if (res.code === '200' || res.code === 200) {
+        } else {
+          this.$message.error(res.msg)
+        }
+        // 调用表格数据
+        this.fetchData()
+        this.loading = false;
+      }).catch({
+      })
+    },
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 41f5ad4..ffb5c0f 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -194,17 +194,17 @@
   name: 'AddPerson',
   components: { DeptSelect },
   data() {
-    const validateIDCard = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
-          callback(new Error('请输入合法的身份证号'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('身份证号不能为空'))
-      }
-    }
+    // const validateIDCard = (rule, value, callback) => {
+    //   if (value !== '') {
+    //     if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+    //       callback(new Error('请输入合法的身份证号'))
+    //     } else {
+    //       callback()
+    //     }
+    //   } else {
+    //     callback(new Error('身份证号不能为空'))
+    //   }
+    // }
     // 校验年假
     const validateInitAnnualLeave = (rule, value, callback) => {
       if (value !== '') {
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 1b2bdb1..824a451 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -442,7 +442,7 @@
     },
     fetchData(id) {
       this.formLoading = true
-      const base_url = process.env.BASE_API + '/static/'
+      // const base_url = process.env.BASE_API + '/static/'
       personInfo(id).then(response => {
         const personForm = response.data
         this.personForm = {
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 70c5076..4273cde 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -12,14 +12,14 @@
             <dept-select v-model="listQuery.deptid" :need-top="true" :dept-show="true" placeholder="单位/部门"/>
           </el-form-item>
           <!--<el-form-item class="selectForm-container-item">-->
-            <!--<el-select v-model="listQuery.sex" placeholder="性别" clearable>-->
-              <!--<el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>-->
-            <!--</el-select>-->
+          <!--<el-select v-model="listQuery.sex" placeholder="性别" clearable>-->
+          <!--<el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"/>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
           <!--<el-form-item class="selectForm-container-item">-->
-            <!--<el-select v-model="listQuery.duty" placeholder="职务" clearable>-->
-              <!--<el-option v-for="item in dutyList" :key="item.value" :label="item.name" :value="item.value"/>-->
-            <!--</el-select>-->
+          <!--<el-select v-model="listQuery.duty" placeholder="职务" clearable>-->
+          <!--<el-option v-for="item in dutyList" :key="item.value" :label="item.name" :value="item.value"/>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
           <el-form-item class="selectForm-container-item" />
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
diff --git a/src/views/memberManage/updateData.vue b/src/views/memberManage/updateData.vue
index 8b93ada..b616910 100644
--- a/src/views/memberManage/updateData.vue
+++ b/src/views/memberManage/updateData.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发"  append-to-body >
+  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" title="人员数据下发" append-to-body >
     <el-form ref="dataForm" :model="form" :rules="rules" label-width="auto" >
       <el-row type="flex" justify="center">
         <el-col :span="20">
@@ -42,7 +42,7 @@
         selectDeivces: []
       },
       rules: {
-        selectDeivces: [{ required: true, message: '下发设备不能为空', trigger: ['blur', 'change'] }],
+        selectDeivces: [{ required: true, message: '下发设备不能为空', trigger: ['blur', 'change'] }]
       },
       personList: [],
       deviceList: [],