diff --git a/src/api/arcb/salary/employee/index.ts b/src/api/arcb/salary/employee/index.ts
index e006365df..1107241b1 100644
--- a/src/api/arcb/salary/employee/index.ts
+++ b/src/api/arcb/salary/employee/index.ts
@@ -1,51 +1,51 @@
-import request from '@/config/axios'
-
-// 员工花名册 VO
-export interface EmployeeVO {
- id: number // 唯一标识符
- empName: string // 姓名
- idNo: string // 身份证号
- empNo: string // 工号
- station: string // 岗位
- bankNo: string // 银行卡号
- orgNo: number // 所属机构
- annuityNo: string // 企业年金帐号
- socialSecurityNo: string // 社保账号
- pensionNo: string // 养老金帐号
- housingFundNo: string // 住房公积金账号
- workTime: Date // 参加工作时间
- empStatus: string // 员工状态
-}
-
-// 员工花名册 API
-export const EmployeeApi = {
- // 查询员工花名册分页
- getEmployeePage: async (params: any) => {
- return await request.get({ url: `/arcb/salary/employee/page`, params })
- },
-
- // 查询员工花名册详情
- getEmployee: async (id: number) => {
- return await request.get({ url: `/arcb/salary/employee/get?id=` + id })
- },
-
- // 新增员工花名册
- createEmployee: async (data: EmployeeVO) => {
- return await request.post({ url: `/arcb/salary/employee/create`, data })
- },
-
- // 修改员工花名册
- updateEmployee: async (data: EmployeeVO) => {
- return await request.put({ url: `/arcb/salary/employee/update`, data })
- },
-
- // 删除员工花名册
- deleteEmployee: async (id: number) => {
- return await request.delete({ url: `/arcb/salary/employee/delete?id=` + id })
- },
-
- // 导出员工花名册 Excel
- exportEmployee: async (params) => {
- return await request.download({ url: `/arcb/salary/employee/export-excel`, params })
- },
-}
+import request from '@/config/axios'
+
+// 员工花名册 VO
+export interface EmployeeVO {
+ id: number // 唯一标识符
+ empName: string // 姓名
+ idNo: string // 身份证号
+ empNo: string // 工号
+ station: string // 岗位
+ bankNo: string // 银行卡号
+ orgNo: number // 所属机构
+ annuityNo: string // 企业年金帐号
+ socialSecurityNo: string // 社保账号
+ pensionNo: string // 养老金帐号
+ housingFundNo: string // 住房公积金账号
+ workTime: Date // 参加工作时间
+ empStatus: string // 员工状态
+}
+
+// 员工花名册 API
+export const EmployeeApi = {
+ // 查询员工花名册分页
+ getEmployeePage: async (params: any) => {
+ return await request.get({ url: `/salary/employee/page`, params })
+ },
+
+ // 查询员工花名册详情
+ getEmployee: async (id: number) => {
+ return await request.get({ url: `/salary/employee/get?id=` + id })
+ },
+
+ // 新增员工花名册
+ createEmployee: async (data: EmployeeVO) => {
+ return await request.post({ url: `/salary/employee/create`, data })
+ },
+
+ // 修改员工花名册
+ updateEmployee: async (data: EmployeeVO) => {
+ return await request.put({ url: `/salary/employee/update`, data })
+ },
+
+ // 删除员工花名册
+ deleteEmployee: async (id: number) => {
+ return await request.delete({ url: `/salary/employee/delete?id=` + id })
+ },
+
+ // 导出员工花名册 Excel
+ exportEmployee: async (params) => {
+ return await request.download({ url: `/salary/employee/export-excel`, params })
+ },
+}
\ No newline at end of file
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 7b85df1ff..1520fee2c 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -242,5 +242,5 @@ export enum DICT_TYPE {
IOT_RW_TYPE = 'iot_rw_type', // IOT 读写类型
// ===================人力资源模块======================
- ARCB_EMP_STATUS = 'arcb_emp_status',
+ ARCB_EMP_STATUS = 'arcb_emp_status', //员工状态
}
diff --git a/src/views/arcb/salary/employee/EmployeeForm.vue b/src/views/arcb/salary/employee/EmployeeForm.vue
index 3dd8986f6..9dde60fab 100644
--- a/src/views/arcb/salary/employee/EmployeeForm.vue
+++ b/src/views/arcb/salary/employee/EmployeeForm.vue
@@ -4,7 +4,7 @@
ref="formRef"
:model="formData"
:rules="formRules"
- label-width="100px"
+ label-width="150px"
v-loading="formLoading"
>
@@ -41,7 +41,7 @@
diff --git a/src/views/arcb/salary/employee/index.vue b/src/views/arcb/salary/employee/index.vue
index a11bd44b4..5986fc0fe 100644
--- a/src/views/arcb/salary/employee/index.vue
+++ b/src/views/arcb/salary/employee/index.vue
@@ -6,7 +6,7 @@
:model="queryParams"
ref="queryFormRef"
:inline="true"
- label-width="68px"
+ label-width="109px"
>
@@ -131,7 +131,7 @@
type="primary"
plain
@click="openForm('create')"
- v-hasPermi="['arcb:employee:create']"
+ v-hasPermi="['salary:employee:create']"
>
新增
@@ -140,7 +140,7 @@
plain
@click="handleExport"
:loading="exportLoading"
- v-hasPermi="['arcb:employee:export']"
+ v-hasPermi="['salary:employee:export']"
>
导出
@@ -151,7 +151,7 @@
-
+
@@ -174,7 +174,7 @@
link
type="primary"
@click="openForm('update', scope.row.id)"
- v-hasPermi="['arcb:employee:update']"
+ v-hasPermi="['salary:employee:update']"
>
编辑
@@ -182,7 +182,7 @@
link
type="danger"
@click="handleDelete(scope.row.id)"
- v-hasPermi="['arcb:employee:delete']"
+ v-hasPermi="['salary:employee:delete']"
>
删除