From 340cc2029ba12c21398c5caa88a6231e55282e0e Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Mon, 10 Mar 2025 18:28:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A2=9E=E5=88=A0=E6=94=B9?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/demo/demo/index.ts | 62 --- src/api/demo/demo/types.ts | 90 ---- src/api/demo/tree/index.ts | 62 --- src/api/demo/tree/types.ts | 80 ---- src/api/login.ts | 4 +- src/api/machinery/machinery/index.ts | 63 +++ src/api/machinery/machinery/types.ts | 111 +++++ src/api/machinery/machineryDetail/index.ts | 63 +++ src/api/machinery/machineryDetail/types.ts | 156 +++++++ src/api/project/constructionUser/index.ts | 63 +++ src/api/project/constructionUser/types.ts | 426 ++++++++++++++++++ src/api/project/contractor/index.ts | 63 +++ src/api/project/contractor/types.ts | 111 +++++ src/api/project/projectTeam/index.ts | 63 +++ src/api/project/projectTeam/types.ts | 81 ++++ src/api/project/projectTeamMember/index.ts | 63 +++ src/api/project/projectTeamMember/types.ts | 96 ++++ src/views/machinery/index.vue | 253 +++++++++++ src/views/machinery/machineryDetail/index.vue | 281 ++++++++++++ src/views/materials/company/index.vue | 52 +-- src/views/materials/materials/index.vue | 93 +--- .../materials/materialsInventory/index.vue | 53 +-- .../subcontractor/index.vue | 44 -- .../teamAllocation/index.vue | 10 - .../personnelManagement/workerList/index.vue | 151 ------- src/views/project/constructionUser/index.vue | 385 ++++++++++++++++ src/views/project/contractor/index.vue | 257 +++++++++++ .../project/project/index.vue | 2 +- .../component/ShuttleFrame.vue | 6 +- .../project/projectRelevancy/index.vue | 0 .../projectTeam/component/UserListDialog.vue | 81 ++++ src/views/project/projectTeam/index.vue | 250 ++++++++++ src/views/project/projectTeamMember/index.vue | 272 +++++++++++ src/views/system/user/index.vue | 35 +- 34 files changed, 3197 insertions(+), 685 deletions(-) delete mode 100644 src/api/demo/demo/index.ts delete mode 100644 src/api/demo/demo/types.ts delete mode 100644 src/api/demo/tree/index.ts delete mode 100644 src/api/demo/tree/types.ts create mode 100644 src/api/machinery/machinery/index.ts create mode 100644 src/api/machinery/machinery/types.ts create mode 100644 src/api/machinery/machineryDetail/index.ts create mode 100644 src/api/machinery/machineryDetail/types.ts create mode 100644 src/api/project/constructionUser/index.ts create mode 100644 src/api/project/constructionUser/types.ts create mode 100644 src/api/project/contractor/index.ts create mode 100644 src/api/project/contractor/types.ts create mode 100644 src/api/project/projectTeam/index.ts create mode 100644 src/api/project/projectTeam/types.ts create mode 100644 src/api/project/projectTeamMember/index.ts create mode 100644 src/api/project/projectTeamMember/types.ts create mode 100644 src/views/machinery/index.vue create mode 100644 src/views/machinery/machineryDetail/index.vue delete mode 100644 src/views/personnelManagement/subcontractor/index.vue delete mode 100644 src/views/personnelManagement/teamAllocation/index.vue delete mode 100644 src/views/personnelManagement/workerList/index.vue create mode 100644 src/views/project/constructionUser/index.vue create mode 100644 src/views/project/contractor/index.vue rename src/views/{personnelManagement => }/project/project/index.vue (99%) rename src/views/{personnelManagement => }/project/projectRelevancy/component/ShuttleFrame.vue (93%) rename src/views/{personnelManagement => }/project/projectRelevancy/index.vue (100%) create mode 100644 src/views/project/projectTeam/component/UserListDialog.vue create mode 100644 src/views/project/projectTeam/index.vue create mode 100644 src/views/project/projectTeamMember/index.vue diff --git a/src/api/demo/demo/index.ts b/src/api/demo/demo/index.ts deleted file mode 100644 index 7441720..0000000 --- a/src/api/demo/demo/index.ts +++ /dev/null @@ -1,62 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { DemoVO, DemoForm, DemoQuery } from '@/api/demo/demo/types'; - -/** - * 查询测试单列表 - * @param query - * @returns {*} - */ -export const listDemo = (query?: DemoQuery): AxiosPromise => { - return request({ - url: '/demo/demo/list', - method: 'get', - params: query - }); -}; - -/** - * 查询测试单详细 - * @param id - */ -export const getDemo = (id: string | number): AxiosPromise => { - return request({ - url: '/demo/demo/' + id, - method: 'get' - }); -}; - -/** - * 新增测试单 - * @param data - */ -export const addDemo = (data: DemoForm) => { - return request({ - url: '/demo/demo', - method: 'post', - data: data - }); -}; - -/** - * 修改测试单 - * @param data - */ -export const updateDemo = (data: DemoForm) => { - return request({ - url: '/demo/demo', - method: 'put', - data: data - }); -}; - -/** - * 删除测试单 - * @param id - */ -export const delDemo = (id: string | number | Array) => { - return request({ - url: '/demo/demo/' + id, - method: 'delete' - }); -}; diff --git a/src/api/demo/demo/types.ts b/src/api/demo/demo/types.ts deleted file mode 100644 index ea51d32..0000000 --- a/src/api/demo/demo/types.ts +++ /dev/null @@ -1,90 +0,0 @@ -export interface DemoVO { - /** - * 主键 - */ - id: string | number; - - /** - * 部门id - */ - deptId: string | number; - - /** - * 用户id - */ - userId: string | number; - - /** - * 排序号 - */ - orderNum: number; - - /** - * key键 - */ - testKey: string; - - /** - * 值 - */ - value: string; -} - -export interface DemoForm extends BaseEntity { - /** - * 主键 - */ - id?: string | number; - - /** - * 部门id - */ - deptId?: string | number; - - /** - * 用户id - */ - userId?: string | number; - - /** - * 排序号 - */ - orderNum?: number; - - /** - * key键 - */ - testKey?: string; - - /** - * 值 - */ - value?: string; -} - -export interface DemoQuery extends PageQuery { - /** - * 部门id - */ - deptId?: string | number; - - /** - * 用户id - */ - userId?: string | number; - - /** - * 排序号 - */ - orderNum?: number; - - /** - * key键 - */ - testKey?: string; - - /** - * 值 - */ - value?: string; -} diff --git a/src/api/demo/tree/index.ts b/src/api/demo/tree/index.ts deleted file mode 100644 index 562deb6..0000000 --- a/src/api/demo/tree/index.ts +++ /dev/null @@ -1,62 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { TreeVO, TreeForm, TreeQuery } from '@/api/demo/tree/types'; - -/** - * 查询测试树列表 - * @param query - * @returns {*} - */ -export const listTree = (query?: TreeQuery): AxiosPromise => { - return request({ - url: '/demo/tree/list', - method: 'get', - params: query - }); -}; - -/** - * 查询测试树详细 - * @param id - */ -export const getTree = (id: string | number): AxiosPromise => { - return request({ - url: '/demo/tree/' + id, - method: 'get' - }); -}; - -/** - * 新增测试树 - * @param data - */ -export const addTree = (data: TreeForm) => { - return request({ - url: '/demo/tree', - method: 'post', - data: data - }); -}; - -/** - * 修改测试树 - * @param data - */ -export const updateTree = (data: TreeForm) => { - return request({ - url: '/demo/tree', - method: 'put', - data: data - }); -}; - -/** - * 删除测试树 - * @param id - */ -export const delTree = (id: string | number | Array) => { - return request({ - url: '/demo/tree/' + id, - method: 'delete' - }); -}; diff --git a/src/api/demo/tree/types.ts b/src/api/demo/tree/types.ts deleted file mode 100644 index e164d8b..0000000 --- a/src/api/demo/tree/types.ts +++ /dev/null @@ -1,80 +0,0 @@ -export interface TreeVO { - /** - * 主键 - */ - id: string | number; - - /** - * 父id - */ - parentId: string | number; - - /** - * 部门id - */ - deptId: string | number; - - /** - * 用户id - */ - userId: string | number; - - /** - * 值 - */ - treeName: string; - - /** - * 子对象 - */ - children: TreeVO[]; -} - -export interface TreeForm extends BaseEntity { - /** - * 主键 - */ - id?: string | number; - - /** - * 父id - */ - parentId?: string | number; - - /** - * 部门id - */ - deptId?: string | number; - - /** - * 用户id - */ - userId?: string | number; - - /** - * 值 - */ - treeName?: string; -} - -export interface TreeQuery { - /** - * 父id - */ - parentId?: string | number; - - /** - * 部门id - */ - deptId?: string | number; - - /** - * 用户id - */ - userId?: string | number; - - /** - * 值 - */ - treeName?: string; -} diff --git a/src/api/login.ts b/src/api/login.ts index d81b2a6..854b387 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { LoginData, LoginResult, VerifyCodeResult, TenantInfo,UserProject } from './types'; +import { LoginData, LoginResult, TenantInfo, UserProject, VerifyCodeResult } from './types'; import { UserInfo } from '@/api/system/user/types'; // pc端固定客户端授权id @@ -118,4 +118,4 @@ export function getUserProject(): AxiosPromise { url: '/project/projectRelevancy/login/list', method: 'get' }); -} \ No newline at end of file +} diff --git a/src/api/machinery/machinery/index.ts b/src/api/machinery/machinery/index.ts new file mode 100644 index 0000000..8c81ea8 --- /dev/null +++ b/src/api/machinery/machinery/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { MachineryVO, MachineryForm, MachineryQuery } from '@/api/machinery/machinery/types'; + +/** + * 查询机械列表 + * @param query + * @returns {*} + */ + +export const listMachinery = (query?: MachineryQuery): AxiosPromise => { + return request({ + url: '/machinery/machinery/list', + method: 'get', + params: query + }); +}; + +/** + * 查询机械详细 + * @param id + */ +export const getMachinery = (id: string | number): AxiosPromise => { + return request({ + url: '/machinery/machinery/' + id, + method: 'get' + }); +}; + +/** + * 新增机械 + * @param data + */ +export const addMachinery = (data: MachineryForm) => { + return request({ + url: '/machinery/machinery', + method: 'post', + data: data + }); +}; + +/** + * 修改机械 + * @param data + */ +export const updateMachinery = (data: MachineryForm) => { + return request({ + url: '/machinery/machinery', + method: 'put', + data: data + }); +}; + +/** + * 删除机械 + * @param id + */ +export const delMachinery = (id: string | number | Array) => { + return request({ + url: '/machinery/machinery/' + id, + method: 'delete' + }); +}; diff --git a/src/api/machinery/machinery/types.ts b/src/api/machinery/machinery/types.ts new file mode 100644 index 0000000..c6900de --- /dev/null +++ b/src/api/machinery/machinery/types.ts @@ -0,0 +1,111 @@ +export interface MachineryVO { + /** + * 主键id + */ + id: string | number; + + /** + * 机械名称 + */ + machineryName: string; + + /** + * 机械型号 + */ + machineryNumber: string; + + /** + * 项目id + */ + projectId: string | number; + + /** + * 数量 + */ + number: number; + + /** + * 负责人 + */ + principal: string; + + /** + * 备注 + */ + remark: string; + +} + +export interface MachineryForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 机械名称 + */ + machineryName?: string; + + /** + * 机械型号 + */ + machineryNumber?: string; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 数量 + */ + number?: number; + + /** + * 负责人 + */ + principal?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface MachineryQuery extends PageQuery { + + /** + * 机械名称 + */ + machineryName?: string; + + /** + * 机械型号 + */ + machineryNumber?: string; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 数量 + */ + number?: number; + + /** + * 负责人 + */ + principal?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/machinery/machineryDetail/index.ts b/src/api/machinery/machineryDetail/index.ts new file mode 100644 index 0000000..eac3ff4 --- /dev/null +++ b/src/api/machinery/machineryDetail/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { MachineryDetailVO, MachineryDetailForm, MachineryDetailQuery } from '@/api/machinery/machineryDetail/types'; + +/** + * 查询机械详情列表 + * @param query + * @returns {*} + */ + +export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise => { + return request({ + url: '/machinery/machineryDetail/list', + method: 'get', + params: query + }); +}; + +/** + * 查询机械详情详细 + * @param id + */ +export const getMachineryDetail = (id: string | number): AxiosPromise => { + return request({ + url: '/machinery/machineryDetail/' + id, + method: 'get' + }); +}; + +/** + * 新增机械详情 + * @param data + */ +export const addMachineryDetail = (data: MachineryDetailForm) => { + return request({ + url: '/machinery/machineryDetail', + method: 'post', + data: data + }); +}; + +/** + * 修改机械详情 + * @param data + */ +export const updateMachineryDetail = (data: MachineryDetailForm) => { + return request({ + url: '/machinery/machineryDetail', + method: 'put', + data: data + }); +}; + +/** + * 删除机械详情 + * @param id + */ +export const delMachineryDetail = (id: string | number | Array) => { + return request({ + url: '/machinery/machineryDetail/' + id, + method: 'delete' + }); +}; diff --git a/src/api/machinery/machineryDetail/types.ts b/src/api/machinery/machineryDetail/types.ts new file mode 100644 index 0000000..7981117 --- /dev/null +++ b/src/api/machinery/machineryDetail/types.ts @@ -0,0 +1,156 @@ +export interface MachineryDetailVO { + /** + * 主键id + */ + id: string | number; + + /** + * 检验证编号 + */ + checkoutNumber: string; + + /** + * 检验单位 + */ + checkoutUnit: string; + + /** + * 检定日期/有效期 + */ + checkoutDate: string; + + /** + * 施工类型状态（0正常 1停用） + */ + status: number; + + /** + * 0入场 1出场 + */ + type: number; + + /** + * 入场时间 + */ + entryTime: string; + + /** + * 备注 + */ + remark: string; + + /** + * 图片(英文逗号分隔) + */ + picture: string; + + /** + * 机械主键id + */ + machineryId: string | number; + +} + +export interface MachineryDetailForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 检验证编号 + */ + checkoutNumber?: string; + + /** + * 检验单位 + */ + checkoutUnit?: string; + + /** + * 检定日期/有效期 + */ + checkoutDate?: string; + + /** + * 施工类型状态（0正常 1停用） + */ + status?: number; + + /** + * 0入场 1出场 + */ + type?: number; + + /** + * 入场时间 + */ + entryTime?: string; + + /** + * 备注 + */ + remark?: string; + + /** + * 图片(英文逗号分隔) + */ + picture?: string; + + /** + * 机械主键id + */ + machineryId?: string | number; + +} + +export interface MachineryDetailQuery extends PageQuery { + + /** + * 检验证编号 + */ + checkoutNumber?: string; + + /** + * 检验单位 + */ + checkoutUnit?: string; + + /** + * 检定日期/有效期 + */ + checkoutDate?: string; + + /** + * 施工类型状态（0正常 1停用） + */ + status?: number; + + /** + * 0入场 1出场 + */ + type?: number; + + /** + * 入场时间 + */ + entryTime?: string; + + /** + * 图片(英文逗号分隔) + */ + picture?: string; + + /** + * 机械主键id + */ + machineryId?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/project/constructionUser/index.ts b/src/api/project/constructionUser/index.ts new file mode 100644 index 0000000..3137217 --- /dev/null +++ b/src/api/project/constructionUser/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { ConstructionUserVO, ConstructionUserForm, ConstructionUserQuery } from '@/api/project/constructionUser/types'; + +/** + * 查询施工人员列表 + * @param query + * @returns {*} + */ + +export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise => { + return request({ + url: '/project/constructionUser/list', + method: 'get', + params: query + }); +}; + +/** + * 查询施工人员详细 + * @param id + */ +export const getConstructionUser = (id: string | number): AxiosPromise => { + return request({ + url: '/project/constructionUser/' + id, + method: 'get' + }); +}; + +/** + * 新增施工人员 + * @param data + */ +export const addConstructionUser = (data: ConstructionUserForm) => { + return request({ + url: '/project/constructionUser', + method: 'post', + data: data + }); +}; + +/** + * 修改施工人员 + * @param data + */ +export const updateConstructionUser = (data: ConstructionUserForm) => { + return request({ + url: '/project/constructionUser', + method: 'put', + data: data + }); +}; + +/** + * 删除施工人员 + * @param id + */ +export const delConstructionUser = (id: string | number | Array) => { + return request({ + url: '/project/constructionUser/' + id, + method: 'delete' + }); +}; diff --git a/src/api/project/constructionUser/types.ts b/src/api/project/constructionUser/types.ts new file mode 100644 index 0000000..ea9ed35 --- /dev/null +++ b/src/api/project/constructionUser/types.ts @@ -0,0 +1,426 @@ +export interface ConstructionUserVO { + /** + * 主键id + */ + id: string | number; + + /** + * 微信id + */ + openid: string | number; + + /** + * 微信名称 + */ + nickName: string; + + /** + * 人脸照 + */ + pacePhoto: string; + + /** + * 人员姓名 + */ + userName: string; + + /** + * 项目id + */ + projectId: string | number; + + /** + * 分包公司id + */ + contractorId: string | number; + + /** + * 班组id + */ + teamId: 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; + + /** + * 备注 + */ + remark: string; + +} + +export interface ConstructionUserForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 微信id + */ + openid?: string | number; + + /** + * 微信名称 + */ + nickName?: string; + + /** + * 人脸照 + */ + pacePhoto?: string; + + /** + * 人员姓名 + */ + userName?: string; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 分包公司id + */ + contractorId?: string | number; + + /** + * 班组id + */ + teamId?: 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; + + /** + * 备注 + */ + remark?: string; + +} + +export interface ConstructionUserQuery extends PageQuery { + + /** + * 微信id + */ + openid?: string | number; + + /** + * 微信名称 + */ + nickName?: string; + + /** + * 人脸照 + */ + pacePhoto?: string; + + /** + * 人员姓名 + */ + userName?: string; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 分包公司id + */ + contractorId?: string | number; + + /** + * 班组id + */ + teamId?: 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/contractor/index.ts b/src/api/project/contractor/index.ts new file mode 100644 index 0000000..e0f2068 --- /dev/null +++ b/src/api/project/contractor/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { ContractorVO, ContractorForm, ContractorQuery } from '@/api/project/contractor/types'; + +/** + * 查询分包单位列表 + * @param query + * @returns {*} + */ + +export const listContractor = (query?: ContractorQuery): AxiosPromise => { + return request({ + url: '/project/contractor/list', + method: 'get', + params: query + }); +}; + +/** + * 查询分包单位详细 + * @param id + */ +export const getContractor = (id: string | number): AxiosPromise => { + return request({ + url: '/project/contractor/' + id, + method: 'get' + }); +}; + +/** + * 新增分包单位 + * @param data + */ +export const addContractor = (data: ContractorForm) => { + return request({ + url: '/project/contractor', + method: 'post', + data: data + }); +}; + +/** + * 修改分包单位 + * @param data + */ +export const updateContractor = (data: ContractorForm) => { + return request({ + url: '/project/contractor', + method: 'put', + data: data + }); +}; + +/** + * 删除分包单位 + * @param id + */ +export const delContractor = (id: string | number | Array) => { + return request({ + url: '/project/contractor/' + id, + method: 'delete' + }); +}; diff --git a/src/api/project/contractor/types.ts b/src/api/project/contractor/types.ts new file mode 100644 index 0000000..9acd322 --- /dev/null +++ b/src/api/project/contractor/types.ts @@ -0,0 +1,111 @@ +export interface ContractorVO { + /** + * 主键id + */ + id: string | number; + + /** + * 公司名称 + */ + name: string; + + /** + * 负责人 + */ + principal: string; + + /** + * 负责人联系电话 + */ + principalPhone: string; + + /** + * 管理人 + */ + custodian: string; + + /** + * 管理人联系电话 + */ + custodianPhone: string; + + /** + * 备注 + */ + remark: string; + +} + +export interface ContractorForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 公司名称 + */ + name?: string; + + /** + * 负责人 + */ + principal?: string; + + /** + * 负责人联系电话 + */ + principalPhone?: string; + + /** + * 管理人 + */ + custodian?: string; + + /** + * 管理人联系电话 + */ + custodianPhone?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface ContractorQuery extends PageQuery { + + /** + * 公司名称 + */ + name?: string; + + /** + * 负责人 + */ + principal?: string; + + /** + * 负责人联系电话 + */ + principalPhone?: string; + + /** + * 管理人 + */ + custodian?: string; + + /** + * 管理人联系电话 + */ + custodianPhone?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/project/projectTeam/index.ts b/src/api/project/projectTeam/index.ts new file mode 100644 index 0000000..c4a9940 --- /dev/null +++ b/src/api/project/projectTeam/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { ProjectTeamVO, ProjectTeamForm, ProjectTeamQuery } from '@/api/project/projectTeam/types'; + +/** + * 查询项目班组列表 + * @param query + * @returns {*} + */ + +export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise => { + return request({ + url: '/project/projectTeam/list', + method: 'get', + params: query + }); +}; + +/** + * 查询项目班组详细 + * @param id + */ +export const getProjectTeam = (id: string | number): AxiosPromise => { + return request({ + url: '/project/projectTeam/' + id, + method: 'get' + }); +}; + +/** + * 新增项目班组 + * @param data + */ +export const addProjectTeam = (data: ProjectTeamForm) => { + 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 new file mode 100644 index 0000000..6021f9d --- /dev/null +++ b/src/api/project/projectTeam/types.ts @@ -0,0 +1,81 @@ +export interface ProjectTeamVO { + /** + * 主键id + */ + id: string | number; + + /** + * 项目id + */ + projectId: string | number; + + /** + * 班组名称 + */ + teamName: string; + + /** + * 范围内打卡（0范围内打卡 1任何地点打卡）默认为1 + */ + isClockIn: number; + + /** + * 备注 + */ + remark: string; + +} + +export interface ProjectTeamForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 班组名称 + */ + teamName?: string; + + /** + * 范围内打卡（0范围内打卡 1任何地点打卡）默认为1 + */ + isClockIn?: number; + + /** + * 备注 + */ + remark?: string; + +} + +export interface ProjectTeamQuery extends PageQuery { + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 班组名称 + */ + teamName?: string; + + /** + * 范围内打卡（0范围内打卡 1任何地点打卡）默认为1 + */ + isClockIn?: number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/project/projectTeamMember/index.ts b/src/api/project/projectTeamMember/index.ts new file mode 100644 index 0000000..d5a4750 --- /dev/null +++ b/src/api/project/projectTeamMember/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { ProjectTeamMemberVO, ProjectTeamMemberForm, ProjectTeamMemberQuery } 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) => { + 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 new file mode 100644 index 0000000..72835b4 --- /dev/null +++ b/src/api/project/projectTeamMember/types.ts @@ -0,0 +1,96 @@ +export interface ProjectTeamMemberVO { + /** + * 主键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 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; + + /** + * 岗位（默认为0普通员工，1组长） + */ + postId?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/views/machinery/index.vue b/src/views/machinery/index.vue new file mode 100644 index 0000000..ede377c --- /dev/null +++ b/src/views/machinery/index.vue @@ -0,0 +1,253 @@ + + + diff --git a/src/views/machinery/machineryDetail/index.vue b/src/views/machinery/machineryDetail/index.vue new file mode 100644 index 0000000..178a039 --- /dev/null +++ b/src/views/machinery/machineryDetail/index.vue @@ -0,0 +1,281 @@ + + + diff --git a/src/views/materials/company/index.vue b/src/views/materials/company/index.vue index 7bccf8c..60d8ee5 100644 --- a/src/views/materials/company/index.vue +++ b/src/views/materials/company/index.vue @@ -7,9 +7,6 @@ - - - @@ -45,15 +42,10 @@ - + - - - - @@ -94,9 +85,6 @@ - - - @@ -115,11 +103,18 @@ diff --git a/src/views/materials/materials/index.vue b/src/views/materials/materials/index.vue index 00ba86f..c247dc8 100644 --- a/src/views/materials/materials/index.vue +++ b/src/views/materials/materials/index.vue @@ -7,51 +7,6 @@ - - - - - 搜索 重置 @@ -84,18 +39,11 @@ - + - - - - - @@ -148,9 +96,6 @@ - - - @@ -205,11 +150,16 @@ - - - - diff --git a/src/views/personnelManagement/teamAllocation/index.vue b/src/views/personnelManagement/teamAllocation/index.vue deleted file mode 100644 index 1325456..0000000 --- a/src/views/personnelManagement/teamAllocation/index.vue +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/src/views/personnelManagement/workerList/index.vue b/src/views/personnelManagement/workerList/index.vue deleted file mode 100644 index 27a5b3d..0000000 --- a/src/views/personnelManagement/workerList/index.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - diff --git a/src/views/project/constructionUser/index.vue b/src/views/project/constructionUser/index.vue new file mode 100644 index 0000000..899bbdf --- /dev/null +++ b/src/views/project/constructionUser/index.vue @@ -0,0 +1,385 @@ + + + diff --git a/src/views/project/contractor/index.vue b/src/views/project/contractor/index.vue new file mode 100644 index 0000000..cc6242c --- /dev/null +++ b/src/views/project/contractor/index.vue @@ -0,0 +1,257 @@ + + + diff --git a/src/views/personnelManagement/project/project/index.vue b/src/views/project/project/index.vue similarity index 99% rename from src/views/personnelManagement/project/project/index.vue rename to src/views/project/project/index.vue index d948471..5ece9c9 100644 --- a/src/views/personnelManagement/project/project/index.vue +++ b/src/views/project/project/index.vue @@ -89,7 +89,7 @@ - + diff --git a/src/views/personnelManagement/project/projectRelevancy/component/ShuttleFrame.vue b/src/views/project/projectRelevancy/component/ShuttleFrame.vue similarity index 93% rename from src/views/personnelManagement/project/projectRelevancy/component/ShuttleFrame.vue rename to src/views/project/projectRelevancy/component/ShuttleFrame.vue index 29dae2d..b2b0c46 100644 --- a/src/views/personnelManagement/project/projectRelevancy/component/ShuttleFrame.vue +++ b/src/views/project/projectRelevancy/component/ShuttleFrame.vue @@ -27,7 +27,7 @@ const selectedProjects = ref([]); const getProjectList = async () => { try { const res = await listProject(); - allProjects.value = res.records.map((project) => ({ + allProjects.value = res.data.records.map((project) => ({ key: project.id, label: project.projectName })); @@ -41,8 +41,8 @@ const getUserProjects = async () => { const res = await listUserProjects({ userId: props.userId }); // 修改这里，使用 res.records 而不是 res.rows - selectedProjects.value = Array.isArray(res.records) - ? res.records.map((item) => item.projectId) + selectedProjects.value = Array.isArray(res.data.records) + ? res.data.records.map((item) => item.projectId) : []; console.log('已加载用户关联项目:', selectedProjects.value); diff --git a/src/views/personnelManagement/project/projectRelevancy/index.vue b/src/views/project/projectRelevancy/index.vue similarity index 100% rename from src/views/personnelManagement/project/projectRelevancy/index.vue rename to src/views/project/projectRelevancy/index.vue diff --git a/src/views/project/projectTeam/component/UserListDialog.vue b/src/views/project/projectTeam/component/UserListDialog.vue new file mode 100644 index 0000000..8f22aea --- /dev/null +++ b/src/views/project/projectTeam/component/UserListDialog.vue @@ -0,0 +1,81 @@ + + + diff --git a/src/views/project/projectTeam/index.vue b/src/views/project/projectTeam/index.vue new file mode 100644 index 0000000..5f53063 --- /dev/null +++ b/src/views/project/projectTeam/index.vue @@ -0,0 +1,250 @@ + + + diff --git a/src/views/project/projectTeamMember/index.vue b/src/views/project/projectTeamMember/index.vue new file mode 100644 index 0000000..78503c9 --- /dev/null +++ b/src/views/project/projectTeamMember/index.vue @@ -0,0 +1,272 @@ + + + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 67de61a..fdbc5ad 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -60,7 +60,7 @@ @@ -211,7 +207,7 @@ - {{ dict.label }} + {{ dict.label }} @@ -280,9 +276,12 @@
将文件拖到此处，或点击上传
@@ -301,14 +300,12 @@ import api from '@/api/system/user'; import { UserForm, UserQuery, UserVO } from '@/api/system/user/types'; import { DeptTreeVO, DeptVO } from '@/api/system/dept/types'; import { RoleVO } from '@/api/system/role/types'; -import { PostQuery, PostVO } from '@/api/system/post/types'; -import { treeselect } from '@/api/system/dept'; +import { PostVO } from '@/api/system/post/types'; import { globalHeaders } from '@/utils/request'; import { to } from 'await-to-js'; import { optionselect } from '@/api/system/post'; +import ShuttleFrame from '../../project/projectRelevancy/component/ShuttleFrame.vue'; -import { ProjectRelevancyVO } from '@/api/project/projectRelevancy/types'; -import ShuttleFrame from '../../personnelManagement/project/projectRelevancy/component/ShuttleFrame.vue'; const router = useRouter(); const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { sys_normal_disable, sys_user_sex } = toRefs(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));