diff --git a/ruoyi-ui/src/api/pay/employeeInfo.js b/ruoyi-ui/src/api/pay/employeeInfo.js
index cd51ac8..7026efd 100644
--- a/ruoyi-ui/src/api/pay/employeeInfo.js
+++ b/ruoyi-ui/src/api/pay/employeeInfo.js
@@ -42,3 +42,12 @@ export function delEmployeeInfo(id) {
method: 'delete'
})
}
+
+//修改每日应出勤小时数
+export function updateHour(data) {
+ return request({
+ url: '/secure/empinfo/edithour',
+ method: 'put',
+ params: data
+ })
+}
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index d67c9a4..982ff49 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -5,6 +5,8 @@ const user = {
state: {
token: getToken(),
name: '',
+ userId: '',
+ tenantId: '',
avatar: '',
roles: [],
permissions: []
@@ -17,6 +19,12 @@ const user = {
SET_NAME: (state, name) => {
state.name = name
},
+ SET_USERID: (state, userId) => {
+ state.userId = userId
+ },
+ SET_TENANTID: (state, tenantId) => {
+ state.tenantId = tenantId
+ },
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
},
@@ -59,6 +67,8 @@ const user = {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.userName)
+ commit('SET_USERID', user.userId)
+ commit('SET_TENANTID', user.tenantId)
commit('SET_AVATAR', avatar)
resolve(res)
}).catch(error => {
diff --git a/ruoyi-ui/src/views/pay/employeeInfo/index.vue b/ruoyi-ui/src/views/pay/employeeInfo/index.vue
index 6610cbb..d3346c5 100644
--- a/ruoyi-ui/src/views/pay/employeeInfo/index.vue
+++ b/ruoyi-ui/src/views/pay/employeeInfo/index.vue
@@ -1,403 +1,452 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.htstime, '{y}-{m}-{d}') }}
-
-
-
-
- {{ parseTime(scope.row.htetime, '{y}-{m}-{d}') }}
-
-
-
-
-
-
- 修改
- 删除
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 搜索
+ 重置
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 导出
+
+
+ 修改每日应出勤小时数
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+