From d066a27c2cc053b4533004c566414609bf84e044 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Thu, 13 Mar 2025 15:07:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=84=E6=A8=A1=E5=9D=97ts?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/machinery/machinery/index.ts | 6 +-- src/api/machinery/machinery/types.ts | 23 ++++++----- src/api/machinery/machineryDetail/index.ts | 6 +-- src/api/machinery/machineryDetail/types.ts | 4 ++ src/api/materials/company/index.ts | 6 +-- src/api/materials/company/types.ts | 4 ++ src/api/materials/materials/index.ts | 7 ++-- src/api/materials/materials/types.ts | 11 ++++++ src/api/materials/materialsInventory/index.ts | 11 ++++-- src/api/materials/materialsInventory/types.ts | 14 ++++--- src/api/project/constructionUser/index.ts | 6 +-- src/api/project/constructionUser/types.ts | 4 ++ src/api/project/contractor/index.ts | 6 +-- src/api/project/contractor/types.ts | 4 ++ src/api/project/project/index.ts | 6 +-- src/api/project/project/types.ts | 4 ++ src/api/project/projectRelevancy/index.ts | 12 +++--- src/api/project/projectRelevancy/types.ts | 24 ++++++------ src/api/project/projectTeam/index.ts | 6 +-- src/api/project/projectTeam/types.ts | 4 ++ src/api/project/projectTeamMember/index.ts | 6 +-- src/api/project/projectTeamMember/types.ts | 4 ++ src/api/system/user/index.ts | 4 +- src/types/global.d.ts | 9 ++++- src/views/machinery/index.vue | 8 ++-- src/views/materials/company/index.vue | 4 +- src/views/materials/materials/index.vue | 6 +-- src/views/project/constructionUser/index.vue | 2 +- src/views/project/contractor/index.vue | 2 + .../component/ShuttleFrame.vue | 15 ++++--- src/views/project/projectRelevancy/index.vue | 39 +++++++++++-------- 31 files changed, 168 insertions(+), 99 deletions(-) diff --git a/src/api/machinery/machinery/index.ts b/src/api/machinery/machinery/index.ts index 8c81ea8..fad757b 100644 --- a/src/api/machinery/machinery/index.ts +++ b/src/api/machinery/machinery/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { MachineryVO, MachineryForm, MachineryQuery } from '@/api/machinery/machinery/types'; +import { MachineryForm, MachineryQuery, MachineryVO, PageMachinery } from '@/api/machinery/machinery/types'; /** * 查询机械列表 @@ -8,7 +8,7 @@ import { MachineryVO, MachineryForm, MachineryQuery } from '@/api/machinery/mach * @returns {*} */ -export const listMachinery = (query?: MachineryQuery): AxiosPromise => { +export const listMachinery = (query?: MachineryQuery): AxiosPromise => { return request({ url: '/machinery/machinery/list', method: 'get', @@ -31,7 +31,7 @@ export const getMachinery = (id: string | number): AxiosPromise => * 新增机械 * @param data */ -export const addMachinery = (data: MachineryForm) => { +export const addMachinery = (data: MachineryForm): AxiosPromise => { return request({ url: '/machinery/machinery', method: 'post', diff --git a/src/api/machinery/machinery/types.ts b/src/api/machinery/machinery/types.ts index c6900de..ed6e92c 100644 --- a/src/api/machinery/machinery/types.ts +++ b/src/api/machinery/machinery/types.ts @@ -33,7 +33,6 @@ export interface MachineryVO { * 备注 */ remark: string; - } export interface MachineryForm extends BaseEntity { @@ -71,11 +70,9 @@ export interface MachineryForm extends BaseEntity { * 备注 */ remark?: string; - } -export interface MachineryQuery extends PageQuery { - +export interface MachineryQuery extends PageRequest { /** * 机械名称 */ @@ -101,11 +98,17 @@ export interface MachineryQuery extends PageQuery { */ principal?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 备注 + */1 + remark?: string; + + /** + * 日期范围参数 + */ + params?: any; } - - +export interface PageMachinery extends PageResponse { + records?: MachineryVO[]; +} diff --git a/src/api/machinery/machineryDetail/index.ts b/src/api/machinery/machineryDetail/index.ts index eac3ff4..9fbe588 100644 --- a/src/api/machinery/machineryDetail/index.ts +++ b/src/api/machinery/machineryDetail/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { MachineryDetailVO, MachineryDetailForm, MachineryDetailQuery } from '@/api/machinery/machineryDetail/types'; +import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO, PageMachineryDetail } from '@/api/machinery/machineryDetail/types'; /** * 查询机械详情列表 @@ -8,7 +8,7 @@ import { MachineryDetailVO, MachineryDetailForm, MachineryDetailQuery } from '@/ * @returns {*} */ -export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise => { +export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise => { return request({ url: '/machinery/machineryDetail/list', method: 'get', @@ -31,7 +31,7 @@ export const getMachineryDetail = (id: string | number): AxiosPromise { +export const addMachineryDetail = (data: MachineryDetailForm): AxiosPromise => { return request({ url: '/machinery/machineryDetail', method: 'post', diff --git a/src/api/machinery/machineryDetail/types.ts b/src/api/machinery/machineryDetail/types.ts index 6383ef3..1cffc50 100644 --- a/src/api/machinery/machineryDetail/types.ts +++ b/src/api/machinery/machineryDetail/types.ts @@ -148,3 +148,7 @@ export interface MachineryDetailQuery extends PageRequest { */ params?: any; } + +export interface PageMachineryDetail extends PageResponse { + records?: MachineryDetailVO[]; +} diff --git a/src/api/materials/company/index.ts b/src/api/materials/company/index.ts index c3f8ec6..4737dbf 100644 --- a/src/api/materials/company/index.ts +++ b/src/api/materials/company/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { CompanyVO, CompanyForm, CompanyQuery } from '@/api/materials/company/types'; +import { CompanyForm, CompanyQuery, CompanyVO, PageCompany } from '@/api/materials/company/types'; /** * 查询公司列表 @@ -8,7 +8,7 @@ import { CompanyVO, CompanyForm, CompanyQuery } from '@/api/materials/company/ty * @returns {*} */ -export const listCompany = (query?: CompanyQuery): AxiosPromise => { +export const listCompany = (query?: CompanyQuery): AxiosPromise => { return request({ url: '/materials/company/list', method: 'get', @@ -31,7 +31,7 @@ export const getCompany = (id: string | number): AxiosPromise => { * 新增公司 * @param data */ -export const addCompany = (data: CompanyForm) => { +export const addCompany = (data: CompanyForm): AxiosPromise => { return request({ url: '/materials/company', method: 'post', diff --git a/src/api/materials/company/types.ts b/src/api/materials/company/types.ts index 493630c..fe62e22 100644 --- a/src/api/materials/company/types.ts +++ b/src/api/materials/company/types.ts @@ -88,3 +88,7 @@ export interface CompanyQuery extends PageRequest { */ params?: any; } + +export interface PageCompany extends PageResponse { + records?: CompanyVO[]; +} diff --git a/src/api/materials/materials/index.ts b/src/api/materials/materials/index.ts index c2fef31..09ff677 100644 --- a/src/api/materials/materials/index.ts +++ b/src/api/materials/materials/index.ts @@ -1,14 +1,13 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { MaterialsVO, MaterialsForm, MaterialsQuery } from '@/api/materials/materials/types'; +import { MaterialsForm, MaterialsQuery, MaterialsVO, PageMaterials } from '@/api/materials/materials/types'; /** * 查询材料名称列表 * @param query * @returns {*} */ - -export const listMaterials = (query?: MaterialsQuery): AxiosPromise => { +export const listMaterials = (query?: MaterialsQuery): AxiosPromise => { return request({ url: '/materials/materials/list', method: 'get', @@ -31,7 +30,7 @@ export const getMaterials = (id: string | number): AxiosPromise => * 新增材料名称 * @param data */ -export const addMaterials = (data: MaterialsForm) => { +export const addMaterials = (data: MaterialsForm): AxiosPromise => { return request({ url: '/materials/materials', method: 'post', diff --git a/src/api/materials/materials/types.ts b/src/api/materials/materials/types.ts index 33e32f6..5e63de1 100644 --- a/src/api/materials/materials/types.ts +++ b/src/api/materials/materials/types.ts @@ -1,3 +1,5 @@ +import { CompanyVO } from '@/api/materials/company/types'; + export interface MaterialsVO { /** * 主键id @@ -14,6 +16,11 @@ export interface MaterialsVO { */ companyId: string | number; + /** + * 公司信息 + */ + companyVo: CompanyVO; + /** * 项目id */ @@ -283,3 +290,7 @@ export interface MaterialsQuery extends PageRequest { */ params?: any; } + +export interface PageMaterials extends PageResponse { + records?: MaterialsVO[]; +} diff --git a/src/api/materials/materialsInventory/index.ts b/src/api/materials/materialsInventory/index.ts index 70dccea..18ae030 100644 --- a/src/api/materials/materialsInventory/index.ts +++ b/src/api/materials/materialsInventory/index.ts @@ -1,6 +1,11 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { MaterialsInventoryVO, MaterialsInventoryForm, MaterialsInventoryQuery } from '@/api/materials/materialsInventory/types'; +import { + MaterialsInventoryForm, + MaterialsInventoryQuery, + MaterialsInventoryVO, + PageMaterialsInventory +} from '@/api/materials/materialsInventory/types'; /** * 查询材料出/入库列表 @@ -8,7 +13,7 @@ import { MaterialsInventoryVO, MaterialsInventoryForm, MaterialsInventoryQuery } * @returns {*} */ -export const listMaterialsInventory = (query?: MaterialsInventoryQuery): AxiosPromise => { +export const listMaterialsInventory = (query?: MaterialsInventoryQuery): AxiosPromise => { return request({ url: '/materials/materialsInventory/list', method: 'get', @@ -31,7 +36,7 @@ export const getMaterialsInventory = (id: string | number): AxiosPromise { +export const addMaterialsInventory = (data: MaterialsInventoryForm): AxiosPromise => { return request({ url: '/materials/materialsInventory', method: 'post', diff --git a/src/api/materials/materialsInventory/types.ts b/src/api/materials/materialsInventory/types.ts index 0ce3ba1..10c24cb 100644 --- a/src/api/materials/materialsInventory/types.ts +++ b/src/api/materials/materialsInventory/types.ts @@ -11,6 +11,11 @@ export interface MaterialsInventoryVO { */ materialsId: string | number; + /** + * 材料信息 + */ + materialsVo: MaterialsVO; + /** * 项目id */ @@ -65,11 +70,6 @@ export interface MaterialsInventoryVO { * 备注 */ remark: string; - - /** - * 材料封装 - */ - materialsVo: MaterialsVO; } export interface MaterialsInventoryForm extends BaseEntity { @@ -205,3 +205,7 @@ export interface MaterialsInventoryQuery extends PageRequest { */ params?: any; } + +export interface PageMaterialsInventory extends PageResponse { + records?: MaterialsInventoryVO[]; +} diff --git a/src/api/project/constructionUser/index.ts b/src/api/project/constructionUser/index.ts index 3137217..4c1e4e1 100644 --- a/src/api/project/constructionUser/index.ts +++ b/src/api/project/constructionUser/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { ConstructionUserVO, ConstructionUserForm, ConstructionUserQuery } from '@/api/project/constructionUser/types'; +import { ConstructionUserVO, ConstructionUserForm, ConstructionUserQuery, PageConstructionUser } from '@/api/project/constructionUser/types'; /** * 查询施工人员列表 @@ -8,7 +8,7 @@ import { ConstructionUserVO, ConstructionUserForm, ConstructionUserQuery } from * @returns {*} */ -export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise => { +export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise => { return request({ url: '/project/constructionUser/list', method: 'get', @@ -31,7 +31,7 @@ export const getConstructionUser = (id: string | number): AxiosPromise { +export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise => { return request({ url: '/project/constructionUser', method: 'post', diff --git a/src/api/project/constructionUser/types.ts b/src/api/project/constructionUser/types.ts index b2d4d58..fd689e4 100644 --- a/src/api/project/constructionUser/types.ts +++ b/src/api/project/constructionUser/types.ts @@ -430,3 +430,7 @@ export interface ConstructionUserQuery extends PageRequest { */ params?: any; } + +export interface PageConstructionUser extends PageResponse { + records?: ConstructionUserVO[]; +} diff --git a/src/api/project/contractor/index.ts b/src/api/project/contractor/index.ts index e0f2068..144f966 100644 --- a/src/api/project/contractor/index.ts +++ b/src/api/project/contractor/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { ContractorVO, ContractorForm, ContractorQuery } from '@/api/project/contractor/types'; +import { ContractorForm, ContractorQuery, ContractorVO, PageContractor } from '@/api/project/contractor/types'; /** * 查询分包单位列表 @@ -8,7 +8,7 @@ import { ContractorVO, ContractorForm, ContractorQuery } from '@/api/project/con * @returns {*} */ -export const listContractor = (query?: ContractorQuery): AxiosPromise => { +export const listContractor = (query?: ContractorQuery): AxiosPromise => { return request({ url: '/project/contractor/list', method: 'get', @@ -31,7 +31,7 @@ export const getContractor = (id: string | number): AxiosPromise = * 新增分包单位 * @param data */ -export const addContractor = (data: ContractorForm) => { +export const addContractor = (data: ContractorForm): AxiosPromise => { return request({ url: '/project/contractor', method: 'post', diff --git a/src/api/project/contractor/types.ts b/src/api/project/contractor/types.ts index c0e2573..607b77d 100644 --- a/src/api/project/contractor/types.ts +++ b/src/api/project/contractor/types.ts @@ -103,3 +103,7 @@ export interface ContractorQuery extends PageRequest { */ params?: any; } + +export interface PageContractor extends PageResponse { + records?: ContractorVO[]; +} diff --git a/src/api/project/project/index.ts b/src/api/project/project/index.ts index fe1456d..16b87f7 100644 --- a/src/api/project/project/index.ts +++ b/src/api/project/project/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { ProjectVO, ProjectForm, ProjectQuery } from '@/api/project/project/types'; +import { PageProjectVo, ProjectForm, ProjectQuery, ProjectVO } from '@/api/project/project/types'; /** * 查询项目列表 @@ -8,7 +8,7 @@ import { ProjectVO, ProjectForm, ProjectQuery } from '@/api/project/project/type * @returns {*} */ -export const listProject = (query?: ProjectQuery): AxiosPromise => { +export const listProject = (query?: ProjectQuery): AxiosPromise => { return request({ url: '/project/project/list', method: 'get', @@ -31,7 +31,7 @@ export const getProject = (id: string | number): AxiosPromise => { * 新增项目 * @param data */ -export const addProject = (data: ProjectForm) => { +export const addProject = (data: ProjectForm): AxiosPromise => { return request({ url: '/project/project', method: 'post', diff --git a/src/api/project/project/types.ts b/src/api/project/project/types.ts index c249b06..317944a 100644 --- a/src/api/project/project/types.ts +++ b/src/api/project/project/types.ts @@ -328,3 +328,7 @@ export interface ProjectQuery extends PageRequest { */ params?: any; } + +export interface PageProjectVo extends PageResponse { + records?: ProjectVO[]; +} diff --git a/src/api/project/projectRelevancy/index.ts b/src/api/project/projectRelevancy/index.ts index cb255d8..94cf59f 100644 --- a/src/api/project/projectRelevancy/index.ts +++ b/src/api/project/projectRelevancy/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { ProjectRelevancyVO, ProjectRelevancyForm, ProjectRelevancyQuery } from '@/api/project/projectRelevancy/types'; +import { PageProjectRelevancy, ProjectRelevancyForm, ProjectRelevancyQuery, ProjectRelevancyVO } from '@/api/project/projectRelevancy/types'; /** * 查询系统用户与项目关联列表 @@ -8,7 +8,7 @@ import { ProjectRelevancyVO, ProjectRelevancyForm, ProjectRelevancyQuery } from * @returns {*} */ -export const listProjectRelevancy = (query?: ProjectRelevancyQuery): AxiosPromise => { +export const listProjectRelevancy = (query?: ProjectRelevancyQuery): AxiosPromise => { return request({ url: '/project/projectRelevancy/login/page', method: 'get', @@ -31,7 +31,7 @@ export const getProjectRelevancy = (id: string | number): AxiosPromise { +export const addProjectRelevancy = (data: ProjectRelevancyForm): AxiosPromise => { return request({ url: '/project/projectRelevancy', method: 'post', @@ -70,7 +70,7 @@ export const delProjectRelevancy = (id: string | number | Array * 获取用户已关联的项目列表 * @param params { userId: number } */ -export function listUserProjects(params: { userId: number }) { +export function listUserProjects(params: { userId: number | string }) { return request({ url: '/project/projectRelevancy/list', method: 'get', @@ -82,7 +82,7 @@ export function listUserProjects(params: { userId: number }) { * 添加项目关联 * @param data { userId: number; projectIds: number[] } */ -export function addNewProjectRelevancy(data: { userId: number; projectIds: number[] }) { +export function addNewProjectRelevancy(data: { userId: number | string; projectIdList: number[] }) { return request({ url: '/project/projectRelevancy/add/project/list', method: 'post', @@ -94,7 +94,7 @@ export function addNewProjectRelevancy(data: { userId: number; projectIds: numbe * 移除项目关联 * @param data { userId: number; projectIds: number[] } */ -export function removeNewProjectRelevancy(data: { userId: number; projectIds: number[] }) { +export function removeNewProjectRelevancy(data: { userId: number | string; projectIdList: number[] }) { return request({ url: '/project/projectRelevancy/remove/project/list', method: 'delete', diff --git a/src/api/project/projectRelevancy/types.ts b/src/api/project/projectRelevancy/types.ts index a38dfe3..3b469e7 100644 --- a/src/api/project/projectRelevancy/types.ts +++ b/src/api/project/projectRelevancy/types.ts @@ -1,3 +1,5 @@ +import { ProjectVO } from '@/api/project/project/types'; + export interface ProjectRelevancyVO { /** * 主键ID @@ -15,10 +17,9 @@ export interface ProjectRelevancyVO { projectId: string | number; /** - * 删除时间 + * 项目详情 */ - deletedAt: string; - + project: ProjectVO; } export interface ProjectRelevancyForm extends BaseEntity { @@ -41,11 +42,9 @@ export interface ProjectRelevancyForm extends BaseEntity { * 删除时间 */ deletedAt?: string; - } -export interface ProjectRelevancyQuery extends PageQuery { - +export interface ProjectRelevancyQuery extends PageRequest { /** * 用户ID */ @@ -61,11 +60,12 @@ export interface ProjectRelevancyQuery extends PageQuery { */ deletedAt?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - +export interface PageProjectRelevancy extends PageResponse { + records?: ProjectRelevancyVO[]; +} diff --git a/src/api/project/projectTeam/index.ts b/src/api/project/projectTeam/index.ts index c4a9940..cb504b5 100644 --- a/src/api/project/projectTeam/index.ts +++ b/src/api/project/projectTeam/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { ProjectTeamVO, ProjectTeamForm, ProjectTeamQuery } from '@/api/project/projectTeam/types'; +import { PageProjectTeam, ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } from '@/api/project/projectTeam/types'; /** * 查询项目班组列表 @@ -8,7 +8,7 @@ import { ProjectTeamVO, ProjectTeamForm, ProjectTeamQuery } from '@/api/project/ * @returns {*} */ -export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise => { +export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise => { return request({ url: '/project/projectTeam/list', method: 'get', @@ -31,7 +31,7 @@ export const getProjectTeam = (id: string | number): AxiosPromise * 新增项目班组 * @param data */ -export const addProjectTeam = (data: ProjectTeamForm) => { +export const addProjectTeam = (data: ProjectTeamForm): AxiosPromise => { return request({ url: '/project/projectTeam', method: 'post', diff --git a/src/api/project/projectTeam/types.ts b/src/api/project/projectTeam/types.ts index c1bf0b9..45a6469 100644 --- a/src/api/project/projectTeam/types.ts +++ b/src/api/project/projectTeam/types.ts @@ -73,3 +73,7 @@ export interface ProjectTeamQuery extends PageRequest { */ params?: any; } + +export interface PageProjectTeam extends PageResponse { + records?: ProjectTeamVO[]; +} diff --git a/src/api/project/projectTeamMember/index.ts b/src/api/project/projectTeamMember/index.ts index d5a4750..2d5f125 100644 --- a/src/api/project/projectTeamMember/index.ts +++ b/src/api/project/projectTeamMember/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { ProjectTeamMemberVO, ProjectTeamMemberForm, ProjectTeamMemberQuery } from '@/api/project/projectTeamMember/types'; +import { PageProjectTeamMember, ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types'; /** * 查询项目班组下的成员列表 @@ -8,7 +8,7 @@ import { ProjectTeamMemberVO, ProjectTeamMemberForm, ProjectTeamMemberQuery } fr * @returns {*} */ -export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise => { +export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise => { return request({ url: '/project/projectTeamMember/list', method: 'get', @@ -31,7 +31,7 @@ export const getProjectTeamMember = (id: string | number): AxiosPromise { +export const addProjectTeamMember = (data: ProjectTeamMemberForm): AxiosPromise => { return request({ url: '/project/projectTeamMember', method: 'post', diff --git a/src/api/project/projectTeamMember/types.ts b/src/api/project/projectTeamMember/types.ts index 67a754a..18e2d6f 100644 --- a/src/api/project/projectTeamMember/types.ts +++ b/src/api/project/projectTeamMember/types.ts @@ -93,3 +93,7 @@ export interface ProjectTeamMemberQuery extends PageRequest { */ params?: any; } + +export interface PageProjectTeamMember extends PageResponse { + records?: ProjectTeamMemberVO[]; +} diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index 0867c48..ee66383 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -1,8 +1,8 @@ -import {DeptTreeVO, DeptVO} from './../dept/types'; +import { DeptTreeVO } from './../dept/types'; import { RoleVO } from '@/api/system/role/types'; import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { UserForm, UserQuery, UserVO, UserInfoVO } from './types'; +import { UserForm, UserInfoVO, UserQuery, UserVO } from './types'; import { parseStrEmpty } from '@/utils/ruoyi'; /** diff --git a/src/types/global.d.ts b/src/types/global.d.ts index 26c3d8a..6eba9eb 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -1,4 +1,4 @@ -import type { PropType as VuePropType, ComponentInternalInstance as ComponentInstance } from 'vue'; +import type { ComponentInternalInstance as ComponentInstance } from 'vue'; import { LanguageEnum } from '@/enums/LanguageEnum'; declare global { @@ -98,6 +98,13 @@ declare global { sortOrder: string; } + declare interface PageResponse { + total?: number; + size?: number; + current?: number; + pages?: number; + } + declare interface LayoutSetting { /** * 是否显示顶部导航 diff --git a/src/views/machinery/index.vue b/src/views/machinery/index.vue index 1de8b70..4ecf38d 100644 --- a/src/views/machinery/index.vue +++ b/src/views/machinery/index.vue @@ -75,7 +75,7 @@ - + @@ -150,8 +150,10 @@ const initFormData: MachineryForm = { const data = reactive>({ form: { ...initFormData }, queryParams: { - pageNum: 1, + current: 1, pageSize: 10, + sortField: 'createTime', + sortOrder: 'descend', machineryName: undefined, machineryNumber: undefined, projectId: currentProject.value.id, @@ -189,7 +191,7 @@ const reset = () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.value.pageNum = 1; + queryParams.value.current = 1; getList(); }; diff --git a/src/views/materials/company/index.vue b/src/views/materials/company/index.vue index a531c78..2f6796c 100644 --- a/src/views/materials/company/index.vue +++ b/src/views/materials/company/index.vue @@ -135,6 +135,8 @@ const data = reactive>({ queryParams: { current: 1, pageSize: 10, + sortField: 'createTime', + sortOrder: 'descend', companyName: undefined, projectId: currentProject.value.id, status: undefined, @@ -171,7 +173,7 @@ const reset = () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.value.pageNum = 1; + queryParams.value.current = 1; getList(); }; diff --git a/src/views/materials/materials/index.vue b/src/views/materials/materials/index.vue index f86b7d4..5f92e66 100644 --- a/src/views/materials/materials/index.vue +++ b/src/views/materials/materials/index.vue @@ -193,7 +193,6 @@ const initFormData: MaterialsForm = { materialsName: undefined, companyId: undefined, projectId: currentProject.value.id, - companyVo: undefined, typeSpecificationName: undefined, typeSpecificationUrl: undefined, certificateConformityName: undefined, @@ -215,10 +214,11 @@ const data = reactive>({ queryParams: { current: 1, pageSize: 10, + sortField: 'createTime', + sortOrder: 'descend', materialsName: undefined, companyId: undefined, projectId: currentProject.value.id, - companyVo: undefined, typeSpecificationName: undefined, typeSpecificationUrl: undefined, certificateConformityName: undefined, @@ -250,7 +250,7 @@ const getList = async () => { materialsList.value = res.data.records; total.value = res.data.total; const companyMap = new Map(); - res.data.records.forEach((record) => { + res.data.records.forEach((record: MaterialsVO) => { const { id, companyName } = record.companyVo; if (!companyMap.has(id)) { companyMap.set(id, { id, companyName }); diff --git a/src/views/project/constructionUser/index.vue b/src/views/project/constructionUser/index.vue index efe0860..0f33486 100644 --- a/src/views/project/constructionUser/index.vue +++ b/src/views/project/constructionUser/index.vue @@ -326,7 +326,7 @@ const getContractorList = async () => { loading.value = false; }; -const projectTeamOpt = ref(); +const projectTeamOpt = ref([]); /** 查询当前项目下的班组列表 */ const getProjectTeamList = async () => { diff --git a/src/views/project/contractor/index.vue b/src/views/project/contractor/index.vue index c42764b..0d8f3ef 100644 --- a/src/views/project/contractor/index.vue +++ b/src/views/project/contractor/index.vue @@ -143,6 +143,8 @@ const data = reactive>({ queryParams: { current: 1, pageSize: 10, + sortField: 'createTime', + sortOrder: 'descend', name: undefined, principal: undefined, principalPhone: undefined, diff --git a/src/views/project/projectRelevancy/component/ShuttleFrame.vue b/src/views/project/projectRelevancy/component/ShuttleFrame.vue index b2b0c46..a083c7d 100644 --- a/src/views/project/projectRelevancy/component/ShuttleFrame.vue +++ b/src/views/project/projectRelevancy/component/ShuttleFrame.vue @@ -10,15 +10,16 @@