diff --git a/src/api/project/constructionUserFile/index.ts b/src/api/project/constructionUserFile/index.ts index ef40d02..e24dc8a 100644 --- a/src/api/project/constructionUserFile/index.ts +++ b/src/api/project/constructionUserFile/index.ts @@ -10,7 +10,7 @@ import { ConstructionUserFileVO, ConstructionUserFileForm, ConstructionUserFileQ export const listConstructionUserFile = (query?: ConstructionUserFileQuery): AxiosPromise => { return request({ - url: '/project/constructionUserFile/list', + url: '/contractor/constructionUserFile/list', method: 'get', params: query }); diff --git a/src/api/project/goUser/index.ts b/src/api/project/goUser/index.ts new file mode 100644 index 0000000..94e219d --- /dev/null +++ b/src/api/project/goUser/index.ts @@ -0,0 +1,52 @@ +import request from '@/utils/request'; +// 人员 考勤 补卡 请假接口 对接go 后台 +// 获取施工人员列表 +export const getBusConstructionUser = (params) => { + return request({ + url: '/zm/api/wxApplet/wxApplet/busConstructionUser/list', + method: 'get', + params + }); +}; +// 获取人员详情 +export const getDetails = (id) => { + return request({ + url: '/zm/api/wxApplet/wxApplet/busConstructionUser/getDetails', + method: 'get', + params: { + id: id + } + }); +}; +// 获取考勤列表数据 +export const pcSelectBelowProjectOfPersonnel = (params) => { + return request({ + url: '/zm/api/v1/system/busConstructionUser/pcSelectBelowProjectOfPersonnel', + method: 'get', + params + }); +}; +// 获取考勤图表数据 +export const pcCollectDataForTwoWeeks = (params) => { + return request({ + url: '/api/v1/system/busConstructionUser/pcCollectDataForTwoWeeks', + method: 'get', + params + }); +}; +// 获取补卡申请 +export const busReissueACardList = (params) => { + return request({ + url: '/zm/api/v1/system/busReissueACard/list', + method: 'get', + params + }); +}; +// 获取请假列表 +export const busAskforleaveList = (params) => { + return request({ + url: '/zm/api/v1/system/busAskforleave/list', + method: 'get', + params + }); +}; \ No newline at end of file diff --git a/src/views/project/projectUser/index.vue b/src/views/project/projectUser/index.vue index 4130b26..bf343ee 100644 --- a/src/views/project/projectUser/index.vue +++ b/src/views/project/projectUser/index.vue @@ -35,72 +35,12 @@ - - @@ -167,25 +107,6 @@ 详情 - - 修改 - - 打卡 - - 黑名单 - - - 人员迁移 - 入退场记录 - - 删除 - 文件上传 @@ -195,174 +116,11 @@ - - - - -
-
用户信息
-
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
-
-
-
银行卡
-
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
-
-
-
单位信息
-
-
- - - -
-
- - - - - -
-
- - - - - -
-
- - - - - -
-
- - - -
-
-
-
- -
- - - - - - - - - - - - -
{{ item.label }}
@@ -392,78 +150,6 @@ - - - - - - - - - - 请输入薪资 - - - - -
- - - {{ '入场时间:' + item.entryDate }} - - -
{{ '退场时间:' + item.entryDate }}
-
- 退场文件:
-

- 备注:{{ item.remark }} -

-
-
-
-
- - -
- - - - - -
@@ -495,7 +181,6 @@ import { } from '@/api/project/constructionUser/types'; import { useUserStoreHook } from '@/store/modules/user'; import { listContractor } from '@/api/project/contractor'; -import { listProjectTeam } from '@/api/project/projectTeam'; import { ContractorVO } from '@/api/project/contractor/types'; import { ProjectTeamVO } from '@/api/project/projectTeam/types'; import ConstructionUserDetail from '@/views/project/constructionUser/component/ConstructionUserDetail.vue'; @@ -556,7 +241,6 @@ const dialog = reactive({ title: '', id: undefined }); -const baseUrl = import.meta.env.VITE_APP_BASE_API; //人员迁移条件 const skipObject: skipType = reactive({ id: '',