diff --git a/.env.development b/.env.development index de8c02f..e5b0bf4 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.209:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:18899' # 应用访问路径 例如使用前缀 /admin/ VITE_APP_CONTEXT_PATH = '/' diff --git a/src/api/login.ts b/src/api/login.ts index 854b387..1d07fa7 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -115,7 +115,7 @@ export function getTenantList(isToken: boolean): AxiosPromise { //获取用户项目信息 export function getUserProject(): AxiosPromise { return request({ - url: '/project/projectRelevancy/login/list', + url: '/system/project/projectRelevancy/login/list', method: 'get' }); } diff --git a/src/api/project/attendance/echarts.ts b/src/api/project/attendance/echarts.ts deleted file mode 100644 index 3a66873..0000000 --- a/src/api/project/attendance/echarts.ts +++ /dev/null @@ -1,63 +0,0 @@ -const grid = { - left: 100, - right: 100, - top: 30, - bottom: 50 -}; - -const color = ['#4FD6A9', '#409EFF', '#ECF5FF', '#FFC069']; -const titleList = [ - { name: '全勤人数', color: '#fff' }, - { name: '半勤人数', color: '#fff' }, - { name: '缺勤人数', color: '#000' }, - { name: '请假人数', color: '#000' } -]; - -// export const echartsConfig = (ref: any, list?: any) => { -// const commandstatsIntance = echarts.init(ref, 'macarons'); -// }; - -export const option = (list?: any) => { - const attendanceArray = list.map((item) => item.attendance); - const halfAttendanceArray = list.map((item) => item.halfAttendance); - const absenteeismArray = list.map((item) => item.absenteeism); - const leaveArray = list.map((item) => item.leave); - - const rawData = [attendanceArray, halfAttendanceArray, absenteeismArray, leaveArray]; - const series: any = titleList.map((item, sid) => { - return { - name: item.name, - type: 'bar', - stack: 'total', - barWidth: '25', - label: { - show: true, - color: item.color, - fontSize: 10, - formatter: function (params) { - return params.value > 0 ? params.value : ''; - } - }, - data: rawData[sid] - }; - }); - const data = list.map((item) => item.clockDate); - const option = { - legend: { - selectedMode: false, - right: 0 - }, - grid, - yAxis: { - type: 'value', - show: false - }, - xAxis: { - type: 'category', - data - }, - series, - color - }; - return option; -}; diff --git a/src/api/project/attendance/index.ts b/src/api/project/attendance/index.ts deleted file mode 100644 index 87866a6..0000000 --- a/src/api/project/attendance/index.ts +++ /dev/null @@ -1,99 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { - AttendanceVO, - AttendanceForm, - AttendanceQuery, - AttendanceTwoWeekQuery, - AttendanceTwoWeekVO, - AttendanceMonthVO, - AttendanceMonthQuery -} from '@/api/project/attendance/types'; - -/** - * 查询考勤列表 - * @param query - * @returns {*} - */ - -export const listAttendance = (query?: AttendanceQuery): AxiosPromise => { - return request({ - url: '/contractor/constructionUser/list/attendance/total', - method: 'get', - params: query - }); -}; - -/** - * 查询近两周考勤列表 - * @param query - * @returns {*} - */ - -export const listAttendanceTwoWeek = (query?: AttendanceTwoWeekQuery): AxiosPromise => { - return request({ - url: '/project/attendance/list/clockDate/twoWeek', - method: 'get', - params: query - }); -}; - -/** - * 查询施工人员月份考勤列表 - * @param query - * @returns {*} - */ - -export const listAttendanceMonth = (query?: AttendanceMonthQuery): AxiosPromise => { - return request({ - url: '/project/attendance/list/month/byUserId', - method: 'get', - params: query - }); -}; - -/** - * 查询考勤详细 - * @param id - */ -export const getAttendance = (id: string | number): AxiosPromise => { - return request({ - url: '/project/attendance/' + id, - method: 'get' - }); -}; - -/** - * 新增考勤 - * @param data - */ -export const addAttendance = (data: AttendanceForm) => { - return request({ - url: '/project/attendance', - method: 'post', - data: data - }); -}; - -/** - * 修改考勤 - * @param data - */ -export const updateAttendance = (data: AttendanceForm) => { - return request({ - url: '/project/attendance', - method: 'put', - data: data - }); -}; - -/** - * 删除考勤 - * @param id - */ -export const delAttendance = (id: string | number | Array) => { - return request({ - url: '/project/attendance/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/attendance/types.ts b/src/api/project/attendance/types.ts deleted file mode 100644 index 1dd03cd..0000000 --- a/src/api/project/attendance/types.ts +++ /dev/null @@ -1,210 +0,0 @@ -export interface AttendanceVO { - /** - * 人员姓名 - */ - userName: string; - - id?: string | number; - - /** - * 人员id - */ - - /** - * 上班打卡时间 - */ - onClockTime: string; - - /** - * 下班打卡时间 - */ - offClockTime: string; - - /** - * 打卡日期 - */ - clockDate: string; - - /** - * 1正常,2迟到,3早退,4缺勤,5补卡 - */ - clockStatus: string; - - /** - * 上下班(1上班,2下班) - */ - commuter: string; - - /** - * 备注 - */ - remark: string; -} - -export interface AttendanceTwoWeekQuery { - projectId?: string | number; -} - -export interface AttendanceMonthQuery { - userId: string | number; - clockMonth?: string; -} - -export interface AttendanceMonthVO { - id: string | number; - clockDate: string; - status: string; - attendanceList?: monthList[]; - clockList?: clockObject; -} - -interface clockObject { - downClockTime?: string; - downClockPic?: string; - upClockTime?: string; - upClockPic?: string; -} - -interface monthList { - commuter: string; - clockTime: string; - clockStatus: string; -} - -export interface AttendanceTwoWeekVO { - /** - * 出勤人数 - */ - attendance: string; - - /** - * 半勤人数 - - */ - halfAttendance: string; - - /** - * 打卡日期 - */ - clockDate: string; - - /** - * 缺勤人数 - - */ - absenteeism: string; -} - -export interface AttendanceForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 人员id - */ - userId?: string | number; - typeOfWork?: string; - teamId?: string; - clockDate?: string; - - /** - * 人脸照 - */ - facePic?: string; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 上班打卡时间 - */ - onClockTime?: string; - - /** - * 下班打卡时间 - */ - offClockTime?: string; - - /** - * 打卡日期 - */ - clockDate?: string; - - /** - * 1正常,2迟到,3早退,4缺勤,5补卡 - */ - clockStatus?: string; - - /** - * 代打人员id - */ - pinchUserId?: string | number; - - /** - * 多次打卡时间记录 - */ - clockRecord?: string; - - /** - * 上下班(1上班,2下班) - */ - commuter?: string; - - /** - * 日薪 - */ - dailyWage?: number; - - /** - * 经度 - */ - lng?: string; - - /** - * 纬度 - */ - lat?: string; - - /** - * 备注 - */ - remark?: string; -} - -export interface AttendanceQuery extends PageQuery { - /** - * 人员姓名 - */ - userName?: string; - - /** - * 项目id - */ - projectId?: string | number; - typeOfWork?: string | number; - teamId?: string | number; - - /** - * 打卡日期 - */ - clockDate?: string; - - /** - * 1正常,2迟到,3早退,4缺勤,5补卡 - */ - clockStatus?: string; - - /** - * 上下班(1上班,2下班) - */ - commuter?: string; - - /** - * 日期范围参数 - */ - params?: any; -} diff --git a/src/api/project/attendanceRecords/index.ts b/src/api/project/attendanceRecords/index.ts deleted file mode 100644 index edd9542..0000000 --- a/src/api/project/attendanceRecords/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { AttendanceVO, AttendanceForm, AttendanceQuery } from '@/api/project/attendance/types'; - -/** - * 查询考勤列表 - * @param query - * @returns {*} - */ - -export const listAttendance = (query?: AttendanceQuery): AxiosPromise => { - return request({ - url: '/project/attendance/list', - method: 'get', - params: query - }); -}; - -/** - * 查询考勤详细 - * @param id - */ -export const getAttendance = (id: string | number): AxiosPromise => { - return request({ - url: '/project/attendance/' + id, - method: 'get' - }); -}; - -/** - * 新增考勤 - * @param data - */ -export const addAttendance = (data: AttendanceForm) => { - return request({ - url: '/project/attendance', - method: 'post', - data: data - }); -}; - -/** - * 修改考勤 - * @param data - */ -export const updateAttendance = (data: AttendanceForm) => { - return request({ - url: '/project/attendance', - method: 'put', - data: data - }); -}; - -/** - * 删除考勤 - * @param id - */ -export const delAttendance = (id: string | number | Array) => { - return request({ - url: '/project/attendance/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/attendanceRecords/types.ts b/src/api/project/attendanceRecords/types.ts deleted file mode 100644 index d51f73d..0000000 --- a/src/api/project/attendanceRecords/types.ts +++ /dev/null @@ -1,146 +0,0 @@ -export interface AttendanceVO { - /** - * 人员姓名 - */ - userName: string; - - /** - * 上班打卡时间 - */ - onClockTime: string; - - /** - * 下班打卡时间 - */ - offClockTime: string; - - /** - * 打卡日期 - */ - clockDate: string; - - /** - * 1正常,2迟到,3早退,4缺勤,5补卡 - */ - clockStatus: string; - - /** - * 上下班(1上班,2下班) - */ - commuter: string; - - /** - * 备注 - */ - remark: string; -} - -export interface AttendanceForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 人员id - */ - userId?: string | number; - - /** - * 人脸照 - */ - facePic?: string; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 上班打卡时间 - */ - onClockTime?: string; - - /** - * 下班打卡时间 - */ - offClockTime?: string; - - /** - * 打卡日期 - */ - clockDate?: string; - - /** - * 1正常,2迟到,3早退,4缺勤,5补卡 - */ - clockStatus?: string; - - /** - * 代打人员id - */ - pinchUserId?: string | number; - - /** - * 多次打卡时间记录 - */ - clockRecord?: string; - - /** - * 上下班(1上班,2下班) - */ - commuter?: string; - - /** - * 日薪 - */ - dailyWage?: number; - - /** - * 经度 - */ - lng?: string; - - /** - * 纬度 - */ - lat?: string; - - /** - * 备注 - */ - remark?: string; -} - -export interface AttendanceQuery extends PageQuery { - /** - * 人员姓名 - */ - userName?: string; - teamId?: string | number; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 打卡日期 - */ - clockDate?: string; - - /** - * 1正常,2迟到,3早退,4缺勤,5补卡 - */ - clockStatus?: string; - - /** - * 上下班(1上班,2下班) - */ - commuter?: string; - - /** - * 日期范围参数 - */ - params?: any; -} diff --git a/src/api/project/constructionBlacklist/index.ts b/src/api/project/constructionBlacklist/index.ts deleted file mode 100644 index 3407e0d..0000000 --- a/src/api/project/constructionBlacklist/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { ConstructionBlacklistVO, ConstructionBlacklistForm, ConstructionBlacklistQuery } from '@/api/project/constructionBlacklist/types'; - -/** - * 查询黑名单列表 - * @param query - * @returns {*} - */ - -export const listConstructionBlacklist = (query?: ConstructionBlacklistQuery): AxiosPromise => { - return request({ - url: '/project/constructionBlacklist/list', - method: 'get', - params: query - }); -}; - -/** - * 查询黑名单详细 - * @param id - */ -export const getConstructionBlacklist = (id: string | number): AxiosPromise => { - return request({ - url: '/project/constructionBlacklist/' + id, - method: 'get' - }); -}; - -/** - * 新增黑名单 - * @param data - */ -export const addConstructionBlacklist = (data: ConstructionBlacklistForm) => { - return request({ - url: '/project/constructionBlacklist', - method: 'post', - data: data - }); -}; - -/** - * 修改黑名单 - * @param data - */ -export const updateConstructionBlacklist = (data: ConstructionBlacklistForm) => { - return request({ - url: '/project/constructionBlacklist', - method: 'put', - data: data - }); -}; - -/** - * 删除黑名单 - * @param id - */ -export const delConstructionBlacklist = (id: string | number | Array) => { - return request({ - url: '/project/constructionBlacklist/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/constructionBlacklist/types.ts b/src/api/project/constructionBlacklist/types.ts deleted file mode 100644 index 890f194..0000000 --- a/src/api/project/constructionBlacklist/types.ts +++ /dev/null @@ -1,69 +0,0 @@ -export interface ConstructionBlacklistVO { - /** - * id - */ - id: string | number; - /** - * 名字 - */ - userName: string; - - /** - * 身份证号码 - */ - sfzNumber: string; - - /** - * 备注 - */ - remark: string; -} - -export interface ConstructionBlacklistForm extends BaseEntity { - /** - * 项目id - */ - projectId?: string | number; - - /** - * 用户id - */ - userId?: string | number; - - /** - * 备注 - */ - remark?: string; -} - -export interface ConstructionBlacklistQuery extends PageQuery { - /** - * 主键id - */ - id?: string | number; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 用户id - */ - userId?: string | number; - - /** - * 名字 - */ - userName?: string; - - /** - * 身份证号码 - */ - sfzNumber?: string; - - /** - * 日期范围参数 - */ - params?: any; -} diff --git a/src/api/project/constructionUser/index.ts b/src/api/project/constructionUser/index.ts deleted file mode 100644 index 35ec956..0000000 --- a/src/api/project/constructionUser/index.ts +++ /dev/null @@ -1,205 +0,0 @@ -import request, { download } from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { - ConstructionUserForm, - ConstructionUserQuery, - ConstructionUserVO, - skipType, - ConstructionUserStatusForm, - ConstructionUserPlayCardForm, - ConstructionUserSalaryForm, - ConstructionUserExitForm, - ConstructionUserTemplateForm, - ConstructionUserMembeForm, - ConstructionMonthQuery -} from '@/api/project/constructionUser/types'; -import { AttendanceMonthVO } from '../attendance/types'; - -/** - * 查询施工人员月份考勤列表 - * @param query - * @returns {*} - */ - -export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosPromise => { - return request({ - url: '/contractor/constructionUser/list/attendance/month', - method: 'get', - params: query - }); -}; -/** - * 查询施工人员列表 - * @param query - * @returns {*} - */ - -export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise => { - return request({ - url: '/contractor/constructionUser/list', - method: 'get', - params: query - }); -}; - -/** - * 查询施工人员详细 - * @param id - */ -export const getConstructionUser = (id: string | number): AxiosPromise => { - return request({ - url: '/contractor/constructionUser/' + id, - method: 'get' - }); -}; - -/** - * 人员迁移 - * @param data - */ -export const transferConstructionUser = (data: skipType) => { - return request({ - url: '/contractor/constructionUser/change/project', - method: 'put', - data: data - }); -}; - -/** - * 查询项目以及项目下的分包公司列表 - */ -export const getProjectContractorList = () => { - return request({ - url: '/project/project/list/project/contractorList', - method: 'get' - }); -}; - -/** - * 新增施工人员 - * @param data - */ -export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise => { - return request({ - url: '/contractor/constructionUser', - method: 'post', - data: data - }); -}; - -/** - * 修改施工人员 - * @param data - */ -export const updateConstructionUser = (data: ConstructionUserForm) => { - return request({ - url: '/contractor/constructionUser', - method: 'put', - data: data - }); -}; - -/** - * 删除施工人员 - * @param id - */ -export const delConstructionUser = (id: string | number | Array) => { - return request({ - url: '/contractor/constructionUser/' + id, - method: 'delete' - }); -}; - -/** - * 修改施工人员在职状态 - * @param data - */ -export const updateConstructionUserStatus = (data: ConstructionUserStatusForm) => { - return request({ - url: '/contractor/constructionUser/batch/status', - method: 'put', - data: data - }); -}; - -/** - * 根据项目id批量修改施工人员打卡状态 - * @param data - */ -export const updateConstructionUserPlayCardStatus = (data: ConstructionUserPlayCardForm) => { - return request({ - url: '/contractor/constructionUser/batch/clock', - method: 'put', - data: data - }); -}; - -/** - * 修改施工人员打卡状态 - * @param data - */ -export const updateConstructionUserPlayCardOneStatus = (data: ConstructionUserPlayCardForm) => { - return request({ - url: '/contractor/constructionUser/clock', - method: 'put', - data: data - }); -}; - -/** - * 修改施工人员工资 - * @param data - */ -export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) => { - return request({ - url: '/contractor/constructionUser/salary', - method: 'put', - data: data - }); -}; - -/** - * 查询施工人员入退场记录 - * @param query - */ -export const getConstructionUserExit = (query: ConstructionUserExitForm) => { - return request({ - url: '/contractor/constructionUserExit/list', - method: 'get', - params: query - }); -}; - -/** - * 下载施工人员文件存储模板 - * @param query - */ -export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateForm) => { - let { projectId } = query; - const fileName = projectId + '_project.zip'; - return download('/contractor/constructionUserFile/exportFileTemplate', query, fileName); -}; - -/** - * 施工人员退场 - * @param data - */ -export const delConstructionUserMember = (data: ConstructionUserMembeForm) => { - return request({ - url: '/contractor/projectTeamMember/', - method: 'delete', - data - }); -}; - -/** - * 上传施工人员文件压缩包,批量导入存储施工人员文件 - * @param data - */ -export const importConstructionUserInfo = (file: string) => { - return request({ - url: '/contractor/constructionUserFile/upload/zip', - method: 'post', - data: { file } - }); -}; diff --git a/src/api/project/constructionUser/types.ts b/src/api/project/constructionUser/types.ts deleted file mode 100644 index b65e23f..0000000 --- a/src/api/project/constructionUser/types.ts +++ /dev/null @@ -1,605 +0,0 @@ -import { ContractorVO } from '@/api/project/contractor/types'; -import { ProjectTeamVO } from '@/api/project/projectTeam/types'; -import { S } from 'node_modules/vite/dist/node/types.d-aGj9QkWt'; - -export interface ConstructionUserVO { - /** - * 主键id - */ - id: string | number; - - /** - * 微信id - */ - openid: string | number; - - /** - * 微信名称 - */ - nickName: string; - - /** - * 人脸照 - */ - facePic: string; - - /** - * 人脸照url - */ - facePicUrl: string; - - /** - * 人员姓名 - */ - userName: string; - - /** - * 项目id - */ - projectId: string | number; - - /** - * 分包公司id - */ - contractorId: string | number; - - /** - * 分包公司 - */ - contractorVo: ContractorVO; - - /** - * 班组id - */ - teamId: string | number; - - /** - * 班组 - */ - teamVo: ProjectTeamVO; - - /** - * 状态(0在职 1离职) - */ - status: number; - - /** - * 是否代打 - */ - isPinch: number; - - /** - * 联系电话 - */ - phone: string; - - /** - * 0:保密 1:男 2女 - */ - sex: number; - - /** - * 民族 - */ - nation: string; - - /** - * 身份证正面照片 - */ - sfzFrontPic: string; - - /** - * 身份证背面照片 - */ - sfzBackPic: string; - - /** - * 身份证号码 - */ - sfzNumber: string; - - /** - * 身份证有效开始期 - */ - sfzStart: string; - - /** - * 身份证有效结束期 - */ - sfzEnd: string; - - /** - * 身份证地址 - */ - sfzSite: string; - - /** - * 身份证出生日期 - */ - sfzBirth: string; - - /** - * 籍贯 - */ - nativePlace: string; - - /** - * 银行卡图片 - */ - yhkPic: string; - - /** - * 银行卡号 - */ - yhkNumber: string; - - /** - * 开户行 - */ - yhkOpeningBank: string; - - /** - * 持卡人 - */ - yhkCardholder: string; - - /** - * 工种(字典type_of_work) - */ - typeOfWork: number; - - /** - * 特种工作证图片 - */ - specialWorkPic: string; - - /** - * 打卡(0启用打卡 1禁止打卡) - */ - clock: number; - - /** - * 入场时间 - */ - entryDate: string; - - /** - * 离场时间 - */ - leaveDate: string; - - /** - * 薪水 - */ - salary: number; - - /** - * 备注 - */ - remark: string; - - /** - * 创建时间 - */ - createTime: string; -} -export interface skipType { - /** - * 项目id - */ - projectId: string | number; - - /** - * 分包id - */ - contractorId: string | number; - id: string | number; -} - -export interface ConstructionMonthQuery { - /** - * id - */ - userId: string | number; - - /** - * 打卡月份 - - */ - clockMonth?: string | number; -} - -export interface ConstructionUserMembeForm { - /** - * 用户id - */ - id: string | number; - /** - * 用户姓名 - */ - userName: string | number; - /** - * 文件路径 - */ - filePath: string; - /** - * 备注 - */ - remark: string | number; -} - -export interface ConstructionUserTemplateForm { - /** - * 项目id - */ - projectId: string | number; -} - -export interface ConstructionUserExitForm { - /** - * userId - */ - userId: number | string; -} - -export interface ConstructionUserSalaryForm { - /** - * 列表 - */ - id: number | string; - - /** - * 工资 - */ - salary?: number | string; -} - -export interface ConstructionUserPlayCardForm { - /** - * 项目 - */ - projectId?: string | number; - /** - * 用户id - */ - id?: string | number; - /** - * 打卡状态 - */ - clock: number | string; -} - -export interface skipOptionType { - /** - * 名称 - */ - projectName: string | number; - - /** - * id - */ - id: string | number; - /** - * 子项 - */ - contractorList: Array; -} -export interface skipTeamType { - /** - * 名称 - */ - name: string | number; - - /** - * id - */ - id: string | number; -} - -export interface ConstructionUserForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 微信id - */ - openid?: string | number; - - /** - * 微信名称 - */ - nickName?: string; - - /** - * 人脸照 - */ - facePic?: string; - - /** - * 人员姓名 - */ - userName?: string; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 分包公司id - */ - contractorId?: string | number; - /** - * 结算方式 - */ - wageMeasureUnit?: string | number; - - /** - * 班组id - */ - teamId?: string | number; - - /** - * 状态(0在职 1离职) - */ - status?: number; - - /** - * 是否代打 - */ - isPinch?: number; - - /** - * 联系电话 - */ - phone?: string; - - /** - * 0:保密 1:男 2女 - */ - sex?: number; - - /** - * 民族 - */ - nation?: string; - - /** - * 身份证正面照片 - */ - sfzFrontPic: string; - - /** - * 身份证背面照片 - */ - sfzBackPic: string; - - /** - * 身份证号码 - */ - sfzNumber?: string; - - /** - * 身份证有效开始期 - */ - sfzStart?: string; - - /** - * 身份证有效结束期 - */ - sfzEnd?: string; - - /** - * 身份证地址 - */ - sfzSite?: string; - - /** - * 身份证出生日期 - */ - sfzBirth?: string; - - /** - * 籍贯 - */ - nativePlace?: string; - - /** - * 银行卡图片 - */ - yhkPic: string; - - /** - * 银行卡号 - */ - yhkNumber?: string; - - /** - * 开户行 - */ - yhkOpeningBank?: string; - - /** - * 持卡人 - */ - yhkCardholder?: string; - - /** - * 工种(字典type_of_work) - */ - typeOfWork?: number; - - /** - * 特种工作证图片 - */ - specialWorkPic: string; - - /** - * 打卡(0启用打卡 1禁止打卡) - */ - clock?: number; - - /** - * 入场时间 - */ - entryDate?: string; - - /** - * 离场时间 - */ - leaveDate?: string; - - /** - * 薪水 - */ - salary?: number; - - /** - * 备注 - */ - remark?: string; -} - -export interface ConstructionUserStatusForm { - status: number | string; - idList: Array; -} - -export interface ConstructionUserQuery extends PageQuery { - /** - * 微信id - */ - openid?: string | number; - - /** - * 微信名称 - */ - nickName?: string; - - /** - * 人员姓名 - */ - userName?: string; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 分包公司id - */ - contractorId?: string | number; - - /** - * 班组id - */ - teamId?: string | number; - - /** - * 不在班组id - */ - notTeamId?: string | number; - - /** - * 状态(0在职 1离职) - */ - status?: number; - - /** - * 是否代打 - */ - isPinch?: number; - - /** - * 联系电话 - */ - phone?: string; - - /** - * 0:保密 1:男 2女 - */ - sex?: number; - - /** - * 民族 - */ - nation?: string; - - /** - * 身份证号码 - */ - sfzNumber?: string; - - /** - * 身份证有效开始期 - */ - sfzStart?: string; - - /** - * 身份证有效结束期 - */ - sfzEnd?: string; - - /** - * 身份证地址 - */ - sfzSite?: string; - - /** - * 身份证出生日期 - */ - sfzBirth?: string; - - /** - * 籍贯 - */ - nativePlace?: string; - - /** - * 银行卡号 - */ - yhkNumber?: string; - - /** - * 开户行 - */ - yhkOpeningBank?: string; - - /** - * 持卡人 - */ - yhkCardholder?: string; - - /** - * 工种(字典type_of_work) - */ - typeOfWork?: number; - - /** - * 打卡(0启用打卡 1禁止打卡) - */ - clock?: number; - - /** - * 入场时间 - */ - entryDate?: string; - - /** - * 离场时间 - */ - leaveDate?: string; - - /** - * 薪水 - */ - salary?: number; - - /** - * 日期范围参数 - */ - params?: any; -} diff --git a/src/api/project/constructionUserFile/index.ts b/src/api/project/constructionUserFile/index.ts deleted file mode 100644 index ef40d02..0000000 --- a/src/api/project/constructionUserFile/index.ts +++ /dev/null @@ -1,40 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { ConstructionUserFileVO, ConstructionUserFileForm, ConstructionUserFileQuery } from '@/api/project/constructionUserFile/types'; - -/** - * 查询施工人员文件存储列表 - * @param query - * @returns {*} - */ - -export const listConstructionUserFile = (query?: ConstructionUserFileQuery): AxiosPromise => { - return request({ - url: '/project/constructionUserFile/list', - method: 'get', - params: query - }); -}; - -/** - * 查询施工人员文件存储详细 - * @param data - */ -export const setConstructionUserFile = (data: ConstructionUserFileForm): AxiosPromise => { - return request({ - url: '/project/constructionUserFile/save', - method: 'post', - data - }); -}; - -/** - * 删除施工人员文件存储 - * @param id - */ -export const delConstructionUserFile = (id: string | number | Array) => { - return request({ - url: '/project/constructionUserFile/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/constructionUserFile/types.ts b/src/api/project/constructionUserFile/types.ts deleted file mode 100644 index 30c4473..0000000 --- a/src/api/project/constructionUserFile/types.ts +++ /dev/null @@ -1,137 +0,0 @@ -export interface ConstructionUserFileVO { - /** - * 主键id - */ - id: string | number; - - /** - * 用户id - */ - userId: string | number; - - /** - * 文件类型 - */ - fileType: string; - - /** - * 文件名称 - */ - fileName: string; - - /** - * 文件路径 - */ - path: string; - - /** - * 备注 - */ - remark: string; -} - -export interface ConstructionUserExitVO { - /** - * 主键id - */ - id: string | number; - - /** - * 用户id - */ - userId: string | number; - /** - * 文件路径地址 - */ - pathUrl: Array; - - /** - * 身份证号码 - - */ - sfzNumber: string; - - /** - * 项目id - */ - projectId: string; - /** - * 班组id - */ - teamId: string; - /** - * 入场时间 - - */ - entryDate: string; - /** - * 退场时间 - - */ - leaveDate: string; - - /** - * 退场文件 - - */ - path: string; - - /** - * 备注 - */ - remark: string; -} - -export interface ConstructionUserFileForm extends BaseEntity { - /** - * 用户id - */ - userId?: string | number; - - /** - * 文件类型 - */ - fileList?: Array; -} - -interface fileListType { - fileId: string | number; - fileType: string | number; -} - -export interface ConstructionUserFileQuery { - /** - * 主键id - */ - id?: string | number; - - /** - * 用户id - */ - userId?: string | number; - - /** - * 文件类型 - */ - fileType?: string; - - /** - * 文件名称 - */ - fileName?: string; - - /** - * 文件路径 - */ - path?: string; - - /** - * 备注 - */ - remark?: string; - - /** - * 日期范围参数 - */ - params?: any; -} diff --git a/src/api/project/contractor/index.ts b/src/api/project/contractor/index.ts deleted file mode 100644 index e63b992..0000000 --- a/src/api/project/contractor/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/contractor/types'; - -/** - * 查询分包单位列表 - * @param query - * @returns {*} - */ - -export const listContractor = (query?: ContractorQuery): AxiosPromise => { - return request({ - url: '/contractor/contractor/list', - method: 'get', - params: query - }); -}; - -/** - * 查询分包单位详细 - * @param id - */ -export const getContractor = (id: string | number): AxiosPromise => { - return request({ - url: '/contractor/contractor/' + id, - method: 'get' - }); -}; - -/** - * 新增分包单位 - * @param data - */ -export const addContractor = (data: ContractorForm): AxiosPromise => { - return request({ - url: '/contractor/contractor', - method: 'post', - data: data - }); -}; - -/** - * 修改分包单位 - * @param data - */ -export const updateContractor = (data: ContractorForm) => { - return request({ - url: '/contractor/contractor', - method: 'put', - data: data - }); -}; - -/** - * 删除分包单位 - * @param id - */ -export const delContractor = (id: string | number | Array) => { - return request({ - url: '/contractor/contractor/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/contractor/types.ts b/src/api/project/contractor/types.ts deleted file mode 100644 index 0d4ab3f..0000000 --- a/src/api/project/contractor/types.ts +++ /dev/null @@ -1,147 +0,0 @@ -export interface ContractorVO { - /** - * 主键id - */ - id: string | number; - - /** - * 公司名称 - */ - name: string; - - /** - * 负责人 - */ - principal: string; - - /** - * 负责人联系电话 - */ - principalPhone: string; - - /** - * 管理人 - */ - custodian: string; - - /** - * 管理人联系电话 - */ - custodianPhone: string; - /** - * 分包类型 - */ - contractorType?: string; - - /** - * 公司相关文件 - */ - fileMap: Record; - - /** - * 备注 - */ - remark: string; - - /** - * 创建时间 - */ - createTime: string; -} - -export interface ContractorForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - /** - * 供应商id - */ - supplierId?: string | number; - /** - * 供应商 - */ - supplier?: string; - - /** - * 主键id - */ - projectId?: string | number; - - /** - * 公司名称 - */ - name?: string; - - /** - * 负责人 - */ - principal?: string; - - /** - * 负责人联系电话 - */ - principalPhone?: string; - - /** - * 管理人 - */ - custodian?: string; - - /** - * 管理人联系电话 - */ - custodianPhone?: string; - /** - * 分包类型 - */ - contractorType?: string; - /** - * 公司相关文件 - */ - fileMap: Record; - - /** - * 备注 - */ - remark?: string; -} - -export interface ContractorQuery extends PageQuery { - /** - * 公司名称 - */ - name?: string; - - /** - * 负责人 - */ - principal?: string; - /** - * 项目id - */ - projectId: string | number; - /** - * 负责人联系电话 - */ - principalPhone?: string; - - /** - * 管理人 - */ - custodian?: string; - - /** - * 管理人联系电话 - */ - custodianPhone?: string; - /** - * 分包类型 - */ - contractorType?: string; - - /** - * 日期范围参数 - */ - params?: any; -} diff --git a/src/api/project/contractorMaterial/contractorMaterialRecord/index.ts b/src/api/project/contractorMaterial/contractorMaterialRecord/index.ts deleted file mode 100644 index 2be6a25..0000000 --- a/src/api/project/contractorMaterial/contractorMaterialRecord/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { ContractorMaterialRecordVO, ContractorMaterialRecordForm, ContractorMaterialRecordQuery } from '@/api/contractor/contractorMaterialRecord/types'; - -/** - * 查询分包方物料记录列表 - * @param query - * @returns {*} - */ - -export const listContractorMaterialRecord = (query?: ContractorMaterialRecordQuery): AxiosPromise => { - return request({ - url: '/contractor/contractorMaterialRecord/list', - method: 'get', - params: query - }); -}; - -/** - * 查询分包方物料记录详细 - * @param id - */ -export const getContractorMaterialRecord = (id: string | number): AxiosPromise => { - return request({ - url: '/contractor/contractorMaterialRecord/' + id, - method: 'get' - }); -}; - -/** - * 新增分包方物料记录 - * @param data - */ -export const addContractorMaterialRecord = (data: ContractorMaterialRecordForm) => { - return request({ - url: '/contractor/contractorMaterialRecord', - method: 'post', - data: data - }); -}; - -/** - * 修改分包方物料记录 - * @param data - */ -export const updateContractorMaterialRecord = (data: ContractorMaterialRecordForm) => { - return request({ - url: '/contractor/contractorMaterialRecord', - method: 'put', - data: data - }); -}; - -/** - * 删除分包方物料记录 - * @param id - */ -export const delContractorMaterialRecord = (id: string | number | Array) => { - return request({ - url: '/contractor/contractorMaterialRecord/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/contractorMaterial/contractorMaterialRecord/types.ts b/src/api/project/contractorMaterial/contractorMaterialRecord/types.ts deleted file mode 100644 index ec71dbc..0000000 --- a/src/api/project/contractorMaterial/contractorMaterialRecord/types.ts +++ /dev/null @@ -1,141 +0,0 @@ -export interface ContractorMaterialRecordVO { - /** - * 主键id - */ - id: string | number; - - /** - * 项目id - */ - projectId: string | number; - - /** - * 分包方id - */ - contractorId: string | number; - - /** - * 物料id - */ - contractorMaterialId: string | number; - - /** - * 记录类型(1到货计划 2使用情况) - */ - recordType: string; - - /** - * 记录时间 - */ - recordTime: string; - - /** - * 数量 - */ - recordNumber: number; - - /** - * 剩余数量(到货 使用) - */ - remainingNumber: number; - - /** - * 使用位置或构件部位(使用情况) - */ - usedPosition: string; - - /** - * 相关附件 - */ - file: string; - - /** - * 备注 - */ - remark: string; - -} - -export interface ContractorMaterialRecordForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 物料id - */ - contractorMaterialId?: string | number; - - /** - * 记录类型(1到货计划 2使用情况) - */ - recordType?: string; - - /** - * 记录时间 - */ - recordTime?: string; - - /** - * 数量 - */ - recordNumber?: number; - - /** - * 剩余数量(到货 使用) - */ - remainingNumber?: number; - - /** - * 使用位置或构件部位(使用情况) - */ - usedPosition?: string; - - /** - * 相关附件 - */ - file?: string; - - /** - * 备注 - */ - remark?: string; - -} - -export interface ContractorMaterialRecordQuery extends PageQuery { - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 分包方id - */ - contractorId?: string | number; - - /** - * 物料id - */ - contractorMaterialId?: string | number; - - /** - * 记录类型(1到货计划 2使用情况) - */ - recordType?: string; - - /** - * 使用位置或构件部位(使用情况) - */ - usedPosition?: string; - - /** - * 日期范围参数 - */ - params?: any; -} - - - diff --git a/src/api/project/contractorMaterial/index.ts b/src/api/project/contractorMaterial/index.ts deleted file mode 100644 index 330eec4..0000000 --- a/src/api/project/contractorMaterial/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { ContractorMaterialVO, ContractorMaterialForm, ContractorMaterialQuery } from '@/api/project/contractorMaterial/types'; - -/** - * 查询分包方物料列表 - * @param query - * @returns {*} - */ - -export const listContractorMaterial = (query?: ContractorMaterialQuery): AxiosPromise => { - return request({ - url: '/contractor/contractorMaterial/list', - method: 'get', - params: query - }); -}; - -/** - * 查询分包方物料详细 - * @param id - */ -export const getContractorMaterial = (id: string | number): AxiosPromise => { - return request({ - url: '/contractor/contractorMaterial/' + id, - method: 'get' - }); -}; - -/** - * 新增分包方物料 - * @param data - */ -export const addContractorMaterial = (data: ContractorMaterialForm) => { - return request({ - url: '/contractor/contractorMaterial', - method: 'post', - data: data - }); -}; - -/** - * 修改分包方物料 - * @param data - */ -export const updateContractorMaterial = (data: ContractorMaterialForm) => { - return request({ - url: '/contractor/contractorMaterial', - method: 'put', - data: data - }); -}; - -/** - * 删除分包方物料 - * @param id - */ -export const delContractorMaterial = (id: string | number | Array) => { - return request({ - url: '/contractor/contractorMaterial/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/contractorMaterial/types.ts b/src/api/project/contractorMaterial/types.ts deleted file mode 100644 index cea393c..0000000 --- a/src/api/project/contractorMaterial/types.ts +++ /dev/null @@ -1,126 +0,0 @@ -export interface ContractorMaterialVO { - /** - * 分包方id - */ - contractorId: string | number; - - /** - * 物料名称 - */ - materialName: string; - - /** - * 物料类型 - */ - materialType: string; - - /** - * 物料型号 - */ - materialModel: string; - - /** - * 物料数量 - */ - materialNumber: number; - - /** - * 物料单位 - */ - materialUnit: string; - - /** - * 文件 - */ - file: string; - - /** - * 备注 - */ - remark: string; - -} - -export interface ContractorMaterialForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 分包方id - */ - contractorId?: string | number; - - /** - * 物料名称 - */ - materialName?: string; - - /** - * 物料类型 - */ - materialType?: string; - - /** - * 物料型号 - */ - materialModel?: string; - - /** - * 物料单位 - */ - materialUnit?: string; - - /** - * 文件 - */ - file?: string; - - /** - * 备注 - */ - remark?: string; - -} - -export interface ContractorMaterialQuery extends PageQuery { - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 分包方id - */ - contractorId?: string | number; - - /** - * 物料名称 - */ - materialName?: string; - - /** - * 物料类型 - */ - materialType?: string; - - /** - * 物料型号 - */ - materialModel?: string; - - /** - * 日期范围参数 - */ - params?: any; -} - - - diff --git a/src/api/project/contractorTool/contractorToolEntry/index.ts b/src/api/project/contractorTool/contractorToolEntry/index.ts deleted file mode 100644 index 6a9ddc1..0000000 --- a/src/api/project/contractorTool/contractorToolEntry/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { ContractorToolEntryVO, ContractorToolEntryForm, ContractorToolEntryQuery } from '@/api/contractor/contractorToolEntry/types'; - -/** - * 查询分包方工器具进场列表 - * @param query - * @returns {*} - */ - -export const listContractorToolEntry = (query?: ContractorToolEntryQuery): AxiosPromise => { - return request({ - url: '/contractor/contractorToolRecord/list', - method: 'get', - params: query - }); -}; - -/** - * 查询分包方工器具进场详细 - * @param id - */ -export const getContractorToolEntry = (id: string | number): AxiosPromise => { - return request({ - url: '/contractor/contractorToolRecord/' + id, - method: 'get' - }); -}; - -/** - * 新增分包方工器具进场 - * @param data - */ -export const addContractorToolEntry = (data: ContractorToolEntryForm) => { - return request({ - url: '/contractor/contractorToolRecord', - method: 'post', - data: data - }); -}; - -/** - * 修改分包方工器具进场 - * @param data - */ -export const updateContractorToolEntry = (data: ContractorToolEntryForm) => { - return request({ - url: '/contractor/contractorToolRecord', - method: 'put', - data: data - }); -}; - -/** - * 删除分包方工器具进场 - * @param id - */ -export const delContractorToolEntry = (id: string | number | Array) => { - return request({ - url: '/contractor/contractorToolRecord/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/contractorTool/contractorToolEntry/types.ts b/src/api/project/contractorTool/contractorToolEntry/types.ts deleted file mode 100644 index d966cc0..0000000 --- a/src/api/project/contractorTool/contractorToolEntry/types.ts +++ /dev/null @@ -1,156 +0,0 @@ -export interface ContractorToolEntryVO { - /** - * 主键id - */ - id: string | number; - - /** - * 项目id - */ - projectId: string | number; - - /** - * 分包方id - */ - contractorId: string | number; - - /** - * 分包方工器具id - */ - contractorToolId: string | number; - - /** - * 进场工器具数量 - */ - toolNumber: string; - - /** - * 检测编号 - */ - checkNum: string; - - /** - * 检测部门 - */ - checkDept: string; - - /** - * 检测时间 - */ - checkTime: string; - - /** - * 合格证 - */ - certificate: string; - - /** - * 备注 - */ - remark: string; - - /** - * 进场时间 - */ - entryTime: string; - -} - -export interface ContractorToolEntryForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 分包方工器具id - */ - contractorToolId?: string | number; - - /** - * 进场工器具数量 - */ - toolNumber?: string; - - /** - * 检测编号 - */ - checkNum?: string; - - /** - * 检测部门 - */ - checkDept?: string; - - /** - * 检测时间 - */ - checkTime?: string; - - /** - * 合格证 - */ - certificate?: string; - - /** - * 备注 - */ - remark?: string; - - /** - * 进场时间 - */ - entryTime?: string; - /** - * 类型 - */ - recordType?: string; - /** - * 工器具数量 - */ - recordNumber?: number; -} - -export interface ContractorToolEntryQuery extends PageQuery { - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 分包方id - */ - contractorId?: string | number; - - /** - * 分包方工器具id - */ - contractorToolId?: string | number; - - /** - * 进场工器具数量 - */ - toolNumber?: string; - - /** - * 检测编号 - */ - checkNum?: string; - /** - * 类型 - */ - recordType?: string; - /** - * 检测部门 - */ - checkDept?: string; - - /** - * 日期范围参数 - */ - params?: any; -} - - - diff --git a/src/api/project/contractorTool/index.ts b/src/api/project/contractorTool/index.ts deleted file mode 100644 index c5d423a..0000000 --- a/src/api/project/contractorTool/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { ContractorToolVO, ContractorToolForm, ContractorToolQuery } from '@/api/project/contractorTool/types'; - -/** - * 查询分包方工器具列表 - * @param query - * @returns {*} - */ - -export const listContractorTool = (query?: ContractorToolQuery): AxiosPromise => { - return request({ - url: '/contractor/contractorTool/list', - method: 'get', - params: query - }); -}; - -/** - * 查询分包方工器具详细 - * @param id - */ -export const getContractorTool = (id: string | number): AxiosPromise => { - return request({ - url: '/contractor/contractorTool/' + id, - method: 'get' - }); -}; - -/** - * 新增分包方工器具 - * @param data - */ -export const addContractorTool = (data: ContractorToolForm) => { - return request({ - url: '/contractor/contractorTool', - method: 'post', - data: data - }); -}; - -/** - * 修改分包方工器具 - * @param data - */ -export const updateContractorTool = (data: ContractorToolForm) => { - return request({ - url: '/contractor/contractorTool', - method: 'put', - data: data - }); -}; - -/** - * 删除分包方工器具 - * @param id - */ -export const delContractorTool = (id: string | number | Array) => { - return request({ - url: '/contractor/contractorTool/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/contractorTool/types.ts b/src/api/project/contractorTool/types.ts deleted file mode 100644 index 97d91f4..0000000 --- a/src/api/project/contractorTool/types.ts +++ /dev/null @@ -1,136 +0,0 @@ -export interface ContractorToolVO { - /** - * 主键id - */ - id: string | number; - - /** - * 项目id - */ - projectId: string | number; - - /** - * 分包方id - */ - contractorId: string | number; - - /** - * 工具名称 - */ - toolName: string; - - /** - * 工具类型 - */ - toolType: string; - - /** - * 工具型号 - */ - toolModel: string; - - /** - * 工具数量 - */ - toolNumber: string; - - /** - * 备注 - */ - remark: string; - - /** - * 创建时间 - */ - createTime: string; - -} - -export interface ContractorToolForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 分包方id - */ - contractorId?: string | number; - - /** - * 工具名称 - */ - toolName?: string; - - /** - * 工具类型 - */ - toolType?: string; - - /** - * 工具型号 - */ - toolModel?: string; - - /** - * 工具数量 - */ - toolNumber?: string; - - /** - * 文件 - */ - file?: string; - - /** - * 备注 - */ - remark?: string; - -} - -export interface ContractorToolQuery extends PageQuery { - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 分包方id - */ - contractorId?: string | number; - - /** - * 工具名称 - */ - toolName?: string; - - /** - * 工具类型 - */ - toolType?: string; - - /** - * 工具型号 - */ - toolModel?: string; - - /** - * 工具数量 - */ - toolNumber?: string; - - /** - * 日期范围参数 - */ - params?: any; -} - - - diff --git a/src/api/project/leave/index.ts b/src/api/project/leave/index.ts deleted file mode 100644 index 50bdc04..0000000 --- a/src/api/project/leave/index.ts +++ /dev/null @@ -1,76 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { LeaveVO, LeaveForm, LeaveQuery } from '@/api/project/leave/types'; -import { AuditReissueCardForm } from '../reissueCard/types'; - -/** - * 查询施工人员请假申请列表 - * @param query - * @returns {*} - */ - -export const listLeave = (query?: LeaveQuery): AxiosPromise => { - return request({ - url: '/project/leave/list', - method: 'get', - params: query - }); -}; - -/** - * 查询施工人员请假申请详细 - * @param id - */ -export const getLeave = (id: string | number): AxiosPromise => { - return request({ - url: '/project/leave/' + id, - method: 'get' - }); -}; - -/** - * 新增施工人员请假申请 - * @param data - */ -export const addLeave = (data: LeaveForm) => { - return request({ - url: '/project/leave', - method: 'post', - data: data - }); -}; - -/** - * 修改施工人员请假申请 - * @param data - */ -export const updateLeave = (data: LeaveForm) => { - return request({ - url: '/project/leave', - method: 'put', - data: data - }); -}; - -/** - * 删除施工人员请假申请 - * @param id - */ -export const delLeave = (id: string | number | Array) => { - return request({ - url: '/project/leave/' + id, - method: 'delete' - }); -}; - -/** - * 管理员审核施工人员请假申请 - * @param data - */ -export const AuditReissueCard = (data: AuditReissueCardForm) => { - return request({ - url: '/project/leave/review/manager', - method: 'put', - data: data - }); -}; diff --git a/src/api/project/leave/types.ts b/src/api/project/leave/types.ts deleted file mode 100644 index c4a0331..0000000 --- a/src/api/project/leave/types.ts +++ /dev/null @@ -1,206 +0,0 @@ -export interface LeaveVO { - /** - * 申请人名字 - */ - userName: string; - id?: string | number; - /** - * 申请请假说明 - */ - userExplain: string; - status?: string; - /** - * 请假申请时间 - */ - userTime: string; - - /** - * 请假类型(1事假 2病假) - */ - leaveType: string; - - /** - * 请假开始时间 - */ - startTime: string; - - /** - * 请假结束时间 - */ - endTime: string; - - /** - * 班组长名字 - */ - gangerName: string; - - /** - * 班组长意见(1未读 2同意 3拒绝) - */ - gangerOpinion: string; - - /** - * 班组长说明 - */ - gangerExplain: string; - - /** - * 班组长操作时间 - */ - gangerTime: string; - - /** - * 管理员意见(1未读 2同意 3拒绝) - */ - managerOpinion: string; - - /** - * 管理员说明 - */ - managerExplain: string; - - /** - * 管理员操作时间 - */ - managerTime: string; - - /** - * 备注 - */ - remark: string; - managerName?: string; -} - -export interface LeaveForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 申请人id - */ - userId?: string | number; - - /** - * 申请人名字 - */ - userName?: string; - - /** - * 申请请假说明 - */ - userExplain?: string; - - /** - * 请假申请时间 - */ - userTime?: string; - - /** - * 请假类型(1事假 2病假) - */ - leaveType?: string; - - /** - * 请假开始时间 - */ - startTime?: string; - - /** - * 请假结束时间 - */ - endTime?: string; - - /** - * 班组长 - */ - gangerId?: string | number; - - /** - * 班组长名字 - */ - gangerName?: string; - - /** - * 班组长意见(1未读 2同意 3拒绝) - */ - gangerOpinion?: string; - - /** - * 班组长说明 - */ - gangerExplain?: string; - - /** - * 班组长操作时间 - */ - gangerTime?: string; - - /** - * 管理员意见(1未读 2同意 3拒绝) - */ - managerOpinion?: string; - - /** - * 管理员说明 - */ - managerExplain?: string; - - /** - * 管理员操作时间 - */ - managerTime?: string; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 班组id - */ - teamId?: string | number; - - /** - * 备注 - */ - remark?: string; -} - -export interface LeaveQuery extends PageQuery { - /** - * 申请人名字 - */ - userName?: string; - - /** - * 请假类型(1事假 2病假) - */ - leaveType?: string; - - /** - * 班组长意见(1未读 2同意 3拒绝) - */ - gangerOpinion?: string; - - /** - * 管理员意见(1未读 2同意 3拒绝) - */ - managerOpinion?: string; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 班组id - */ - teamId?: string | number; - - /** - * 日期范围参数 - */ - params?: any; -} diff --git a/src/api/project/project/index.ts b/src/api/project/project/index.ts index 04d5b65..2130a90 100644 --- a/src/api/project/project/index.ts +++ b/src/api/project/project/index.ts @@ -10,7 +10,7 @@ import { childProjectQuery, ProjectForm, ProjectQuery, ProjectVO } from '@/api/p export const listProject = (query?: ProjectQuery): AxiosPromise => { return request({ - url: '/project/project/list', + url: '/system/project/project/list', method: 'get', params: query }); @@ -24,7 +24,7 @@ export const listProject = (query?: ProjectQuery): AxiosPromise => export const listDXFProject = (id: string | number): AxiosPromise => { return request({ - url: '/project/projectFile/json/' + id, + url: '/system/project/projectFile/json/' + id, method: 'get' }); }; @@ -35,7 +35,7 @@ export const listDXFProject = (id: string | number): AxiosPromise => { */ export const getProject = (id: string | number): AxiosPromise => { return request({ - url: '/project/project/' + id, + url: '/system/project/project/' + id, method: 'get' }); }; @@ -46,7 +46,7 @@ export const getProject = (id: string | number): AxiosPromise => { */ export const addProject = (data: ProjectForm): AxiosPromise => { return request({ - url: '/project/project', + url: '/system/project/project', method: 'post', data: data }); @@ -58,7 +58,7 @@ export const addProject = (data: ProjectForm): AxiosPromise => */ export const updateProject = (data: ProjectForm) => { return request({ - url: '/project/project', + url: '/system/project/project', method: 'put', data: data }); @@ -70,7 +70,7 @@ export const updateProject = (data: ProjectForm) => { */ export const upLoadProjectDXF = (data: any) => { return request({ - url: '/project/projectFile/upload/dxf', + url: '/system/project/projectFile/upload/dxf', method: 'post', data: data }); @@ -147,7 +147,7 @@ export const addInverter = (data: any) => { */ export const delProject = (id: string | number | Array) => { return request({ - url: '/project/project/' + id, + url: '/system/project/project/' + id, method: 'delete' }); }; @@ -158,7 +158,7 @@ export const delProject = (id: string | number | Array) => { */ export const addChildProject = (data: childProjectQuery) => { return request({ - url: '/project/project/sub', + url: '/system/project/project/sub', method: 'post', data: data }); @@ -170,7 +170,7 @@ export const addChildProject = (data: childProjectQuery) => { */ export const getChildProject = (id: string | number): AxiosPromise => { return request({ - url: '/project/project/list/sub/' + id, + url: '/system/project/project/list/sub/' + id, method: 'get' }); }; @@ -181,7 +181,7 @@ export const getChildProject = (id: string | number): AxiosPromise { return request({ - url: '/project/project/save/tender/file', + url: '/system/project/project/save/tender/file', method: 'put', data: data }); @@ -193,7 +193,7 @@ export const uploadProjectFile = (data: any) => { */ export const changeProject = (id: string | number) => { return request({ - url: '/project/project/changeProject/' + id, + url: '/system/project/project/changeProject/' + id, method: 'get' }); }; diff --git a/src/api/project/projectRelevancy/index.ts b/src/api/project/projectRelevancy/index.ts index 7577e83..2b01cd1 100644 --- a/src/api/project/projectRelevancy/index.ts +++ b/src/api/project/projectRelevancy/index.ts @@ -10,7 +10,7 @@ import { ProjectRelevancyForm, ProjectRelevancyQuery, ProjectRelevancyVO } from export const listProjectRelevancy = (query?: ProjectRelevancyQuery): AxiosPromise => { return request({ - url: '/project/projectRelevancy/login/page', + url: '/system/project/projectRelevancy/login/page', method: 'get', params: query }); @@ -22,7 +22,7 @@ export const listProjectRelevancy = (query?: ProjectRelevancyQuery): AxiosPromis */ export const getProjectRelevancy = (id: string | number): AxiosPromise => { return request({ - url: '/project/projectRelevancy/' + id, + url: '/system/project/projectRelevancy/' + id, method: 'get' }); }; @@ -33,7 +33,7 @@ export const getProjectRelevancy = (id: string | number): AxiosPromise => { return request({ - url: '/project/projectRelevancy', + url: '/system/project/projectRelevancy', method: 'post', data: data }); @@ -45,7 +45,7 @@ export const addProjectRelevancy = (data: ProjectRelevancyForm): AxiosPromise { return request({ - url: '/project/projectRelevancy', + url: '/system/project/projectRelevancy', method: 'put', data: data }); @@ -57,7 +57,7 @@ export const updateProjectRelevancy = (data: ProjectRelevancyForm) => { */ export const delProjectRelevancy = (id: string | number | Array) => { return request({ - url: '/project/projectRelevancy/' + id, + url: '/system/project/projectRelevancy/' + id, method: 'delete' }); }; @@ -72,7 +72,7 @@ export const delProjectRelevancy = (id: string | number | Array */ export function listUserProjects(params: { userId: number | string }) { return request({ - url: '/project/projectRelevancy/list', + url: '/system/project/projectRelevancy/list', method: 'get', params }); @@ -84,7 +84,7 @@ export function listUserProjects(params: { userId: number | string }) { */ export function addNewProjectRelevancy(data: { userId: number | string; projectIdList: number[] }) { return request({ - url: '/project/projectRelevancy/add/project/list', + url: '/system/project/projectRelevancy/add/project/list', method: 'post', data }); @@ -96,7 +96,7 @@ export function addNewProjectRelevancy(data: { userId: number | string; projectI */ export function removeNewProjectRelevancy(data: { userId: number | string; projectIdList: number[] }) { return request({ - url: '/project/projectRelevancy/remove/project/list', + url: '/system/project/projectRelevancy/remove/project/list', method: 'delete', data }); diff --git a/src/api/project/projectTeam/index.ts b/src/api/project/projectTeam/index.ts deleted file mode 100644 index 8a55f69..0000000 --- a/src/api/project/projectTeam/index.ts +++ /dev/null @@ -1,74 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { ProjectTeamForemanResp, ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } from '@/api/project/projectTeam/types'; - -/** - * 查询项目班组列表 - * @param query - * @returns {*} - */ - -export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise => { - return request({ - url: '/project/projectTeam/list', - method: 'get', - params: query - }); -}; - -/** - * 根据项目id查询项目班组班组长信息列表 - * @param projectId - */ -export const listProjectTeamForeman = (projectId: string | number): AxiosPromise => { - return request({ - url: '/project/projectTeam/listForeman/' + projectId, - method: 'get' - }); -}; - -/** - * 查询项目班组详细 - * @param id - */ -export const getProjectTeam = (id: string | number): AxiosPromise => { - return request({ - url: '/project/projectTeam/' + id, - method: 'get' - }); -}; - -/** - * 新增项目班组 - * @param data - */ -export const addProjectTeam = (data: ProjectTeamForm): AxiosPromise => { - return request({ - url: '/project/projectTeam', - method: 'post', - data: data - }); -}; - -/** - * 修改项目班组 - * @param data - */ -export const updateProjectTeam = (data: ProjectTeamForm) => { - return request({ - url: '/project/projectTeam', - method: 'put', - data: data - }); -}; - -/** - * 删除项目班组 - * @param id - */ -export const delProjectTeam = (id: string | number | Array) => { - return request({ - url: '/project/projectTeam/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/projectTeam/types.ts b/src/api/project/projectTeam/types.ts deleted file mode 100644 index d14b582..0000000 --- a/src/api/project/projectTeam/types.ts +++ /dev/null @@ -1,109 +0,0 @@ -export interface ProjectTeamVO { - /** - * 主键id - */ - id: string | number; - - /** - * 项目id - */ - projectId: string | number; - - /** - * 班组名称 - */ - teamName: string; - - /** - * 范围内打卡(0范围内打卡 1任何地点打卡)默认为1 - */ - isClockIn: number; - - /** - * 备注 - */ - remark: string; - - /** - * 创建时间 - */ - createTime: string; -} - -export interface ProjectTeamForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - peopleNumber?: string | number; - /** - * 项目id - */ - projectId?: string | number; - - /** - * 班组名称 - */ - teamName?: string; - - /** - * 范围内打卡(0范围内打卡 1任何地点打卡)默认为1 - */ - isClockIn?: number; - - /** - * 备注 - */ - remark?: string; -} - -export interface ProjectTeamQuery extends PageQuery { - /** - * 项目id - */ - projectId?: string | number; - peopleNumber?: string | number; - /** - * 班组名称 - */ - teamName?: string; - - /** - * 范围内打卡(0范围内打卡 1任何地点打卡)默认为1 - */ - isClockIn?: number; - - /** - * 日期范围参数 - */ - params?: any; -} - -export interface ProjectTeamForemanResp { - /** - * 班组id - */ - id: string | number; - foremanList: foremanQuery[]; - /** - * 班组名称 - */ - teamName: string; - - /** - * 项目id - */ - projectId: string | number; -} - -export interface foremanQuery { - /** - * 班组长id - */ - foremanId: string | number; - - /** - * 班组长名字 - */ - foremanName: string; -} diff --git a/src/api/project/projectTeamMember/index.ts b/src/api/project/projectTeamMember/index.ts deleted file mode 100644 index c64cee2..0000000 --- a/src/api/project/projectTeamMember/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types'; - -/** - * 查询项目班组下的成员列表 - * @param query - * @returns {*} - */ - -export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise => { - return request({ - url: '/project/projectTeamMember/list', - method: 'get', - params: query - }); -}; - -/** - * 查询项目班组下的成员详细 - * @param id - */ -export const getProjectTeamMember = (id: string | number): AxiosPromise => { - return request({ - url: '/project/projectTeamMember/' + id, - method: 'get' - }); -}; - -/** - * 新增项目班组下的成员 - * @param data - */ -export const addProjectTeamMember = (data: ProjectTeamMemberForm): AxiosPromise => { - return request({ - url: '/project/projectTeamMember', - method: 'post', - data: data - }); -}; - -/** - * 修改项目班组下的成员 - * @param data - */ -export const updateProjectTeamMember = (data: ProjectTeamMemberForm) => { - return request({ - url: '/project/projectTeamMember', - method: 'put', - data: data - }); -}; - -/** - * 删除项目班组下的成员 - * @param id - */ -export const delProjectTeamMember = (id: string | number | Array) => { - return request({ - url: '/project/projectTeamMember/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/projectTeamMember/types.ts b/src/api/project/projectTeamMember/types.ts deleted file mode 100644 index dc5ba3b..0000000 --- a/src/api/project/projectTeamMember/types.ts +++ /dev/null @@ -1,105 +0,0 @@ -export interface ProjectTeamMemberVO { - /** - * 主键id - */ - id: string | number; - - /** - * 班组id - */ - teamId: string | number; - - /** - * 项目id - */ - projectId: string | number; - - /** - * 施工人员id - */ - memberId: string | number; - - /** - * 岗位(默认为0普通员工,1组长) - */ - postId: string | number; - - /** - * 施工人员姓名 - */ - memberName: string; - - /** - * 备注 - */ - remark: string; - - /** - * 创建时间 - */ - createTime: string; -} - -export interface ProjectTeamMemberForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 班组id - */ - teamId?: string | number; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 施工人员id - */ - memberId?: string | number; - - /** - * 岗位(默认为0普通员工,1组长) - */ - postId?: string | number; - - /** - * 备注 - */ - remark?: string; -} - -export interface ProjectTeamMemberQuery extends PageQuery { - /** - * 班组id - */ - teamId?: string | number; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 施工人员id - */ - memberId?: string | number; - - /** - * 施工人员姓名 - */ - memberName?: string; - - /** - * 岗位(默认为0普通员工,1组长) - */ - postId?: string | number; - - /** - * 日期范围参数 - */ - params?: any; -} diff --git a/src/api/project/reissueCard/index.ts b/src/api/project/reissueCard/index.ts deleted file mode 100644 index 4709a89..0000000 --- a/src/api/project/reissueCard/index.ts +++ /dev/null @@ -1,75 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { ReissueCardVO, ReissueCardForm, ReissueCardQuery, AuditReissueCardForm } from '@/api/project/reissueCard/types'; - -/** - * 查询施工人员补卡申请列表 - * @param query - * @returns {*} - */ - -export const listReissueCard = (query?: ReissueCardQuery): AxiosPromise => { - return request({ - url: '/project/reissueCard/list', - method: 'get', - params: query - }); -}; - -/** - * 查询施工人员补卡申请详细 - * @param id - */ -export const getReissueCard = (id: string | number): AxiosPromise => { - return request({ - url: '/project/reissueCard/' + id, - method: 'get' - }); -}; - -/** - * 新增施工人员补卡申请 - * @param data - */ -export const addReissueCard = (data: ReissueCardForm) => { - return request({ - url: '/project/reissueCard', - method: 'post', - data: data - }); -}; - -/** - * 修改施工人员补卡申请 - * @param data - */ -export const updateReissueCard = (data: ReissueCardForm) => { - return request({ - url: '/project/reissueCard', - method: 'put', - data: data - }); -}; - -/** - * 删除施工人员补卡申请 - * @param id - */ -export const delReissueCard = (id: string | number | Array) => { - return request({ - url: '/project/reissueCard/' + id, - method: 'delete' - }); -}; - -/** - * 管理员审核施工人员补卡申请 - * @param data - */ -export const AuditReissueCard = (data: AuditReissueCardForm) => { - return request({ - url: '/project/reissueCard/review/manager', - method: 'put', - data: data - }); -}; diff --git a/src/api/project/reissueCard/types.ts b/src/api/project/reissueCard/types.ts deleted file mode 100644 index 3937951..0000000 --- a/src/api/project/reissueCard/types.ts +++ /dev/null @@ -1,173 +0,0 @@ -export interface ReissueCardVO { - /** - * 申请人名字 - */ - userName: string; - id?: string | number; - status?: string; - managerName?: string; - /** - * 申请补卡说明 - */ - userExplain: string; - - /** - * 补卡申请时间 - */ - userTime: string; - - /** - * 班组长名字 - */ - gangerName: string; - - /** - * 班组长意见(1未读 2同意 3拒绝) - */ - gangerOpinion: string; - - /** - * 班组长说明 - */ - gangerExplain: string; - - /** - * 班组长操作时间 - */ - gangerTime: string; - - /** - * 管理员意见(1未读 2同意 3拒绝) - */ - managerOpinion: string; - - /** - * 管理员说明 - */ - managerExplain: string; - - /** - * 管理员操作时间 - */ - managerTime: string; - - /** - * 备注 - */ - remark: string; -} -export interface AuditReissueCardForm { - /** - * 主键id - */ - id?: string | number; - - /** - * 管理员意见 - */ - managerOpinion?: string; - - /** - * 管理员说明 - */ - managerExplain?: string; - - /** - * 备注 - */ - remark?: string; -} - -export interface ReissueCardForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 申请人id - */ - userId?: string | number; - - /** - * 申请补卡说明 - */ - userExplain?: string; - - /** - * 班组长 - */ - gangerId?: string | number; - - /** - * 班组长意见(1未读 2同意 3拒绝) - */ - gangerOpinion?: string; - - /** - * 班组长说明 - */ - gangerExplain?: string; - - /** - * 管理员意见(1未读 2同意 3拒绝) - */ - managerOpinion?: string; - - /** - * 管理员说明 - */ - managerExplain?: string; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 考勤表主键id - */ - attendanceId?: string | number; - - /** - * 备注 - */ - remark?: string; -} - -export interface ReissueCardQuery extends PageQuery { - /** - * 申请人名字 - */ - userName?: string; - - /** - * 班组长意见(1未读 2同意 3拒绝) - */ - gangerOpinion?: string; - - /** - * 管理员意见(1未读 2同意 3拒绝) - */ - managerOpinion?: string; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 班组id - */ - teamId?: string | number; - - /** - * 补卡类型(1上班 2下班) - */ - reissueCardType?: string; - - /** - * 日期范围参数 - */ - params?: any; -} diff --git a/src/api/project/subcontract/index.ts b/src/api/project/subcontract/index.ts deleted file mode 100644 index 9ba3ef7..0000000 --- a/src/api/project/subcontract/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { SubcontractVO, SubcontractForm, SubcontractQuery } from '@/api/project/subcontract/types'; - -/** - * 查询分包合同列表 - * @param query - * @returns {*} - */ - -export const listSubcontract = (query?: SubcontractQuery): AxiosPromise => { - return request({ - url: '/contractor/subcontract/list', - method: 'get', - params: query - }); -}; - -/** - * 查询分包合同详细 - * @param id - */ -export const getSubcontract = (id: string | number): AxiosPromise => { - return request({ - url: '/contractor/subcontract/' + id, - method: 'get' - }); -}; - -/** - * 新增分包合同 - * @param data - */ -export const addSubcontract = (data: SubcontractForm) => { - return request({ - url: '/contractor/subcontract', - method: 'post', - data: data - }); -}; - -/** - * 修改分包合同 - * @param data - */ -export const updateSubcontract = (data: SubcontractForm) => { - return request({ - url: '/contractor/subcontract', - method: 'put', - data: data - }); -}; - -/** - * 删除分包合同 - * @param id - */ -export const delSubcontract = (id: string | number | Array) => { - return request({ - url: '/contractor/subcontract/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/subcontract/types.ts b/src/api/project/subcontract/types.ts deleted file mode 100644 index fdb6c19..0000000 --- a/src/api/project/subcontract/types.ts +++ /dev/null @@ -1,136 +0,0 @@ -export interface SubcontractVO { - /** - * 项目id - */ - projectId: string | number; - - /** - * 分包方id - */ - contractorId: string | number; - - /** - * 合同文件id - */ - contractFileId: string | number; - - /** - * 合同编号 - */ - contractNumber: string; - - /** - * 合同名称 - */ - contractName: string; - - /** - * 合同类型 - */ - contractType: string; - - /** - * 合同金额 - */ - contractAmount: number; - - /** - * 合同时间 - */ - contractTime: string; - - /** - * 备注 - */ - remark: string; - -} - -export interface SubcontractForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 分包方id - */ - contractorId?: string | number; - - /** - * 合同文件id - */ - contractFileId?: string | number; - - /** - * 合同编号 - */ - contractNumber?: string; - - /** - * 合同名称 - */ - contractName?: string; - - /** - * 合同类型 - */ - contractType?: string; - - /** - * 合同金额 - */ - contractAmount?: number; - - /** - * 合同时间 - */ - contractTime?: string; - - /** - * 备注 - */ - remark?: string; - -} - -export interface SubcontractQuery extends PageQuery { - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 分包方id - */ - contractorId?: string | number; - - /** - * 合同编号 - */ - contractNumber?: string; - - /** - * 合同名称 - */ - contractName?: string; - - /** - * 合同类型 - */ - contractType?: string; - - /** - * 日期范围参数 - */ - params?: any; -} - - - diff --git a/src/api/project/workWage/index.ts b/src/api/project/workWage/index.ts deleted file mode 100644 index 01ed29d..0000000 --- a/src/api/project/workWage/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { WorkWageVO, WorkWageForm, WorkWageQuery } from '@/api/project/workWage/types'; - -/** - * 查询工种薪水列表 - * @param query - * @returns {*} - */ - -export const listWorkWage = (query?: WorkWageQuery): AxiosPromise => { - return request({ - url: '/project/workWage/list', - method: 'get', - params: query - }); -}; - -/** - * 查询工种薪水详细 - * @param id - */ -export const getWorkWage = (id: string | number): AxiosPromise => { - return request({ - url: '/project/workWage/' + id, - method: 'get' - }); -}; - -/** - * 新增工种薪水 - * @param data - */ -export const addWorkWage = (data: WorkWageForm) => { - return request({ - url: '/project/workWage', - method: 'post', - data: data - }); -}; - -/** - * 修改工种薪水 - * @param data - */ -export const updateWorkWage = (data: WorkWageForm) => { - return request({ - url: '/project/workWage', - method: 'put', - data: data - }); -}; - -/** - * 删除工种薪水 - * @param id - */ -export const delWorkWage = (id: string | number | Array) => { - return request({ - url: '/project/workWage/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/workWage/types.ts b/src/api/project/workWage/types.ts deleted file mode 100644 index 75a5989..0000000 --- a/src/api/project/workWage/types.ts +++ /dev/null @@ -1,131 +0,0 @@ -export interface WorkWageVO { - /** - * 主键id - */ - id: string | number; - - /** - * 项目id - */ - projectId: string | number; - - /** - * 工种 - */ - workType: string; - - /** - * 是否是特种兵(1是 2否) - */ - isSpecialType: string; - - /** - * 工资计算方式(1计时 2计件) - */ - wageCalculationType: string; - - /** - * 工资标准 - */ - wage: number; - - /** - * 工资计量单位 - */ - wageMeasureUnit: string; - - /** - * 备注 - */ - remark: string; - -} - -export interface SpecialType{ - label:string;//名称 - value:number | string;//id -} - -export interface WorkWageForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 工种 - */ - workType?: string; - - /** - * 是否是特种兵(1是 2否) - */ - isSpecialType?: string; - - /** - * 工资计算方式(1计时 2计件) - */ - wageCalculationType?: string; - - /** - * 工资标准 - */ - wage?: number; - - /** - * 工资计量单位 - */ - wageMeasureUnit?: string; - - /** - * 备注 - */ - remark?: string; - -} - -export interface WorkWageQuery extends PageQuery { - - /** - * 项目id - */ - projectId?: string | number; - - /** - * 工种 - */ - workType?: string; - - /** - * 是否是特种兵(1是 2否) - */ - isSpecialType?: string; - - /** - * 工资计算方式(1计时 2计件) - */ - wageCalculationType?: string; - - /** - * 工资标准 - */ - wage?: number; - - /** - * 工资计量单位 - */ - wageMeasureUnit?: string; - - /** - * 日期范围参数 - */ - params?: any; -} - - - diff --git a/src/api/project/workerDailyReport/index.ts b/src/api/project/workerDailyReport/index.ts deleted file mode 100644 index 5a6f373..0000000 --- a/src/api/project/workerDailyReport/index.ts +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { WorkerDailyReportVO, WorkerDailyReportForm, WorkerDailyReportQuery } from '@/api/project/workerDailyReport/types'; - -/** - * 查询施工人员日报列表 - * @param query - * @returns {*} - */ - -export const listWorkerDailyReport = (query?: WorkerDailyReportQuery): AxiosPromise => { - return request({ - url: '/project/workerDailyReport/list', - method: 'get', - params: query - }); -}; - -/** - * 查询施工人员日报详细 - * @param id - */ -export const getWorkerDailyReport = (id: string | number): AxiosPromise => { - return request({ - url: '/project/workerDailyReport/' + id, - method: 'get' - }); -}; - -/** - * 新增施工人员日报 - * @param data - */ -export const addWorkerDailyReport = (data: WorkerDailyReportForm) => { - return request({ - url: '/project/workerDailyReport', - method: 'post', - data: data - }); -}; - -/** - * 修改施工人员日报 - * @param data - */ -export const updateWorkerDailyReport = (data: WorkerDailyReportForm) => { - return request({ - url: '/project/workerDailyReport', - method: 'put', - data: data - }); -}; - -/** - * 删除施工人员日报 - * @param id - */ -export const delWorkerDailyReport = (id: string | number | Array) => { - return request({ - url: '/project/workerDailyReport/' + id, - method: 'delete' - }); -}; diff --git a/src/api/project/workerDailyReport/types.ts b/src/api/project/workerDailyReport/types.ts deleted file mode 100644 index 205f222..0000000 --- a/src/api/project/workerDailyReport/types.ts +++ /dev/null @@ -1,132 +0,0 @@ -export interface WorkerDailyReportVO { - /** - * 申请人名字 - */ - userName: string; - userId?: string; - id?: string; - - /** - * 今日完成工作 - */ - todayCompletedWork: string; - - /** - * 未完成工作 - */ - unfinishedWork: string; - - /** - * 明日工作 - */ - tomorrowWork: string; - - /** - * 需协调与帮助 - */ - coordinationHelp: string; -} - -export interface WorkerDailyReportForm extends BaseEntity { - /** - * 主键id - */ - id?: string | number; - - /** - * 项目id - */ - projectId?: string | number; - teamName?: string; - resubmitReason?: string; - reportDate?: string; - isResubmit: string; - - /** - * 班组id - */ - teamId?: string | number; - - /** - * 申请人id - */ - userId?: string | number; - - /** - * 申请人名字 - */ - userName?: string; - - /** - * 今日完成工作 - */ - todayCompletedWork?: string; - - /** - * 未完成工作 - */ - unfinishedWork?: string; - - /** - * 明日工作 - */ - tomorrowWork?: string; - - /** - * 需协调与帮助 - */ - coordinationHelp?: string; - - /** - * 附件 - */ - fileList?: Array; - dailyPieceItemVoList?: dailyPieceItemVO[]; -} - -interface dailyPieceItemVO { - /** - * 主键id - */ - id?: string | number; - - /** - * 计件类型 - */ - pieceType?: string; - - /** - * 数量 - */ - pieceCount?: number; - pieceUnit?: string; - remark?: string; -} - -export interface WorkerDailyReportQuery extends PageQuery { - /** - * 项目id - */ - projectId?: string | number; - - /** - * 班组id - */ - teamId?: string | number; - - /** - * 申请人id - */ - userId?: string | number; - - /** - * 申请人名字 - */ - userName?: string; - - /** - * 日期范围参数 - */ - params?: any; - isResubmit?: string; -} diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 162edf5..9eb9aa4 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -81,9 +81,9 @@ export const useUserStore = defineStore('user', () => { const profile = user.avatar == '' || user.avatar == null ? defAva : user.avatar; if (data.roles && data.roles.length > 0) { - setRoles(); permissionList.value = data.permissions; roleList.value = data.roles; + setRoles(); } else { roles.value = ['ROLE_DEFAULT']; } @@ -108,9 +108,9 @@ export const useUserStore = defineStore('user', () => { const profile = user.avatar == '' || user.avatar == null ? defAva : user.avatar; if (data.roles && data.roles.length > 0) { - setRoles(); permissionList.value = data.permissions; roleList.value = data.roles; + setRoles(); } else { roles.value = ['ROLE_DEFAULT']; } @@ -127,6 +127,7 @@ export const useUserStore = defineStore('user', () => { const projectRole = roleList.value.find((item) => item.projectId == selectedProject.value?.id)?.projectRoles || []; roles.value = projectRole; const projectPermissions = permissionList.value.find((item) => item.projectId == selectedProject.value?.id)?.projectPermissions || []; + console.log('🚀 ~ setRoles ~ projectPermissions:', projectPermissions, permissionList.value, selectedProject.value?.id); permissions.value = projectPermissions; }; diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index d12aeed..cc2e067 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -10,7 +10,7 @@ class="mt-2" node-key="id" :data="deptOptions" - :props="{ label: 'label', children: 'children' } as any" + :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false" :filter-node-method="filterNode" highlight-current @@ -159,7 +159,7 @@ { const vitePlugins: any = []; vitePlugins.push(vue()); - vitePlugins.push(vueDevTools()); + // vitePlugins.push(vueDevTools()); vitePlugins.push(createUnoCss()); vitePlugins.push(createAutoImport(path)); vitePlugins.push(createComponents(path));